rake 0.4.11 → 0.8.7

data/doc/release_notes/rake-0.8.7.rdoc

@@ -0,0 +1,55 @@
+= Rake 0.8.7 Released
+
+Rake version 0.8.5 introduced greatly improved support for executing
+commands on Windows.  The "sh" command now has the same semantics on
+Windows that it has on Unix based platforms.
+
+Rake version 0.8.6 includes minor fixes the the RDoc generation.
+Rake version 0.8.7 includes a minor fix for JRuby running on windows.
+
+== Changes
+
+=== New Features / Enhancements in Version 0.8.5
+
+* Improved implementation of the Rake system command for Windows.
+  (patch from James M. Lawrence/quix)
+
+* Support for Ruby 1.9's improved system command.  (patch from James
+  M. Lawrence/quix)
+
+* Rake now includes the configured extension when invoking an
+  executable (Config::CONFIG['EXEEXT])
+
+=== Bug Fixes in Version 0.8.5
+
+* Environment variable keys are now correctly cased (it matters in
+  some implementations).
+
+== What is Rake
+
+Rake is a build tool similar to the make program in many ways. But
+instead of cryptic make recipes, Rake uses standard Ruby code to
+declare tasks and dependencies. You have the full power of a modern
+scripting language built right into your build tool.
+
+== Availability
+
+The easiest way to get and install rake is via RubyGems ...
+
+  gem install rake    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Home Page:: http://rake.rubyforge.org/
+Download::  http://rubyforge.org/project/showfiles.php?group_id=50
+GitHub::    git://github.com/jimweirich/rake.git 
+
+== Thanks
+
+As usual, it was input from users that drove a alot of these changes. The
+following people either contributed patches, made suggestions or made
+otherwise helpful comments.  Thanks to ...
+
+* Charles Nutter
+
+-- Jim Weirich

data/lib/rake/alt_system.rb

@@ -0,0 +1,108 @@
+#
+# Copyright (c) 2008 James M. Lawrence
+# 
+# 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.
+#
+
+require 'rbconfig'
+
+#
+# Alternate implementations of system() and backticks `` on Windows
+# for ruby-1.8 and earlier.
+# 
+module Rake::AltSystem
+  WINDOWS = Config::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
+
+  class << self
+    def define_module_function(name, &block)
+      define_method(name, &block)
+      module_function(name)
+    end
+  end
+    
+  if WINDOWS and RUBY_VERSION < "1.9.0"
+    RUNNABLE_EXTS = %w[com exe bat cmd]
+    RUNNABLE_PATTERN = %r!\.(#{RUNNABLE_EXTS.join('|')})\Z!i
+
+    define_module_function :kernel_system, &Kernel.method(:system)
+    define_module_function :kernel_backticks, &Kernel.method(:'`')
+
+    module_function
+
+    def repair_command(cmd)
+      "call " + (
+        if cmd =~ %r!\A\s*\".*?\"!
+          # already quoted
+          cmd
+        elsif match = cmd.match(%r!\A\s*(\S+)!)
+          if match[1] =~ %r!/!
+            # avoid x/y.bat interpretation as x with option /y
+            %Q!"#{match[1]}"! + match.post_match
+          else
+            # a shell command will fail if quoted
+            cmd
+          end
+        else
+          # empty or whitespace
+          cmd
+        end
+      )
+    end
+
+    def find_runnable(file)
+      if file =~ RUNNABLE_PATTERN
+        file
+      else
+        RUNNABLE_EXTS.each { |ext|
+          if File.exist?(test = "#{file}.#{ext}")
+            return test
+          end
+        }
+        nil
+      end
+    end
+
+    def system(cmd, *args)
+      repaired = (
+        if args.empty?
+          [repair_command(cmd)]
+        elsif runnable = find_runnable(cmd)
+          [File.expand_path(runnable), *args]
+        else
+          # non-existent file
+          [cmd, *args]
+        end
+      )
+      kernel_system(*repaired)
+    end
+
+    def backticks(cmd)
+      kernel_backticks(repair_command(cmd))
+    end
+
+    define_module_function :'`', &method(:backticks)
+  else
+    # Non-Windows or ruby-1.9+: same as Kernel versions
+    define_module_function :system, &Kernel.method(:system)
+    define_module_function :backticks, &Kernel.method(:'`')
+    define_module_function :'`', &Kernel.method(:'`')
+  end
+end

data/lib/rake/classic_namespace.rb

@@ -0,0 +1,8 @@
+# The following classes used to be in the top level namespace.
+# Loading this file enables compatibility with older Rakefile that
+# referenced Task from the top level.
+
+Task = Rake::Task
+FileTask = Rake::FileTask
+FileCreationTask = Rake::FileCreationTask
+RakeApp = Rake::Application

data/lib/rake/clean.rb

@@ -16,7 +16,9 @@
 require 'rake'
 
 CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
-CLEAN.clear_exclude
+CLEAN.clear_exclude.exclude { |fn| 
+  fn.pathmap("%f") == 'core' && File.directory?(fn) 
+}
 
 desc "Remove any temporary products."
 task :clean do

data/lib/rake/contrib/ftptools.rb

@@ -6,7 +6,6 @@
 # use.
 
 require 'date'
-require 'parsedate'
 require 'net/ftp'
 
 module Rake # :nodoc:
@@ -20,6 +19,10 @@ module Rake # :nodoc:
       @date_class ||= Date
     end
 
+    def self.time
+      @time_class ||= Time
+    end
+
     def initialize(path, entry)
       @path = path
       @mode, line, @owner, @group, size, d1, d2, d3, @name = entry.split(' ')
@@ -48,23 +51,34 @@ module Rake # :nodoc:
     def parse_mode(m)
       result = 0
       (1..9).each do |i|
-	result = 2*result + ((m[i]==?-) ? 0 : 1)
+        result = 2*result + ((m[i]==?-) ? 0 : 1)
       end
       result
     end
 
     def determine_time(d1, d2, d3)
-      elements = ParseDate.parsedate("#{d1} #{d2} #{d3}")
-      if elements[0].nil?
-	today = self.class.date.today
-	if elements[1] > today.month
-	  elements[0] = today.year - 1
-	else
-	  elements[0] = today.year
-	end
+      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}")
+        end
+      else
+        result = Time.parse("#{d1} #{d2} #{d3}")
       end
-      elements = elements.collect { |el| el.nil? ? 0 : el }
-      Time.mktime(*elements[0,7])
+      result
+#       elements = ParseDate.parsedate("#{d1} #{d2} #{d3}")
+#       if elements[0].nil?
+#         today = self.class.date.today
+#         if elements[1] > today.month
+#           elements[0] = today.year - 1
+#         else
+#           elements[0] = today.year
+#         end
+#       end
+#       elements = elements.collect { |el| el.nil? ? 0 : el }
+#       Time.mktime(*elements[0,7])
     end
   end
 
@@ -79,12 +93,12 @@ module Rake # :nodoc:
       # Create an uploader and pass it to the given block as +up+.
       # When the block is complete, close the uploader.
       def connect(path, host, account, password)
-	up = self.new(path, host, account, password)
-	begin
-	  yield(up)
-	ensure
-	  up.close
-	end
+        up = self.new(path, host, account, password)
+        begin
+          yield(up)
+        ensure
+          up.close
+        end
       end
     end
 
@@ -103,13 +117,13 @@ module Rake # :nodoc:
     def makedirs(path)
       route = []
       File.split(path).each do |dir|
-	route << dir
-	current_dir = File.join(route)
-	if @created[current_dir].nil?
-	  @created[current_dir] = true
-	  puts "Creating Directory  #{current_dir}" if @verbose
-	  @ftp.mkdir(current_dir) rescue nil
-	end
+        route << dir
+        current_dir = File.join(route)
+        if @created[current_dir].nil?
+          @created[current_dir] = true
+          puts "Creating Directory  #{current_dir}" if @verbose
+          @ftp.mkdir(current_dir) rescue nil
+        end
       end
     end
 
@@ -117,7 +131,7 @@ module Rake # :nodoc:
     # path.
     def upload_files(wildcard)
       Dir[wildcard].each do |fn|
-	upload(fn)
+        upload(fn)
       end
     end
     

data/lib/rake/contrib/publisher.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-# Copyright 2003, 2004 by Jim Weirich (jim@weirichhouse.org)
+# Copyright 2003, 2004, 2005, 2006, 2007, 2008 by Jim Weirich (jim@weirichhouse.org)
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/lib/rake/contrib/rubyforgepublisher.rb

@@ -9,9 +9,9 @@ module Rake
     
     def initialize(projname, user)
       super(
-	"#{user}@rubyforge.org",
-	"/var/www/gforge-projects/#{projname}",
-	"html")
+        "#{user}@rubyforge.org",
+        "/var/www/gforge-projects/#{projname}",
+        "html")
     end
   end
   

data/lib/rake/contrib/sshpublisher.rb

@@ -40,7 +40,7 @@ module Rake
     # Upload the local directory to the remote directory.
     def upload
       @files.each do |fn|
-	sh %{scp -q #{@local_dir}/#{fn} #{@host}:#{@remote_dir}}
+        sh %{scp -q #{@local_dir}/#{fn} #{@host}:#{@remote_dir}}
       end
     end
   end

data/lib/rake/contrib/sys.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #--
-# Copyright (c) 2003, 2004 Jim Weirich
+# 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
@@ -23,7 +23,10 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 #
-require 'ftools'
+begin
+  require 'ftools'
+rescue LoadError
+end
 require 'rbconfig'
 
 ######################################################################
@@ -97,13 +100,13 @@ module Sys
   def delete(*wildcards)
     wildcards.each do |wildcard|
       Dir[wildcard].each do |fn|
-	if File.directory?(fn)
-	  log "Deleting directory #{fn}"
-	  Dir.delete(fn)
-	else
-	  log "Deleting file #{fn}"
-	  File.delete(fn)
-	end
+        if File.directory?(fn)
+          log "Deleting directory #{fn}"
+          Dir.delete(fn)
+        else
+          log "Deleting file #{fn}"
+          File.delete(fn)
+        end
       end
     end
   end
@@ -112,18 +115,18 @@ module Sys
   def delete_all(*wildcards)
     wildcards.each do |wildcard|
       Dir[wildcard].each do |fn|
-	next if ! File.exist?(fn)
-	if File.directory?(fn)
-	  Dir["#{fn}/*"].each do |subfn|
-	    next if subfn=='.' || subfn=='..'
-	    delete_all(subfn)
-	  end
-	  log "Deleting directory #{fn}"
-	  Dir.delete(fn)
-	else
-	  log "Deleting file #{fn}"
-	  File.delete(fn)
-	end
+        next if ! File.exist?(fn)
+        if File.directory?(fn)
+          Dir["#{fn}/*"].each do |subfn|
+            next if subfn=='.' || subfn=='..'
+            delete_all(subfn)
+          end
+          log "Deleting directory #{fn}"
+          Dir.delete(fn)
+        else
+          log "Deleting file #{fn}"
+          File.delete(fn)
+        end
       end
     end
   end
@@ -177,7 +180,7 @@ module Sys
   def for_files(*wildcards)
     wildcards.each do |wildcard|
       Dir[wildcard].each do |fn|
-	yield(fn)
+        yield(fn)
       end
     end
   end
@@ -204,4 +207,3 @@ module Sys
   end
 
 end
-

data/lib/rake/gempackagetask.rb

@@ -6,12 +6,8 @@
 require 'rubygems'
 require 'rake'
 require 'rake/packagetask'
-
-begin
-  Gem.manage_gems
-rescue NoMethodError => ex
-  # Using rubygems prior to 0.6.1
-end
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
 
 module Rake
 
@@ -77,21 +73,24 @@ module Rake
     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}"
-	  }
-	}
+        when_writing("Creating GEM") {
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, "#{package_dir}/#{gem_file}"
+          }
+        }
       end
     end
     
-    private
-    
     def gem_file
-      "#{package_name}.gem"
+      if @gem_spec.platform == Gem::Platform::RUBY
+        "#{package_name}.gem"
+      else
+        "#{package_name}-#{@gem_spec.platform}.gem"
+      end
     end
     
   end

data/lib/rake/loaders/makefile.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+
+module Rake
+
+  # Makefile loader to be used with the import file loader.
+  class MakefileLoader
+    SPACE_MARK = "__ __"
+
+    # 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
+      end
+    end
+
+    private
+
+    # Process one logical line of makefile data.
+    def process_line(line)
+      file_tasks, args = line.split(':')
+      return if args.nil?
+      dependents = args.split.map { |d| respace(d) }
+      file_tasks.strip.split.each do |file_task|
+        file_task = respace(file_task)
+        file file_task => dependents
+      end
+    end
+    
+    def respace(str)
+      str.gsub(/#{SPACE_MARK}/, ' ')
+    end
+  end
+
+  # Install the handler
+  Rake.application.add_loader('mf', MakefileLoader.new)
+end

data/lib/rake/packagetask.rb

@@ -27,12 +27,18 @@ module Rake
   # [<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).  
   #
+  # [<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).  
+  #
+  # [<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).  
+  #
   # [<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).
   #
   # Example:
   #
-  #   PackageTask.new("rake", "1.2.3") do |p|
+  #   Rake::PackageTask.new("rake", "1.2.3") do |p|
   #     p.need_tar = true
   #     p.package_files.include("lib/**/*.rb")
   #   end
@@ -47,15 +53,27 @@ module Rake
     # Directory used to store the package files (default is 'pkg').
     attr_accessor :package_dir
 
-    # True if a gzipped tar file should be produced (default is false).
+    # True if a gzipped tar file (tgz) should be produced (default is false).
     attr_accessor :need_tar
 
+    # True if a gzipped tar file (tar.gz) should be produced (default is false).
+    attr_accessor :need_tar_gz
+
+    # True if a bzip2'd tar file (tar.bz2) should be produced (default is false).
+    attr_accessor :need_tar_bz2
+
     # True if a zip file should be produced (default is false)
     attr_accessor :need_zip
 
     # List of files to be included in the package.
     attr_accessor :package_files
 
+    # Tar command for gzipped or bzip2ed archives.  The default is 'tar'.
+    attr_accessor :tar_command
+
+    # Zip command for zipped archives.  The default is 'zip'.
+    attr_accessor :zip_command
+
     # Create a Package Task with the given name and version. 
     def initialize(name=nil, version=nil)
       init(name, version)
@@ -70,7 +88,11 @@ module Rake
       @package_files = Rake::FileList.new
       @package_dir = 'pkg'
       @need_tar = false
+      @need_tar_gz = false
+      @need_tar_bz2 = false
       @need_zip = false
+      @tar_command = 'tar'
+      @zip_command = 'zip'
     end
 
     # Create the tasks defined by this task library.
@@ -86,50 +108,54 @@ module Rake
       
       desc "Remove package products" 
       task :clobber_package do
-	rm_r package_dir rescue nil
+        rm_r package_dir rescue nil
       end
 
       task :clobber => [:clobber_package]
 
-      if need_tar
-	task :package => ["#{package_dir}/#{tgz_file}"]
-	file "#{package_dir}/#{tgz_file}" => [package_dir_path] + package_files do
-	  chdir(package_dir) do
-	    sh %{tar zcvf #{tgz_file} #{package_name}}
-	  end
-	end
+      [
+        [need_tar, tgz_file, "z"],
+        [need_tar_gz, tar_gz_file, "z"],
+        [need_tar_bz2, tar_bz2_file, "j"]
+      ].each do |(need, file, flag)|
+        if need
+          task :package => ["#{package_dir}/#{file}"]
+          file "#{package_dir}/#{file}" => [package_dir_path] + package_files do
+            chdir(package_dir) do
+              sh %{#{@tar_command} #{flag}cvf #{file} #{package_name}}
+            end
+          end
+        end
       end
-
+      
       if need_zip
-	task :package => ["#{package_dir}/#{zip_file}"]
-	file "#{package_dir}/#{zip_file}" => [package_dir_path] + package_files do
-	  chdir(package_dir) do
-	    sh %{zip -r #{zip_file} #{package_name}}
-	  end
-	end
+        task :package => ["#{package_dir}/#{zip_file}"]
+        file "#{package_dir}/#{zip_file}" => [package_dir_path] + package_files do
+          chdir(package_dir) do
+            sh %{#{@zip_command} -r #{zip_file} #{package_name}}
+          end
+        end
       end
 
       directory package_dir
 
       file package_dir_path => @package_files do
-	mkdir_p package_dir rescue nil
-	@package_files.each do |fn|
-	  f = File.join(package_dir_path, fn)
-	  fdir = File.dirname(f)
-	  mkdir_p(fdir) if !File.exist?(fdir)
-	  if File.directory?(fn)
-	    mkdir_p(f)
-	  else
-	    rm_f f
-	    safe_ln(fn, f)
-	  end
-	end
+        mkdir_p package_dir rescue nil
+        @package_files.each do |fn|
+          f = File.join(package_dir_path, fn)
+          fdir = File.dirname(f)
+          mkdir_p(fdir) if !File.exist?(fdir)
+          if File.directory?(fn)
+            mkdir_p(f)
+          else
+            rm_f f
+            safe_ln(fn, f)
+          end
+        end
       end
       self
     end
 
-    private
-
     def package_name
       @version ? "#{@name}-#{@version}" : @name
     end
@@ -142,11 +168,17 @@ module Rake
       "#{package_name}.tgz"
     end
 
+    def tar_gz_file
+      "#{package_name}.tar.gz"
+    end
+
+    def tar_bz2_file
+      "#{package_name}.tar.bz2"
+    end
+
     def zip_file
       "#{package_name}.zip"
     end
   end
 
 end
-
-    

data/lib/rake/rake_test_loader.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+# Load the test files from the command line.
+
+ARGV.each { |f| load f unless f =~ /^-/  }