drake 0.8.7.0.2.3 → 0.8.7.0.2.4

data/CHANGES.drake

@@ -1,6 +1,10 @@
 
 = Drake Changelog
 
+== Version 0.8.7.0.2.4
+
+* Fix for kite-shaped dep graphs; based on a patch by Heath Kehoe.
+
 == Version 0.8.7.0.2.3
 
 * update from mainline branch

data/Rakefile.drake

@@ -13,9 +13,9 @@ task :drake_prerelease => [:clobber, :gemspec] do
   unless `git status` =~ %r!nothing to commit \(working directory clean\)!
     raise "Directory not clean"
   end
-  unless `git pull` =~ %r!Already up-to-date!
-    raise "New stuff from remote repository"
-  end
+  #unless `git pull` =~ %r!Already up-to-date!
+  #  raise "New stuff from remote repository"
+  #end
   %w[github.com rubyforge.org].each { |server|
     cmd = "ping " + (
       if Config::CONFIG["host"] =~ %r!darwin!
@@ -59,7 +59,7 @@ task :drake_finish_release do
   }
 
   git("tag", "drake-" + SPEC.version.to_s)
-  git(*%w(push --tags origin master))
+  git(*%w(push --tags origin))
 end
 
 task :drake_release =>

data/lib/rake.rb

@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.7.0.2.3'
+RAKEVERSION = '0.8.7.0.2.4'
 
 require 'rbconfig'
 require 'fileutils'

data/lib/rake/parallel.rb

@@ -110,15 +110,8 @@ module Rake
       def invoke_with_call_chain_collector(task_args, new_chain, previous_chain)
         prereqs = invoke_prerequisites_collector(task_args, new_chain)
         parallel = application.parallel
-        if needed? or parallel.tasks[self]
+        if needed? or prereqs.any? { |p| parallel.tasks[p] }
           parallel.tasks[self] = [task_args, prereqs]
-          unless previous_chain == InvocationChain::EMPTY
-            #
-            # Touch the parent to propagate 'needed?' upwards.  This
-            # works because the recursion is depth-first.
-            #
-            parallel.tasks[previous_chain.value] = true
-          end
         end
       end
       

data/test/test_file_task.rb

@@ -17,7 +17,12 @@ class TestFileTask < Test::Unit::TestCase
   def setup
     Task.clear
     @runs = SerializedArray.new
-    FileUtils.rm_f FILES
+    FileUtils.rm_rf "testdata", :verbose => false
+    FileUtils.mkdir_p "testdata", :verbose => false
+  end
+
+  def teardown
+    FileUtils.rm_rf "testdata", :verbose => false
   end
 
   def test_create_dispersed_timed_files
@@ -119,6 +124,166 @@ class TestFileTask < Test::Unit::TestCase
     assert_equal([ANCIENT_FILE, OLDFILE, MIDDLE_AGED_FILE], @runs)
   end
 
+  def test_old_file_in_between_with_missing_leaf
+    create_dispersed_timed_files(MIDDLE_AGED_FILE, OLDFILE)
+    sleep 1
+
+    file MIDDLE_AGED_FILE => OLDFILE do |t|
+      @runs << t.name
+      touch MIDDLE_AGED_FILE, :verbose => false
+    end
+    file OLDFILE => NEWFILE do |t|
+      @runs << t.name
+      touch OLDFILE, :verbose => false
+    end
+    file NEWFILE do |t|
+      @runs << t.name
+      touch NEWFILE, :verbose => false
+    end
+
+    Task[MIDDLE_AGED_FILE].invoke
+    assert_equal([NEWFILE, OLDFILE, MIDDLE_AGED_FILE], @runs)
+  end
+
+  def test_two_old_files_in_between_with_missing_leaf
+    create_dispersed_timed_files(MIDDLE_AGED_FILE, OLDFILE, ANCIENT_FILE)
+    sleep 1
+
+    file MIDDLE_AGED_FILE => OLDFILE do |t|
+      @runs << t.name
+      touch MIDDLE_AGED_FILE, :verbose => false
+    end
+    file OLDFILE => ANCIENT_FILE do |t|
+      @runs << t.name
+      touch OLDFILE, :verbose => false
+    end
+    file ANCIENT_FILE => NEWFILE do |t|
+      @runs << t.name
+      touch ANCIENT_FILE, :verbose => false
+    end
+    file NEWFILE do |t|
+      @runs << t.name
+      touch NEWFILE, :verbose => false
+    end
+
+    Task[MIDDLE_AGED_FILE].invoke
+    assert_equal([NEWFILE, ANCIENT_FILE, OLDFILE, MIDDLE_AGED_FILE], @runs)
+  end
+
+  def test_diamond_graph_with_missing_leaf
+    a, b, c, d = %w[a b c d].map { |n| "testdata/#{n}" }
+    create_timed_files(a, b, c)
+    sleep 1
+    
+    file a => [b, c] do
+      @runs << a
+      touch a
+    end
+    file b => d do
+      @runs << b
+      touch b
+    end
+    file c => d do
+      @runs << c
+      touch c
+    end
+    file d do
+      @runs << d
+      touch d
+    end
+
+    Task[a].invoke
+    assert_equal [a, b, c, d], @runs.sort
+  end
+
+  def test_diamond_graph_with_new_leaf
+    a, b, c, d = %w[a b c d].map { |n| "testdata/#{n}" }
+    create_timed_files(a, b, c)
+    sleep 1
+    touch d
+
+    file a => [b, c] do
+      @runs << a
+      touch a
+    end
+    file b => d do
+      @runs << b
+      touch b
+    end
+    file c => d do
+      @runs << c
+      touch c
+    end
+    file d do
+      @runs << d
+      touch d
+    end
+
+    Task[a].invoke
+    assert_equal [a, b, c], @runs.sort
+  end
+
+  def test_kite_graph_with_missing_leaf
+    a, b, c, d, e = %w[a b c d e].map { |n| "testdata/#{n}" }
+    create_timed_files(a, b, c, d)
+    sleep 1
+
+    file a => [b, c] do
+      @runs << a
+      touch a
+    end
+    file b => d do
+      @runs << b
+      touch b
+    end
+    file c => d do
+      @runs << c
+      touch c
+    end
+    file d => e do
+      @runs << d
+      touch d
+    end
+    file e do
+      @runs << e
+      touch e
+    end
+
+    Task[a].invoke
+    assert_equal [a, b, c, d, e], @runs.sort
+  end
+
+  def test_kite_graph_with_new_leaf
+    a, b, c, d, e = %w[a b c d e].map { |n| "testdata/#{n}" }
+    create_timed_files(a, b, c, d)
+    sleep 1
+    touch e
+
+    file a => [b, c] do
+      @runs << a
+      touch a
+    end
+    file b => d do
+      @runs << b
+      touch b
+    end
+    file c => d do
+      @runs << c
+      touch c
+    end
+    file d => e do
+      @runs << d
+      touch d
+    end
+    file e do
+      @runs << e
+      touch e
+    end
+
+    Task[a].invoke
+    assert_equal [a, b, c, d], @runs.sort
+  end
+
   # I have currently disabled this test.  I'm not convinced that
   # deleting the file target on failure is always the proper thing to
   # do.  I'm willing to hear input on this topic.

metadata

@@ -1,7 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: drake
 version: !ruby/object:Gem::Version 
-  version: 0.8.7.0.2.3
+  hash: 207
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 7
+  - 0
+  - 2
+  - 4
+  version: 0.8.7.0.2.4
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -9,20 +18,26 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 -04:00
+date: 2010-06-07 00:00:00 -04:00
 default_executable: drake
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: comp_tree
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 7
+        - 3
         version: 0.7.3
-    version: 
-description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.
+  type: :runtime
+  version_requirements: *id001
+description: "      Rake is a Make-like program implemented in Ruby. Tasks\n      and dependencies are specified in standard Ruby syntax. \n"
 email: quixoticsycophant@gmail.com
 executables: 
 - drake
@@ -61,9 +76,9 @@ files:
 - CHANGES
 - CHANGES.drake
 - MIT-LICENSE
+- README
 - Rakefile
 - Rakefile.drake
-- README
 - TODO
 - bin/drake
 - lib/rake/alt_system.rb
@@ -108,10 +123,10 @@ files:
 - test/test_definitions.rb
 - test/test_earlytime.rb
 - test/test_extension.rb
-- test/test_filelist.rb
-- test/test_fileutils.rb
 - test/test_file_creation_task.rb
 - test/test_file_task.rb
+- test/test_filelist.rb
+- test/test_fileutils.rb
 - test/test_ftp.rb
 - test/test_invocation_chain.rb
 - test/test_makefile_loader.rb
@@ -125,10 +140,10 @@ files:
 - test/test_rdoc_task.rb
 - test/test_require.rb
 - test/test_rules.rb
-- test/test_tasklib.rb
-- test/test_tasks.rb
 - test/test_task_arguments.rb
 - test/test_task_manager.rb
+- test/test_tasklib.rb
+- test/test_tasks.rb
 - test/test_test_task.rb
 - test/test_top_level_functions.rb
 - test/test_win32.rb
@@ -143,14 +158,12 @@ files:
 - test/data/namespace/Rakefile
 - test/data/statusreturn/Rakefile
 - test/data/unittest/Rakefile
-- test/data/unittest/subdir
 - doc/command_line_usage.rdoc
-- doc/example
+- doc/example/Rakefile1
+- doc/example/Rakefile2
 - doc/example/a.c
 - doc/example/b.c
 - doc/example/main.c
-- doc/example/Rakefile1
-- doc/example/Rakefile2
 - doc/glossary.rdoc
 - doc/jamis.rb
 - doc/parallel.rdoc
@@ -158,7 +171,6 @@ files:
 - doc/rake.1.gz
 - doc/rakefile.rdoc
 - doc/rational.rdoc
-- doc/release_notes
 - doc/release_notes/rake-0.4.14.rdoc
 - doc/release_notes/rake-0.4.15.rdoc
 - doc/release_notes/rake-0.5.0.rdoc
@@ -178,6 +190,8 @@ files:
 - doc/release_notes/rake-0.8.7.rdoc
 has_rdoc: true
 homepage: http://drake.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -188,23 +202,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: drake
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A branch of Rake supporting automatic parallelizing of tasks.
 test_files: []