rake 0.9.0 → 0.9.1

data/test/test_rake_dsl.rb

@@ -0,0 +1,53 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRakeDsl < Rake::TestCase
+
+  def test_namespace_command
+    namespace "n" do
+      task "t"
+    end
+    refute_nil Rake::Task["n:t"]
+  end
+
+  def test_namespace_command_with_bad_name
+    ex = assert_raises(ArgumentError) do
+      namespace 1 do end
+    end
+    assert_match(/string/i, ex.message)
+    assert_match(/symbol/i, ex.message)
+  end
+
+  def test_namespace_command_with_a_string_like_object
+    name = Object.new
+    def name.to_str
+      "bob"
+    end
+    namespace name do
+      task "t"
+    end
+    refute_nil Rake::Task["bob:t"]
+  end
+
+  class Foo
+    def initialize
+      task :foo_deprecated_a => "foo_deprecated_b" do
+        print "a"
+      end
+      file "foo_deprecated_b" do
+        print "b"
+      end
+    end
+  end
+
+  def test_deprecated_object_dsl
+    out, err = capture_io do
+      Foo.new
+      Rake.application.invoke_task :foo_deprecated_a
+    end
+    assert_equal("ba", out)
+    assert_match(/deprecated/, err)
+    assert_match(/Foo\#task/, err)
+    assert_match(/Foo\#file/, err)
+    assert_match(/test_rake_dsl\.rb:\d+/, err)
+  end
+end

data/test/{lib/earlytime_test.rb → test_rake_early_time.rb}

@@ -1,9 +1,6 @@
-#!/usr/bin/env ruby
+require File.expand_path('../helper', __FILE__)
 
-require 'test/unit'
-require 'rake'
-
-class TestEarlyTime < Test::Unit::TestCase
+class TestRakeEarlyTime < Rake::TestCase
   def test_create
     early = Rake::EarlyTime.instance
     assert early <= Time.now

data/test/{lib/extension_test.rb → test_rake_extension.rb}

@@ -1,11 +1,7 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'rake'
+require File.expand_path('../helper', __FILE__)
 require 'stringio'
 
-######################################################################
-class TestExtension < Test::Unit::TestCase
+class TestRakeExtension < Rake::TestCase
 
   module Redirect
     def error_redirect

data/test/{lib/file_creation_task_test.rb → test_rake_file_creation_task.rb}

@@ -1,23 +1,23 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
+require File.expand_path('../helper', __FILE__)
 require 'fileutils'
-require 'rake'
-require 'test/file_creation'
 
 ######################################################################
-class TestFileCreationTask < Test::Unit::TestCase
+class TestRakeFileCreationTask < Rake::TestCase
   include Rake
-  include FileCreation
+  include Rake::DSL
 
   DUMMY_DIR = 'testdata/dummy_dir'
 
   def setup
+    super
+
     Task.clear
   end
 
   def teardown
     FileUtils.rm_rf DUMMY_DIR
+
+    super
   end
 
   def test_file_needed

data/test/{lib/filelist_test.rb → test_rake_file_list.rb}

@@ -1,23 +1,19 @@
-#!/usr/bin/env ruby
+require File.expand_path('../helper', __FILE__)
 
-require 'test/unit'
-require 'rake'
-
-require 'test/capture_stdout'
-require 'test/rake_test_setup'
-
-class TestFileList < Test::Unit::TestCase
+class TestRakeFileList < Rake::TestCase
   FileList = Rake::FileList
-  include CaptureStdout
-  include TestMethods
 
   def setup
+    super
+
     create_test_data
   end
 
   def teardown
 #    FileList.select_default_ignore_patterns
     FileUtils.rm_rf("testdata")
+
+    super
   end
 
   def test_delegating_methods_do_not_include_to_a_or_to_ary
@@ -90,8 +86,8 @@ class TestFileList < Test::Unit::TestCase
 
   def test_match
     fl = FileList.new
-    fl.include('test/lib/*_test.rb')
-    assert fl.include?("test/lib/filelist_test.rb")
+    fl.include('test/test_*.rb')
+    assert fl.include?("test/test_rake_file_list.rb")
     assert fl.size > 3
     fl.each { |fn| assert_match(/\.rb$/, fn) }
   end
@@ -99,10 +95,10 @@ class TestFileList < Test::Unit::TestCase
   def test_add_matching
     fl = FileList.new
     fl << "a.java"
-    fl.include("test/lib/*.rb")
+    fl.include("test/*.rb")
     assert_equal "a.java", fl[0]
     assert fl.size > 2
-    assert fl.include?("test/lib/filelist_test.rb")
+    assert fl.include?("test/test_rake_file_list.rb")
   end
 
   def test_multiple_patterns
@@ -329,32 +325,32 @@ class TestFileList < Test::Unit::TestCase
   end
 
   def test_egrep_with_output
-    files = FileList['test/lib/*_test.rb']
+    files = FileList['test/test_*.rb']
     the_line_number = __LINE__ + 1
-    out = capture_stdout do files.egrep(/PUGH/) end
+    out, = capture_io do files.egrep(/PUGH/) end
     assert_match(/:#{the_line_number}:/, out)
   end
 
   def test_egrep_with_block
-    files = FileList['test/lib/*_test.rb']
+    files = FileList['test/test_*.rb']
     found = nil
     the_line_number = __LINE__ + 1
     files.egrep(/XYZZY/) do |fn, ln, line |
       found = [fn, ln, line]
     end
-    assert_equal 'test/lib/filelist_test.rb', found[0]
+    assert_equal 'test/test_rake_file_list.rb', found[0]
     assert_equal the_line_number, found[1]
     assert_match(/files\.egrep/, found[2])
   end
 
   def test_egrep_with_error
-    files = FileList['test/lib/*_test.rb']
-    error_messages = capture_stderr do
+    files = FileList['test/test_*.rb']
+    _, err = capture_io do
       files.egrep(/ANYTHING/) do |fn, ln, line |
         fail "_EGREP_FAILURE_"
       end
     end
-    assert_match(/_EGREP_FAILURE_/, error_messages)
+    assert_match(/_EGREP_FAILURE_/, err)
   end
 
   def test_existing
@@ -461,7 +457,7 @@ class TestFileList < Test::Unit::TestCase
     a = FileList['a', 'b', 'c']
     a.freeze
     c = a.clone
-    assert_exception(TypeError, RuntimeError) do
+    assert_raises(TypeError, RuntimeError) do
       c << 'more'
     end
   end

data/test/test_rake_file_list_path_map.rb

@@ -0,0 +1,8 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestRakeFileListPathMap < Rake::TestCase
+  def test_file_list_supports_pathmap
+    assert_equal ['a', 'b'], FileList['dir/a.rb', 'dir/b.rb'].pathmap("%n")
+  end
+end
+

data/test/{lib/file_task_test.rb → test_rake_file_task.rb}

@@ -1,18 +1,12 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
+require File.expand_path('../helper', __FILE__)
 require 'fileutils'
-require 'rake'
-require 'test/file_creation'
-require 'test/rake_test_setup'
 
-######################################################################
-class TestFileTask < Test::Unit::TestCase
+class TestRakeFileTask < Rake::TestCase
   include Rake
-  include FileCreation
-  include TestMethods
 
   def setup
+    super
+
     Task.clear
     @runs = Array.new
     FileUtils.rm_f NEWFILE
@@ -20,15 +14,23 @@ class TestFileTask < Test::Unit::TestCase
   end
 
   def test_file_need
+    FileUtils.mkdir_p 'testdata' # HACK use tmpdir
+
     name = "testdata/dummy"
     file name
+
     ftask = Task[name]
+
     assert_equal name.to_s, ftask.name
     File.delete(ftask.name) rescue nil
+
     assert ftask.needed?, "file should be needed"
+
     open(ftask.name, "w") { |f| f.puts "HI" }
+
     assert_equal nil, ftask.prerequisites.collect{|n| Task[n].timestamp}.max
     assert ! ftask.needed?, "file should not be needed"
+  ensure
     File.delete(ftask.name) rescue nil
   end
 
@@ -66,11 +68,19 @@ class TestFileTask < Test::Unit::TestCase
   end
 
   def test_existing_file_depends_on_non_existing_file
+    @ran = false
+
     create_file(OLDFILE)
     delete_file(NEWFILE)
-    file NEWFILE
+    file NEWFILE do
+      @ran = true
+    end
+
     file OLDFILE => NEWFILE
-    assert_nothing_raised do Task[OLDFILE].invoke end
+
+    Task[OLDFILE].invoke
+
+    assert @ran
   end
 
   # I have currently disabled this test.  I'm not convinced that
@@ -92,52 +102,3 @@ class TestFileTask < Test::Unit::TestCase
 
 end
 
-######################################################################
-class TestDirectoryTask < Test::Unit::TestCase
-  include Rake
-
-  def setup
-    Rake.rm_rf "testdata", :verbose=>false
-  end
-
-  def teardown
-    Rake.rm_rf "testdata", :verbose=>false
-  end
-
-  def test_directory
-    desc "DESC"
-    directory "testdata/a/b/c"
-    assert_equal FileCreationTask, Task["testdata"].class
-    assert_equal FileCreationTask, Task["testdata/a"].class
-    assert_equal FileCreationTask, Task["testdata/a/b/c"].class
-    assert_nil             Task["testdata"].comment
-    assert_equal "DESC",   Task["testdata/a/b/c"].comment
-    assert_nil             Task["testdata/a/b"].comment
-    verbose(false) {
-      Task['testdata/a/b'].invoke
-    }
-    assert File.exist?("testdata/a/b")
-    assert ! File.exist?("testdata/a/b/c")
-  end
-
-  if Rake::Win32.windows?
-    def test_directory_win32
-      desc "WIN32 DESC"
-      FileUtils.mkdir_p("testdata")
-      Dir.chdir("testdata") do
-        directory 'c:/testdata/a/b/c'
-        assert_equal FileCreationTask, Task['c:/testdata'].class
-        assert_equal FileCreationTask, Task['c:/testdata/a'].class
-        assert_equal FileCreationTask, Task['c:/testdata/a/b/c'].class
-        assert_nil             Task['c:/testdata'].comment
-        assert_equal "WIN32 DESC",   Task['c:/testdata/a/b/c'].comment
-        assert_nil             Task['c:/testdata/a/b'].comment
-        verbose(false) {
-          Task['c:/testdata/a/b'].invoke
-        }
-        assert File.exist?('c:/testdata/a/b')
-        assert ! File.exist?('c:/testdata/a/b/c')
-      end
-    end
-  end
-end

data/test/{lib/fileutils_test.rb → test_rake_file_utils.rb}

@@ -1,18 +1,12 @@
-#!/usr/bin/env ruby
-
-require 'rake'
-require 'test/unit'
-require 'test/file_creation'
+require File.expand_path('../helper', __FILE__)
 require 'fileutils'
 require 'stringio'
-require 'test/rake_test_setup'
 
-class TestFileUtils < Test::Unit::TestCase
-  include FileCreation
-  include TestMethods
-  include Rake::DSL
+class TestRakeFileUtils < Rake::TestCase
 
   def setup
+    super
+
     File.chmod(0750, "test/shellcommand.rb")
   end
 
@@ -20,6 +14,8 @@ class TestFileUtils < Test::Unit::TestCase
     File.chmod(0755, "test/shellcommand.rb")
     FileUtils.rm_rf("testdata")
     FileUtils::LN_SUPPORTED[0] = true
+
+    super
   end
 
   def test_rm_one_file
@@ -85,7 +81,7 @@ class TestFileUtils < Test::Unit::TestCase
   def test_safe_ln_fails_on_script_error
     FileUtils::LN_SUPPORTED[0] = true
     c = BadLink.new(ScriptError)
-    assert_exception(ScriptError) do c.safe_ln "a", "b" end
+    assert_raises(ScriptError) do c.safe_ln "a", "b" end
   end
 
   def test_verbose
@@ -118,8 +114,8 @@ class TestFileUtils < Test::Unit::TestCase
 
   def test_fileutils_methods_dont_leak
     obj = Object.new
-    assert_exception(NoMethodError) { obj.copy } # from FileUtils
-    assert_exception(NoMethodError) { obj.ruby "-v" } # from RubyFileUtils
+    assert_raises(NoMethodError) { obj.copy } # from FileUtils
+    assert_raises(NoMethodError) { obj.ruby "-v" } # from RubyFileUtils
   end
 
   def test_sh
@@ -159,7 +155,7 @@ class TestFileUtils < Test::Unit::TestCase
   end
 
   def test_sh_failure
-    assert_exception(RuntimeError) {
+    assert_raises(RuntimeError) {
       verbose(false) { Sh.run %{#{FileUtils::RUBY} test/shellcommand.rb 1} }
     }
   end
@@ -187,7 +183,7 @@ class TestFileUtils < Test::Unit::TestCase
   end
 
   def test_sh_bad_option
-    ex = assert_exception(ArgumentError) {
+    ex = assert_raises(ArgumentError) {
       verbose(false) { sh %{test/shellcommand.rb}, :bad_option=>true }
     }
     assert_match(/bad_option/, ex.message)

data/test/{lib/ftp_test.rb → test_rake_ftp_file.rb}

@@ -1,8 +1,6 @@
-#!/usr/bin/env ruby
-
+require File.expand_path('../helper', __FILE__)
 require 'date'
 require 'time'
-require 'test/unit'
 require 'rake/contrib/ftptools'
 
 class FakeDate
@@ -14,10 +12,11 @@ class FakeDate
   end
 end
 
-
-class TestFtpFile < Test::Unit::TestCase
+class TestRakeFtpFile < Rake::TestCase
 
   def setup
+    super
+
     Rake::FtpFile.class_eval { @date_class = FakeDate; @time_class = FakeDate }
   end
 
@@ -57,3 +56,4 @@ class TestFtpFile < Test::Unit::TestCase
     assert !file.directory?
   end
 end
+

data/test/{functional/session_based_tests.rb → test_rake_functional.rb}

@@ -1,15 +1,25 @@
-#!/usr/bin/env ruby
-
 begin
-  require 'rubygems'
+  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
+
+if defined?(Session)
+  if File::ALT_SEPARATOR
+    puts "Unable to run functional tests on MS Windows. Skipping."
+  end
 end
-require 'test/unit'
+
+require File.expand_path('../helper', __FILE__)
 require 'fileutils'
-require 'session'
-require 'test/in_environment'
-require 'test/rake_test_setup'
-require 'rake'
 
 # Version 2.1.9 of session has a bug where the @debug instance
 # variable is not initialized, causing warning messages.  This snippet
@@ -22,19 +32,20 @@ module Session
       old_initialize(*args)
     end
   end
-end
+end if defined? Session
 
-class SessionBasedTests < 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."]
     @verbose = ! ENV['VERBOSE'].nil?
+
     if @verbose
       puts
       puts
@@ -77,7 +88,7 @@ class SessionBasedTests < 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
 
@@ -88,7 +99,7 @@ class SessionBasedTests < 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
@@ -116,7 +127,7 @@ class SessionBasedTests < 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_included
@@ -189,14 +200,14 @@ class SessionBasedTests < Test::Unit::TestCase
     in_environment("PWD" => "test/data/verbose") do
       rake "inline_verbose_false"
     end
-    assert_no_match(/ruby -e/, @err)
+    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
-    assert_no_match(/ruby -e/, @err)
+    refute_match(/ruby -e/, @err)
   end
 
   def test_block_verbose_true_should_show_command
@@ -217,15 +228,15 @@ class SessionBasedTests < Test::Unit::TestCase
     in_environment("PWD" => "test/data/verbose") do
       rake "standalone_verbose_false"
     end
-    assert_no_match(/ruby -e/, @err)
+    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}, @err
     assert_match %r{Execute \(dry run\) other}, @err
-    assert_no_match %r{DEFAULT}, @out
-    assert_no_match %r{OTHER}, @out
+    refute_match %r{DEFAULT}, @out
+    refute_match %r{OTHER}, @out
   end
 
   # Test for the trace/dry_run bug found by Brian Chandler
@@ -237,7 +248,7 @@ class SessionBasedTests < 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
 
@@ -250,7 +261,7 @@ class SessionBasedTests < 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
 
@@ -376,7 +387,7 @@ class SessionBasedTests < Test::Unit::TestCase
     in_environment("PWD" => "test/data/comments") do
       rake "-T"
     end
-    assert_no_match(/comment for t1/, @out)
+    refute_match(/comment for t1/, @out)
   end
 
   def test_comment_separated_from_task_by_blank_line_is_not_picked_up
@@ -454,4 +465,4 @@ class SessionBasedTests < Test::Unit::TestCase
   def assert_status(expected_status=0)
     assert_equal expected_status, @status
   end
-end
+end if defined?(Session)