Making sure URIs are escaped to handle ugly paths

Author: Nick Veys

lib/metric_fu/formatter/html.rb

@@ -88,7 +88,7 @@ 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("file://#{dir}/", 'index.html')
+        uri = URI.join(URI.escape("file://#{dir}/"), 'index.html')
         Launchy.open(uri) if open_in_browser?
       end
     end

spec/metric_fu/formatter/html_spec.rb

@@ -87,7 +87,7 @@ def directory(name)
       it "can open the results in the browser" do
         formatter = MetricFu::Formatter::HTML.new
         path = MetricFu.run_path.join(directory('output_directory'))
-        uri = URI.join("file://#{path}/", 'index.html')
+        uri = URI.join(URI.escape("file://#{path}/"), 'index.html')
         expect(Launchy).to receive(:open).with(uri)
         formatter.finish
         formatter.display_results
@@ -140,7 +140,7 @@ def directory(name)
       it "can open the results in the browser from the custom output directory" do
         formatter = MetricFu::Formatter::HTML.new(output: @output)
         path = MetricFu.run_path.join("#{directory('base_directory')}/#{@output}")
-        uri = URI.join("file://#{path}/", 'index.html')
+        uri = URI.join(URI.escape("file://#{path}/"), 'index.html')
         expect(Launchy).to receive(:open).with(uri)
         formatter.finish
         formatter.display_results

spec/usage_test_spec.rb

@@ -70,13 +70,13 @@
       expect(test_result.success).to eq(false)
     end
     specify 'succeeds when the code exits with a zero exit status' do
-      code = "sh #{fixtures_path.join('exit0.sh').to_path}"
+      code = "sh '#{fixtures_path.join('exit0.sh').to_path}'"
       test_result = SnippetRunner.new(code, 'sh').run_code
       expect(test_result.captured_output).to match("exit status 0")
       expect(test_result.success).to eq(true)
     end
     specify 'fails when the code exits with a non-zero exit status' do
-      code = "sh #{fixtures_path.join('exit1.sh').to_path}"
+      code = "sh '#{fixtures_path.join('exit1.sh').to_path}'"
       test_result = SnippetRunner.new(code, 'sh').run_code
       expect(test_result.captured_output).to match("exit status 1")
       expect(test_result.success).to eq(false)