drake 0.8.7.0.2.4 → 0.9.0.0.3.0

data/test/in_environment.rb

@@ -1,13 +1,15 @@
 module InEnvironment
   private
-  
+
   # Create an environment for a test. At the completion of the yielded
   # block, the environment is restored to its original conditions.
-  def in_environment(settings)
-    original_settings = set_env(settings)
-    yield    
+  def in_environment(settings=nil)
+    settings ||= {}
+    full_settings = {"RAKEOPT" => nil}.merge(settings)
+    original_settings = set_env(full_settings)
+    yield
   ensure
-    set_env(original_settings)
+    set_env(original_settings) rescue nil
   end
 
   # Set the environment according to the settings hash.

data/test/{test_application.rb → lib/application_test.rb}

@@ -21,19 +21,27 @@ class TestApplication < Test::Unit::TestCase
   include TestMethods
 
   def setup
+    super
     @app = Rake::Application.new
     @app.options.threads = Rake.application.options.threads
     @app.options.rakelib = []
+    Rake::TaskManager.record_task_metadata = true
+  end
+
+  def teardown
+    Rake::TaskManager.record_task_metadata = false
+    super
   end
 
   def test_constant_warning
-    err = capture_stderr do @app.instance_eval { const_warning("Task") } end
-    assert_match(/warning/i, err)
-    assert_match(/deprecated/i, err)
-    assert_match(/Task/i, err)
+    error_messages = capture_stderr do @app.instance_eval { const_warning("Task") } end
+    assert_match(/warning/i, error_messages)
+    assert_match(/deprecated/i, error_messages)
+    assert_match(/Task/i, error_messages)
   end
 
   def test_display_tasks
+    @app.options.show_tasks = :tasks
     @app.options.show_task_pattern = //
     @app.last_description = "COMMENT"
     @app.define_task(Rake::Task, "t")
@@ -44,6 +52,7 @@ class TestApplication < Test::Unit::TestCase
 
   def test_display_tasks_with_long_comments
     in_environment('RAKE_COLUMNS' => '80') do
+      @app.options.show_tasks = :tasks
       @app.options.show_task_pattern = //
       @app.last_description = "1234567890" * 8
       @app.define_task(Rake::Task, "t")
@@ -55,8 +64,8 @@ class TestApplication < Test::Unit::TestCase
 
   def test_display_tasks_with_task_name_wider_than_tty_display
     in_environment('RAKE_COLUMNS' => '80') do
+      @app.options.show_tasks = :tasks
       @app.options.show_task_pattern = //
-      description = "something short"
       task_name = "task name" * 80
       @app.last_description = "something short"
       @app.define_task(Rake::Task, task_name )
@@ -67,6 +76,7 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_display_tasks_with_very_long_task_name_to_a_non_tty_shows_name_and_comment
+    @app.options.show_tasks = :tasks
     @app.options.show_task_pattern = //
     @app.tty_output = false
     description = "something short"
@@ -79,6 +89,7 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_display_tasks_with_long_comments_to_a_non_tty_shows_entire_comment
+    @app.options.show_tasks = :tasks
     @app.options.show_task_pattern = //
     @app.tty_output = false
     @app.last_description = "1234567890" * 8
@@ -90,6 +101,7 @@ class TestApplication < Test::Unit::TestCase
 
   def test_display_tasks_with_long_comments_to_a_non_tty_with_columns_set_truncates_comments
     in_environment("RAKE_COLUMNS" => '80') do
+      @app.options.show_tasks = :tasks
       @app.options.show_task_pattern = //
       @app.tty_output = false
       @app.last_description = "1234567890" * 8
@@ -100,9 +112,9 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
-  def test_display_tasks_with_full_descriptions
+  def test_describe_tasks
+    @app.options.show_tasks = :describe
     @app.options.show_task_pattern = //
-    @app.options.full_description = true
     @app.last_description = "COMMENT"
     @app.define_task(Rake::Task, "t")
     out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
@@ -110,6 +122,16 @@ class TestApplication < Test::Unit::TestCase
     assert_match(/^ {4}COMMENT$/, out)
   end
 
+  def test_show_lines
+    @app.options.show_tasks = :lines
+    @app.options.show_task_pattern = //
+    @app.last_description = "COMMENT"
+    @app.define_task(Rake::Task, "t")
+    @app['t'].locations << "HERE:1"
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    assert_match(/^rake t +[^:]+:\d+ *$/, out)
+  end
+
   def test_finding_rakefile
     assert_match(/Rakefile/i, @app.instance_eval { have_rakefile })
   end
@@ -122,7 +144,7 @@ class TestApplication < Test::Unit::TestCase
 
   def test_load_rakefile
     in_environment("PWD" => "test/data/unittest") do
-      @app.instance_eval do 
+      @app.instance_eval do
         handle_options
         options.silent = true
         load_rakefile
@@ -132,6 +154,19 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
+  def test_load_rakefile_doesnt_print_rakefile_directory_from_same_dir
+    in_environment("PWD" => "test/data/unittest") do
+      error_messages = capture_stderr do
+        @app.instance_eval do
+          @original_dir = File.expand_path(".") # pretend we started from the unittest dir
+          raw_load_rakefile
+        end
+      end
+      _, location = @app.find_rakefile_location
+      assert_no_match(/\(in #{location}\)/, error_messages)
+    end
+  end
+
   def test_load_rakefile_from_subdir
     in_environment("PWD" => "test/data/unittest/subdir") do
       @app.instance_eval do
@@ -144,14 +179,40 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
+  def test_load_rakefile_prints_rakefile_directory_from_subdir
+    in_environment("PWD" => "test/data/unittest/subdir") do
+      error_messages = capture_stderr do
+        @app.instance_eval do
+          raw_load_rakefile
+        end
+      end
+      _, location = @app.find_rakefile_location
+      assert_match(/\(in #{location}\)/, error_messages)
+    end
+  end
+
+  def test_load_rakefile_doesnt_print_rakefile_directory_from_subdir_if_silent
+    in_environment("PWD" => "test/data/unittest/subdir") do
+      error_messages = capture_stderr do
+        @app.instance_eval do
+          handle_options
+          options.silent = true
+          raw_load_rakefile
+        end
+      end
+      _, location = @app.find_rakefile_location
+      assert_no_match(/\(in #{location}\)/, error_messages)
+    end
+  end
+
   def test_load_rakefile_not_found
     in_environment("PWD" => "/", "RAKE_SYSTEM" => 'not_exist') do
       @app.instance_eval do
         handle_options
         options.silent = true
       end
-      ex = assert_exception(RuntimeError) do 
-        @app.instance_eval do raw_load_rakefile end 
+      ex = assert_exception(RuntimeError) do
+        @app.instance_eval do raw_load_rakefile end
       end
       assert_match(/no rakefile found/i, ex.message)
     end
@@ -172,6 +233,21 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
+  def test_load_from_calculated_system_rakefile
+    flexmock(@app, :standard_system_dir => "__STD_SYS_DIR__")
+    in_environment('RAKE_SYSTEM' => nil) do
+      @app.options.rakelib = []
+      @app.instance_eval do
+        handle_options
+        options.silent = true
+        options.load_system = true
+        options.rakelib = []
+        load_rakefile
+      end
+      assert_equal "__STD_SYS_DIR__", @app.system_dir
+    end
+  end
+
   def test_windows
     assert ! (@app.windows? && @app.unix?)
   end
@@ -260,8 +336,8 @@ class TestApplication < Test::Unit::TestCase
     ARGV.clear
     ARGV << '-f' << '-s' <<  '--rakelib=""'
     assert_exception(SystemExit) {
-      err = capture_stderr { @app.run }
-      assert_match(/see full trace/, err)
+      error_messages = capture_stderr { @app.run }
+      assert_match(/see full trace/, error_messages)
     }
   ensure
     ARGV.clear
@@ -272,8 +348,8 @@ class TestApplication < Test::Unit::TestCase
     ARGV.clear
     ARGV << '-f' << '-s' << '-t'
     assert_exception(SystemExit) {
-      err = capture_stderr { capture_stdout { @app.run } }
-      assert_no_match(/see full trace/, err)
+      error_messages = capture_stderr { capture_stdout { @app.run } }
+      assert_no_match(/see full trace/, error_messages)
     }
   ensure
     ARGV.clear
@@ -284,11 +360,22 @@ class TestApplication < Test::Unit::TestCase
     ARGV.clear
     ARGV << '-f' << '-s' << '--xyzzy'
     assert_exception(SystemExit) {
-      err = capture_stderr { capture_stdout { @app.run } }
+      capture_stderr { capture_stdout { @app.run } }
     }
   ensure
     ARGV.clear
   end
+
+  def test_deprecation_message
+    in_environment do
+      error_messages = capture_stderr do
+        @app.deprecate("a", "b", "c")
+      end
+      assert_match(/'a' is deprecated/i, error_messages)
+      assert_match(/use 'b' instead/i, error_messages)
+      assert_match(/at c$/i, error_messages)
+    end
+  end
 end
 
 
@@ -296,20 +383,21 @@ end
 class TestApplicationOptions < Test::Unit::TestCase
   include CaptureStdout
   include TestMethods
+  include InEnvironment
 
   def setup
     clear_argv
-    RakeFileUtils.verbose_flag = false
-    RakeFileUtils.nowrite_flag = false
+    Rake::FileUtilsExt.verbose_flag = false
+    Rake::FileUtilsExt.nowrite_flag = false
     TESTING_REQUIRE.clear
   end
 
   def teardown
     clear_argv
-    RakeFileUtils.verbose_flag = false
-    RakeFileUtils.nowrite_flag = false
+    Rake::FileUtilsExt.verbose_flag = false
+    Rake::FileUtilsExt.nowrite_flag = false
   end
-  
+
   def clear_argv
     while ! ARGV.empty?
       ARGV.pop
@@ -317,225 +405,299 @@ class TestApplicationOptions < Test::Unit::TestCase
   end
 
   def test_default_options
-    opts = command_line
-    assert_nil opts.classic_namespace
-    assert_nil opts.dryrun
-    assert_nil opts.full_description
-    assert_nil opts.ignore_system
-    assert_nil opts.load_system
-    assert_nil opts.nosearch
-    assert_equal ['rakelib'], opts.rakelib
-    assert_nil opts.show_prereqs
-    assert_nil opts.show_task_pattern
-    assert_nil opts.show_tasks
-    assert_nil opts.silent
-    assert_nil opts.trace
-    assert_equal ['rakelib'], opts.rakelib
-    assert ! RakeFileUtils.verbose_flag
-    assert ! RakeFileUtils.nowrite_flag
+    in_environment("RAKEOPT" => nil) do
+      opts = command_line
+      assert_nil opts.classic_namespace
+      assert_nil opts.dryrun
+      assert_nil opts.ignore_system
+      assert_nil opts.load_system
+      assert_nil opts.nosearch
+      assert_equal ['rakelib'], opts.rakelib
+      assert_nil opts.show_prereqs
+      assert_nil opts.show_task_pattern
+      assert_nil opts.show_tasks
+      assert_nil opts.silent
+      assert_nil opts.trace
+      assert_equal ['rakelib'], opts.rakelib
+      assert ! Rake::FileUtilsExt.verbose_flag
+      assert ! Rake::FileUtilsExt.nowrite_flag
+    end
   end
 
   def test_dry_run
-    flags('--dry-run', '-n') do |opts|
-      assert opts.dryrun
-      assert opts.trace
-      assert RakeFileUtils.verbose_flag
-      assert RakeFileUtils.nowrite_flag
+    in_environment do
+      flags('--dry-run', '-n') do |opts|
+        assert opts.dryrun
+        assert opts.trace
+        assert Rake::FileUtilsExt.verbose_flag
+        assert Rake::FileUtilsExt.nowrite_flag
+      end
     end
   end
 
   def test_describe
-    flags('--describe') do |opts|
-      assert opts.full_description
-      assert opts.show_tasks
-      assert_equal(//.to_s, opts.show_task_pattern.to_s)
+    in_environment do
+      flags('--describe') do |opts|
+        assert_equal :describe, opts.show_tasks
+        assert_equal(//.to_s, opts.show_task_pattern.to_s)
+      end
     end
   end
 
   def test_describe_with_pattern
-    flags('--describe=X') do |opts|
-      assert opts.full_description
-      assert opts.show_tasks
-      assert_equal(/X/.to_s, opts.show_task_pattern.to_s)
+    in_environment do
+      flags('--describe=X') do |opts|
+        assert_equal :describe, opts.show_tasks
+        assert_equal(/X/.to_s, opts.show_task_pattern.to_s)
+      end
     end
   end
 
   def test_execute
-    $xyzzy = 0
-    flags('--execute=$xyzzy=1', '-e $xyzzy=1') do |opts|
-      assert_equal 1, $xyzzy
-      assert_equal :exit, @exit
+    in_environment do
       $xyzzy = 0
+      flags('--execute=$xyzzy=1', '-e $xyzzy=1') do |opts|
+        assert_equal 1, $xyzzy
+        assert_equal :exit, @exit
+        $xyzzy = 0
+      end
     end
   end
 
   def test_execute_and_continue
-    $xyzzy = 0
-    flags('--execute-continue=$xyzzy=1', '-E $xyzzy=1') do |opts|
-      assert_equal 1, $xyzzy
-      assert_not_equal :exit, @exit
+    in_environment do
       $xyzzy = 0
+      flags('--execute-continue=$xyzzy=1', '-E $xyzzy=1') do |opts|
+        assert_equal 1, $xyzzy
+        assert_not_equal :exit, @exit
+        $xyzzy = 0
+      end
     end
   end
 
   def test_execute_and_print
-    $xyzzy = 0
-    flags('--execute-print=$xyzzy="pugh"', '-p $xyzzy="pugh"') do |opts|
-      assert_equal 'pugh', $xyzzy
-      assert_equal :exit, @exit
-      assert_match(/^pugh$/, @out)
+    in_environment do
       $xyzzy = 0
+      flags('--execute-print=$xyzzy="pugh"', '-p $xyzzy="pugh"') do |opts|
+        assert_equal 'pugh', $xyzzy
+        assert_equal :exit, @exit
+        assert_match(/^pugh$/, @out)
+        $xyzzy = 0
+      end
     end
   end
 
   def test_help
-    flags('--help', '-H', '-h') do |opts|
-      assert_match(/\Arake/, @out)
-      assert_match(/\boptions\b/, @out)
-      assert_match(/\btargets\b/, @out)
-      assert_equal :exit, @exit
-      assert_equal :exit, @exit
+    in_environment do
+      flags('--help', '-H', '-h') do |opts|
+        assert_match(/\Adrake/, @out)
+        assert_match(/\boptions\b/, @out)
+        assert_match(/\btargets\b/, @out)
+        assert_equal :exit, @exit
+        assert_equal :exit, @exit
+      end
     end
   end
 
   def test_libdir
-    flags(['--libdir', 'xx'], ['-I', 'xx'], ['-Ixx']) do |opts|
-      $:.include?('xx')
+    in_environment do
+      flags(['--libdir', 'xx'], ['-I', 'xx'], ['-Ixx']) do |opts|
+        $:.include?('xx')
+      end
     end
   ensure
     $:.delete('xx')
   end
 
   def test_rakefile
-    flags(['--rakefile', 'RF'], ['--rakefile=RF'], ['-f', 'RF'], ['-fRF']) do |opts|
-      assert_equal ['RF'], @app.instance_eval { @rakefiles }
+    in_environment do
+      flags(['--rakefile', 'RF'], ['--rakefile=RF'], ['-f', 'RF'], ['-fRF']) do |opts|
+        assert_equal ['RF'], @app.instance_eval { @rakefiles }
+      end
     end
   end
 
   def test_rakelib
-    flags(['--rakelibdir', 'A:B:C'], ['--rakelibdir=A:B:C'], ['-R', 'A:B:C'], ['-RA:B:C']) do |opts|
-      assert_equal ['A', 'B', 'C'], opts.rakelib
+    in_environment do
+      flags(['--rakelibdir', 'A:B:C'], ['--rakelibdir=A:B:C'], ['-R', 'A:B:C'], ['-RA:B:C']) do |opts|
+        assert_equal ['A', 'B', 'C'], opts.rakelib
+      end
     end
   end
 
   def test_require
-    flags(['--require', 'test/reqfile'], '-rtest/reqfile2', '-rtest/reqfile3') do |opts|
+    in_environment do
+      flags(['--require', 'test/reqfile'], '-rtest/reqfile2', '-rtest/reqfile3') do |opts|
+      end
+      assert TESTING_REQUIRE.include?(1)
+      assert TESTING_REQUIRE.include?(2)
+      assert TESTING_REQUIRE.include?(3)
+      assert_equal 3, TESTING_REQUIRE.size
     end
-    assert TESTING_REQUIRE.include?(1)
-    assert TESTING_REQUIRE.include?(2)
-    assert TESTING_REQUIRE.include?(3)
-    assert_equal 3, TESTING_REQUIRE.size
   end
 
   def test_missing_require
-    ex = assert_exception(LoadError) do
-      flags(['--require', 'test/missing']) do |opts|
+    in_environment do
+      ex = assert_exception(LoadError) do
+        flags(['--require', 'test/missing']) do |opts|
+        end
       end
+      assert_match(/such file/, ex.message)
+      assert_match(/test\/missing/, ex.message)
     end
-    assert_match(/no such file/, ex.message)
-    assert_match(/test\/missing/, ex.message)
   end
 
   def test_prereqs
-    flags('--prereqs', '-P') do |opts|
-      assert opts.show_prereqs
+    in_environment do
+      flags('--prereqs', '-P') do |opts|
+        assert opts.show_prereqs
+      end
     end
   end
 
   def test_quiet
-    flags('--quiet', '-q') do |opts|
-      assert ! RakeFileUtils.verbose_flag
-      assert ! opts.silent
+    in_environment do
+      flags('--quiet', '-q') do |opts|
+        assert ! Rake::FileUtilsExt.verbose_flag
+        assert ! opts.silent
+      end
     end
   end
 
   def test_no_search
-    flags('--nosearch', '--no-search', '-N') do |opts|
-      assert opts.nosearch
+    in_environment do
+      flags('--nosearch', '--no-search', '-N') do |opts|
+        assert opts.nosearch
+      end
     end
   end
 
   def test_silent
-    flags('--silent', '-s') do |opts|
-      assert ! RakeFileUtils.verbose_flag
-      assert opts.silent
+    in_environment do
+      flags('--silent', '-s') do |opts|
+        assert ! Rake::FileUtilsExt.verbose_flag
+        assert opts.silent
+      end
     end
   end
 
   def test_system
-    flags('--system', '-g') do |opts|
-      assert opts.load_system
+    in_environment do
+      flags('--system', '-g') do |opts|
+        assert opts.load_system
+      end
     end
   end
 
   def test_no_system
-    flags('--no-system', '-G') do |opts|
-      assert opts.ignore_system
+    in_environment do
+      flags('--no-system', '-G') do |opts|
+        assert opts.ignore_system
+      end
     end
   end
 
   def test_trace
-    flags('--trace', '-t') do |opts|
-      assert opts.trace
-      assert RakeFileUtils.verbose_flag
-      assert ! RakeFileUtils.nowrite_flag
+    in_environment do
+      flags('--trace', '-t') do |opts|
+        assert opts.trace
+        assert Rake::FileUtilsExt.verbose_flag
+        assert ! Rake::FileUtilsExt.nowrite_flag
+      end
     end
   end
 
   def test_trace_rules
-    flags('--rules') do |opts|
-      assert opts.trace_rules
+    in_environment do
+      flags('--rules') do |opts|
+        assert opts.trace_rules
+      end
     end
   end
 
   def test_tasks
-    flags('--tasks', '-T') do |opts|
-      assert opts.show_tasks
-      assert_equal(//.to_s, opts.show_task_pattern.to_s)
+    in_environment do
+      flags('--tasks', '-T') do |opts|
+        assert_equal :tasks, opts.show_tasks
+        assert_equal(//.to_s, opts.show_task_pattern.to_s)
+      end
+      flags(['--tasks', 'xyz'], ['-Txyz']) do |opts|
+        assert_equal :tasks, opts.show_tasks
+        assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
+      end
     end
-    flags(['--tasks', 'xyz'], ['-Txyz']) do |opts|
-      assert opts.show_tasks
-      assert_equal(/xyz/, opts.show_task_pattern)
+  end
+
+  def test_where
+    in_environment do
+      flags('--where', '-W') do |opts|
+        assert_equal :lines, opts.show_tasks
+        assert_equal(//.to_s, opts.show_task_pattern.to_s)
+      end
+      flags(['--where', 'xyz'], ['-Wxyz']) do |opts|
+        assert_equal :lines, opts.show_tasks
+        assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
+      end
+    end
+  end
+
+  def test_no_deprecated_messages
+    in_environment do
+      flags('--no-deprecation-warnings', '-X') do |opts|
+        assert opts.ignore_deprecate
+      end
     end
   end
 
   def test_verbose
-    flags('--verbose', '-V') do |opts|
-      assert RakeFileUtils.verbose_flag
-      assert ! opts.silent
+    in_environment do
+      flags('--verbose', '-V') do |opts|
+        assert Rake::FileUtilsExt.verbose_flag
+        assert ! opts.silent
+      end
     end
   end
 
   def test_version
-    flags('--version', '-V') do |opts|
-      assert_match(/\bversion\b/, @out)
-      assert_match(/\b#{RAKEVERSION}\b/, @out)
-      assert_equal :exit, @exit
+    in_environment do
+      flags('--version', '-V') do |opts|
+        assert_match(/\bversion\b/, @out)
+        assert_match(/\b#{RAKEVERSION}\b/, @out)
+        assert_equal :exit, @exit
+      end
     end
   end
-  
+
   def test_classic_namespace
-    flags(['--classic-namespace'], ['-C', '-T', '-P', '-n', '-s', '-t']) do |opts|
-      assert opts.classic_namespace
-      assert_equal opts.show_tasks, $show_tasks
-      assert_equal opts.show_prereqs, $show_prereqs
-      assert_equal opts.trace, $trace
-      assert_equal opts.dryrun, $dryrun
-      assert_equal opts.silent, $silent
+    in_environment do
+      error_messages = capture_stderr do
+        flags(['--classic-namespace'], ['-C', '-T', '-P', '-n', '-s', '-t']) do |opts|
+          assert opts.classic_namespace
+          assert_equal opts.show_tasks, $show_tasks
+          assert_equal opts.show_prereqs, $show_prereqs
+          assert_equal opts.trace, $trace
+          assert_equal opts.dryrun, $dryrun
+          assert_equal opts.silent, $silent
+        end
+      end
+      assert_match(/deprecated/, error_messages)
     end
   end
 
   def test_bad_option
-    capture_stderr do
-      ex = assert_exception(OptionParser::InvalidOption) do
-        flags('--bad-option') 
-      end
-      if ex.message =~ /^While/ # Ruby 1.9 error message
-        assert_match(/while parsing/i, ex.message)
-      else                      # Ruby 1.8 error message
-        assert_match(/(invalid|unrecognized) option/i, ex.message)
-        assert_match(/--bad-option/, ex.message)
+    in_environment do
+      error_messages = capture_stderr do
+        ex = assert_exception(OptionParser::InvalidOption) do
+          flags('--bad-option')
+        end
+        if ex.message =~ /^While/ # Ruby 1.9 error message
+          assert_match(/while parsing/i, ex.message)
+        else                      # Ruby 1.8 error message
+          assert_match(/(invalid|unrecognized) option/i, ex.message)
+          assert_match(/--bad-option/, ex.message)
+        end
       end
+      assert_equal '', error_messages
     end
   end
 
@@ -543,12 +705,12 @@ class TestApplicationOptions < Test::Unit::TestCase
     command_line("a", "b")
     assert_equal ["a", "b"], @tasks.sort
   end
-  
+
   def test_default_task_collection
     command_line()
     assert_equal ["default"], @tasks
   end
-  
+
   def test_environment_definition
     ENV.delete('TESTKEY')
     command_line("a", "TESTKEY=12")
@@ -556,13 +718,13 @@ class TestApplicationOptions < Test::Unit::TestCase
     assert '12', ENV['TESTKEY']
   end
 
-  private 
+  private
 
   def flags(*sets)
     sets.each do |set|
       ARGV.clear
-      @out = capture_stdout { 
-        @exit = catch(:system_exit) { opts = command_line(*set) }
+      @out = capture_stdout {
+        @exit = catch(:system_exit) { command_line(*set) }
       }
       yield(@app.options) if block_given?
     end
@@ -589,31 +751,31 @@ class TestTaskArgumentParsing < Test::Unit::TestCase
     @app = Rake::Application.new
     @app.options.threads = Rake.application.options.threads
   end
-  
+
   def test_name_only
     name, args = @app.parse_task_string("name")
     assert_equal "name", name
     assert_equal [], args
   end
-  
+
   def test_empty_args
     name, args = @app.parse_task_string("name[]")
     assert_equal "name", name
     assert_equal [], args
   end
-  
+
   def test_one_argument
     name, args = @app.parse_task_string("name[one]")
     assert_equal "name", name
     assert_equal ["one"], args
   end
-  
+
   def test_two_arguments
     name, args = @app.parse_task_string("name[one,two]")
     assert_equal "name", name
     assert_equal ["one", "two"], args
   end
-  
+
   def test_can_handle_spaces_between_args
     name, args = @app.parse_task_string("name[one, two,\tthree , \tfour]")
     assert_equal "name", name
@@ -680,4 +842,30 @@ class TestTaskArgumentParsing < Test::Unit::TestCase
       assert_equal 80, app.terminal_width
     end
   end
+
+  def test_no_rakeopt
+    in_environment do
+      ARGV << '--trace'
+      app = Rake::Application.new
+      app.init
+      assert !app.options.silent
+    end
+  end
+
+  def test_rakeopt_with_blank_options
+    in_environment("RAKEOPT" => "") do
+      ARGV << '--trace'
+      app = Rake::Application.new
+      app.init
+      assert !app.options.silent
+    end
+  end
+
+  def test_rakeopt_with_silent_options
+    in_environment("RAKEOPT" => "-s") do
+      app = Rake::Application.new
+      app.init
+      assert app.options.silent
+    end
+  end
 end