rake 0.8.7 → 0.9.0.beta.0

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,25 @@
+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
+
+  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

data/lib/rake/rdoctask.rb

@@ -1,209 +1,230 @@
-#!/usr/bin/env ruby
-
-require 'rake'
-require 'rake/tasklib'
-
-module Rake
-
-  # Create a documentation task that will generate the RDoc files for
-  # a project.
-  #
-  # The RDocTask will create the following targets:
-  #
-  # [<b><em>rdoc</em></b>]
-  #   Main task for this RDOC task.  
-  #
-  # [<b>:clobber_<em>rdoc</em></b>]
-  #   Delete all the rdoc files.  This target is automatically
-  #   added to the main clobber target.
-  #
-  # [<b>:re<em>rdoc</em></b>]
-  #   Rebuild the rdoc files from scratch, even if they are not out
-  #   of date.
-  #
-  # Simple Example:
-  #
-  #   Rake::RDocTask.new do |rd|
-  #     rd.main = "README.rdoc"
-  #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  #   end
-  #
-  # The +rd+ object passed to the block is an RDocTask object. See the
-  # attributes list for the RDocTask class for available customization options.
-  #
-  # == Specifying different task names
-  #
-  # You may wish to give the task a different name, such as if you are
-  # generating two sets of documentation.  For instance, if you want to have a
-  # development set of documentation including private methods:
-  #
-  #   Rake::RDocTask.new(:rdoc_dev) do |rd|
-  #     rd.main = "README.doc"
-  #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  #     rd.options << "--all"
-  #   end
-  #
-  # The tasks would then be named :<em>rdoc_dev</em>, :clobber_<em>rdoc_dev</em>, and
-  # :re<em>rdoc_dev</em>. 
-  #
-  # If you wish to have completely different task names, then pass a Hash as
-  # first argument. With the <tt>:rdoc</tt>, <tt>:clobber_rdoc</tt> and
-  # <tt>:rerdoc</tt> options, you can customize the task names to your liking.
-  # For example:
-  #
-  #   Rake::RDocTask.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force")
-  #
-  # This will create the tasks <tt>:rdoc</tt>, <tt>:rdoc_clean</tt> and
-  # <tt>:rdoc:force</tt>.
-  #
-  class RDocTask < TaskLib
-    # Name of the main, top level task.  (default is :rdoc)
-    attr_accessor :name
-
-    # Name of directory to receive the html output files. (default is "html")
-    attr_accessor :rdoc_dir
-
-    # Title of RDoc documentation. (defaults to rdoc's default)
-    attr_accessor :title
-
-    # Name of file to be used as the main, top level file of the
-    # RDoc. (default is none)
-    attr_accessor :main
-
-    # Name of template to be used by rdoc. (defaults to rdoc's default)
-    attr_accessor :template
-
-    # List of files to be included in the rdoc generation. (default is [])
-    attr_accessor :rdoc_files
-
-    # Additional list of options to be passed rdoc.  (default is [])
-    attr_accessor :options
-
-    # Whether to run the rdoc process as an external shell (default is false)
-    attr_accessor :external
-    
-    attr_accessor :inline_source
-
-    # Create an RDoc task with the given name. See the RDocTask class overview
-    # for documentation.
-    def initialize(name = :rdoc)  # :yield: self
-      if name.is_a?(Hash)
-        invalid_options = name.keys.map { |k| k.to_sym } - [:rdoc, :clobber_rdoc, :rerdoc]
-        if !invalid_options.empty?
-          raise ArgumentError, "Invalid option(s) passed to RDocTask.new: #{invalid_options.join(", ")}"
+# rake/rdoctask is deprecated in favor of rdoc/task
+
+warn 'rake/rdoctask is deprecated.  Use rdoc/task instead (in RDoc 2.4.2+)'
+
+require 'rubygems'
+
+begin
+  gem 'rdoc'
+  require 'rdoc'
+  require 'rdoc/task'
+rescue LoadError, Gem::LoadError
+end
+
+if defined?(RDoc::Task) then
+  module Rake
+    RDocTask = RDoc::Task unless const_defined? :RDocTask
+  end
+else
+  require 'rake'
+  require 'rake/tasklib'
+
+  module Rake
+
+    # NOTE: Rake::RDocTask is deprecated in favor of RDoc:Task which is included
+    # in RDoc 2.4.2+.  Use require 'rdoc/task' to require it.
+    #
+    # Create a documentation task that will generate the RDoc files for
+    # a project.
+    #
+    # The RDocTask will create the following targets:
+    #
+    # [<b><em>rdoc</em></b>]
+    #   Main task for this RDOC task.
+    #
+    # [<b>:clobber_<em>rdoc</em></b>]
+    #   Delete all the rdoc files.  This target is automatically
+    #   added to the main clobber target.
+    #
+    # [<b>:re<em>rdoc</em></b>]
+    #   Rebuild the rdoc files from scratch, even if they are not out
+    #   of date.
+    #
+    # Simple Example:
+    #
+    #   Rake::RDocTask.new do |rd|
+    #     rd.main = "README.rdoc"
+    #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+    #   end
+    #
+    # The +rd+ object passed to the block is an RDocTask object. See the
+    # attributes list for the RDocTask class for available customization options.
+    #
+    # == Specifying different task names
+    #
+    # You may wish to give the task a different name, such as if you are
+    # generating two sets of documentation.  For instance, if you want to have a
+    # development set of documentation including private methods:
+    #
+    #   Rake::RDocTask.new(:rdoc_dev) do |rd|
+    #     rd.main = "README.doc"
+    #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+    #     rd.options << "--all"
+    #   end
+    #
+    # The tasks would then be named :<em>rdoc_dev</em>, :clobber_<em>rdoc_dev</em>, and
+    # :re<em>rdoc_dev</em>.
+    #
+    # If you wish to have completely different task names, then pass a Hash as
+    # first argument. With the <tt>:rdoc</tt>, <tt>:clobber_rdoc</tt> and
+    # <tt>:rerdoc</tt> options, you can customize the task names to your liking.
+    # For example:
+    #
+    #   Rake::RDocTask.new(:rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force")
+    #
+    # This will create the tasks <tt>:rdoc</tt>, <tt>:rdoc_clean</tt> and
+    # <tt>:rdoc:force</tt>.
+    #
+    class RDocTask < TaskLib
+      # Name of the main, top level task.  (default is :rdoc)
+      attr_accessor :name
+
+      # Name of directory to receive the html output files. (default is "html")
+      attr_accessor :rdoc_dir
+
+      # Title of RDoc documentation. (defaults to rdoc's default)
+      attr_accessor :title
+
+      # Name of file to be used as the main, top level file of the
+      # RDoc. (default is none)
+      attr_accessor :main
+
+      # Name of template to be used by rdoc. (defaults to rdoc's default)
+      attr_accessor :template
+
+      # List of files to be included in the rdoc generation. (default is [])
+      attr_accessor :rdoc_files
+
+      # Additional list of options to be passed rdoc.  (default is [])
+      attr_accessor :options
+
+      # Whether to run the rdoc process as an external shell (default is false)
+      attr_accessor :external
+
+      attr_accessor :inline_source
+
+      # Create an RDoc task with the given name. See the RDocTask class overview
+      # for documentation.
+      def initialize(name = :rdoc)  # :yield: self
+        if name.is_a?(Hash)
+          invalid_options = name.keys.map { |k| k.to_sym } - [:rdoc, :clobber_rdoc, :rerdoc]
+          if !invalid_options.empty?
+            raise ArgumentError, "Invalid option(s) passed to RDocTask.new: #{invalid_options.join(", ")}"
+          end
         end
+
+        @name = name
+        @rdoc_files = Rake::FileList.new
+        @rdoc_dir = 'html'
+        @main = nil
+        @title = nil
+        @template = nil
+        @external = false
+        @inline_source = true
+        @options = []
+        yield self if block_given?
+        define
       end
-      
-      @name = name
-      @rdoc_files = Rake::FileList.new
-      @rdoc_dir = 'html'
-      @main = nil
-      @title = nil
-      @template = nil
-      @external = false
-      @inline_source = true
-      @options = []
-      yield self if block_given?
-      define
-    end
-    
-    # Create the tasks defined by this task lib.
-    def define
-      if rdoc_task_name != "rdoc"
-        desc "Build the RDOC HTML Files"
-      else
-        desc "Build the #{rdoc_task_name} HTML Files"
+
+      # Create the tasks defined by this task lib.
+      def define
+        if rdoc_task_name != "rdoc"
+          desc "Build the RDOC HTML Files"
+        else
+          desc "Build the #{rdoc_task_name} HTML Files"
+        end
+        task rdoc_task_name
+
+        desc "Force a rebuild of the RDOC files"
+        task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
+
+        desc "Remove rdoc products"
+        task clobber_task_name do
+          rm_r rdoc_dir rescue nil
+        end
+
+        task :clobber => [clobber_task_name]
+
+        directory @rdoc_dir
+        task rdoc_task_name => [rdoc_target]
+        file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
+          rm_r @rdoc_dir rescue nil
+          @before_running_rdoc.call if @before_running_rdoc
+          args = option_list + @rdoc_files
+          if @external
+            argstring = args.join(' ')
+            sh %{ruby -Ivendor vendor/rd #{argstring}}
+          else
+            require 'rdoc/rdoc'
+            RDoc::RDoc.new.document(args)
+          end
+        end
+        self
       end
-      task rdoc_task_name
-      
-      desc "Force a rebuild of the RDOC files"
-      task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
-      
-      desc "Remove rdoc products" 
-      task clobber_task_name do
-        rm_r rdoc_dir rescue nil
+
+      def option_list
+        result = @options.dup
+        result << "-o" << @rdoc_dir
+        result << "--main" << quote(main) if main
+        result << "--title" << quote(title) if title
+        result << "-T" << quote(template) if template
+        result << "--inline-source" if inline_source && !@options.include?("--inline-source") && !@options.include?("-S")
+        result
       end
-      
-      task :clobber => [clobber_task_name]
-      
-      directory @rdoc_dir
-      task rdoc_task_name => [rdoc_target]
-      file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
-        rm_r @rdoc_dir rescue nil
-        @before_running_rdoc.call if @before_running_rdoc
-        args = option_list + @rdoc_files
+
+      def quote(str)
         if @external
-          argstring = args.join(' ')
-          sh %{ruby -Ivendor vendor/rd #{argstring}}
+          "'#{str}'"
         else
-          require 'rdoc/rdoc'
-          RDoc::RDoc.new.document(args)
+          str
         end
       end
-      self
-    end
 
-    def option_list
-      result = @options.dup
-      result << "-o" << @rdoc_dir
-      result << "--main" << quote(main) if main
-      result << "--title" << quote(title) if title
-      result << "-T" << quote(template) if template
-      result << "--inline-source" if inline_source && !@options.include?("--inline-source") && !@options.include?("-S")
-      result
-    end
+      def option_string
+        option_list.join(' ')
+      end
 
-    def quote(str)
-      if @external
-        "'#{str}'"
-      else
-        str
+      # The block passed to this method will be called just before running the
+      # RDoc generator. It is allowed to modify RDocTask attributes inside the
+      # block.
+      def before_running_rdoc(&block)
+        @before_running_rdoc = block
       end
-    end
 
-    def option_string
-      option_list.join(' ')
-    end
-    
-    # The block passed to this method will be called just before running the
-    # RDoc generator. It is allowed to modify RDocTask attributes inside the
-    # block.
-    def before_running_rdoc(&block)
-      @before_running_rdoc = block
-    end
+      private
 
-    private
-    
-    def rdoc_target
-      "#{rdoc_dir}/index.html"
-    end
-    
-    def rdoc_task_name
-      case name
-      when Hash
-        (name[:rdoc] || "rdoc").to_s
-      else
-        name.to_s
+      def rdoc_target
+        "#{rdoc_dir}/index.html"
       end
-    end
-    
-    def clobber_task_name
-      case name
-      when Hash
-        (name[:clobber_rdoc] || "clobber_rdoc").to_s
-      else
-        "clobber_#{name}"
+
+      def rdoc_task_name
+        case name
+        when Hash
+          (name[:rdoc] || "rdoc").to_s
+        else
+          name.to_s
+        end
       end
-    end
-    
-    def rerdoc_task_name
-      case name
-      when Hash
-        (name[:rerdoc] || "rerdoc").to_s
-      else
-        "re#{name}"
+
+      def clobber_task_name
+        case name
+        when Hash
+          (name[:clobber_rdoc] || "clobber_rdoc").to_s
+        else
+          "clobber_#{name}"
+        end
+      end
+
+      def rerdoc_task_name
+        case name
+        when Hash
+          (name[:rerdoc] || "rerdoc").to_s
+        else
+          "re#{name}"
+        end
       end
-    end
 
+    end
   end
 end
+