Append the PATH when running rubydevkit.

Author: larskanis

lib/ruby_installer/msys2_installation.rb

@@ -129,6 +129,9 @@ def disable_msys_apps(mingwarch=nil)
 
     def msys_apps_envvars_for_cmd
       vars = with_msys_install_hint{ msys_apps_envvars }
+      if (path=vars.delete("PATH")) && !ENV['PATH'].include?(path)
+        vars['PATH'] = path + ";" + ENV['PATH']
+      end
       vars.map do |key, val|
         "#{key}=#{val}"
       end.join("\n")

test/test_rubydevkit.rb

@@ -5,6 +5,8 @@ class TestRubydevkit < Minitest::Test
   def test_rubydevkit_without_params
     skip unless File.directory?("C:/msys64")
 
+    old = ENV['PATH']
+    ENV['PATH'] += ";c:\\testpath"
     out = Tempfile.open(%w[test .cmd]) do |fd|
       fd.write <<-EOT
 @call rubydevkit
@@ -16,7 +18,8 @@ def test_rubydevkit_without_params
     end
 
     mingw = RUBY_PLATFORM =~ /x64/ ? "MINGW64" : "MINGW32"
-    assert_match(/PATH: .*;C:\\msys64\\#{mingw}\\bin;C:\\msys64\\usr\\bin/i, out)
+    assert_match(/PATH: .*;C:\\msys64\\#{mingw}\\bin;C:\\msys64\\usr\\bin.*c:\\testpath$/i, out)
     assert_match(/MSYSTEM: #{mingw}/i, out)
+    ENV['PATH'] = old
   end
 end