rake 0.4.8 → 0.7.3

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 =~ /^-/  }

data/lib/rake/rdoctask.rb

@@ -8,22 +8,22 @@ module Rake
   # Create a documentation task that will generate the RDoc files for
   # a project.
   #
-  # The PackageTask will create the following targets:
+  # 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 package files.  This target is automatically
+  #   Delete all the rdoc files.  This target is automatically
   #   added to the main clobber target.
   #
   # [<b>:re<em>rdoc</em></b>]
-  #   Rebuild the package files from scratch, even if they are not out
+  #   Rebuild the rdoc files from scratch, even if they are not out
   #   of date.
   #
   # Simple Example:
   #
-  #   RDocTask.new do |rd|
+  #   Rake::RDocTask.new do |rd|
   #     rd.main = "README.rdoc"
   #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
   #   end
@@ -32,7 +32,7 @@ module Rake
   # generating two sets of documentation.  For instance, if you want to have a
   # development set of documentation including private methods:
   #
-  #   RDocTask.new(:rdoc_dev) do |rd|
+  #   Rake::RDocTask.new(:rdoc_dev) do |rd|
   #     rd.main = "README.doc"
   #     rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
   #     rd.options << "--all"
@@ -64,14 +64,18 @@ module Rake
     # List of options to be passed rdoc.  (default is [])
     attr_accessor :options
 
+    # Run the rdoc process as an external shell (default is false)
+    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'
       @main = nil
       @title = nil
       @template = 'html'
+      @external = false
       @options = []
       yield self if block_given?
       define
@@ -80,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"
@@ -91,29 +95,44 @@ 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)]
       
       directory @rdoc_dir
       task name => [rdoc_target]
-      file rdoc_target => @rdoc_files + ["Rakefile"] do
-	rm_r @rdoc_dir rescue nil
-	opts = option_list.join(' ')
-	sh %{rdoc -o #{@rdoc_dir} #{opts} #{@rdoc_files}}
+      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
       end
       self
     end
 
     def option_list
       result = @options.dup
-      result << "--main" << "'#{main}'" if main
-      result << "--title" << "'#{title}'" if title
-      result << "-T" << "'#{template}'" if template
+      result << "-o" << @rdoc_dir
+      result << "--main" << quote(main) if main
+      result << "--title" << quote(title) if title
+      result << "-T" << quote(template) if template
       result
     end
 
+    def quote(str)
+      if @external
+        "'#{str}'"
+      else
+        str
+      end
+    end
+
     def option_string
       option_list.join(' ')
     end

data/lib/rake/ruby182_test_unit_fix.rb

@@ -0,0 +1,23 @@
+module Test
+  module Unit
+    module Collector
+      class Dir
+        undef collect_file
+        def collect_file(name, suites, already_gathered)
+          # loadpath = $:.dup
+          dir = File.dirname(File.expand_path(name))
+          $:.unshift(dir) unless $:.first == dir
+          if(@req)
+            @req.require(name)
+          else
+            require(name)
+          end
+          find_test_cases(already_gathered).each{|t| add_suite(suites, t.suite)}
+        ensure
+          # $:.replace(loadpath)
+          $:.delete_at $:.rindex(dir)
+        end
+      end
+    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

data/lib/rake/tasklib.rb

@@ -1,19 +1,13 @@
 #!/usr/bin/env ruby
 
+require 'rake'
+
 module Rake
 
   # Base class for Task Libraries.
   class TaskLib
 
-    # Make a copy of a task.
-    def clone
-      sibling = self.class.new
-      instance_variables.each do |ivar|
-	value = self.instance_variable_get(ivar)
-	sibling.instance_variable_set(ivar, value.dup) if value
-      end
-      sibling
-    end
+    include Cloneable
 
     # Make a symbol by pasting two strings together. 
     def paste(a,b)

data/lib/rake/testtask.rb

@@ -36,8 +36,6 @@ module Rake
   #
   class TestTask < TaskLib
 
-    SEP = ''
-
     # Name of test task. (default is :test)
     attr_accessor :name
 
@@ -48,12 +46,29 @@ module Rake
     # True if verbose test output desired. (default is false)
     attr_accessor :verbose
 
-    # Test options passed to the test suite. (default is NONE)
+    # Test options passed to the test suite.  An explicit
+    # TESTOPTS=opts on the command line will override this. (default
+    # is NONE)
     attr_accessor :options
 
+    # Request that the tests be run with the warning flag set.
+    # E.g. warning=true implies "ruby -w" used to run the tests.
+    attr_accessor :warning
+
     # Glob pattern to match test files. (default is 'test/test*.rb')
     attr_accessor :pattern
 
+    # Style of test loader to use.  Options are:
+    #
+    # * :rake -- Rake provided test loading script (default).
+    # * :testrb -- Ruby provided test loading script.
+    # * :direct -- Load tests using command line loader.
+    # 
+    attr_accessor :loader
+
+    # Array of commandline options to pass to ruby when running test loader.
+    attr_accessor :ruby_opts
+
     # Explicitly define the list of test files to be included in a
     # test.  +list+ is expected to be an array of file names (a
     # FileList is acceptable).  If both +pattern+ and +test_files+ are
@@ -67,8 +82,12 @@ module Rake
       @name = name
       @libs = ["lib"]
       @pattern = nil
+      @options = nil
       @test_files = nil
       @verbose = false
+      @warning = false
+      @loader = :rake
+      @ruby_opts = []
       yield self if block_given?
       @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
       define
@@ -79,40 +98,64 @@ module Rake
       lib_path = @libs.join(File::PATH_SEPARATOR)
       desc "Run tests" + (@name==:test ? "" : " for #{@name}")
       task @name do
-	RakeFileUtils.verbose(@verbose) do
-	  ruby %{-I#{lib_path} -e0 #{SEP}#{required_files}#{option_list}}
-	end
+        run_code = ''
+        RakeFileUtils.verbose(@verbose) do
+          run_code =
+            case @loader
+            when :direct
+              "-e 'ARGV.each{|f| load f}'"
+            when :testrb
+              "-S testrb #{fix}"
+            when :rake
+              rake_loader
+            end
+          @ruby_opts.unshift( "-I#{lib_path}" )
+          @ruby_opts.unshift( "-w" ) if @warning
+          ruby @ruby_opts.join(" ") +
+            " \"#{run_code}\" " +
+            file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
+            " #{option_list}"
+        end
       end
       self
     end
 
-    def required_files # :nodoc:
-      file_list.gsub(/^(.*)\.rb$/, ' -r\1').join(" #{SEP}")
-    end
-    
     def option_list # :nodoc:
-      if get_options
-	testoptions = " #{SEP} -- #{get_options}"
+      ENV['TESTOPTS'] || @options || ""
+    end
+
+    def file_list # :nodoc:
+      if ENV['TEST']
+        FileList[ ENV['TEST'] ]
       else
-	testoptions = ''
+        result = []
+        result += @test_files.to_a if @test_files
+        result += FileList[ @pattern ].to_a if @pattern
+        FileList[result]
       end
     end
 
-    def get_options # :nodoc:
-      ENV['TESTOPTS'] || @options
+    def fix # :nodoc:
+      case RUBY_VERSION
+      when '1.8.2'
+        find_file 'rake/ruby182_test_unit_fix'
+      else
+        nil
+      end || ''
     end
 
-    def file_list # :nodoc:
-      if ENV['TEST']
-	FileList[ ENV['TEST'] ]
-      else
-	result = []
-	result += @test_files.to_a if @test_files
-	result += FileList[ @pattern ].to_a if @pattern
-	FileList[result]
+    def rake_loader # :nodoc:
+      find_file('rake/rake_test_loader') or
+        fail "unable to find rake test loader"
+    end
+
+    def find_file(fn) # :nodoc:
+      $LOAD_PATH.each do |path|
+        file_path = File.join(path, "#{fn}.rb")
+        return file_path if File.exist? file_path
       end
+      nil
     end
 
   end
 end
-