Fixed problem with :verbose=>false in sh and ruby commands

(http://onestepback.org/redmine/issues/show/52).
Updated tests to cover all scenarios.

Author: jimweirich

CHANGES

@@ -15,6 +15,8 @@
 * Fixed the silent option parsing problem.
   (http://onestepback.org/redmine/issues/show/47)
 
+* Fixed :verbose=>false flag on sh and ruby commands.  
+
 == Version 0.8.7
 
 * Fixed EXEEXT for JRuby on windows.

lib/rake/file_utils.rb

@@ -37,9 +37,9 @@ def sh(*cmd, &block)
         ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
       }
     end
-    if RakeFileUtils.verbose_flag == :default
+    if RakeFileUtils.verbose_flag == :default && options[:verbose].nil?
       options[:verbose] = true
-    else
+    elsif options[:verbose].nil?
       options[:verbose] ||= RakeFileUtils.verbose_flag
     end
     options[:noop]    ||= RakeFileUtils.nowrite_flag

rakelib/tags.rake

@@ -2,7 +2,7 @@
 
 module Tags
   PROG = ENV['TAGS'] || 'ctags'
-  RUBY_FILES = FileList['**/*.rb']
+  RUBY_FILES = FileList['**/*.rb'].exclude('sys.rb')
   RUBY_FILES.include('**/*.rake')
 end
 

test/data/verbose/Rakefile

@@ -0,0 +1,34 @@
+
+task :standalone_verbose_true do
+  verbose true
+  sh "ruby -e '0'"
+end
+
+task :standalone_verbose_false do
+  verbose false
+  sh "ruby -e '0'"
+end
+
+task :inline_verbose_default do
+  sh "ruby -e '0'"
+end
+
+task :inline_verbose_false do
+  sh "ruby -e '0'", :verbose => false
+end
+
+task :inline_verbose_true do
+  sh "ruby -e '0'", :verbose => true
+end
+
+task :block_verbose_true do
+  verbose(true) do
+    sh "ruby -e '0'"
+  end
+end
+
+task :block_verbose_false do
+  verbose(false) do
+    sh "ruby -e '0'"
+  end
+end

test/functional/session_based_tests.rb

@@ -163,6 +163,55 @@ def test_invalid_command_line_options
     assert_match %r{invalid +option}i, @err
   end
 
+  def test_inline_verbose_default_should_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "inline_verbose_default"
+    end
+    assert_match(/ruby -e/, @err)
+  end
+
+  def test_inline_verbose_true_should_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "inline_verbose_true"
+    end
+    assert_match(/ruby -e/, @err)
+  end
+
+  def test_inline_verbose_false_should_not_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "inline_verbose_false"
+    end
+    assert_no_match(/ruby -e/, @err)
+  end
+
+  def test_block_verbose_false_should_not_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "block_verbose_false"
+    end
+    assert_no_match(/ruby -e/, @err)
+  end
+
+  def test_block_verbose_true_should_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "block_verbose_true"
+    end
+    assert_match(/ruby -e/, @err)
+  end
+
+  def test_standalone_verbose_true_should_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "standalone_verbose_true"
+    end
+    assert_match(/ruby -e/, @err)
+  end
+
+  def test_standalone_verbose_false_should_not_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "standalone_verbose_false"
+    end
+    assert_no_match(/ruby -e/, @err)
+  end
+
   def test_dry_run
     in_environment("PWD" => "test/data/default") do rake "-n", "other" end
     assert_match %r{Execute \(dry run\) default}, @out