rake 0.9.0 → 0.9.1

data/test/test_rake_task_argument_parsing.rb

@@ -0,0 +1,116 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRakeTaskArgumentParsing < Rake::TestCase
+  def setup
+    super
+
+    @app = Rake::Application.new
+  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
+    assert_equal ["one", "two", "three", "four"], args
+  end
+
+  def test_keeps_embedded_spaces
+    name, args = @app.parse_task_string("name[a one ana, two]")
+    assert_equal "name", name
+    assert_equal ["a one ana", "two"], args
+  end
+
+  def test_terminal_width_using_env
+    app = Rake::Application.new
+    in_environment('RAKE_COLUMNS' => '1234') do
+      assert_equal 1234, app.terminal_width
+    end
+  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
+  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
+  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
+  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
+  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

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

@@ -1,10 +1,7 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'rake'
+require File.expand_path('../helper', __FILE__)
 
 ######################################################################
-class TestTaskArguments < Test::Unit::TestCase
+class TestRakeTaskArguments < Rake::TestCase
   def teardown
     ENV.delete('rev')
     ENV.delete('VER')

data/test/{lib/tasklib_test.rb → test_rake_task_lib.rb}

@@ -1,10 +1,7 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
+require File.expand_path('../helper', __FILE__)
 require 'rake/tasklib'
 
-
-class TestTaskLib < Test::Unit::TestCase
+class TestRakeTaskLib < Rake::TestCase
   def test_paste
     tl = Rake::TaskLib.new
     assert_equal :ab, tl.paste(:a, :b)

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

@@ -1,22 +1,15 @@
-#!/usr/bin/env ruby
+require File.expand_path('../helper', __FILE__)
 
-require 'test/unit'
-require 'rake'
-require 'test/rake_test_setup'
-
-class TaskManager
-  include Rake::TaskManager
-end
-
-class TestTaskManager < Test::Unit::TestCase
-  include TestMethods
+class TestRakeTaskManager < Rake::TestCase
 
   def setup
-    @tm = TaskManager.new
+    super
+
+    @tm = Rake::TestCase::TaskManager.new
   end
 
   def test_create_task_manager
-    assert_not_nil @tm
+    refute_nil @tm
     assert_equal [], @tm.tasks
   end
 
@@ -71,7 +64,7 @@ class TestTaskManager < Test::Unit::TestCase
   end
 
   def test_name_lookup_with_nonexistent_task
-    assert_exception(RuntimeError) {
+    assert_raises(RuntimeError) {
       @tm["DOES NOT EXIST"]
     }
   end
@@ -150,34 +143,3 @@ class TestTaskManager < Test::Unit::TestCase
 
 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)
-    assert_equal [:t, [], [:x, :y]], task(:t => [:x, :y])
-
-    assert_equal [:t, [:a, :b], []],       task(:t, :a, :b)
-    assert_equal [:t, [], [:x]],           task(:t, :needs => :x)
-    assert_equal [:t, [:a, :b], [:x]],     task(:t, :a, :b, :needs => :x)
-    assert_equal [:t, [:a, :b], [:x, :y]], task(:t, :a, :b, :needs => [:x, :y])
-
-    assert_equal [:t, [:a, :b], []],       task(:t, [:a, :b])
-    assert_equal [:t, [:a, :b], [:x]],     task(:t, [:a, :b] => :x)
-    assert_equal [:t, [:a, :b], [:x, :y]], task(:t, [:a, :b] => [:x, :y])
-  end
-
-  def task(*args)
-    tm = TaskManager.new
-    tm.resolve_args(args)
-  end
-end

data/test/test_rake_task_manager_argument_resolution.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRakeTaskManagerArgumentResolution < Rake::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)
+    assert_equal [:t, [], [:x, :y]], task(:t => [:x, :y])
+
+    assert_equal [:t, [:a, :b], []],       task(:t, :a, :b)
+    assert_equal [:t, [], [:x]],           task(:t, :needs => :x)
+    assert_equal [:t, [:a, :b], [:x]],     task(:t, :a, :b, :needs => :x)
+    assert_equal [:t, [:a, :b], [:x, :y]], task(:t, :a, :b, :needs => [:x, :y])
+
+    assert_equal [:t, [:a, :b], []],       task(:t, [:a, :b])
+    assert_equal [:t, [:a, :b], [:x]],     task(:t, [:a, :b] => :x)
+    assert_equal [:t, [:a, :b], [:x, :y]], task(:t, [:a, :b] => [:x, :y])
+  end
+
+  def task(*args)
+    tm = Rake::TestCase::TaskManager.new
+    tm.resolve_args(args)
+  end
+end

data/test/test_rake_task_with_arguments.rb

@@ -0,0 +1,162 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRakeTaskWithArguments < Rake::TestCase
+  include Rake
+
+  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
+    t = task :t
+    assert_equal [], t.arg_names
+  end
+
+  def test_args_given
+    t = task :t, :a, :b
+    assert_equal [:a, :b], t.arg_names
+  end
+
+  def test_name_and_needs
+    t = task(:t => [:pre])
+    assert_equal "t", t.name
+    assert_equal [], t.arg_names
+    assert_equal ["pre"], t.prerequisites
+  end
+
+  def test_name_args_and_explicit_needs
+    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
+    ignore_deprecations do
+      assert_raises RuntimeError do
+        t = task(:t, :x, :y => 1, :needs => [:pre])
+      end
+    end
+  end
+
+  def test_arg_list_is_empty_if_no_args_given
+    t = task(:t) { |tt, args| assert_equal({}, args.to_hash) }
+    t.invoke(1, 2, 3)
+  end
+
+  def test_tasks_can_access_arguments_as_hash
+    t = task :t, :a, :b, :c do |tt, args|
+      assert_equal({:a => 1, :b => 2, :c => 3}, args.to_hash)
+      assert_equal 1, args[:a]
+      assert_equal 2, args[:b]
+      assert_equal 3, args[:c]
+      assert_equal 1, args.a
+      assert_equal 2, args.b
+      assert_equal 3, args.c
+    end
+    t.invoke(1, 2, 3)
+  end
+
+  def test_actions_of_various_arity_are_ok_with_args
+    notes = []
+    t = task(:t, :x) do
+      notes << :a
+    end
+    t.enhance do | |
+      notes << :b
+    end
+    t.enhance do |task|
+      notes << :c
+      assert_kind_of Task, task
+    end
+    t.enhance do |t2, args|
+      notes << :d
+      assert_equal t, t2
+      assert_equal({:x => 1}, args.to_hash)
+    end
+    t.invoke(1)
+    assert_equal [:a, :b, :c, :d], notes
+  end
+
+  def test_arguments_are_passed_to_block
+    t = task(:t, :a, :b) { |tt, args|
+      assert_equal( { :a => 1, :b => 2 }, args.to_hash )
+    }
+    t.invoke(1, 2)
+  end
+
+  def test_extra_parameters_are_ignored
+    t = task(:t, :a) { |tt, args|
+      assert_equal 1, args.a
+      assert_nil args.b
+    }
+    t.invoke(1, 2)
+  end
+
+  def test_arguments_are_passed_to_all_blocks
+    counter = 0
+    t = task :t, :a
+    task :t do |tt, args|
+      assert_equal 1, args.a
+      counter += 1
+    end
+    task :t do |tt, args|
+      assert_equal 1, args.a
+      counter += 1
+    end
+    t.invoke(1)
+    assert_equal 2, counter
+  end
+
+  def test_block_with_no_parameters_is_ok
+    t = task(:t) { }
+    t.invoke(1, 2)
+  end
+
+  def test_name_with_args
+    desc "T"
+    t = task(:tt, :a, :b)
+    assert_equal "tt", t.name
+    assert_equal "T", t.comment
+    assert_equal "[a,b]", t.arg_description
+    assert_equal "tt[a,b]", t.name_with_args
+    assert_equal [:a, :b],t.arg_names
+  end
+
+  def test_named_args_are_passed_to_prereqs
+    value = nil
+    pre = task(:pre, :rev) { |t, args| value = args.rev }
+    t = task(:t, [:name, :rev] => [:pre])
+    t.invoke("bill", "1.2")
+    assert_equal "1.2", value
+  end
+
+  def test_args_not_passed_if_no_prereq_names
+    pre = task(:pre) { |t, args|
+      assert_equal({}, args.to_hash)
+      assert_equal "bill", args.name
+    }
+    t = task(:t, [:name, :rev] => [:pre])
+    t.invoke("bill", "1.2")
+  end
+
+  def test_args_not_passed_if_no_arg_names
+    pre = task(:pre, :rev) { |t, args|
+      assert_equal({}, args.to_hash)
+    }
+    t = task(:t  => [:pre])
+    t.invoke("bill", "1.2")
+  end
+end
+

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

@@ -1,19 +1,20 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
+require File.expand_path('../helper', __FILE__)
 require 'rake/testtask'
 
-class TestTestTask < Test::Unit::TestCase
+class TestRakeTestTask < Rake::TestCase
   include Rake
-  include TestMethods
 
   def setup
+    super
+
     Task.clear
     ENV.delete('TEST')
   end
 
   def teardown
     FileUtils.rm_rf("testdata")
+
+    super
   end
 
   def test_no_task
@@ -22,7 +23,7 @@ class TestTestTask < Test::Unit::TestCase
 
   def test_defaults
     tt = Rake::TestTask.new do |t| end
-    assert_not_nil tt
+    refute_nil tt
     assert_equal :test, tt.name
     assert_equal ['lib'], tt.libs
     assert_equal 'test/test*.rb', tt.pattern
@@ -36,7 +37,7 @@ class TestTestTask < Test::Unit::TestCase
       t.pattern = 'test/tc_*.rb'
       t.verbose = true
     end
-    assert_not_nil tt
+    refute_nil tt
     assert_equal :example, tt.name
     assert_equal ['src', 'ext'], tt.libs
     assert_equal 'test/tc_*.rb', tt.pattern
@@ -74,4 +75,48 @@ class TestTestTask < Test::Unit::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|
+      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
+    refute_match(/-I/, test_task.ruby_opts_string)
+  end
 end