Merge pull request #323 from metricfu/fixes/escape-warnings

Make metric_fu compatible with Ruby 3.0

Author: bronzdoc

.github/workflows/ruby.yml

@@ -5,7 +5,7 @@
 # This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
 # For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
 
-name: Ruby
+name: Test
 
 on:
   push:
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7']
+        ruby-version: ['2.5', '2.6', '2.7', '3.0']
 
     steps:
     - uses: actions/checkout@v2

lib/metric_fu/formatter/html.rb

@@ -88,7 +88,8 @@ def open_in_browser?
       #   The directory path where the 'index.html' we want to open is
       #   stored
       def show_in_browser(dir)
-        uri = URI.join(URI.escape("file://#{dir}/"), "index.html")
+        parser = URI::Parser.new
+        uri = URI.join(parser.escape("file://#{dir}/"), "index.html")
         Launchy.open(uri) if open_in_browser?
       end
     end

lib/metric_fu/utility.rb

@@ -35,8 +35,8 @@ def rm_rf(*args)
       FileUtils.rm_rf(*args)
     end
 
-    def mkdir_p(*args)
-      FileUtils.mkdir_p(*args)
+    def mkdir_p(dir, **args)
+      FileUtils.mkdir_p(dir, **args)
     end
 
     def glob(*args)

spec/metric_fu/formatter/html_spec.rb

@@ -80,7 +80,8 @@ def directory(name)
       allow(MetricFu.configuration).to receive(:is_cruise_control_rb?).and_return(false)
       formatter = MetricFu::Formatter::HTML.new
       path = MetricFu.run_path.join(directory("output_directory"))
-      uri = URI.join(URI.escape("file://#{path}/"), "index.html")
+      parser = URI::Parser.new
+      uri = URI.join(parser.escape("file://#{path}/"), "index.html")
       expect(Launchy).to receive(:open).with(uri)
       formatter.finish
       formatter.display_results
@@ -125,7 +126,8 @@ def directory(name)
       allow(MetricFu.configuration).to receive(:is_cruise_control_rb?).and_return(false)
       formatter = MetricFu::Formatter::HTML.new(output: @output)
       path = MetricFu.run_path.join("#{directory('base_directory')}/#{@output}")
-      uri = URI.join(URI.escape("file://#{path}/"), "index.html")
+      parser = URI::Parser.new
+      uri = URI.join(parser.escape("file://#{path}/"), "index.html")
       expect(Launchy).to receive(:open).with(uri)
       formatter.finish
       formatter.display_results