rake 0.8.7 → 0.9.0

data/lib/rake/tasklib.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 require 'rake'
 
 module Rake
@@ -7,6 +5,7 @@ module Rake
   # Base class for Task Libraries.
   class TaskLib
     include Cloneable
+    include Rake::DSL
 
     # Make a symbol by pasting two strings together.
     #

data/lib/rake/testtask.rb

@@ -1,5 +1,3 @@
-#!/usr/bin/env ruby
-
 # Define a task library for running unit tests.
 
 require 'rake'
@@ -10,7 +8,7 @@ module Rake
   # Create a task that runs a set of tests.
   #
   # Example:
-  #  
+  #
   #   Rake::TestTask.new do |t|
   #     t.libs << "test"
   #     t.test_files = FileList['test/test*.rb']
@@ -63,7 +61,7 @@ module Rake
     # * :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.
@@ -95,33 +93,37 @@ module Rake
 
     # Create the tasks defined by this task lib.
     def define
-      lib_path = @libs.join(File::PATH_SEPARATOR)
       desc "Run tests" + (@name==:test ? "" : " for #{@name}")
       task @name do
-        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}"
+        FileUtilsExt.verbose(@verbose) do
+          ruby "#{ruby_opts_string} #{run_code} #{file_list_string} #{option_list}"
         end
       end
       self
     end
 
     def option_list # :nodoc:
-      ENV['TESTOPTS'] || @options || ""
+      (ENV['TESTOPTS'] ||
+        ENV['TESTOPT'] ||
+        ENV['TEST_OPTS'] ||
+        ENV['TEST_OPT'] ||
+        @options ||
+        "")
+    end
+
+    def ruby_opts_string
+      opts = @ruby_opts.dup
+      opts.unshift( "-I\"#{lib_path}\"" ) unless @libs.empty?
+      opts.unshift( "-w" ) if @warning
+      opts.join(" ")
+    end
+
+    def lib_path
+      @libs.join(File::PATH_SEPARATOR)
+    end
+
+    def file_list_string
+      file_list.collect { |fn| "\"#{fn}\"" }.join(' ')
     end
 
     def file_list # :nodoc:
@@ -130,20 +132,35 @@ module Rake
       else
         result = []
         result += @test_files.to_a if @test_files
-        result += FileList[ @pattern ].to_a if @pattern
-        FileList[result]
+        result << @pattern if @pattern
+        result
       end
     end
 
     def fix # :nodoc:
-      case RUBY_VERSION
+      case ruby_version
       when '1.8.2'
-        find_file 'rake/ruby182_test_unit_fix'
+        "\"#{find_file 'rake/ruby182_test_unit_fix'}\""
       else
         nil
       end || ''
     end
 
+    def ruby_version
+      RUBY_VERSION
+    end
+
+    def run_code
+      case @loader
+      when :direct
+        "-e \"ARGV.each{|f| require f}\""
+      when :testrb
+        "-S testrb #{fix}"
+      when :rake
+        "-I\"#{rake_lib_dir}\" \"#{rake_loader}\""
+      end
+    end
+
     def rake_loader # :nodoc:
       find_file('rake/rake_test_loader') or
         fail "unable to find rake test loader"
@@ -157,5 +174,18 @@ module Rake
       nil
     end
 
+    def rake_lib_dir # :nodoc:
+      find_dir('rake') or
+        fail "unable to find rake lib"
+    end
+
+    def find_dir(fn) # :nodoc:
+      $LOAD_PATH.each do |path|
+        file_path = File.join(path, "#{fn}.rb")
+        return path if File.exist? file_path
+      end
+      nil
+    end
+
   end
 end

data/lib/rake/version.rb

@@ -0,0 +1,10 @@
+module Rake
+  module Version
+    NUMBERS = [
+      MAJOR = 0,
+      MINOR = 9,
+      BUILD = 0,
+    ]
+  end
+  VERSION = Version::NUMBERS.join('.')
+end

data/lib/rake/win32.rb

@@ -5,12 +5,12 @@ module Rake
   # Win 32 interface methods for Rake. Windows specific functionality
   # will be placed here to collect that knowledge in one spot.
   module Win32
-    
+
     # Error indicating a problem in locating the home directory on a
     # Win32 system.
     class Win32HomeError < RuntimeError
     end
-    
+
     class << self
       # True if running on a windows system.
       def windows?
@@ -21,7 +21,7 @@ module Rake
       def rake_system(*cmd)
         AltSystem.system(*cmd)
       end
-      
+
       # The standard directory containing system wide rake files on
       # Win 32 systems. Try the following environment variables (in
       # order):
@@ -49,7 +49,7 @@ module Rake
       def normalize(path)
         path.gsub(/\\/, '/')
       end
-      
+
     end
   end
 end