rake 0.8.7 → 0.9.0

data/lib/rake/gempackagetask.rb

@@ -1,97 +1,13 @@
-#!/usr/bin/env ruby
+# rake/gempackagetask is deprecated in favor of rubygems/package_task
 
-# Define a package task library to aid in the definition of GEM
-# packages.
+warn 'rake/gempackagetask is deprecated.  Use rubygems/package_task instead'
 
 require 'rubygems'
+require 'rubygems/package_task'
+
 require 'rake'
-require 'rake/packagetask'
-require 'rubygems/user_interaction'
-require 'rubygems/builder'
 
 module Rake
-
-  # Create a package based upon a Gem spec.  Gem packages, as well as
-  # zip files and tar/gzipped packages can be produced by this task.
-  #
-  # In addition to the Rake targets generated by PackageTask, a
-  # GemPackageTask will also generate the following tasks:
-  #
-  # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.gem"</b>]
-  #   Create a Ruby GEM package with the given name and version.
-  #
-  # Example using a Ruby GEM spec:
-  #
-  #   require 'rubygems'
-  #
-  #   spec = Gem::Specification.new do |s|
-  #     s.platform = Gem::Platform::RUBY
-  #     s.summary = "Ruby based make-like utility."
-  #     s.name = 'rake'
-  #     s.version = PKG_VERSION
-  #     s.requirements << 'none'
-  #     s.require_path = 'lib'
-  #     s.autorequire = 'rake'
-  #     s.files = PKG_FILES
-  #     s.description = <<EOF
-  #   Rake is a Make-like program implemented in Ruby. Tasks
-  #   and dependencies are specified in standard Ruby syntax. 
-  #   EOF
-  #   end
-  #   
-  #   Rake::GemPackageTask.new(spec) do |pkg|
-  #     pkg.need_zip = true
-  #     pkg.need_tar = true
-  #   end
-  #
-  class GemPackageTask < PackageTask
-    # Ruby GEM spec containing the metadata for this package.  The
-    # name, version and package_files are automatically determined
-    # from the GEM spec and don't need to be explicitly provided.
-    attr_accessor :gem_spec
-
-    # Create a GEM Package task library.  Automatically define the gem
-    # if a block is given.  If no block is supplied, then +define+
-    # needs to be called to define the task.
-    def initialize(gem_spec)
-      init(gem_spec)
-      yield self if block_given?
-      define if block_given?
-    end
-
-    # Initialization tasks without the "yield self" or define
-    # operations.
-    def init(gem)
-      super(gem.name, gem.version)
-      @gem_spec = gem
-      @package_files += gem_spec.files if gem_spec.files
-    end
-
-    # Create the Rake tasks and actions specified by this
-    # GemPackageTask.  (+define+ is automatically called if a block is
-    # given to +new+).
-    def define
-      super
-      task :package => [:gem]
-      desc "Build the gem file #{gem_file}"
-      task :gem => ["#{package_dir}/#{gem_file}"]
-      file "#{package_dir}/#{gem_file}" => [package_dir] + @gem_spec.files do
-        when_writing("Creating GEM") {
-          Gem::Builder.new(gem_spec).build
-          verbose(true) {
-            mv gem_file, "#{package_dir}/#{gem_file}"
-          }
-        }
-      end
-    end
-    
-    def gem_file
-      if @gem_spec.platform == Gem::Platform::RUBY
-        "#{package_name}.gem"
-      else
-        "#{package_name}-#{@gem_spec.platform}.gem"
-      end
-    end
-    
-  end
+  GemPackageTask = Gem::PackageTask
 end
+

data/lib/rake/invocation_chain.rb

@@ -0,0 +1,51 @@
+module Rake
+
+  ####################################################################
+  # InvocationChain tracks the chain of task invocations to detect
+  # circular dependencies.
+  class InvocationChain
+    def initialize(value, tail)
+      @value = value
+      @tail = tail
+    end
+
+    def member?(obj)
+      @value == obj || @tail.member?(obj)
+    end
+
+    def append(value)
+      if member?(value)
+        fail RuntimeError, "Circular dependency detected: #{to_s} => #{value}"
+      end
+      self.class.new(value, self)
+    end
+
+    def to_s
+      "#{prefix}#{@value}"
+    end
+
+    def self.append(value, chain)
+      chain.append(value)
+    end
+
+    private
+
+    def prefix
+      "#{@tail.to_s} => "
+    end
+
+    class EmptyInvocationChain
+      def member?(obj)
+        false
+      end
+      def append(value)
+        InvocationChain.new(value, self)
+      end
+      def to_s
+        "TOP"
+      end
+    end
+
+    EMPTY = EmptyInvocationChain.new
+  end
+end

data/lib/rake/invocation_exception_mixin.rb

@@ -0,0 +1,16 @@
+module Rake
+  module InvocationExceptionMixin
+    # Return the invocation chain (list of Rake tasks) that were in
+    # effect when this exception was detected by rake.  May be null if
+    # no tasks were active.
+    def chain
+      @rake_invocation_chain ||= nil
+    end
+
+    # Set the invocation chain in effect when this exception was
+    # detected.
+    def chain=(value)
+      @rake_invocation_chain = value
+    end
+  end
+end

data/lib/rake/loaders/makefile.rb

@@ -1,21 +1,19 @@
-#!/usr/bin/env ruby
-
 module Rake
 
   # Makefile loader to be used with the import file loader.
   class MakefileLoader
-    SPACE_MARK = "__ __"
+    include Rake::DSL
+
+    SPACE_MARK = "\0"
 
     # Load the makefile dependencies in +fn+.
     def load(fn)
-      open(fn) do |mf|
-        lines = mf.read
-        lines.gsub!(/\\ /, SPACE_MARK)
-        lines.gsub!(/#[^\n]*\n/m, "")
-        lines.gsub!(/\\\n/, ' ')
-        lines.split("\n").each do |line|
-          process_line(line)
-        end
+      lines = File.read fn
+      lines.gsub!(/\\ /, SPACE_MARK)
+      lines.gsub!(/#[^\n]*\n/m, "")
+      lines.gsub!(/\\\n/, ' ')
+      lines.each_line do |line|
+        process_line(line)
       end
     end
 
@@ -23,17 +21,17 @@ module Rake
 
     # Process one logical line of makefile data.
     def process_line(line)
-      file_tasks, args = line.split(':')
+      file_tasks, args = line.split(':', 2)
       return if args.nil?
       dependents = args.split.map { |d| respace(d) }
-      file_tasks.strip.split.each do |file_task|
+      file_tasks.scan(/\S+/) do |file_task|
         file_task = respace(file_task)
         file file_task => dependents
       end
     end
-    
+
     def respace(str)
-      str.gsub(/#{SPACE_MARK}/, ' ')
+      str.tr SPACE_MARK, ' '
     end
   end
 

data/lib/rake/multi_task.rb

@@ -0,0 +1,16 @@
+module Rake
+
+  # Same as a regular task, but the immediate prerequisites are done in
+  # parallel using Ruby threads.
+  #
+  class MultiTask < Task
+    private
+    def invoke_prerequisites(args, invocation_chain)
+      threads = @prerequisites.collect { |p|
+        Thread.new(p) { |r| application[r, @scope].invoke_with_call_chain(args, invocation_chain) }
+      }
+      threads.each { |t| t.join }
+    end
+  end
+
+end

data/lib/rake/name_space.rb

@@ -0,0 +1,25 @@
+module Rake
+
+  # The NameSpace class will lookup task names in the the scope
+  # defined by a +namespace+ command.
+  #
+  class NameSpace
+
+    # Create a namespace lookup object using the given task manager
+    # and the list of scopes.
+    def initialize(task_manager, scope_list)
+      @task_manager = task_manager
+      @scope = scope_list.dup
+    end
+
+    # Lookup a task named +name+ in the namespace.
+    def [](name)
+      @task_manager.lookup(name, @scope)
+    end
+
+    # Return the list of tasks defined in this and nested namespaces.
+    def tasks
+      @task_manager.tasks_in_scope(@scope)
+    end
+  end
+end

data/lib/rake/packagetask.rb

@@ -1,6 +1,4 @@
-#!/usr/bin/env ruby
-
-# Define a package task libarary to aid in the definition of
+# Define a package task library to aid in the definition of
 # redistributable package files.
 
 require 'rake'
@@ -25,13 +23,13 @@ module Rake
   #   of date.
   #
   # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tgz"</b>]
-  #   Create a gzipped tar package (if <em>need_tar</em> is true).  
+  #   Create a gzipped tar package (if <em>need_tar</em> is true).
   #
   # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tar.gz"</b>]
-  #   Create a gzipped tar package (if <em>need_tar_gz</em> is true).  
+  #   Create a gzipped tar package (if <em>need_tar_gz</em> is true).
   #
   # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.tar.bz2"</b>]
-  #   Create a bzip2'd tar package (if <em>need_tar_bz2</em> is true).  
+  #   Create a bzip2'd tar package (if <em>need_tar_bz2</em> is true).
   #
   # [<b>"<em>package_dir</em>/<em>name</em>-<em>version</em>.zip"</b>]
   #   Create a zip package archive (if <em>need_zip</em> is true).
@@ -74,7 +72,10 @@ module Rake
     # Zip command for zipped archives.  The default is 'zip'.
     attr_accessor :zip_command
 
-    # Create a Package Task with the given name and version. 
+    # Create a Package Task with the given name and version.  Use +:noversion+
+    # as the version to build a package without a version or to provide a
+    # fully-versioned package name.
+
     def initialize(name=nil, version=nil)
       init(name, version)
       yield self if block_given?
@@ -102,11 +103,11 @@ module Rake
 
       desc "Build all the packages"
       task :package
-      
+
       desc "Force a rebuild of the package files"
       task :repackage => [:clobber_package, :package]
-      
-      desc "Remove package products" 
+
+      desc "Remove package products"
       task :clobber_package do
         rm_r package_dir rescue nil
       end
@@ -127,7 +128,7 @@ module Rake
           end
         end
       end
-      
+
       if need_zip
         task :package => ["#{package_dir}/#{zip_file}"]
         file "#{package_dir}/#{zip_file}" => [package_dir_path] + package_files do
@@ -159,7 +160,7 @@ module Rake
     def package_name
       @version ? "#{@name}-#{@version}" : @name
     end
-      
+
     def package_dir_path
       "#{package_dir}/#{package_name}"
     end

data/lib/rake/pathmap.rb

@@ -0,0 +1 @@
+require 'rake/ext/string'

data/lib/rake/pseudo_status.rb

@@ -0,0 +1,24 @@
+module Rake
+
+  ####################################################################
+  # Exit status class for times the system just gives us a nil.
+  class PseudoStatus
+    attr_reader :exitstatus
+    def initialize(code=0)
+      @exitstatus = code
+    end
+    def to_i
+      @exitstatus << 8
+    end
+    def >>(n)
+      to_i >> n
+    end
+    def stopped?
+      false
+    end
+    def exited?
+      true
+    end
+  end
+
+end

data/lib/rake/rake_module.rb

@@ -0,0 +1,29 @@
+require 'rake/application'
+
+module Rake
+
+  # Rake module singleton methods.
+  #
+  class << self
+    # Current Rake Application
+    def application
+      @application ||= Rake::Application.new
+    end
+
+    # Set the current Rake application object.
+    def application=(app)
+      @application = app
+    end
+
+    # Return the original directory where the Rake application was started.
+    def original_dir
+      application.original_dir
+    end
+
+    # Load a rakefile.
+    def load_rakefile(path)
+      load(path)
+    end
+  end
+
+end

data/lib/rake/rake_test_loader.rb

@@ -1,5 +1,13 @@
-#!/usr/bin/env ruby
+require 'rake'
 
 # Load the test files from the command line.
 
-ARGV.each { |f| load f unless f =~ /^-/  }
+ARGV.each do |f|
+  next if f =~ /^-/
+
+  if f =~ /\*/
+    FileList[f].to_a.each { |fn| require File.expand_path(fn) }
+  else
+    require File.expand_path(f)
+  end
+end