Merge pull request #202 from igaiga/fix_sh_hash_option_problem

Change FileUtils#sh to adopt with hash style option.

Author: hsbt

lib/rake/file_utils.rb

@@ -50,7 +50,7 @@ def sh(*cmd, &block)
     Rake.rake_output_message sh_show_command cmd if verbose
 
     unless noop
-      res = system(*cmd, options)
+      res = (Hash === cmd.last) ? system(*cmd) : system(*cmd, options)
       status = $?
       status = Rake::PseudoStatus.new(1) if !res && status.nil?
       shell_runner.call(res, status)

test/test_rake_file_utils.rb

@@ -180,6 +180,15 @@ def test_sh_with_spawn_options
     assert_equal "echocommand.rb\n", r.read
   end
 
+  def test_sh_with_hash_option
+    skip "JRuby does not support spawn options" if jruby?
+    check_expansion
+
+    verbose(false) {
+      sh "#{RUBY} check_expansion.rb", {chdir: "."}, { verbose: false }
+    }
+  end
+
   def test_sh_failure
     shellcommand