rake 0.7.1 → 0.7.2

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

@@ -48,7 +48,7 @@ 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
@@ -56,12 +56,12 @@ module Rake # :nodoc:
     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
+        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])
@@ -79,12 +79,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 +103,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 +117,7 @@ module Rake # :nodoc:
     # path.
     def upload_files(wildcard)
       Dir[wildcard].each do |fn|
-	upload(fn)
+        upload(fn)
       end
     end
     

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

@@ -97,13 +97,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 +112,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 +177,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 +204,3 @@ module Sys
   end
 
 end
-

data/lib/rake/gempackagetask.rb

@@ -77,22 +77,23 @@ 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
     
     def gem_file
       if @gem_spec.platform == Gem::Platform::RUBY
-	"#{package_name}.gem"
+        "#{package_name}.gem"
       else
-	"#{package_name}-#{@gem_spec.platform}.gem"
+        "#{package_name}-#{@gem_spec.platform}.gem"
       end
     end
     

data/lib/rake/loaders/makefile.rb

@@ -9,17 +9,17 @@ module Rake
     def load(fn)
       buffer = ''
       open(fn) do |mf|
-	mf.each do |line|
-	  next if line =~ /^\s*#/
-	  buffer << line
-	  if buffer =~ /\\$/
-	    buffer.sub!(/\\\n/, ' ')
-	    state = :append
-	  else
-	    process_line(buffer)
-	    buffer = ''
-	  end
-	end
+        mf.each do |line|
+          next if line =~ /^\s*#/
+          buffer << line
+          if buffer =~ /\\$/
+            buffer.sub!(/\\\n/, ' ')
+            state = :append
+          else
+            process_line(buffer)
+            buffer = ''
+          end
+        end
       end
       process_line(buffer) if buffer != ''
     end
@@ -37,5 +37,4 @@ module Rake
 
   # Install the handler
   Rake.application.add_loader('mf', MakefileLoader.new)
-
 end

data/lib/rake/packagetask.rb

@@ -68,6 +68,12 @@ module Rake
     # 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)
@@ -85,6 +91,8 @@ module Rake
       @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.
@@ -100,50 +108,50 @@ 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]
 
       [
-	[need_tar, tgz_file, "z"],
-	[need_tar_gz, tar_gz_file, "z"],
-	[need_tar_bz2, tar_bz2_file, "j"]
+        [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 #{flag}cvf #{file} #{package_name}}
-	    end
-	  end
-	end
+        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
@@ -174,5 +182,3 @@ module Rake
   end
 
 end
-
-    

data/lib/rake/rdoctask.rb

@@ -68,7 +68,7 @@ module Rake
     attr_accessor :external
 
     # Create an RDoc task named <em>rdoc</em>.  Default task name is +rdoc+.
-    def initialize(name=:rdoc)	# :yield: self
+    def initialize(name=:rdoc)  # :yield: self
       @name = name
       @rdoc_files = Rake::FileList.new
       @rdoc_dir = 'html'
@@ -84,7 +84,7 @@ module Rake
     # Create the tasks defined by this task lib.
     def define
       if name.to_s != "rdoc"
-	desc "Build the RDOC HTML Files"
+        desc "Build the RDOC HTML Files"
       end
 
       desc "Build the #{name} HTML Files"
@@ -95,7 +95,7 @@ module Rake
       
       desc "Remove rdoc products" 
       task paste("clobber_", name) do
-	rm_r rdoc_dir rescue nil
+        rm_r rdoc_dir rescue nil
       end
 
       task :clobber => [paste("clobber_", name)]
@@ -103,15 +103,15 @@ module Rake
       directory @rdoc_dir
       task name => [rdoc_target]
       file rdoc_target => @rdoc_files + [$rakefile] do
-	rm_r @rdoc_dir rescue nil
-	args = option_list + @rdoc_files
-	if @external
-	  argstring = args.join(' ')
-	  sh %{ruby -Ivendor vender/rd #{argstring}}
-	else
-	  require 'rdoc/rdoc'
-	  RDoc::RDoc.new.document(args)
-	end
+        rm_r @rdoc_dir rescue nil
+        args = option_list + @rdoc_files
+        if @external
+          argstring = args.join(' ')
+          sh %{ruby -Ivendor vender/rd #{argstring}}
+        else
+          require 'rdoc/rdoc'
+          RDoc::RDoc.new.document(args)
+        end
       end
       self
     end
@@ -127,9 +127,9 @@ module Rake
 
     def quote(str)
       if @external
-	"'#{str}'"
+        "'#{str}'"
       else
-	str
+        str
       end
     end
 

data/lib/rake/ruby182_test_unit_fix.rb

@@ -2,9 +2,9 @@ module Test
   module Unit
     module Collector
       class Dir
-	undef collect_file
+        undef collect_file
         def collect_file(name, suites, already_gathered)
-	  # loadpath = $:.dup
+          # loadpath = $:.dup
           dir = File.dirname(File.expand_path(name))
           $:.unshift(dir) unless $:.first == dir
           if(@req)
@@ -14,8 +14,8 @@ module Test
           end
           find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
         ensure
-	  # $:.replace(loadpath)
-	  $:.delete_at $:.rindex(dir)
+          # $:.replace(loadpath)
+          $:.delete_at $:.rindex(dir)
         end
       end
     end

data/lib/rake/runtest.rb

@@ -10,11 +10,11 @@ module Rake
     Dir["#{pattern}"].each { |fn|
       puts fn if log_enabled
       begin
-	load fn
+        load fn
       rescue Exception => ex
-	puts "Error in #{fn}: #{ex.message}"
-	puts ex.backtrace
-	assert false
+        puts "Error in #{fn}: #{ex.message}"
+        puts ex.backtrace
+        assert false
       end
     }
   end