rake 0.8.7 → 0.9.0.beta.0

data/lib/rake/classic_namespace.rb

@@ -2,6 +2,7 @@
 # Loading this file enables compatibility with older Rakefile that
 # referenced Task from the top level.
 
+warn "WARNING: Classic namespaces are deprecated and will be removed from future versions of Rake."
 Task = Rake::Task
 FileTask = Rake::FileTask
 FileCreationTask = Rake::FileCreationTask

data/lib/rake/clean.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 # The 'rake/clean' file defines two file lists (CLEAN and CLOBBER) and
 # two rake tasks (:clean and :clobber).
 #
@@ -15,19 +13,21 @@
 
 require 'rake'
 
-CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
-CLEAN.clear_exclude.exclude { |fn| 
-  fn.pathmap("%f") == 'core' && File.directory?(fn) 
-}
+Rake::DSL.environment do
+  CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
+  CLEAN.clear_exclude.exclude { |fn|
+    fn.pathmap("%f") == 'core' && File.directory?(fn)
+  }
 
-desc "Remove any temporary products."
-task :clean do
-  CLEAN.each { |fn| rm_r fn rescue nil }
-end
+  desc "Remove any temporary products."
+  task :clean do
+    CLEAN.each { |fn| rm_r fn rescue nil }
+  end
 
-CLOBBER = Rake::FileList.new
+  CLOBBER = Rake::FileList.new
 
-desc "Remove any generated file."
-task :clobber => [:clean] do
-  CLOBBER.each { |fn| rm_r fn rescue nil }
+  desc "Remove any generated file."
+  task :clobber => [:clean] do
+    CLOBBER.each { |fn| rm_r fn rescue nil }
+  end
 end

data/lib/rake/cloneable.rb

@@ -0,0 +1,25 @@
+module Rake
+  # ##########################################################################
+  # Mixin for creating easily cloned objects.
+  #
+  module Cloneable
+    # Clone an object by making a new object and setting all the instance
+    # variables to the same values.
+    def dup
+      sibling = self.class.new
+      instance_variables.each do |ivar|
+        value = self.instance_variable_get(ivar)
+        new_value = value.clone rescue value
+        sibling.instance_variable_set(ivar, new_value)
+      end
+      sibling.taint if tainted?
+      sibling
+    end
+
+    def clone
+      sibling = dup
+      sibling.freeze if frozen?
+      sibling
+    end
+  end
+end

data/lib/rake/contrib/compositepublisher.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 module Rake
 
   # Manage several publishers as a single entity.
@@ -7,12 +5,12 @@ module Rake
     def initialize
       @publishers = []
     end
-    
+
     # Add a publisher to the composite.
     def add(pub)
       @publishers << pub
     end
-    
+
     # Upload all the individual publishers.
     def upload
       @publishers.each { |p| p.upload }
@@ -21,4 +19,3 @@ module Rake
 
 end
 
-

data/lib/rake/contrib/ftptools.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 # = Tools for FTP uploading.
 #
 # This file is still under development and is not released for general
@@ -25,7 +23,7 @@ module Rake # :nodoc:
 
     def initialize(path, entry)
       @path = path
-      @mode, line, @owner, @group, size, d1, d2, d3, @name = entry.split(' ')
+      @mode, _, @owner, @group, size, d1, d2, d3, @name = entry.split(' ')
       @size = size.to_i
       @time = determine_time(d1, d2, d3)
     end
@@ -59,7 +57,6 @@ module Rake # :nodoc:
     def determine_time(d1, d2, d3)
       now = self.class.time.now
       if /:/ =~ d3
-        h, m = d3.split(':')
         result = Time.parse("#{d1} #{d2} #{now.year} #{d3}")
         if result > now
           result = Time.parse("#{d1} #{d2} #{now.year-1} #{d3}")
@@ -102,7 +99,7 @@ module Rake # :nodoc:
       end
     end
 
-    # Create an FTP uploader targetting the directory +path+ on +host+
+    # Create an FTP uploader targeting the directory +path+ on +host+
     # using the given account and password.  +path+ will be the root
     # path of the uploader.
     def initialize(path, host, account, password)
@@ -121,7 +118,7 @@ module Rake # :nodoc:
         current_dir = File.join(route)
         if @created[current_dir].nil?
           @created[current_dir] = true
-          puts "Creating Directory  #{current_dir}" if @verbose
+          $stderr.puts "Creating Directory  #{current_dir}" if @verbose
           @ftp.mkdir(current_dir) rescue nil
         end
       end
@@ -134,7 +131,7 @@ module Rake # :nodoc:
         upload(fn)
       end
     end
-    
+
     # Close the uploader.
     def close
       @ftp.close
@@ -144,7 +141,7 @@ module Rake # :nodoc:
 
     # Upload a single file to the uploader's root path.
     def upload(file)
-      puts "Uploading #{file}" if @verbose
+      $stderr.puts "Uploading #{file}" if @verbose
       dir = File.dirname(file)
       makedirs(dir)
       @ftp.putbinaryfile(file, file) unless File.directory?(file)

data/lib/rake/contrib/publisher.rb

@@ -1,19 +1,13 @@
-#!/usr/bin/env ruby
-
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008 by Jim Weirich (jim@weirichhouse.org)
+# Copyright 2003-2010 by Jim Weirich (jim.weirich@gmail.com)
 # All rights reserved.
 
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-
 # Configuration information about an upload host system.
 # * name   :: Name of host system.
 # * webdir :: Base directory for the web information for the
 #             application.  The application name (APP) is appended to
 #             this directory before using.
 # * pkgdir :: Directory on the host system where packages can be
-#             placed. 
+#             placed.
 HostInfo = Struct.new(:name, :webdir, :pkgdir)
 
 # Manage several publishers as a single entity.

data/lib/rake/contrib/rubyforgepublisher.rb

@@ -1,12 +1,10 @@
-#!/usr/bin/env ruby
-
 require 'rake/contrib/sshpublisher'
 
 module Rake
 
   class RubyForgePublisher < SshDirPublisher
     attr_reader :project, :proj_id, :user
-    
+
     def initialize(projname, user)
       super(
         "#{user}@rubyforge.org",
@@ -14,5 +12,5 @@ module Rake
         "html")
     end
   end
-  
+
 end

data/lib/rake/contrib/sshpublisher.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'rake/contrib/compositepublisher'
 
 module Rake
@@ -12,12 +10,12 @@ module Rake
       @remote_dir = remote_dir
       @local_dir = local_dir
     end
-    
+
     def upload
       sh %{scp -rq #{@local_dir}/* #{@host}:#{@remote_dir}}
     end
   end
-  
+
   # Publish an entire directory to a fresh remote directory using SSH.
   class SshFreshDirPublisher < SshDirPublisher
     def upload
@@ -26,7 +24,7 @@ module Rake
       super
     end
   end
-  
+
   # Publish a list of files to an existing remote directory.
   class SshFilePublisher
     # Create a publisher using the give host information.
@@ -36,7 +34,7 @@ module Rake
       @local_dir = local_dir
       @files = files
     end
-    
+
     # Upload the local directory to the remote directory.
     def upload
       @files.each do |fn|

data/lib/rake/contrib/sys.rb

@@ -1,26 +1,8 @@
-#!/usr/bin/env ruby
+warn 'Sys has been deprecated in favor of FileUtils'
 
 #--
-# Copyright 2003, 2004, 2005, 2006, 2007, 2008 by Jim Weirich (jim@weirichhouse.org)
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# Copyright 2003-2010 by Jim Weirich (jim.weirich@gmail.com)
+# All rights reserved.
 #++
 #
 begin
@@ -40,7 +22,7 @@ require 'rbconfig'
 # in Ruby 1.8.
 #
 module Sys
-  RUBY = Config::CONFIG['ruby_install_name']
+  RUBY = RbConfig::CONFIG['ruby_install_name']
 
   # Install all the files matching +wildcard+ into the +dest_dir+
   # directory.  The permission mode is set to +mode+.
@@ -60,7 +42,7 @@ module Sys
   def ruby(*args)
     run "#{RUBY} #{args.join(' ')}"
   end
-  
+
   # Copy a single file from +file_name+ to +dest_file+.
   def copy(file_name, dest_file)
     log "Copying file #{file_name} to #{dest_file}"
@@ -160,10 +142,10 @@ module Sys
     return split_all(head) + [tail]
   end
 
-  # Write a message to standard out if $verbose is enabled.
+  # Write a message to standard error if $verbose is enabled.
   def log(msg)
     print "  " if $trace && $verbose
-    puts msg if $verbose
+    $stderr.puts msg if $verbose
   end
 
   # Perform a block with $verbose disabled.

data/lib/rake/default_loader.rb

@@ -0,0 +1,10 @@
+module Rake
+
+  # Default Rakefile loader used by +import+.
+  class DefaultLoader
+    def load(fn)
+      Rake::Environment.load_rakefile(File.expand_path(fn))
+    end
+  end
+
+end

data/lib/rake/dsl.rb

@@ -0,0 +1,2 @@
+require 'rake'
+include Rake::DSL

data/lib/rake/dsl_definition.rb

@@ -0,0 +1,146 @@
+# Rake DSL functions.
+require 'rake/file_utils_ext'
+
+module Rake
+  module DSL
+
+    # Include the FileUtils file manipulation functions in the top
+    # level module, but mark them private so that they don't
+    # unintentionally define methods on other objects.
+
+    include FileUtilsExt
+    private(*FileUtils.instance_methods(false))
+    private(*FileUtilsExt.instance_methods(false))
+
+    # Declare a basic task.
+    #
+    # Example:
+    #   task :clobber => [:clean] do
+    #     rm_rf "html"
+    #   end
+    #
+    def task(*args, &block)
+      Rake::Task.define_task(*args, &block)
+    end
+
+
+    # Declare a file task.
+    #
+    # Example:
+    #   file "config.cfg" => ["config.template"] do
+    #     open("config.cfg", "w") do |outfile|
+    #       open("config.template") do |infile|
+    #         while line = infile.gets
+    #           outfile.puts line
+    #         end
+    #       end
+    #     end
+    #  end
+    #
+    def file(*args, &block)
+      Rake::FileTask.define_task(*args, &block)
+    end
+
+    # Declare a file creation task.
+    # (Mainly used for the directory command).
+    def file_create(args, &block)
+      Rake::FileCreationTask.define_task(args, &block)
+    end
+
+    # Declare a set of files tasks to create the given directories on
+    # demand.
+    #
+    # Example:
+    #   directory "testdata/doc"
+    #
+    def directory(dir)
+      Rake.each_dir_parent(dir) do |d|
+        file_create d do |t|
+          mkdir_p t.name if ! File.exist?(t.name)
+        end
+      end
+    end
+
+    # Declare a task that performs its prerequisites in
+    # parallel. Multitasks does *not* guarantee that its prerequisites
+    # will execute in any given order (which is obvious when you think
+    # about it)
+    #
+    # Example:
+    #   multitask :deploy => [:deploy_gem, :deploy_rdoc]
+    #
+    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.
+    #
+    # E.g.
+    #
+    #   ns = namespace "nested" do
+    #     task :run
+    #   end
+    #   task_run = ns[:run] # find :run in the given namespace.
+    #
+    def namespace(name=nil, &block)
+      name = name.to_s if name.kind_of?(Symbol)
+      name = name.to_str if name.respond_to?(:to_str)
+      unless name.kind_of?(String) || name.nil?
+        raise ArgumentError, "Expected a String or Symbol for a namespace name"
+      end
+      Rake.application.in_namespace(name, &block)
+    end
+
+    # Declare a rule for auto-tasks.
+    #
+    # Example:
+    #  rule '.o' => '.c' do |t|
+    #    sh %{cc -o #{t.name} #{t.source}}
+    #  end
+    #
+    def rule(*args, &block)
+      Rake::Task.create_rule(*args, &block)
+    end
+
+    # Describe the next rake task.
+    #
+    # Example:
+    #   desc "Run the Unit Tests"
+    #   task :test => [:build]
+    #     runtests
+    #   end
+    #
+    def desc(description)
+      Rake.application.last_description = description
+    end
+
+    # Import the partial Rakefiles +fn+.  Imported files are loaded
+    # _after_ the current file is completely loaded.  This allows the
+    # import statement to appear anywhere in the importing file, and yet
+    # allowing the imported files to depend on objects defined in the
+    # importing file.
+    #
+    # A common use of the import statement is to include files
+    # containing dependency declarations.
+    #
+    # See also the --rakelibdir command line option.
+    #
+    # Example:
+    #   import ".depend", "my_rules"
+    #
+    def import(*fns)
+      fns.each do |fn|
+        Rake.application.add_import(fn)
+      end
+    end
+
+    # Include the Rake DSL commands in the top level Ruby scope.
+    def self.include_in_top_scope
+      Object.send(:include, Rake::DSL)
+    end
+  end
+
+  extend FileUtilsExt
+end