rake 0.9.2 → 0.9.2.2

data/test/test_rake_task_argument_parsing.rb

@@ -45,72 +45,59 @@ class TestRakeTaskArgumentParsing < Rake::TestCase
 
   def test_terminal_width_using_env
     app = Rake::Application.new
-    in_environment('RAKE_COLUMNS' => '1234') do
-      assert_equal 1234, app.terminal_width
-    end
+    app.terminal_columns = 1234
+
+    assert_equal 1234, app.terminal_width
   end
 
   def test_terminal_width_using_stty
-    app = Rake::Application.new
-    flexmock(app,
-      :unix? => true,
-      :dynamic_width_stty => 1235,
-      :dynamic_width_tput => 0)
-    in_environment('RAKE_COLUMNS' => nil) do
-      assert_equal 1235, app.terminal_width
-    end
+    def @app.unix?() true end
+    def @app.dynamic_width_stty() 1235 end
+    def @app.dynamic_width_tput() 0 end
+
+    assert_equal 1235, @app.terminal_width
   end
 
   def test_terminal_width_using_tput
-    app = Rake::Application.new
-    flexmock(app,
-      :unix? => true,
-      :dynamic_width_stty => 0,
-      :dynamic_width_tput => 1236)
-    in_environment('RAKE_COLUMNS' => nil) do
-      assert_equal 1236, app.terminal_width
-    end
+    def @app.unix?() true end
+    def @app.dynamic_width_stty() 0 end
+    def @app.dynamic_width_tput() 1236 end
+
+    assert_equal 1236, @app.terminal_width
   end
 
   def test_terminal_width_using_hardcoded_80
-    app = Rake::Application.new
-    flexmock(app, :unix? => false)
-    in_environment('RAKE_COLUMNS' => nil) do
-      assert_equal 80, app.terminal_width
-    end
+    def @app.unix?() false end
+
+    assert_equal 80, @app.terminal_width
   end
 
   def test_terminal_width_with_failure
-    app = Rake::Application.new
-    flexmock(app).should_receive(:unix?).and_throw(RuntimeError)
-    in_environment('RAKE_COLUMNS' => nil) do
-      assert_equal 80, app.terminal_width
-    end
+    def @app.unix?() raise end
+
+    assert_equal 80, @app.terminal_width
   end
 
   def test_no_rakeopt
-    in_environment do
-      ARGV << '--trace'
-      app = Rake::Application.new
-      app.init
-      assert !app.options.silent
-    end
+    ARGV << '--trace'
+    app = Rake::Application.new
+    app.init
+    assert !app.options.silent
   end
 
   def test_rakeopt_with_blank_options
-    in_environment("RAKEOPT" => "") do
-      ARGV << '--trace'
-      app = Rake::Application.new
-      app.init
-      assert !app.options.silent
-    end
+    ARGV << '--trace'
+    app = Rake::Application.new
+    app.init
+    assert !app.options.silent
   end
 
   def test_rakeopt_with_silent_options
-    in_environment("RAKEOPT" => "-s") do
-      app = Rake::Application.new
-      app.init
-      assert app.options.silent
-    end
+    ENV['RAKEOPT'] = '-s'
+    app = Rake::Application.new
+
+    app.init
+
+    assert app.options.silent
   end
 end

data/test/test_rake_task_arguments.rb

@@ -5,6 +5,8 @@ class TestRakeTaskArguments < Rake::TestCase
   def teardown
     ENV.delete('rev')
     ENV.delete('VER')
+
+    super
   end
 
   def test_empty_arg_list_is_empty

data/test/test_rake_task_manager.rb

@@ -19,6 +19,14 @@ class TestRakeTaskManager < Rake::TestCase
     assert_equal @tm, t.application
   end
 
+  def test_index
+    e = assert_raises RuntimeError do
+      @tm['bad']
+    end
+
+    assert_equal "Don't know how to build task 'bad'", e.message
+  end
+
   def test_name_lookup
     t = @tm.define_task(Rake::Task, :t)
     assert_equal t, @tm[:t]
@@ -46,6 +54,7 @@ class TestRakeTaskManager < Rake::TestCase
       t = @tm.define_task(Rake::FileTask, "fn")
       assert_equal "fn", t.name
     end
+
     assert_equal ["fn"], @tm.tasks.collect { |t| t.name }
   end
 
@@ -58,7 +67,10 @@ class TestRakeTaskManager < Rake::TestCase
   end
 
   def test_name_lookup_with_implicit_file_tasks
+    FileUtils.touch 'README.rdoc'
+
     t = @tm["README.rdoc"]
+
     assert_equal "README.rdoc", t.name
     assert Rake::FileTask === t
   end

data/test/test_rake_task_with_arguments.rb

@@ -158,5 +158,16 @@ class TestRakeTaskWithArguments < Rake::TestCase
     t = task(:t  => [:pre])
     t.invoke("bill", "1.2")
   end
+
+  def test_values_at
+    t = task(:pre, [:a, :b, :c]) { |task, args|
+      a, b, c = args.values_at(:a, :b, :c)
+      assert_equal %w[1 2 3], [a, b, c]
+    }
+
+    t.invoke(*%w[1 2 3])
+
+    # HACK no assertions
+  end
 end
 

data/test/test_rake_test_task.rb

@@ -4,24 +4,7 @@ require 'rake/testtask'
 class TestRakeTestTask < Rake::TestCase
   include Rake
 
-  def setup
-    super
-
-    Task.clear
-    ENV.delete('TEST')
-  end
-
-  def teardown
-    FileUtils.rm_rf("testdata")
-
-    super
-  end
-
-  def test_no_task
-    assert ! Task.task_defined?(:test)
-  end
-
-  def test_defaults
+  def test_initialize
     tt = Rake::TestTask.new do |t| end
     refute_nil tt
     assert_equal :test, tt.name
@@ -31,7 +14,7 @@ class TestRakeTestTask < Rake::TestCase
     assert Task.task_defined?(:test)
   end
 
-  def test_non_defaults
+  def test_initialize_override
     tt = Rake::TestTask.new(:example) do |t|
       t.libs = ['src', 'ext']
       t.pattern = 'test/tc_*.rb'
@@ -45,29 +28,43 @@ class TestRakeTestTask < Rake::TestCase
     assert Task.task_defined?(:example)
   end
 
-  def test_pattern
-    tt = Rake::TestTask.new do |t|
-      t.pattern = '*.rb'
-    end
-    assert_equal ['*.rb'], tt.file_list.to_a
-  end
-
-  def test_env_test
+  def test_file_list_ENV_TEST
     ENV['TEST'] = 'testfile.rb'
     tt = Rake::TestTask.new do |t|
       t.pattern = '*'
     end
+
     assert_equal ["testfile.rb"], tt.file_list.to_a
+  ensure
+    ENV.delete 'TEST'
+  end
+
+  def test_libs_equals
+    test_task = Rake::TestTask.new do |t|
+      t.libs << ["A", "B"]
+    end
+
+    path = %w[lib A B].join File::PATH_SEPARATOR
+
+    assert_equal "-I\"#{path}\"", test_task.ruby_opts_string
+  end
+
+  def test_libs_equals_empty
+    test_task = Rake::TestTask.new do |t|
+      t.libs = []
+    end
+
+    assert_equal '', test_task.ruby_opts_string
   end
 
-  def test_test_files
+  def test_pattern_equals
     tt = Rake::TestTask.new do |t|
-      t.test_files = FileList['a.rb', 'b.rb']
+      t.pattern = '*.rb'
     end
-    assert_equal ["a.rb", 'b.rb'], tt.file_list.to_a
+    assert_equal ['*.rb'], tt.file_list.to_a
   end
 
-  def test_both_pattern_and_test_files
+  def test_pattern_equals_test_files_equals
     tt = Rake::TestTask.new do |t|
       t.test_files = FileList['a.rb', 'b.rb']
       t.pattern = '*.rb'
@@ -75,48 +72,49 @@ class TestRakeTestTask < Rake::TestCase
     assert_equal ['a.rb', 'b.rb', '*.rb'], tt.file_list.to_a
   end
 
-  def test_direct_run_has_quoted_paths
-    test_task = Rake::TestTask.new(:tx) do |t|
+  def test_run_code_direct
+    test_task = Rake::TestTask.new do |t|
       t.loader = :direct
     end
-    assert_match(/-e ".*"/, test_task.run_code)
+
+    assert_equal '-e "ARGV.each{|f| require f}"', test_task.run_code
   end
 
-  def test_testrb_run_has_quoted_paths_on_ruby_182
-    test_task = Rake::TestTask.new(:tx) do |t|
+  def test_run_code_rake
+    test_task = Rake::TestTask.new do |t|
+      t.loader = :rake
+    end
+
+    assert_match(/-I".*?" ".*?"/, test_task.run_code)
+  end
+
+  def test_run_code_testrb_ruby_1_8_2
+    test_task = Rake::TestTask.new do |t|
       t.loader = :testrb
     end
-    flexmock(test_task).should_receive(:ruby_version).and_return('1.8.2')
+
+    def test_task.ruby_version() '1.8.2' end
+
     assert_match(/^-S testrb +".*"$/, test_task.run_code)
   end
 
-  def test_testrb_run_has_quoted_paths_on_ruby_186
-    test_task = Rake::TestTask.new(:tx) do |t|
+  def test_run_code_testrb_ruby_1_8_6
+    test_task = Rake::TestTask.new do |t|
       t.loader = :testrb
     end
-    flexmock(test_task).should_receive(:ruby_version).and_return('1.8.6')
+
+    def test_task.ruby_version() '1.8.6' end
+
     assert_match(/^-S testrb +$/, test_task.run_code)
   end
 
-  def test_rake_run_has_quoted_paths
-    test_task = Rake::TestTask.new(:tx) do |t|
-      t.loader = :rake
+  def test_test_files_equals
+    tt = Rake::TestTask.new do |t|
+      t.test_files = FileList['a.rb', 'b.rb']
     end
-    assert_match(/".*"/, test_task.run_code)
-  end
 
-  def test_nested_libs_will_be_flattened
-    test_task = Rake::TestTask.new(:tx) do |t|
-      t.libs << ["A", "B"]
-    end
-    sep = File::PATH_SEPARATOR
-    assert_match(/lib#{sep}A#{sep}B/, test_task.ruby_opts_string)
+    assert_equal ["a.rb", 'b.rb'], tt.file_list.to_a
   end
 
-  def test_empty_lib_path_implies_no_dash_I_option
-    test_task = Rake::TestTask.new(:tx) do |t|
-      t.libs = []
-    end
-    refute_match(/-I/, test_task.ruby_opts_string)
-  end
 end
+

data/test/test_rake_top_level_functions.rb

@@ -5,28 +5,43 @@ class TestRakeTopLevelFunctions < Rake::TestCase
   def setup
     super
 
-    @app = Rake.application
-    Rake.application = flexmock("app")
-    Rake.application.should_receive(:deprecate).
-      and_return { |old, new, call| @app.deprecate(old, new, call) }
-  end
+    @app = Object.new
 
-  def teardown
-    Rake.application = @app
+    def @app.called
+      @called
+    end
 
-    super
+    def @app.method_missing(*a, &b)
+      @called ||= []
+      @called << [a, b]
+      nil
+    end
+
+    Rake.application = @app
   end
 
   def test_namespace
-    Rake.application.should_receive(:in_namespace).with("xyz", any).once
-    namespace "xyz" do end
+    block = proc do end
+
+    namespace("xyz", &block) 
+
+    expected = [
+      [[:in_namespace, 'xyz'], block]
+    ]
+
+    assert_equal expected, @app.called
   end
 
   def test_import
-    Rake.application.should_receive(:add_import).with("x").once.ordered
-    Rake.application.should_receive(:add_import).with("y").once.ordered
-    Rake.application.should_receive(:add_import).with("z").once.ordered
     import('x', 'y', 'z')
+
+    expected = [
+      [[:add_import, 'x'], nil],
+      [[:add_import, 'y'], nil],
+      [[:add_import, 'z'], nil],
+    ]
+
+    assert_equal expected, @app.called
   end
 
   def test_when_writing
@@ -51,23 +66,43 @@ class TestRakeTopLevelFunctions < Rake::TestCase
   end
 
   def test_missing_constants_task
-    Rake.application.should_receive(:const_warning).with(:Task).once
     Object.const_missing(:Task)
+
+    expected = [
+      [[:const_warning, :Task], nil]
+    ]
+
+    assert_equal expected, @app.called
   end
 
   def test_missing_constants_file_task
-    Rake.application.should_receive(:const_warning).with(:FileTask).once
     Object.const_missing(:FileTask)
+
+    expected = [
+      [[:const_warning, :FileTask], nil]
+    ]
+
+    assert_equal expected, @app.called
   end
 
   def test_missing_constants_file_creation_task
-    Rake.application.should_receive(:const_warning).with(:FileCreationTask).once
     Object.const_missing(:FileCreationTask)
+
+    expected = [
+      [[:const_warning, :FileCreationTask], nil]
+    ]
+
+    assert_equal expected, @app.called
   end
 
   def test_missing_constants_rake_app
-    Rake.application.should_receive(:const_warning).with(:RakeApp).once
     Object.const_missing(:RakeApp)
+
+    expected = [
+      [[:const_warning, :RakeApp], nil]
+    ]
+
+    assert_equal expected, @app.called
   end
 
   def test_missing_other_constant

data/test/test_rake_win32.rb

@@ -1,64 +1,53 @@
 require File.expand_path('../helper', __FILE__)
 
 class TestRakeWin32 < Rake::TestCase
-  include InEnvironment
 
   Win32 = Rake::Win32
 
   def test_win32_system_dir_uses_home_if_defined
-    in_environment('RAKE_SYSTEM' => nil, 'HOME' => 'C:\\HP') do
-      assert_equal "C:/HP/Rake", Win32.win32_system_dir
-    end
+    ENV['HOME'] = 'C:\\HP'
+
+    assert_equal "C:/HP/Rake", Win32.win32_system_dir
   end
 
   def test_win32_system_dir_uses_homedrive_homepath_when_no_home_defined
-    in_environment(
-      'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => "C:",
-      'HOMEPATH' => "\\HP"
-      ) do
-      assert_equal "C:/HP/Rake", Win32.win32_system_dir
-    end
+    ENV['HOME']      = nil
+    ENV['HOMEDRIVE'] = 'C:'
+    ENV['HOMEPATH']  = '\\HP'
+
+    assert_equal "C:/HP/Rake", Win32.win32_system_dir
   end
 
   def test_win32_system_dir_uses_appdata_when_no_home_or_home_combo
-    in_environment(
-      'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => nil,
-      'HOMEPATH' => nil,
-      'APPDATA' => "C:\\Documents and Settings\\HP\\Application Data"
-      ) do
-      assert_equal "C:/Documents and Settings/HP/Application Data/Rake", Win32.win32_system_dir
-    end
+    ENV['APPDATA']   = "C:\\Documents and Settings\\HP\\Application Data"
+    ENV['HOME']      = nil
+    ENV['HOMEDRIVE'] = nil
+    ENV['HOMEPATH']  = nil
+
+    assert_equal "C:/Documents and Settings/HP/Application Data/Rake",
+                 Win32.win32_system_dir
   end
 
   def test_win32_system_dir_fallback_to_userprofile_otherwise
-    in_environment(
-      'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => nil,
-      'HOMEPATH' => nil,
-      'APPDATA' => nil,
-      'USERPROFILE' => "C:\\Documents and Settings\\HP"
-      ) do
-      assert_equal "C:/Documents and Settings/HP/Rake", Win32.win32_system_dir
-    end
+    ENV['HOME']        = nil
+    ENV['HOMEDRIVE']   = nil
+    ENV['HOMEPATH']    = nil
+    ENV['APPDATA']     = nil
+    ENV['USERPROFILE'] = "C:\\Documents and Settings\\HP"
+
+    assert_equal "C:/Documents and Settings/HP/Rake", Win32.win32_system_dir
   end
 
   def test_win32_system_dir_nil_of_no_env_vars
-    in_environment(
-      'RAKE_SYSTEM' => nil,
-      'HOME' => nil,
-      'HOMEDRIVE' => nil,
-      "HOMEPATH" => nil,
-      'APPDATA' => nil,
-      "USERPROFILE" => nil
-      ) do
-      assert_raises(Rake::Win32::Win32HomeError) do
-        Win32.win32_system_dir
-      end
+    ENV['APPDATA']     = nil
+    ENV['HOME']        = nil
+    ENV['HOMEDRIVE']   = nil
+    ENV['HOMEPATH']    = nil
+    ENV['RAKE_SYSTEM'] = nil
+    ENV['USERPROFILE'] = nil
+
+    assert_raises(Rake::Win32::Win32HomeError) do
+      Win32.win32_system_dir
     end
   end