drake 0.8.1.10.0.1 → 0.8.1.11.0.1

data/CHANGES

@@ -53,6 +53,10 @@
   However, if RAKE_COLUMNS is explicitly set, it will be honored in
   any case. (Patch provided by Gavin Stark).
 
+* Numerous fixes for running under windows. A big thanks to Bheeshmar
+  Redheendran for spending a good part of the afternoon at the
+  Lonestar Ruby Conference to help me work out these issues.
+
 == Version 0.8.1
 
 * Removed requires on parsedate.rb (in Ftptools)

data/CHANGES.drake

@@ -0,0 +1,7 @@
+
+= Drake Changelog
+
+== Version 0.8.11.0.1
+
+* Initial release.
+

data/README

@@ -6,13 +6,24 @@ A branch of Rake supporting parallel task execution.
 
 Run up to three tasks in parallel:
 
+  % drake -j3
+
+or equivalently,
+
   % drake --threads 3
 
 == Installation
 
   % gem install drake
 
-== Important Notes
+== Notes
+
+=== Compatibility
+
+Drake is 100% compatible with Rake.  The code path for
+<tt>--threads=1</tt> is effectively identical to that of Rake's.
+Drake passes all of Rake's unit tests, with any number of threads from
+1 to 1000 (that's the most I tested).
 
 === Dependencies
 
@@ -21,12 +32,11 @@ dependency tree has not been properly defined.  Consider
 
    task :a => [:x, :y, :z]
 
-With single-threaded +rake+, _x_,_y_,_z_ will be invoked <em>in that
+With single-threaded Rake, _x_,_y_,_z_ will be invoked <em>in that
 order</em> before _a_ is invoked.  However with
 <code>drake --threads=N</code> (for N > 1), one should not expect any
 particular order of execution.  Since there is no dependency specified
-between _x_,_y_,_z_ above, <code>drake</code> is free to execute them
-in any order.
+between _x_,_y_,_z_ above, Drake is free to run them in any order.
 
 If you wish _x_,_y_,_z_ to be invoked sequentially, then write
 
@@ -43,46 +53,34 @@ complete; can't do _z_ until _y_ is complete; can't do _y_ until _x_
 is complete; therefore do _x_."  In this fashion the sequence
 _x_,_y_,_z_ is enforced.
 
-=== MultiTask
-
-The use of 'multitask' is now deprecated.  Tasks which may properly be
-run in parallel will be run in parallel; those which cannot, will not.
-It is not the user's job to decide.
+The problem of insufficient dependencies plagues Makefiles as well.
+Package maintainers affectionately call it "not j-safe."
 
-=== Compatibility
-
-Except for the addition of 'seq' and the removal of 'multitask'
-described above, Drake is codewise identical to Rake when
-<tt>--threads=1</tt>.  No new code is executed unless threads > 1.
-
-Drake passes all of Rake's unit tests for any number of threads
-(presumably; I tested various numbers up to 1000).
-
-=== Installation Notes
+=== MultiTask
 
-Despite outward appearances, Drake is internally the same as Rake,
-down to using the same file names with top-level module named 'Rake'.
-This is to make a mainline merge easier, if Jim decides to do so.  The
-fork stems from the latest Rake repository.
+The use of +multitask+ is deprecated.  Tasks which may properly be run
+in parallel will be run in parallel; those which cannot, will not.  It
+is not the user's job to decide.
 
-Since Rubygems installs each gem in separate directory, it it safe to
-have Rake and Drake installed at the same time.  You can check this
-with a test Rakefile,
+Drake's +multitask+ is an alias of +task+.
 
-  task :default do
-    puts $LOAD_PATH
-  end
+=== Task#invoke inside Task#invoke
 
-When +rake+ is executed, it will list the lib directory inside the
-rake gem.  When +drake+ is executed, the drake lib will appear.
+Parallelizing code means surrendering control over the
+micro-management of its execution.  Manually invoking tasks inside
+other tasks is rather contrary to this notion, throwing a monkey
+wrench into the system.  An exception will be raised when this is
+attempted in non-single-threaded mode.
 
-== Download
+== Links
 
-* http://rubyforge.org/frs/?group_id=6530
+* Download: * http://rubyforge.org/frs/?group_id=6530
+* Rubyforge home: http://rubyforge.org/projects/drake
+* Repository: http://github.com/quix/rake
 
-== Repository
+== Author
 
-* http://github.com/quix/rake
+* James M. Lawrence <quixoticsycophant@gmail.com>
 
 == License
 

data/Rakefile

@@ -16,7 +16,7 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-CLEAN.include('**/*.o', '*.dot', '**/*.rbc')
+CLEAN.include('**/*.o', '*.dot', '**/.*.rbc')
 CLOBBER.include('doc/example/main', 'testdata')
 CLOBBER.include('test/data/**/temp_*')
 CLOBBER.include('test/data/chains/play.*')
@@ -49,6 +49,8 @@ SRC_RB = FileList['lib/**/*.rb']
 desc "Default Task"
 task :default => :test_all
 
+load 'Rakefile.drake'
+
 # Test Tasks ---------------------------------------------------------
 task :dbg do |t|
   puts "Arguments are: #{t.args.join(', ')}"
@@ -221,7 +223,7 @@ else
 
     #### Author and project details.
 
-    s.author = "Jim Weirich, James M. Lawrence"
+    s.author = "James M. Lawrence"
     s.email = "quixoticsycophant@gmail.com"
     s.homepage = "http://drake.rubyforge.org"
     s.rubyforge_project = "drake"
@@ -432,107 +434,3 @@ desc "Where is the current directory.  This task displays\nthe current rake dire
 task :where_am_i do
   puts Rake.original_dir
 end
-
-######################################################################
-# repackage files from contrib/
-
-$LOAD_PATH.unshift "./contrib/comp_tree/contrib/quix/lib"
-require 'quix/subpackager'
-require 'quix/fileutils'
-
-task :generate_rb do
-  packages = {
-    :rake => {
-      :name_in_ruby => "Rake",
-      :lib_dir => "./lib",
-      :subpackages => {
-        :comp_tree => {
-          :name_in_ruby => "CompTree",
-          :sources => [
-            "driver",
-            "node",
-            "task_node",
-            "error",
-            "bucket_ipc",
-            "algorithm",
-            "retriable_fork",
-            "quix/diagnostic",
-            "quix/kernel",
-            "quix/builtin/kernel/tap",
-          ],
-          :lib_dir => "./contrib/comp_tree/lib",
-          :ignore_root_rb => true,
-        },
-      },
-    },
-  }
-  Quix::Subpackager.run(packages)
-end
-
-######################################################################
-# git
-
-def git(*args)
-  cmd = ["git"] + args
-  sh(*cmd)
-end
-
-task :add_contrib_first_time => :init_contrib do
-  git(*%w!merge --squash -s ours --no-commit comp_tree/master!)
-  git(*%w!read-tree --prefix=contrib/comp_tree -u comp_tree/master!)
-  git("commit", "-m", "add comp_tree package")
-end
-
-task :init_contrib do
-  unless `git remote`.split.include? "comp_tree"
-    git(*%w!remote add -f comp_tree git@github.com:quix/comp_tree.git!)
-  end
-end
-
-task :run_pull_contrib => :init_contrib do
-  git(*%w!pull --no-commit -s subtree comp_tree master!)
-end
-
-task :pull_mainline do
-  git(*%w!pull --no-commit
-          git://github.com/jimweirich/rake.git
-          refs/heads/master:refs/heads/origin!)
-end
-
-task :pull_contrib => [ :init_contrib, :run_pull_contrib, :generate_rb ]
-
-######################################################################
-# drake_release
-
-require 'fileutils'
-
-task :drake_prerelease do
-  rm_rf("html")
-  rm_rf("pkg")
-end
-
-task :drake_publish => :rdoc do
-  Dir.chdir(rd.rdoc_dir) {
-    sh(*%w(scp -r . quix@rubyforge.org:/var/www/gforge-projects/drake))
-  }
-end
-
-task :drake_upload do
-  %w(gem tgz).each_with_index { |ext, index|
-    sh("rubyforge",
-       (index == 0 ? "add_release" : "add_file"), 
-       SPEC.rubyforge_project,
-       SPEC.rubyforge_project,
-       SPEC.version.to_s,
-       "pkg/#{SPEC.name}-#{SPEC.version}.#{ext}")
-  }
-end
-
-task :drake_release =>
-  [
-   :test_all,
-   :drake_prerelease,
-   :drake_publish,
-   :package,
-   :drake_upload,
-  ]

data/Rakefile.drake

@@ -0,0 +1,108 @@
+
+$LOAD_PATH.unshift "./contrib/comp_tree/contrib/quix/lib"
+
+require 'quix/subpackager'
+require 'quix/fileutils'
+require 'fileutils'
+
+######################################################################
+# repackage files from contrib/
+
+task :generate_rb do
+  packages = {
+    :rake => {
+      :name_in_ruby => "Rake",
+      :lib_dir => "./lib",
+      :subpackages => {
+        :comp_tree => {
+          :name_in_ruby => "CompTree",
+          :sources => [
+            "driver",
+            "node",
+            "task_node",
+            "error",
+            "bucket_ipc",
+            "algorithm",
+            "retriable_fork",
+            "quix/diagnostic",
+            "quix/kernel",
+            "quix/builtin/kernel/tap",
+          ],
+          :lib_dir => "./contrib/comp_tree/lib",
+          :ignore_root_rb => true,
+        },
+      },
+    },
+  }
+  Quix::Subpackager.run(packages)
+end
+
+######################################################################
+# git
+
+def git(*args)
+  cmd = ["git"] + args
+  sh(*cmd)
+end
+
+task :add_contrib_first_time => :init_contrib do
+  git(*%w!merge --squash -s ours --no-commit comp_tree/master!)
+  git(*%w!read-tree --prefix=contrib/comp_tree -u comp_tree/master!)
+  git("commit", "-m", "add comp_tree package")
+end
+
+task :init_contrib do
+  unless `git remote`.split.include? "comp_tree"
+    git(*%w!remote add -f comp_tree git@github.com:quix/comp_tree.git!)
+  end
+end
+
+task :run_pull_contrib => :init_contrib do
+  git(*%w!pull --no-commit -s subtree comp_tree master!)
+end
+
+task :pull_mainline do
+  git(*%w!pull --no-commit
+          git://github.com/jimweirich/rake.git
+          refs/heads/master:refs/heads/origin!)
+end
+
+task :pull_contrib => [ :init_contrib, :run_pull_contrib, :generate_rb ]
+
+######################################################################
+# drake_release
+
+task :drake_prerelease => :clean do
+  rm_rf("html")
+  rm_rf("pkg")
+  unless `git status` =~ %r!nothing to commit \(working directory clean\)!
+    raise "Directory not clean"
+  end
+end
+
+task :drake_publish => :rdoc do
+  Dir.chdir("html") {
+    sh(*%w(scp -r . quix@rubyforge.org:/var/www/gforge-projects/drake))
+  }
+end
+
+task :drake_finish_release do
+  sh("rubyforge",
+     "add_release", 
+     SPEC.rubyforge_project,
+     SPEC.rubyforge_project,
+     SPEC.version.to_s,
+     "pkg/#{SPEC.name}-#{SPEC.version}.gem")
+  git("tag", SPEC.version.to_s)
+  git("push")
+end
+
+task :drake_release =>
+  [
+   :drake_prerelease,
+   :gem,
+   :test_all,
+   :drake_publish,
+   :drake_finish_release,
+  ]
+

data/doc/release_notes/rake-0.8.2.rdoc

@@ -159,5 +159,7 @@ otherwise helpful comments.  Thanks to ...
 * Adam Majer
 * Emanuel Inderm�hle
 * Ittay Dror
+* Bheeshmar Redheendran (for spending an afternoon with me debugging
+  windows issues)
 
 -- Jim Weirich

data/lib/rake/comp_tree/driver.rb

@@ -97,7 +97,7 @@ module Rake::CompTree
     #  driver.define_area :width, :height, :offset, %{
     #    width*height - offset
     #  }
-    # Note the '%' before the brace.  The eval form creates a lambda for you.
+    # (Note the '%' before the brace.)
     #
     # The raw form:
     #  driver.define(:area, :width, :height, :offset) { |width, height, offset|

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.1.10.0.1'
+RAKEVERSION = '0.8.1.11.0.1'
 
 require 'rbconfig'
 require 'getoptlong'
@@ -565,16 +565,23 @@ module Rake
 
     # Invoke the task if it is needed.  Prerequites are invoked first.
     def invoke(*args)
-      task_args = TaskArguments.new(arg_names, args)
-
-      if application.num_threads > 1
-        application.parallel_tasks = Hash.new
-      end
-
-      invoke_with_call_chain(task_args, InvocationChain::EMPTY)
+      run_invoke = lambda {
+        invoke_with_call_chain(
+          TaskArguments.new(arg_names, args),
+          InvocationChain::EMPTY)
+      }
 
-      if application.num_threads > 1
-        application.invoke_parallel_tasks
+      if application.num_threads == 1
+        run_invoke.call
+      else
+        if application.parallel_lock.locked?
+          raise "Calling Task#invoke within a task is not allowed."
+        end
+        application.parallel_lock.synchronize {
+          application.parallel_tasks.clear
+          run_invoke.call
+          application.invoke_parallel_tasks
+        }
       end
     end
 
@@ -758,6 +765,10 @@ module Rake
     end # class << Rake::Task
   end # class Rake::Task
 
+  #
+  # DEPRECATED: do not use MultiTask
+  #
+  MultiTask = Task
 
   # #########################################################################
   # A FileTask is a task that includes time based dependencies.  If any of a
@@ -821,13 +832,6 @@ module Rake
       Rake::EARLY
     end
   end
-
-  # #########################################################################
-  # REMOVED: use command-line option '--threads N' or
-  # Rake.application.num_threads = N
-  #
-  class MultiTask < Task
-  end
 end # module Rake
 
 # ###########################################################################
@@ -844,6 +848,12 @@ def task(*args, &block)
   Rake::Task.define_task(*args, &block)
 end
 
+#
+# DEPRECATED: Do not use 'multitask'
+#
+def multitask(*args, &block)
+  task(*args, &block)
+end
 
 # Declare a file task.
 #
@@ -881,14 +891,6 @@ def directory(dir)
   end
 end
 
-# 
-# REMOVED: use command-line option '--threads N' or
-# Rake.application.num_threads = N
-#
-def multitask(args, &block)
-  Rake::MultiTask.define_task(args, &block)
-end
-
 # Create a new rake namespace and use it for evaluating the given block.
 # Returns a NameSpace object that can be used to lookup tasks defined in the
 # namespace.
@@ -947,7 +949,7 @@ def import(*fns)
 end
 
 #
-# seq -- Force tasks to be executed sequentially.
+# +seq+ : Force tasks to be executed sequentially.
 #
 (class << self ; self ; end).class_eval {
   # use this form to cleanly hide the lambda
@@ -1702,7 +1704,8 @@ module Rake
     alias :last_comment :last_description    # Backwards compatibility
 
     attr_accessor :num_threads
-    attr_accessor :parallel_tasks #:nodoc:
+    attr_reader :parallel_tasks #:nodoc:
+    attr_reader :parallel_lock #:nodoc:
 
     def initialize
       super
@@ -1710,7 +1713,10 @@ module Rake
       @rules = Array.new
       @scope = Array.new
       @last_description = nil
+
       @num_threads = 1
+      @parallel_tasks = Hash.new
+      @parallel_lock = Mutex.new
     end
 
     def create_rule(*args, &block)
@@ -2399,7 +2405,7 @@ module Rake
           (options.load_system || rakefile.nil?) &&
           directory?(system_dir)
         puts "(in #{Dir.pwd})" unless options.silent
-        Dir["#{system_dir}/*.rake"].each do |name|
+        glob("#{system_dir}/*.rake") do |name|
           add_import name
         end
       else
@@ -2410,13 +2416,20 @@ module Rake
         puts "(in #{Dir.pwd})" unless options.silent
         $rakefile = @rakefile if options.classic_namespace
         load File.expand_path(@rakefile) if @rakefile && @rakefile != ''
-      end
-      options.rakelib.each do |rlib|
-        Dir["#{rlib}/*.rake"].each do |name| add_import name end
+        options.rakelib.each do |rlib|
+          glob("#{rlib}/*.rake") do |name|
+            add_import name
+          end
+        end
       end
       load_imports
     end
 
+    def glob(path, &block)
+      Dir[path.gsub("\\", '/')].each(&block)
+    end
+    private :glob
+
     # The directory path containing the system wide rakefiles.
     def system_dir
       if ENV['RAKE_SYSTEM']

data/test/session_functional.rb

@@ -102,6 +102,20 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match %r{^SYS1}, @out
   end
 
+  def test_system_excludes_rakelib_files_too
+    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
+      rake '-g', "sys1", '-T', 'extra'
+    end
+    assert_no_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'
+    end
+    assert_match %r{extra:extra}, @out
+  end
+
   def test_implicit_system
     in_environment('RAKE_SYSTEM' => File.expand_path('test/data/sys'), "PWD" => "/") do
       rake "sys1", "--trace"
@@ -320,5 +334,4 @@ class FunctionalTest < Test::Unit::TestCase
   def assert_status(expected_status=0)
     assert_equal expected_status, @status
   end
-
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: drake
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.10.0.1
+  version: 0.8.1.11.0.1
 platform: ruby
 authors: 
-- Jim Weirich, James M. Lawrence
+- James M. Lawrence
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-09-08 00:00:00 -04:00
+date: 2008-09-09 00:00:00 -04:00
 default_executable: drake
 dependencies: []
 
@@ -43,9 +43,11 @@ extra_rdoc_files:
 files: 
 - install.rb
 - CHANGES
+- CHANGES.drake
 - MIT-LICENSE
 - README
 - Rakefile
+- Rakefile.drake
 - TODO
 - bin/drake
 - bin/rake