rake 0.7.2 → 0.7.3

data/test/test_application.rb

@@ -23,7 +23,7 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_constant_warning
-    err = capture_stderr do @app.const_warning("Task") end
+    err = capture_stderr do @app.instance_eval { const_warning("Task") } end
     assert_match(/warning/i, err)
     assert_match(/deprecated/i, err)
     assert_match(/Task/i, err)
@@ -33,28 +33,30 @@ class TestApplication < Test::Unit::TestCase
     @app.options.show_task_pattern = //
     @app.last_comment = "COMMENT"
     @app.define_task(Rake::Task, "t")
-    out = capture_stdout do @app.display_tasks_and_comments end
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
     assert_match(/^rake t/, out)
     assert_match(/# COMMENT/, out)
   end
 
   def test_finding_rakefile
-    assert @app.have_rakefile
+    assert @app.instance_eval { have_rakefile }
     assert_equal "rakefile", @app.rakefile.downcase
   end
 
   def test_not_finding_rakefile
     @app.instance_eval { @rakefiles = ['NEVER_FOUND'] }
-    assert ! @app.have_rakefile
+    assert( ! @app.instance_eval do have_rakefile end )
     assert_nil @app.rakefile
   end
 
   def test_load_rakefile
     original_dir = Dir.pwd
     Dir.chdir("test/data/unittest")
-    @app.handle_options
-    @app.options.silent = true
-    @app.load_rakefile
+    @app.instance_eval do 
+      handle_options
+      options.silent = true
+      load_rakefile
+    end
     assert_equal "rakefile", @app.rakefile.downcase
     assert_match(%r(unittest$), Dir.pwd)
   ensure
@@ -64,9 +66,11 @@ class TestApplication < Test::Unit::TestCase
   def test_load_rakefile_from_subdir
     original_dir = Dir.pwd
     Dir.chdir("test/data/unittest/subdir")
-    @app.handle_options
-    @app.options.silent = true
-    @app.load_rakefile
+    @app.instance_eval do
+      handle_options
+      options.silent = true
+      load_rakefile
+    end
     assert_equal "rakefile", @app.rakefile.downcase
     assert_match(%r(unittest$), Dir.pwd)
   ensure
@@ -76,42 +80,52 @@ class TestApplication < Test::Unit::TestCase
   def test_load_rakefile_not_found
     original_dir = Dir.pwd
     Dir.chdir("/")
-    @app.handle_options
-    @app.options.silent = true
-    ex = assert_raise(RuntimeError) do @app.load_rakefile end
+    @app.instance_eval do
+      handle_options
+      options.silent = true
+    end
+    ex = assert_raise(RuntimeError) do 
+      @app.instance_eval do raw_load_rakefile end 
+    end
     assert_match(/no rakefile found/i, ex.message)
   ensure
     Dir.chdir(original_dir)
   end
 
   def test_not_caring_about_finding_rakefile
-    @app.instance_eval { @rakefiles = [''] }
-    assert @app.have_rakefile
+    @app.instance_eval do @rakefiles = [''] end
+    assert(@app.instance_eval do have_rakefile end)
     assert_equal '', @app.rakefile
   end
 
   def test_loading_imports
     mock = flexmock("loader")
     mock.should_receive(:load).with("x.dummy").once
-    @app.add_loader("dummy", mock)
-    @app.add_import("x.dummy")
-    @app.load_imports
+    @app.instance_eval do
+      add_loader("dummy", mock)
+      add_import("x.dummy")
+      load_imports
+    end
   end
 
   def test_building_imported_files_on_demand
     mock = flexmock("loader")
     mock.should_receive(:load).with("x.dummy").once
     mock.should_receive(:make_dummy).with_no_args.once
-    @app.intern(Rake::Task, "x.dummy").enhance do mock.make_dummy end
-    @app.add_loader("dummy", mock)
-    @app.add_import("x.dummy")
-    @app.load_imports
+    @app.instance_eval do
+      intern(Rake::Task, "x.dummy").enhance do mock.make_dummy end
+        add_loader("dummy", mock)
+      add_import("x.dummy")
+      load_imports
+    end
   end
 
   def test_good_run
     ran = false
     @app.options.silent = true
-    @app.intern(Rake::Task, "default").enhance { ran = true }
+    @app.instance_eval do
+      intern(Rake::Task, "default").enhance { ran = true }
+    end
     @app.run
     assert ran
   end
@@ -358,7 +372,9 @@ class TestApplicationOptions < Test::Unit::TestCase
 
   def test_bad_option
     capture_stderr do
-      ex = assert_raise(GetoptLong::InvalidOption) { flags('--bad-option') }
+      ex = assert_raise(GetoptLong::InvalidOption) do
+        flags('--bad-option') 
+      end
       assert_match(/unrecognized option/, ex.message)
       assert_match(/--bad-option/, ex.message)
     end
@@ -388,7 +404,7 @@ class TestApplicationOptions < Test::Unit::TestCase
       @out = capture_stdout { 
         @exit = catch(:system_exit) { opts = command_line(*set) }
       }
-      yield(@app.options)
+      yield(@app.options) if block_given?
     end
   end
 
@@ -398,8 +414,11 @@ class TestApplicationOptions < Test::Unit::TestCase
     def @app.exit(*args)
       throw :system_exit, :exit
     end
-    @app.handle_options
-    @tasks = @app.collect_tasks
+    @app.instance_eval do
+      handle_options
+      collect_tasks
+    end
+    @tasks = @app.top_level_tasks
     @app.options
   end
 end

data/test/test_filelist.rb

@@ -153,13 +153,13 @@ class TestFileList < Test::Unit::TestCase
 
   def test_exclude_return_on_create
     fl = FileList['testdata/*'].exclude(/.*\.[hcx]$/)
-    assert_equal ['testdata/existing'], fl
+    assert_equal ['testdata/existing', 'testdata/cfiles'].sort, fl.sort
     assert_equal FileList, fl.class
   end
 
   def test_exclude_with_string_return_on_create
     fl = FileList['testdata/*'].exclude('testdata/abc.c')
-    assert_equal %w(testdata/existing testdata/x.c testdata/abc.h testdata/abc.x testdata/xyz.c).sort, fl.sort
+    assert_equal %w(testdata/existing testdata/cfiles testdata/x.c testdata/abc.h testdata/abc.x testdata/xyz.c).sort, fl.sort
     assert_equal FileList, fl.class
   end
 
@@ -215,6 +215,28 @@ class TestFileList < Test::Unit::TestCase
     assert_equal ["testdata/abc.o", "testdata/x.o", "testdata/xyz.o"].sort,
       f3.sort
   end
+  
+  def test_claim_to_be_a_kind_of_array
+    fl = FileList['testdata/*.c']
+    assert fl.is_a?(Array)
+    assert fl.kind_of?(Array)
+  end
+  
+  def test_claim_to_be_a_kind_of_filelist
+    fl = FileList['testdata/*.c']
+    assert fl.is_a?(FileList)
+    assert fl.kind_of?(FileList)
+  end
+  
+  def test_claim_to_be_a_filelist_instance
+    fl = FileList['testdata/*.c']
+    assert fl.instance_of?(FileList)
+  end
+  
+  def test_dont_claim_to_be_an_array_instance
+    fl = FileList['testdata/*.c']
+    assert ! fl.instance_of?(Array)
+  end
 
   def test_sub!
     f = "x/a.c"
@@ -300,6 +322,18 @@ class TestFileList < Test::Unit::TestCase
     assert found, "should have found a matching line"
   end
 
+  def test_existing
+    fl = FileList['testdata/abc.c', 'testdata/notthere.c']
+    assert_equal ["testdata/abc.c"], fl.existing
+    assert fl.existing.is_a?(FileList)
+  end
+
+  def test_existing!
+    fl = FileList['testdata/abc.c', 'testdata/notthere.c']
+    result = fl.existing!
+    assert_equal ["testdata/abc.c"], fl
+    assert_equal fl.object_id, result.object_id
+  end
 
   def test_ignore_special
     f = FileList['testdata/*']
@@ -505,12 +539,25 @@ class TestFileList < Test::Unit::TestCase
     assert_equal ['b', 'd'], r
     assert_equal FileList, r.class
   end
+  
+  def test_file_utils_can_use_filelists
+    cfiles = FileList['testdata/*.c']
+    
+    cp cfiles, @cdir
+    
+    assert File.exist?(File.join(@cdir, 'abc.c'))
+    assert File.exist?(File.join(@cdir, 'xyz.c'))
+    assert File.exist?(File.join(@cdir, 'x.c'))
+  end
 
   def create_test_data
     verbose(false) do
+      
       mkdir "testdata" unless File.exist? "testdata"
       mkdir "testdata/CVS" rescue nil
       mkdir "testdata/.svn" rescue nil
+      @cdir = "testdata/cfiles"
+      mkdir @cdir rescue nil
       touch "testdata/.dummy"
       touch "testdata/x.bak"
       touch "testdata/x~"

data/test/test_require.rb

@@ -8,18 +8,24 @@ class TestRequire < Test::Unit::TestCase
 
   def test_can_load_rake_library
     app = Rake::Application.new
-    assert app.rake_require("test2", ['test/data/rakelib'], [])
+    assert app.instance_eval {
+      rake_require("test2", ['test/data/rakelib'], [])
+    }
   end
 
   def test_wont_reload_rake_library
     app = Rake::Application.new
-    assert ! app.rake_require("test2", ['test/data/rakelib'], ['test2'])
+    assert ! app.instance_eval {
+      rake_require("test2", ['test/data/rakelib'], ['test2'])
+    }
   end
 
   def test_throws_error_if_library_not_found
     app = Rake::Application.new
     ex = assert_raise(LoadError) {
-      assert app.rake_require("testx", ['test/data/rakelib'], [])
+      assert app.instance_eval {
+        rake_require("testx", ['test/data/rakelib'], [])
+      }
     }
     assert_match(/x/, ex.message)
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
-date: 2007-02-27 00:00:00 -05:00
+  version: 0.7.3
+date: 2007-04-20 00:00:00 -04:00
 summary: Ruby based make-like utility.
 require_paths: 
 - lib
@@ -118,6 +118,7 @@ files:
 - doc/release_notes/rake-0.7.0.rdoc
 - doc/release_notes/rake-0.7.1.rdoc
 - doc/release_notes/rake-0.7.2.rdoc
+- doc/release_notes/rake-0.7.3.rdoc
 test_files: []
 
 rdoc_options: 
@@ -145,6 +146,7 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.7.0.rdoc
 - doc/release_notes/rake-0.7.1.rdoc
 - doc/release_notes/rake-0.7.2.rdoc
+- doc/release_notes/rake-0.7.3.rdoc
 executables: 
 - rake
 extensions: []