rake 0.8.7 → 0.9.2

data/test/{session_functional.rb → test_rake_functional.rb}

@@ -1,14 +1,25 @@
-#!/usr/bin/env ruby
-
 begin
-  require 'rubygems'
-rescue LoadError => ex
+  old_verbose = $VERBOSE
+  $VERBOSE = nil
+  require 'session'
+rescue LoadError
+  if File::ALT_SEPARATOR
+    puts "Unable to run functional tests on MS Windows. Skipping."
+  else
+    puts "Unable to run functional tests -- please run \"gem install session\""
+  end
+ensure
+  $VERBOSE = old_verbose
 end
-require 'test/unit'
+
+if defined?(Session)
+  if File::ALT_SEPARATOR
+    puts "Unable to run functional tests on MS Windows. Skipping."
+  end
+end
+
+require File.expand_path('../helper', __FILE__)
 require 'fileutils'
-require 'session'
-require 'test/in_environment'
-require 'test/rake_test_setup'
 
 # Version 2.1.9 of session has a bug where the @debug instance
 # variable is not initialized, causing warning messages.  This snippet
@@ -21,19 +32,20 @@ module Session
       old_initialize(*args)
     end
   end
-end
+end if defined? Session
 
-class FunctionalTest < Test::Unit::TestCase
-  include InEnvironment
-  include TestMethods
+class TestRakeFunctional < Rake::TestCase
 
   RUBY_COMMAND = 'ruby'
 
   def setup
+    super
+
     @rake_path = File.expand_path("bin/rake")
     lib_path = File.expand_path("lib")
-    @ruby_options = "-I#{lib_path} -I."
+    @ruby_options = ["-I#{lib_path}", "-I."]
     @verbose = ! ENV['VERBOSE'].nil?
+
     if @verbose
       puts
       puts
@@ -55,13 +67,13 @@ class FunctionalTest < Test::Unit::TestCase
     assert_status(1)
   end
 
-  def test_env_availabe_at_top_scope
+  def test_env_available_at_top_scope
     Dir.chdir("test/data/default") do rake "TESTTOPSCOPE=1" end
     assert_match(/^TOPSCOPE$/, @out)
     assert_status
   end
 
-  def test_env_availabe_at_task_scope
+  def test_env_available_at_task_scope
     Dir.chdir("test/data/default") do rake "TESTTASKSCOPE=1 task_scope" end
     assert_match(/^TASKSCOPE$/, @out)
     assert_status
@@ -76,10 +88,10 @@ class FunctionalTest < Test::Unit::TestCase
     end
     assert_match %r{^rake a *# A / A2 *$}, @out
     assert_match %r{^rake b *# B *$}, @out
-    assert_no_match %r{^rake c}, @out
+    refute_match %r{^rake c}, @out
     assert_match %r{^rake d *# x{65}\.\.\.$}, @out
   end
-  
+
   def test_long_description
     in_environment("PWD" => "test/data/multidesc") do
       rake "--describe"
@@ -87,7 +99,14 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match %r{^rake a\n *A / A2 *$}m, @out
     assert_match %r{^rake b\n *B *$}m, @out
     assert_match %r{^rake d\n *x{80}}m, @out
-    assert_no_match %r{^rake c\n}m, @out
+    refute_match %r{^rake c\n}m, @out
+  end
+
+  def test_proper_namespace_access
+    in_environment("PWD" => "test/data/access") do
+      rake
+    end
+    assert_not_match %r{^BAD:}, @out
   end
 
   def test_rbext
@@ -108,12 +127,12 @@ class FunctionalTest < Test::Unit::TestCase
     in_environment('RAKE_SYSTEM' => 'test/data/sys') do
       rake '-g', "sys1", '-T', 'extra'
     end
-    assert_no_match %r{extra:extra}, @out
+    refute_match %r{extra:extra}, @out
   end
 
-  def test_by_default_rakelib_files_are_include
-    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
-      rake '-T', 'extra'
+  def test_by_default_rakelib_files_are_included
+    in_environment('RAKE_SYSTEM' => 'test/data/sys', "PWD" => 'test/data/extra') do
+      rake '-T', 'extra', '--trace'
     end
     assert_match %r{extra:extra}, @out
   end
@@ -126,7 +145,7 @@ class FunctionalTest < Test::Unit::TestCase
   end
 
   def test_no_system
-    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
+    in_environment('RAKE_SYSTEM' => 'test/data/sys', "PWD" => "test/data/extra") do
       rake '-G', "sys1"
     end
     assert_match %r{^Don't know how to build task}, @err # emacs wart: '
@@ -156,12 +175,68 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match %r{^No Rakefile found}, @err
   end
 
+  def test_invalid_command_line_options
+    in_environment("PWD" => "test/data/default") do
+      rake "--bad-options"
+    end
+    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
+    refute_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
+    refute_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
+    refute_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
-    assert_match %r{Execute \(dry run\) other}, @out
-    assert_no_match %r{DEFAULT}, @out
-    assert_no_match %r{OTHER}, @out
+    assert_match %r{Execute \(dry run\) default}, @err
+    assert_match %r{Execute \(dry run\) other}, @err
+    refute_match %r{DEFAULT}, @out
+    refute_match %r{OTHER}, @out
   end
 
   # Test for the trace/dry_run bug found by Brian Chandler
@@ -173,7 +248,7 @@ class FunctionalTest < Test::Unit::TestCase
     in_environment("PWD" => "test/data/dryrun") do
       rake "--dry-run"
     end
-    assert_no_match(/No such file/, @out)
+    refute_match(/No such file/, @out)
     assert_status
   end
 
@@ -186,7 +261,7 @@ class FunctionalTest < Test::Unit::TestCase
     in_environment("PWD" => "test/data/dryrun") do
       rake "--trace"
     end
-    assert_no_match(/No such file/, @out)
+    refute_match(/No such file/, @out)
     assert_status
   end
 
@@ -284,7 +359,16 @@ class FunctionalTest < Test::Unit::TestCase
       assert_match(/^XYZ1\nXYZ2$/m, @out)
     end
   end
-  
+
+  def test_file_task_dependencies_scoped_by_namespaces
+    in_environment("PWD" => "test/data/namespace") do
+      rake "scopedep.rb"
+      assert_match(/^PREPARE\nSCOPEDEP$/m, @out)
+    end
+  ensure
+    remove_namespace_files
+  end
+
   def test_rake_returns_status_error_values
     in_environment("PWD" => "test/data/statusreturn") do
       rake "exit5"
@@ -299,30 +383,75 @@ class FunctionalTest < Test::Unit::TestCase
     end
   end
 
+  def test_comment_before_task_acts_like_desc
+    in_environment("PWD" => "test/data/comments") do
+      rake "-T"
+    end
+    refute_match(/comment for t1/, @out)
+  end
+
+  def test_comment_separated_from_task_by_blank_line_is_not_picked_up
+    Dir.chdir("test/data/comments") { rake("-T")}
+    assert_not_match("t2", @out)
+  end
+
+  def test_comment_after_desc_is_ignored
+    Dir.chdir("test/data/comments") { rake("-T")}
+    assert_match("override comment for t3", @out)
+  end
+
+  def test_comment_before_desc_is_ignored
+    Dir.chdir("test/data/comments") { rake("-T")}
+    assert_match("override comment for t4", @out)
+  end
+
+  def test_correct_number_of_tasks_reported
+    Dir.chdir("test/data/comments") { rake("-T")}
+    assert_equal(2, @out.split(/\n/).grep(/t\d/).size)
+  end
+
+  def test_file_list_is_requirable_separately
+    ruby "-rrake/file_list", "-e 'puts Rake::FileList[\"a\"].size'"
+    assert_equal "1\n", @out
+    assert_equal 0, @status
+  end
+
   private
 
+  def assert_not_match(pattern, string, comment="'#{pattern}' was found (incorrectly) in '#{string}.inspect")
+    assert_nil Regexp.new(pattern).match(string), comment
+  end
+
   def remove_chaining_files
     %w(play.scpt play.app base).each do |fn|
       FileUtils.rm_f File.join("test/data/chains", fn)
     end
   end
 
-  class << self
-    def format_command
-      @format_command ||= lambda { |ruby_options, rake_path, options|
-        "ruby #{ruby_options} #{rake_path} #{options}"
-      }
-    end
-    
-    def format_command=(fmt_command)
-      @format_command = fmt_command
+  def remove_namespace_files
+    %w(scopedep.rb).each do |fn|
+      FileUtils.rm_f File.join("test/data/namespace", fn)
     end
   end
-  
-  def rake(*option_list)
-    options = option_list.join(' ')
+
+  # Run a shell Ruby command with command line options (using the
+  # default test options). Output is captured in @out, @err and
+  # @status.
+  def ruby(*option_list)
+    run_ruby(@ruby_options + option_list)
+  end
+
+  # Run a command line rake with the give rake options.  Default
+  # command line ruby options are included.  Output is captured in
+  # @out, @err and @status.
+  def rake(*rake_options)
+    run_ruby @ruby_options + [@rake_path] + rake_options
+  end
+
+  # Low level ruby command runner ...
+  def run_ruby(option_list)
     shell = Session::Shell.new
-    command = self.class.format_command[@ruby_options, @rake_path, options]
+    command = "#{RUBY_COMMAND} " + option_list.join(' ')
     puts "COMMAND: [#{command}]" if @verbose
     @out, @err = shell.execute command
     @status = shell.exit_status
@@ -336,4 +465,4 @@ class FunctionalTest < Test::Unit::TestCase
   def assert_status(expected_status=0)
     assert_equal expected_status, @status
   end
-end
+end if defined?(Session)

data/test/test_rake_invocation_chain.rb

@@ -0,0 +1,52 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRakeInvocationChain < Rake::TestCase
+
+  def setup
+    super
+
+    @empty = Rake::InvocationChain::EMPTY
+
+    @first_member = "A"
+    @second_member = "B"
+    @one = @empty.append(@first_member)
+    @two = @one.append(@second_member)
+  end
+
+  def test_append
+    chain = @empty.append("A")
+
+    assert_equal 'TOP => A', chain.to_s # HACK
+  end
+
+  def test_append_one_circular
+    ex = assert_raises RuntimeError do
+      @one.append(@first_member)
+    end
+    assert_match(/circular +dependency/i, ex.message)
+    assert_match(/A.*=>.*A/, ex.message)
+  end
+
+  def test_append_two_circular
+    ex = assert_raises RuntimeError do
+      @two.append(@first_member)
+    end
+    assert_match(/A.*=>.*B.*=>.*A/, ex.message)
+  end
+
+  def test_member_eh_one
+    assert @one.member?(@first_member)
+  end
+
+  def test_member_eh_two
+    assert @two.member?(@first_member)
+    assert @two.member?(@second_member)
+  end
+
+  def test_to_s_empty
+    assert_equal "TOP", @empty.to_s
+    assert_equal "TOP => A", @one.to_s
+  end
+
+end
+

data/test/{test_makefile_loader.rb → test_rake_makefile_loader.rb}

@@ -1,10 +1,7 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'rake'
+require File.expand_path('../helper', __FILE__)
 require 'rake/loaders/makefile'
 
-class TestMakefileLoader < Test::Unit::TestCase
+class TestRakeMakefileLoader < Rake::TestCase
   include Rake
 
   def test_parse

data/test/{test_multitask.rb → test_rake_multi_task.rb}

@@ -1,20 +1,27 @@
-#!/usr/bin/env ruby
+require File.expand_path('../helper', __FILE__)
+require 'thread'
 
-require 'test/unit'
-require 'rake'
-
-######################################################################
-class TestMultiTask < Test::Unit::TestCase
+class TestRakeMultiTask < Rake::TestCase
   include Rake
+  include Rake::DSL
 
   def setup
+    super
+
     Task.clear
     @runs = Array.new
+    @mutex = Mutex.new
+  end
+
+  def add_run(obj)
+    @mutex.synchronize do
+      @runs << obj
+    end
   end
 
   def test_running_multitasks
-    task :a do 3.times do |i| @runs << "A#{i}"; sleep 0.01; end end
-    task :b do 3.times do |i| @runs << "B#{i}"; sleep 0.01;  end end
+    task :a do 3.times do |i| add_run("A#{i}"); sleep 0.01; end end
+    task :b do 3.times do |i| add_run("B#{i}"); sleep 0.01;  end end
     multitask :both => [:a, :b]
     Task[:both].invoke
     assert_equal 6, @runs.size
@@ -25,9 +32,9 @@ class TestMultiTask < Test::Unit::TestCase
   end
 
   def test_all_multitasks_wait_on_slow_prerequisites
-    task :slow do 3.times do |i| @runs << "S#{i}"; sleep 0.05 end end
-    task :a => [:slow] do 3.times do |i| @runs << "A#{i}"; sleep 0.01 end end
-    task :b => [:slow] do 3.times do |i| @runs << "B#{i}"; sleep 0.01 end end
+    task :slow do 3.times do |i| add_run("S#{i}"); sleep 0.05 end end
+    task :a => [:slow] do 3.times do |i| add_run("A#{i}"); sleep 0.01 end end
+    task :b => [:slow] do 3.times do |i| add_run("B#{i}"); sleep 0.01 end end
     multitask :both => [:a, :b]
     Task[:both].invoke
     assert_equal 9, @runs.size
@@ -42,4 +49,3 @@ class TestMultiTask < Test::Unit::TestCase
   end
 end
 
- 

data/test/{test_namespace.rb → test_rake_name_space.rb}

@@ -1,18 +1,6 @@
-#!/usr/bin/env ruby
+require File.expand_path('../helper', __FILE__)
 
-begin
-  require 'rubygems'
-rescue LoadError
-  # got no gems
-end
-
-require 'test/unit'
-require 'flexmock/test_unit'
-require 'rake'
-require 'test/rake_test_setup'
-
-class TestNameSpace < Test::Unit::TestCase
-  include TestMethods
+class TestRakeNameSpace < Rake::TestCase
 
   class TM
     include Rake::TaskManager
@@ -21,7 +9,7 @@ class TestNameSpace < Test::Unit::TestCase
   def test_namespace_creation
     mgr = TM.new
     ns = Rake::NameSpace.new(mgr, [])
-    assert_not_nil ns
+    refute_nil ns
   end
 
   def test_namespace_lookup
@@ -30,7 +18,7 @@ class TestNameSpace < Test::Unit::TestCase
       mgr.define_task(Rake::Task, "t")
     end
 
-    assert_not_nil ns["t"]
+    refute_nil ns["t"]
     assert_equal mgr["n:t"], ns["t"]
   end
 

data/test/test_rake_package_task.rb

@@ -0,0 +1,78 @@
+require File.expand_path('../helper', __FILE__)
+require 'rake/packagetask'
+
+class TestRakePackageTask < Rake::TestCase
+
+  def test_initialize
+    pkg = Rake::PackageTask.new("pkgr", "1.2.3") { |p|
+      p.package_files << "install.rb"
+      p.package_files.include(
+        '[A-Z]*',
+        'bin/**/*',
+        'lib/**/*.rb',
+        'test/**/*.rb',
+        'doc/**/*',
+        'build/rubyapp.rb',
+        '*.blurb')
+      p.package_files.exclude(/\bCVS\b/)
+      p.package_files.exclude(/~$/)
+      p.package_dir = 'pkg'
+      p.need_tar = true
+      p.need_tar_gz = true
+      p.need_tar_bz2 = true
+      p.need_zip = true
+    }
+
+    assert_equal "pkg", pkg.package_dir
+    assert pkg.package_files.include?("bin/rake")
+    assert_equal 'pkgr', pkg.name
+    assert_equal '1.2.3', pkg.version
+    assert Rake::Task[:package]
+    assert Rake::Task['pkg/pkgr-1.2.3.tgz']
+    assert Rake::Task['pkg/pkgr-1.2.3.tar.gz']
+    assert Rake::Task['pkg/pkgr-1.2.3.tar.bz2']
+    assert Rake::Task['pkg/pkgr-1.2.3.zip']
+    assert Rake::Task['pkg/pkgr-1.2.3']
+    assert Rake::Task[:clobber_package]
+    assert Rake::Task[:repackage]
+  end
+
+  def test_initialize_no_version
+    e = assert_raises RuntimeError do
+      Rake::PackageTask.new 'pkgr'
+    end
+
+    assert_equal 'Version required (or :noversion)', e.message
+  end
+
+  def test_initialize_noversion
+    pkg = Rake::PackageTask.new 'pkgr', :noversion
+
+    assert_equal 'pkg',  pkg.package_dir
+    assert_equal 'pkgr', pkg.name
+    assert_equal nil,    pkg.version
+  end
+
+  def test_clone
+    pkg = Rake::PackageTask.new("x", :noversion)
+    p2 = pkg.clone
+    pkg.package_files << "y"
+    p2.package_files << "x"
+    assert_equal ["y"], pkg.package_files
+    assert_equal ["x"], p2.package_files
+  end
+
+  def test_package_name
+    pkg = Rake::PackageTask.new 'a', '1'
+
+    assert_equal 'a-1', pkg.package_name
+  end
+
+  def test_package_name_noversion
+    pkg = Rake::PackageTask.new 'a', :noversion
+
+    assert_equal 'a', pkg.package_name
+  end
+
+end
+

data/test/{test_pathmap.rb → test_rake_path_map.rb}

@@ -1,11 +1,6 @@
-#!/usr/bin/env ruby
+require File.expand_path('../helper', __FILE__)
 
-require 'test/unit'
-require 'rake'
-
-# ====================================================================
-class TestPathMap < Test::Unit::TestCase
-  include TestMethods
+class TestRakePathMap < Rake::TestCase
 
   def test_returns_self_with_no_args
     assert_equal "abc.rb", "abc.rb".pathmap
@@ -26,7 +21,7 @@ class TestPathMap < Test::Unit::TestCase
 
   def test_n_returns_basename_without_extension
     assert_equal "abc", "abc.rb".pathmap("%n")
-    assert_equal "abc", "abc".pathmap("%n") 
+    assert_equal "abc", "abc".pathmap("%n")
     assert_equal "abc", "this/is/a/dir/abc.rb".pathmap("%n")
     assert_equal "abc", "/this/is/a/dir/abc.rb".pathmap("%n")
     assert_equal "abc", "/this/is/a/dir/abc".pathmap("%n")
@@ -87,7 +82,7 @@ class TestPathMap < Test::Unit::TestCase
   end
 
   def test_undefined_percent_causes_error
-    ex = assert_exception(ArgumentError) {
+    assert_raises(ArgumentError) {
       "dir/abc.rb".pathmap("%z")
     }
   end
@@ -131,7 +126,7 @@ class TestPathMap < Test::Unit::TestCase
   end
 
   def test_pattern_with_invalid_operator
-    ex = assert_exception(ArgumentError) do
+    ex = assert_raises(ArgumentError) do
       "abc.xyz".pathmap("%{src,bin}z")
     end
     assert_match(/unknown.*pathmap.*spec.*z/i, ex.message)
@@ -160,51 +155,3 @@ class TestPathMap < Test::Unit::TestCase
   end
 end
 
-class TestPathMapExplode < Test::Unit::TestCase
-  def setup
-    String.class_eval { public :pathmap_explode }
-  end
-
-  def teardown
-    String.class_eval { protected :pathmap_explode }
-  end
-
-  def test_explode
-    assert_equal ['a'], 'a'.pathmap_explode
-    assert_equal ['a', 'b'], 'a/b'.pathmap_explode
-    assert_equal ['a', 'b', 'c'], 'a/b/c'.pathmap_explode
-    assert_equal ['/', 'a'], '/a'.pathmap_explode
-    assert_equal ['/', 'a', 'b'], '/a/b'.pathmap_explode
-    assert_equal ['/', 'a', 'b', 'c'], '/a/b/c'.pathmap_explode
-    if File::ALT_SEPARATOR
-      assert_equal ['c:.', 'a'], 'c:a'.pathmap_explode
-      assert_equal ['c:.', 'a', 'b'], 'c:a/b'.pathmap_explode
-      assert_equal ['c:.', 'a', 'b', 'c'], 'c:a/b/c'.pathmap_explode
-      assert_equal ['c:/', 'a'], 'c:/a'.pathmap_explode
-      assert_equal ['c:/', 'a', 'b'], 'c:/a/b'.pathmap_explode
-      assert_equal ['c:/', 'a', 'b', 'c'], 'c:/a/b/c'.pathmap_explode
-    end
-  end
-end
-
-class TestPathMapPartial < Test::Unit::TestCase
-  def test_pathmap_partial
-    @path = "1/2/file"
-    def @path.call(n)
-      pathmap_partial(n)
-    end
-    assert_equal("1", @path.call(1))
-    assert_equal("1/2", @path.call(2))
-    assert_equal("1/2", @path.call(3))
-    assert_equal(".", @path.call(0))
-    assert_equal("2", @path.call(-1))
-    assert_equal("1/2", @path.call(-2))
-    assert_equal("1/2", @path.call(-3))
-  end
-end
-
-class TestFileListPathMap < Test::Unit::TestCase
-  def test_file_list_supports_pathmap
-    assert_equal ['a', 'b'], FileList['dir/a.rb', 'dir/b.rb'].pathmap("%n")
-  end
-end

data/test/test_rake_path_map_explode.rb

@@ -0,0 +1,31 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRakePathMapExplode < Rake::TestCase
+  def setup
+    super
+
+    String.class_eval { public :pathmap_explode }
+  end
+
+  def teardown
+    String.class_eval { protected :pathmap_explode }
+  end
+
+  def test_explode
+    assert_equal ['a'], 'a'.pathmap_explode
+    assert_equal ['a', 'b'], 'a/b'.pathmap_explode
+    assert_equal ['a', 'b', 'c'], 'a/b/c'.pathmap_explode
+    assert_equal ['/', 'a'], '/a'.pathmap_explode
+    assert_equal ['/', 'a', 'b'], '/a/b'.pathmap_explode
+    assert_equal ['/', 'a', 'b', 'c'], '/a/b/c'.pathmap_explode
+    if File::ALT_SEPARATOR
+      assert_equal ['c:.', 'a'], 'c:a'.pathmap_explode
+      assert_equal ['c:.', 'a', 'b'], 'c:a/b'.pathmap_explode
+      assert_equal ['c:.', 'a', 'b', 'c'], 'c:a/b/c'.pathmap_explode
+      assert_equal ['c:/', 'a'], 'c:/a'.pathmap_explode
+      assert_equal ['c:/', 'a', 'b'], 'c:/a/b'.pathmap_explode
+      assert_equal ['c:/', 'a', 'b', 'c'], 'c:/a/b/c'.pathmap_explode
+    end
+  end
+end
+