test/data/verbose/Rakefile @@ -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. CHANGES @@ -37,9 +37,9 @@ module FileUtils 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 lib/rake/file_utils.rb @@ -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 rakelib/tags.rake @@ -163,6 +163,55 @@ class SessionBasedTests < Test::Unit::TestCase 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 test/functional/session_based_tests.rb 762e6c5c6d3350c2719b29eb3b4be909b6363492 Jim Weirich jim.weirich@gmail.com http://github.com/jimweirich/rake/commit/6afd6faeee1c39868748f2b8f001e6d627919b49 6afd6faeee1c39868748f2b8f001e6d627919b49 2009-05-24T19:45:48-07:00 2009-05-24T19:45:48-07:00 Fixed problem with :verbose=>false in sh and ruby commands (http://onestepback.org/redmine/issues/show/52). Updated tests to cover all scenarios. d862c1d6ef612fc53ff68d5268e5d1d9c23abcc2 Jim Weirich jim.weirich@gmail.com