rake 0.8.7 → 0.9.0

data/test/{test_rdoc_task.rb → lib/rdoc_task_test.rb}

@@ -1,24 +1,31 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
-require 'rake/rdoctask'
+require 'test/capture_stdout'
+begin
+  old_verbose = $VERBOSE
+  $VERBOSE = nil
+  require 'rake/rdoctask'
+ensure
+  $VERBOSE = old_verbose
+end
 require 'test/rake_test_setup'
 
 class TestRDocTask < Test::Unit::TestCase
   include Rake
   include TestMethods
-  
+
   def setup
     Task.clear
   end
-  
+
   def test_tasks_creation
     Rake::RDocTask.new
     assert Task[:rdoc]
     assert Task[:clobber_rdoc]
     assert Task[:rerdoc]
   end
-  
+
   def test_tasks_creation_with_custom_name_symbol
     rd = Rake::RDocTask.new(:rdoc_dev)
     assert Task[:rdoc_dev]
@@ -26,7 +33,7 @@ class TestRDocTask < Test::Unit::TestCase
     assert Task[:rerdoc_dev]
     assert_equal :rdoc_dev, rd.name
   end
-  
+
   def test_tasks_creation_with_custom_name_string
     rd = Rake::RDocTask.new("rdoc_dev")
     assert Task[:rdoc_dev]
@@ -34,7 +41,7 @@ class TestRDocTask < Test::Unit::TestCase
     assert Task[:rerdoc_dev]
     assert_equal "rdoc_dev", rd.name
   end
-  
+
   def test_tasks_creation_with_custom_name_hash
     options = { :rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force" }
     rd = Rake::RDocTask.new(options)
@@ -44,45 +51,34 @@ class TestRDocTask < Test::Unit::TestCase
     assert_raises(RuntimeError) { Task[:clobber_rdoc] }
     assert_equal options, rd.name
   end
-  
+
   def test_tasks_creation_with_custom_name_hash_will_use_default_if_an_option_isnt_given
-    rd = Rake::RDocTask.new(:clobber_rdoc => "rdoc:clean")
+    Rake::RDocTask.new(:clobber_rdoc => "rdoc:clean")
     assert Task[:rdoc]
     assert Task[:"rdoc:clean"]
     assert Task[:rerdoc]
   end
-  
+
   def test_tasks_creation_with_custom_name_hash_raises_exception_if_invalid_option_given
     assert_raises(ArgumentError) do
       Rake::RDocTask.new(:foo => "bar")
     end
-    
+
     begin
       Rake::RDocTask.new(:foo => "bar")
     rescue ArgumentError => e
       assert_match(/foo/, e.message)
     end
   end
-  
-  def test_inline_source_is_enabled_by_default
-    rd = Rake::RDocTask.new
-    assert rd.option_list.include?('--inline-source')
-  end
-  
+
   def test_inline_source_option_is_only_appended_if_option_not_already_given
     rd = Rake::RDocTask.new
     rd.options << '--inline-source'
     assert_equal 1, rd.option_list.grep('--inline-source').size
-    
+
     rd = Rake::RDocTask.new
     rd.options << '-S'
     assert_equal 1, rd.option_list.grep('-S').size
     assert_equal 0, rd.option_list.grep('--inline-source').size
   end
-  
-  def test_inline_source_option_can_be_disabled
-    rd = Rake::RDocTask.new
-    rd.inline_source = false
-    assert !rd.option_list.include?('--inline-source')
-  end
 end

data/test/{test_require.rb → lib/require_test.rb}

@@ -17,8 +17,13 @@ class TestRequire < Test::Unit::TestCase
 
   def test_wont_reload_rake_library
     app = Rake::Application.new
+
+    paths = ['test/data/rakelib']
+    loaded_files = []
+    app.rake_require("test2", paths, loaded_files)
+
     assert ! app.instance_eval {
-      rake_require("test2", ['test/data/rakelib'], ['test2'])
+      rake_require("test2", paths, loaded_files)
     }
   end
 
@@ -29,7 +34,8 @@ class TestRequire < Test::Unit::TestCase
         rake_require("testx", ['test/data/rakelib'], [])
       }
     }
-    assert_match(/x/, ex.message)
+    assert_match(/(can *not|can't)\s+find/i, ex.message)
+    assert_match(/testx/, ex.message)
   end
 end
 

data/test/{test_rules.rb → lib/rules_test.rb}

@@ -3,7 +3,7 @@
 require 'test/unit'
 require 'fileutils'
 require 'rake'
-require 'test/filecreation'
+require 'test/file_creation'
 require 'test/rake_test_setup'
 
 ######################################################################
@@ -97,7 +97,7 @@ class TestRules < Test::Unit::TestCase
     assert_equal [OBJFILE], @runs
   end
 
-  def test_file_names_beginning_with_dot_can_be_tricked_into_refering_to_file
+  def test_file_names_beginning_with_dot_can_be_tricked_into_referring_to_file
     verbose(false) do
       chdir("testdata") do
         create_file('.foo')
@@ -278,7 +278,6 @@ class TestRules < Test::Unit::TestCase
   end
 
   def test_rule_with_proc_dependent_will_trigger
-    ran = false
     mkdir_p("testdata/src/jw")
     create_file("testdata/src/jw/X.java")
     rule %r(classes/.*\.class) => [

data/test/{test_task_arguments.rb → lib/task_arguments_test.rb}

@@ -50,12 +50,12 @@ class TestTaskArguments < Test::Unit::TestCase
     assert_nil ta.cc
   end
 
-  def test_args_can_reference_env_values
+  def test_args_do_not_reference_env_values
     ta = Rake::TaskArguments.new(["aa"], [1])
     ENV['rev'] = "1.2"
     ENV['VER'] = "2.3"
-    assert_equal "1.2", ta.rev
-    assert_equal "2.3", ta.ver
+    assert_nil ta.rev
+    assert_nil ta.ver
   end
 
   def test_creating_new_argument_scopes
@@ -73,7 +73,7 @@ class TestTaskArguments < Test::Unit::TestCase
     child = Rake::TaskArguments.new(['aa'], [2], parent)
     assert_equal 2, child.aa
   end
-  
+
   def test_default_arguments_values_can_be_merged
     ta = Rake::TaskArguments.new(["aa", "bb"], [nil, "original_val"])
     ta.with_defaults({ :aa => 'default_val' })
@@ -81,7 +81,7 @@ class TestTaskArguments < Test::Unit::TestCase
     assert_equal 'original_val', ta[:bb]
   end
 
-  def test_default_arguements_that_dont_match_names_are_ignored
+  def test_default_arguments_that_dont_match_names_are_ignored
     ta = Rake::TaskArguments.new(["aa", "bb"], [nil, "original_val"])
     ta.with_defaults({ "cc" => "default_val" })
     assert_nil ta[:cc]

data/test/{test_task_manager.rb → lib/task_manager_test.rb}

@@ -65,14 +65,14 @@ class TestTaskManager < Test::Unit::TestCase
   end
 
   def test_name_lookup_with_implicit_file_tasks
-    t = @tm["README"]
-    assert_equal "README", t.name
+    t = @tm["README.rdoc"]
+    assert_equal "README.rdoc", t.name
     assert Rake::FileTask === t
   end
 
   def test_name_lookup_with_nonexistent_task
     assert_exception(RuntimeError) {
-      t = @tm["DOES NOT EXIST"]
+      @tm["DOES NOT EXIST"]
     }
   end
 
@@ -129,7 +129,7 @@ class TestTaskManager < Test::Unit::TestCase
       end
     end
     assert_equal t1, @tm[:t, []]
-    assert_equal t2, @tm[:t, ["a"]]    
+    assert_equal t2, @tm[:t, ["a"]]
     assert_equal t3, @tm[:t, ["a", "b"]]
     assert_equal s,  @tm[:s, ["a", "b"]]
     assert_equal s,  @tm[:s, ["a"]]
@@ -147,10 +147,20 @@ class TestTaskManager < Test::Unit::TestCase
     @tm["a:x"].invoke
     assert_equal ["next z"], values
   end
-  
+
 end
 
 class TestTaskManagerArgumentResolution < Test::Unit::TestCase
+  def setup
+    super
+    Rake.application.options.ignore_deprecate = true
+  end
+
+  def teardown
+    Rake.application.options.ignore_deprecate = false
+    super
+  end
+
   def test_good_arg_patterns
     assert_equal [:t, [], []],       task(:t)
     assert_equal [:t, [], [:x]],     task(:t => :x)

data/test/{test_tasks.rb → lib/task_test.rb}

@@ -3,8 +3,6 @@
 require 'test/unit'
 require 'fileutils'
 require 'rake'
-require 'test/filecreation'
-require 'test/capture_stdout'
 require 'test/rake_test_setup'
 
 ######################################################################
@@ -12,9 +10,16 @@ class TestTask < Test::Unit::TestCase
   include CaptureStdout
   include Rake
   include TestMethods
+  include Rake::DSL
 
   def setup
     Task.clear
+    Rake::TaskManager.record_task_metadata = true
+  end
+
+  def teardown
+    super
+    Rake::TaskManager.record_task_metadata = false
   end
 
   def test_create
@@ -27,10 +32,13 @@ class TestTask < Test::Unit::TestCase
     assert_equal t, arg
     assert_nil t.source
     assert_equal [], t.sources
+    assert_equal 1, t.locations.size
+    assert_match(/#{Regexp.quote(__FILE__)}/, t.locations.first)
   end
 
   def test_inspect
-    t = task(:foo, :needs => [:bar, :baz])
+#    t = task(:foo, :needs => [:bar, :baz])
+    t = task(:foo => [:bar, :baz])
     assert_equal "<Rake::Task foo => [bar, baz]>", t.inspect
   end
 
@@ -61,7 +69,7 @@ class TestTask < Test::Unit::TestCase
     Rake.application.options.dryrun = true
     runlist = []
     t1 = task(:t1) { |t| runlist << t.name; 3321 }
-    out = capture_stdout { t1.invoke }
+    out = capture_stderr { t1.invoke }
     assert_match(/execute .*t1/i, out)
     assert_match(/dry run/i, out)
     assert_no_match(/invoke/i, out)
@@ -73,7 +81,7 @@ class TestTask < Test::Unit::TestCase
   def test_tasks_can_be_traced
     Rake.application.options.trace = true
     t1 = task(:t1)
-    out = capture_stdout {
+    out = capture_stderr {
       t1.invoke
     }
     assert_match(/invoke t1/i, out)
@@ -174,6 +182,56 @@ class TestTask < Test::Unit::TestCase
     assert_equal ["b", "c"], Task[:a].prerequisites
   end
 
+  def test_prerequiste_tasks_returns_tasks_not_strings
+    a = task :a => ["b", "c"]
+    b = task :b
+    c = task :c
+    assert_equal [b, c], a.prerequisite_tasks
+  end
+
+  def test_prerequiste_tasks_fails_if_prerequisites_are_undefined
+    a = task :a => ["b", "c"]
+    b = task :b
+    assert_exception(RuntimeError) do
+      a.prerequisite_tasks
+    end
+  end
+
+  def test_prerequiste_tasks_honors_namespaces
+    a = b = nil
+    namespace "X" do
+      a = task :a => ["b", "c"]
+      b = task :b
+    end
+    c = task :c
+
+    assert_equal [b, c], a.prerequisite_tasks
+  end
+
+  def test_timestamp_returns_now_if_all_prereqs_have_no_times
+    a = task :a => ["b", "c"]
+    b = task :b
+    c = task :c
+
+    faux_stamp = 100
+    flexmock(Time, :now => faux_stamp)
+
+    assert_equal faux_stamp, a.timestamp
+  end
+
+  def test_timestamp_returns_latest_prereq_timestamp
+    a = task :a => ["b", "c"]
+    b = task :b
+    c = task :c
+
+    faux_stamp = 100
+    flexmock(Time, :now => faux_stamp-10)
+    flexmock(b, :timestamp => faux_stamp - 1)
+    flexmock(c, :timestamp => faux_stamp)
+
+    assert_equal faux_stamp, a.timestamp
+  end
+
   def test_investigation_output
     t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
     task(:t2)
@@ -221,9 +279,17 @@ class TestTaskWithArguments < Test::Unit::TestCase
   include CaptureStdout
   include Rake
   include TestMethods
+  include Rake::DSL
 
   def setup
+    super
     Task.clear
+    Rake::TaskManager.record_task_metadata = true
+  end
+
+  def teardown
+    Rake::TaskManager.record_task_metadata = false
+    super
   end
 
   def test_no_args_given
@@ -243,23 +309,20 @@ class TestTaskWithArguments < Test::Unit::TestCase
     assert_equal ["pre"], t.prerequisites
   end
 
-  def test_name_and_explicit_needs
-    t = task(:t, :needs => [:pre])
-    assert_equal "t", t.name
-    assert_equal [], t.arg_names
-    assert_equal ["pre"], t.prerequisites
-  end
-
   def test_name_args_and_explicit_needs
-    t = task(:t, :x, :y, :needs => [:pre])
-    assert_equal "t", t.name
-    assert_equal [:x, :y], t.arg_names
-    assert_equal ["pre"], t.prerequisites
+    ignore_deprecations do
+      t = task(:t, :x, :y, :needs => [:pre])
+      assert_equal "t", t.name
+      assert_equal [:x, :y], t.arg_names
+      assert_equal ["pre"], t.prerequisites
+    end
   end
 
   def test_illegal_keys_in_task_name_hash
-    assert_exception RuntimeError do
-      t = task(:t, :x, :y => 1, :needs => [:pre])
+    ignore_deprecations do
+      assert_exception RuntimeError do
+        t = task(:t, :x, :y => 1, :needs => [:pre])
+      end
     end
   end
 
@@ -350,7 +413,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
   def test_named_args_are_passed_to_prereqs
     value = nil
     pre = task(:pre, :rev) { |t, args| value = args.rev }
-    t = task(:t, :name, :rev, :needs => [:pre])
+    t = task(:t, [:name, :rev] => [:pre])
     t.invoke("bill", "1.2")
     assert_equal "1.2", value
   end
@@ -360,7 +423,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
       assert_equal({}, args.to_hash)
       assert_equal "bill", args.name
     }
-    t = task(:t, :name, :rev, :needs => [:pre])
+    t = task(:t, [:name, :rev] => [:pre])
     t.invoke("bill", "1.2")
   end
 
@@ -368,7 +431,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
     pre = task(:pre, :rev) { |t, args|
       assert_equal({}, args.to_hash)
     }
-    t = task(:t, :needs => [:pre])
+    t = task(:t  => [:pre])
     t.invoke("bill", "1.2")
   end
 end

data/test/{test_test_task.rb → lib/test_task_test.rb}

@@ -6,7 +6,7 @@ require 'rake/testtask'
 class TestTestTask < Test::Unit::TestCase
   include Rake
   include TestMethods
-  
+
   def setup
     Task.clear
     ENV.delete('TEST')
@@ -48,7 +48,7 @@ class TestTestTask < Test::Unit::TestCase
     tt = Rake::TestTask.new do |t|
       t.pattern = '*.rb'
     end
-    assert_equal ['install.rb'], tt.file_list.to_a
+    assert_equal ['*.rb'], tt.file_list.to_a
   end
 
   def test_env_test
@@ -71,7 +71,7 @@ class TestTestTask < Test::Unit::TestCase
       t.test_files = FileList['a.rb', 'b.rb']
       t.pattern = '*.rb'
     end
-    assert_equal ['a.rb', 'b.rb', 'install.rb'], tt.file_list.to_a
+    assert_equal ['a.rb', 'b.rb', '*.rb'], tt.file_list.to_a
   end
 
 end

data/test/lib/testtask_test.rb

@@ -0,0 +1,49 @@
+require 'test/test_helper'
+require 'rake/testtask'
+
+class TestTaskTest < Test::Unit::TestCase
+  def test_direct_run_has_quoted_paths
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.loader = :direct
+    end
+    assert_match(/-e ".*"/, test_task.run_code)
+  end
+
+  def test_testrb_run_has_quoted_paths_on_ruby_182
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.loader = :testrb
+    end
+    flexmock(test_task).should_receive(:ruby_version).and_return('1.8.2')
+    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|
+      t.loader = :testrb
+    end
+    flexmock(test_task).should_receive(:ruby_version).and_return('1.8.6')
+    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
+    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)
+  end
+
+  def test_empty_lib_path_implies_no_dash_I_option
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.libs = []
+    end
+    assert_no_match(/-I/, test_task.ruby_opts_string)
+  end
+end

data/test/{test_top_level_functions.rb → lib/top_level_functions_test.rb}

@@ -20,6 +20,8 @@ class TestTopLevelFunctions < Test::Unit::TestCase
     super
     @app = Rake.application
     Rake.application = flexmock("app")
+    Rake.application.should_receive(:deprecate).
+      and_return { |old, new, call| @app.deprecate(old, new, call) }
   end
 
   def teardown
@@ -49,15 +51,15 @@ class TestTopLevelFunctions < Test::Unit::TestCase
   end
 
   def test_when_not_writing
-    RakeFileUtils.nowrite_flag = true
-    out = capture_stdout do
+    Rake::FileUtilsExt.nowrite_flag = true
+    out = capture_stderr do
       when_writing("NOTWRITING") do
         puts "WRITING"
       end
     end
     assert_equal "DRYRUN: NOTWRITING\n", out
   ensure
-    RakeFileUtils.nowrite_flag = false
+    Rake::FileUtilsExt.nowrite_flag = false
   end
 
   def test_missing_constants_task

data/test/{test_win32.rb → lib/win32_test.rb}

@@ -9,6 +9,7 @@ require 'rake'
 class TestWin32 < Test::Unit::TestCase
   include InEnvironment
   include TestMethods
+  include CaptureStdout
 
   Win32 = Rake::Win32
 
@@ -69,4 +70,22 @@ class TestWin32 < Test::Unit::TestCase
     end
   end
 
+  def test_win32_backtrace_with_different_case
+    ex = nil
+    begin
+     raise 'test exception'
+    rescue => ex
+    end
+
+    ex.set_backtrace ['abc', 'rakefile']
+
+    rake = Rake::Application.new
+    rake.options.trace = true
+    rake.instance_variable_set(:@rakefile, 'Rakefile')
+
+    err = capture_stderr { rake.display_error_message(ex) }
+
+    assert_match(/rakefile/, err)
+  end
+
 end

data/test/rake_test_setup.rb

@@ -8,17 +8,13 @@ rescue LoadError
 end
 
 require 'flexmock/test_unit'
-
-if RUBY_VERSION >= "1.9.0"
-  class Test::Unit::TestCase
-#    def passed?
-#      true
-#    end
-  end
-end
+require 'test/file_creation'
+require 'test/capture_stdout'
+require 'test/test_helper'
 
 module TestMethods
-  def assert_exception(ex, msg=nil, &block)
+  # Shim method for compatibility
+  def assert_exception(ex, msg="", &block)
     assert_raise(ex, msg, &block)
   end
 end

data/test/ruby_version_test.rb

@@ -0,0 +1,3 @@
+require 'test/unit'
+
+puts "\nRUBY VERSION = #{RUBY_VERSION}"

data/test/test_helper.rb

@@ -0,0 +1,19 @@
+begin
+  require 'rubygems'
+rescue LoadError
+end
+require 'test/unit'
+require 'flexmock/test_unit'
+
+require 'rake'
+
+class Test::Unit::TestCase
+  include Rake::DSL
+
+  def ignore_deprecations
+    Rake.application.options.ignore_deprecate = true
+    yield
+  ensure
+    Rake.application.options.ignore_deprecate = false
+  end
+end