jimweirich-rake 0.8.3.100 → 0.8.4.99

data/CHANGES

@@ -23,6 +23,11 @@
 * Fixed stray ARGV option problem that was interfering with
   Test::Unit::Runner.
 
+* Fixed default verbose mode (was accidently changed to false).  
+
+* Removed reference to manage_gem to fix the warning produced by the
+  gem package task.
+
 == Version 0.8.3
 
 * Enhanced the system directory detection in windows. We now check

data/Rakefile

@@ -128,17 +128,26 @@ end
 
 # Create a task to build the RDOC documentation tree.
 
-rd = Rake::RDocTask.new("rdoc") { |rdoc|
+begin
+  require 'darkfish-rdoc'
+  DARKFISH_ENABLED = true
+rescue LoadError => ex
+  DARKFISH_ENABLED = false
+end
+
+rd = Rake::RDocTask.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'html'
   rdoc.template = 'doc/jamis.rb'
   rdoc.title    = "Rake -- Ruby Make"
   rdoc.options << '--line-numbers' << '--inline-source' <<
     '--main'  << 'README' <<
     '--title' << 'Rake -- Ruby Make'
+  rdoc.options << '-SHN' << '-f' << 'darkfish' if DARKFISH_ENABLED
+    
   rdoc.rdoc_files.include('README', 'MIT-LICENSE', 'TODO', 'CHANGES')
   rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
   rdoc.rdoc_files.exclude(/\bcontrib\b/)
-}
+end
 
 # ====================================================================
 # Create a task that will package the Rake software into distributable
@@ -157,6 +166,7 @@ PKG_FILES = FileList[
   'doc/**/*'
 ]
 PKG_FILES.exclude('doc/example/*.o')
+PKG_FILES.exclude('TAGS')
 PKG_FILES.exclude(%r{doc/example/main$})
 
 if ! defined?(Gem)

data/doc/release_notes/rake-0.8.4.rdoc

@@ -2,6 +2,22 @@
 
 Rake version 0.8.4 is a bug-fix release of rake.
 
+NOTE: The version of Rake that comes with Ruby 1.9 has diverged
+      slightly from the core Rake code base.  Rake 0.8.4 will work
+      with Ruby 1.9, but is not a strict upgrade for the Rake that
+      comes with Ruby 1.9.  A (near) future release of Rake will unify
+      those two codebases.
+
+== Letter Writing Campaign
+
+Thanks to Aaron Patterson (@tenderlove) and Eric Hodel (@drbrain) for
+their encouraging support in organizing a letter writing campaign to
+lobby for the "Warning Free" release of rake 0.8.4.  A special callout
+goes to Jonathan D. Lord, Sr (Dr. Wingnut) whose postcard was the
+first to actually reach me. (see
+http://tenderlovemaking.com/2009/02/26/we-need-a-new-version-of-rake/
+for details)
+
 == Changes
 
 === New Features / Enhancements in Version 0.8.4
@@ -9,6 +25,9 @@ Rake version 0.8.4 is a bug-fix release of rake.
 * Case is preserved on rakefile names. (patch from James
   M. Lawrence/quix)
 
+* Improved Rakefile case insensitivity testing (patch from Luis
+  Lavena).
+
 * Windows system dir search order is now: HOME, HOMEDRIVE + HOMEPATH,
   APPDATA, USERPROFILE (patch from Luis Lavena)
 
@@ -17,6 +36,9 @@ Rake version 0.8.4 is a bug-fix release of rake.
 
 === Bug Fixes in Version 0.8.4
 
+* Removed reference to manage_gem to fix the warning produced by the
+  gem package task.
+
 * Fixed stray ARGV option problem that was interfering with
   Test::Unit::Runner. (patch from Pivotal Labs)
 

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/rdoctask.rb

@@ -10,7 +10,7 @@ module Rake
   #
   # The RDocTask will create the following targets:
   #
-  # [<b>:<em>rdoc</em></b>]
+  # [<b><em>rdoc</em></b>]
   #   Main task for this RDOC task.  
   #
   # [<b>:clobber_<em>rdoc</em></b>]
@@ -21,7 +21,7 @@ module Rake
   #   Rebuild the rdoc files from scratch, even if they are not out
   #   of date.
   #
-  # Simple example:
+  # Simple Example:
   #
   #   Rake::RDocTask.new do |rd|
   #     rd.main = "README.rdoc"
@@ -134,7 +134,7 @@ module Rake
         args = option_list + @rdoc_files
         if @external
           argstring = args.join(' ')
-          sh %{ruby -Ivendor vender/rd #{argstring}}
+          sh %{ruby -Ivendor vendor/rd #{argstring}}
         else
           require 'rdoc/rdoc'
           RDoc::RDoc.new.document(args)

data/lib/rake/testtask.rb

@@ -95,7 +95,7 @@ module Rake
 
     # Create the tasks defined by this task lib.
     def define
-      lib_path = @libs.collect {|path| "-I\"#{File.expand_path(path)}\""}.join(' ')
+      lib_path = @libs.join(File::PATH_SEPARATOR)
       desc "Run tests" + (@name==:test ? "" : " for #{@name}")
       task @name do
         run_code = ''
@@ -109,7 +109,7 @@ module Rake
             when :rake
               rake_loader
             end
-          @ruby_opts.unshift( lib_path )
+          @ruby_opts.unshift( "-I\"#{lib_path}\"" )
           @ruby_opts.unshift( "-w" ) if @warning
           ruby @ruby_opts.join(" ") +
             " \"#{run_code}\" " +

data/lib/rake/win32.rb

@@ -1,8 +1,7 @@
 
-require 'rake/repaired_system'
-
 module Rake
-  
+  require 'rake/alt_system'
+
   # Win 32 interface methods for Rake. Windows specific functionality
   # will be placed here to collect that knowledge in one spot.
   module Win32
@@ -15,12 +14,12 @@ module Rake
     class << self
       # True if running on a windows system.
       def windows?
-        Config::CONFIG['host_os'] =~ /mswin|mingw/
+        AltSystem::WINDOWS
       end
 
       # Run a command line on windows.
       def rake_system(*cmd)
-        RepairedSystem.system(*cmd)
+        AltSystem.system(*cmd)
       end
       
       # The standard directory containing system wide rake files on

data/lib/rake.rb

@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.3.100'
+RAKEVERSION = '0.8.4.99'
 
 require 'rbconfig'
 require 'fileutils'
@@ -40,6 +40,8 @@ require 'ostruct'
 
 require 'rake/win32'
 
+$trace = false
+
 ######################################################################
 # Rake extensions to Module.
 #
@@ -60,7 +62,7 @@ class Module
   #   end
   #
   def rake_extension(method)
-    if instance_methods.include?(method.to_s) || instance_methods.include?(method.to_sym)
+    if method_defined?(method)
       $stderr.puts "WARNING: Possible conflict with Rake extension: #{self}##{method} already exists"
     else
       yield
@@ -84,7 +86,7 @@ class String
       if newext != ''
         newext = (newext =~ /^\./) ? newext : ("." + newext)
       end
-      dup.sub!(%r(([^/\\])\.[^./\\]*$)) { $1 + newext } || self + newext
+      self.chomp(File.extname(self)) << newext
     end
   end
 
@@ -161,7 +163,7 @@ class String
     #   'a/b/c/d/file.txt'.pathmap("%2d")   => 'a/b'
     #   'a/b/c/d/file.txt'.pathmap("%-2d")  => 'c/d'
     #
-    # Also the %d, %p, $f, $n, %x, and %X operators can take a
+    # Also the %d, %p, %f, %n, %x, and %X operators can take a
     # pattern/replacement argument to perform simple string substititions on a
     # particular part of the path.  The pattern and replacement are speparated
     # by a comma and are enclosed by curly braces.  The replacement spec comes
@@ -207,13 +209,9 @@ class String
         when '%d'
           result << File.dirname(self)
         when '%x'
-          result << $1 if self =~ /[^\/](\.[^.]+)$/
+          result << File.extname(self)
         when '%X'
-          if self =~ /^(.*[^\/])(\.[^.]+)$/
-            result << $1
-          else
-            result << self
-          end
+          result << self.ext
         when '%p'
           result << self
         when '%s'
@@ -308,6 +306,27 @@ module Rake
     end
   end
 
+  ####################################################################
+  # Exit status class for times the system just gives us a nil.
+  class PseudoStatus
+    attr_reader :exitstatus
+    def initialize(code=0)
+      @exitstatus = code
+    end
+    def to_i
+      @exitstatus << 8
+    end
+    def >>(n)
+      to_i >> n
+    end
+    def stopped?
+      false
+    end
+    def exited?
+      true
+    end
+  end
+
   ####################################################################
   # TaskAguments manage the arguments passed to a task.
   #
@@ -804,6 +823,7 @@ module Rake
   # parallel using Ruby threads.
   #
   class MultiTask < Task
+    private
     def invoke_prerequisites(args, invocation_chain)
       threads = @prerequisites.collect { |p|
         Thread.new(p) { |r| application[r].invoke_with_call_chain(args, invocation_chain) }
@@ -937,7 +957,9 @@ end
 # added to the FileUtils utility functions.
 #
 module FileUtils
-  RUBY = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name']).
+  RUBY = File.join(
+    Config::CONFIG['bindir'],
+    Config::CONFIG['ruby_install_name'] + Config::CONFIG['EXEEXT']).
     sub(/.*\s.*/m, '"\&"')
 
   OPT_TABLE['sh']  = %w(noop verbose)
@@ -963,14 +985,14 @@ module FileUtils
     options = (Hash === cmd.last) ? cmd.pop : {}
     unless block_given?
       show_command = cmd.join(" ")
-      show_command = show_command[0,42] + "..."
+      show_command = show_command[0,42] + "..." unless $trace
       # TODO code application logic heref show_command.length > 45
       block = lambda { |ok, status|
         ok or fail "Command failed with status (#{status.exitstatus}): [#{show_command}]"
       }
     end
     if RakeFileUtils.verbose_flag == :default
-      options[:verbose] = false
+      options[:verbose] = true
     else
       options[:verbose] ||= RakeFileUtils.verbose_flag
     end
@@ -979,16 +1001,14 @@ module FileUtils
     rake_output_message cmd.join(" ") if options[:verbose]
     unless options[:noop]
       res = rake_system(*cmd)
-      block.call(res, $?)
+      status = $?
+      status = PseudoStatus.new(1) if !res && status.nil?
+      block.call(res, status)
     end
   end
 
   def rake_system(*cmd)
-    if Rake::Win32.windows?
-      Rake::Win32.rake_system(*cmd)
-    else
-      system(*cmd)
-    end
+    Rake::AltSystem.system(*cmd)
   end
   private :rake_system
 
@@ -1461,7 +1481,7 @@ module Rake
       collect { |fn| fn.pathmap(spec) }
     end
 
-    # Return a new file list with <tt>String#ext</tt> method applied
+    # Return a new FileList with <tt>String#ext</tt> method applied
     # to each member of the array.
     #
     # This method is a shortcut for:
@@ -1479,9 +1499,9 @@ module Rake
     # name, line number, and the matching line of text.  If no block is given,
     # a standard emac style file:linenumber:line message will be printed to
     # standard out.
-    def egrep(pattern)
+    def egrep(pattern, *options)
       each do |fn|
-        open(fn) do |inf|
+        open(fn, "rb", *options) do |inf|
           count = 0
           inf.each do |line|
             count += 1
@@ -2044,10 +2064,10 @@ module Rake
         yield
       rescue SystemExit => ex
         # Exit silently with current status
-        exit(ex.status)
-      rescue SystemExit, OptionParser::InvalidOption => ex
+        raise
+      rescue OptionParser::InvalidOption => ex
         # Exit silently
-        exit(1)
+        exit(false)
       rescue Exception => ex
         # Exit with error message
         $stderr.puts "#{name} aborted!"
@@ -2058,7 +2078,7 @@ module Rake
           $stderr.puts ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || ""
           $stderr.puts "(See full trace by running task with --trace)"
         end
-        exit(1)
+        exit(false)
       end
     end
 
@@ -2377,8 +2397,6 @@ module Rake
         begin
           if ENV['RAKE_SYSTEM']
             ENV['RAKE_SYSTEM']
-          elsif Win32.windows?
-            Win32.win32_system_dir
           else
             standard_system_dir
           end
@@ -2386,8 +2404,14 @@ module Rake
     end
     
     # The standard directory containing system wide rake files.
-    def standard_system_dir #:nodoc:
-      File.join(File.expand_path('~'), '.rake')
+    if Win32.windows?
+      def standard_system_dir #:nodoc:
+        Win32.win32_system_dir
+      end
+    else
+      def standard_system_dir #:nodoc:
+        File.join(File.expand_path('~'), '.rake')
+      end
     end
     private :standard_system_dir
 

data/test/check_no_expansion.rb

@@ -0,0 +1,5 @@
+if ARGV[0] != ARGV[1]
+  exit 0
+else
+  exit 1
+end

data/test/test_application.rb

@@ -171,48 +171,10 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
-  def test_load_from_system_rakefile_on_unix
-    flexmock(Rake::Win32, :windows? => false,
-      :win32_system_dir => nil)
-    flexmock(@app, :load => nil)
-    flexmock(File).should_receive(:expand_path).with("~").and_return("/HOME")
-    flexmock(File).should_receive(:expand_path).and_return { |fn| fn }
-    
-    in_environment('RAKE_SYSTEM' => nil) do
-      @app.options.rakelib = []
-      @app.instance_eval do
-        handle_options
-        options.silent = true
-        options.load_system = true
-        options.rakelib = []
-        load_rakefile
-      end
-      assert_equal "/HOME/.rake", @app.system_dir
-    end
-  end
-
   def test_windows
     assert ! (@app.windows? && @app.unix?)
   end
 
-  def test_load_from_system_rakefile_on_windows
-    flexmock(Rake::Win32, :windows? => true)
-    flexmock(@app, :standard_system_dir => "XX")
-    flexmock(@app).should_receive(:load).and_return(nil)
-    flexmock(File).should_receive(:directory?).with("C:/AD/Rake").and_return(true)
-    in_environment('RAKE_SYSTEM' => nil, 'HOME' => nil, 'HOMEDRIVE' => 'C:', 'HOMEPATH' => '\\AD') do
-      @app.options.rakelib = []
-      @app.instance_eval do
-        handle_options
-        options.silent = true
-        options.load_system = true
-        options.rakelib = []
-        load_rakefile
-      end
-      assert_equal "C:/AD/Rake", @app.system_dir
-    end
-  end
-
   def test_loading_imports
     mock = flexmock("loader")
     mock.should_receive(:load).with("x.dummy").once
@@ -235,7 +197,7 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
-  def test_handle_options__should_strip_options_from_ARGV
+  def test_handle_options_should_strip_options_from_ARGV
     assert !@app.options.trace
 
     valid_option = '--trace'

data/test/test_filelist.rb

@@ -285,9 +285,7 @@ class TestFileList < Test::Unit::TestCase
     assert_equal "one.two.net", "one.two.c".ext(".net")
     assert_equal "one/two.net", "one/two.c".ext(".net")
     assert_equal "one.x/two.net", "one.x/two.c".ext(".net")
-    assert_equal "one.x\\two.net", "one.x\\two.c".ext(".net")
     assert_equal "one.x/two.net", "one.x/two".ext(".net")
-    assert_equal "one.x\\two.net", "one.x\\two".ext(".net")
     assert_equal ".onerc.net", ".onerc.dot".ext("net")
     assert_equal ".onerc.net", ".onerc".ext("net")
     assert_equal ".a/.onerc.net", ".a/.onerc".ext("net")
@@ -297,6 +295,11 @@ class TestFileList < Test::Unit::TestCase
     assert_equal ".one", ".one".ext
     assert_equal ".", ".".ext("c")
     assert_equal "..", "..".ext("c")
+    # These only need to work in windows
+    if Rake::Win32.windows?
+      assert_equal "one.x\\two.net", "one.x\\two.c".ext(".net")
+      assert_equal "one.x\\two.net", "one.x\\two".ext(".net")
+    end
   end
 
   def test_filelist_ext

data/test/test_fileutils.rb

@@ -139,15 +139,17 @@ class TestFileUtils < Test::Unit::TestCase
     end
   end
 
-  def test_sh_multiple_arguments
+  def test_sh_with_a_single_string_argument
     ENV['RAKE_TEST_SH'] = 'someval'
-    expanded = windows? ? '%RAKE_TEST_SH%' : '$RAKE_TEST_SH'
-    # This one gets expanded by the shell
-    verbose(false) { sh %{ruby test/check_expansion.rb #{expanded} someval} }
-    assert true, "should not fail"
-    assert_exception(RuntimeError) {
-      # This one does not get expanded
-      verbose(false) { Sh.run 'ruby', 'test/check_expansion.rb', expanded, 'someval' }
+    verbose(false) {
+      sh %{ruby test/check_expansion.rb #{env_var} someval}
+    }
+  end
+
+  def test_sh_with_multiple_arguments
+    ENV['RAKE_TEST_SH'] = 'someval'
+    verbose(false) {
+      Sh.run 'ruby', 'test/check_no_expansion.rb', env_var, 'someval'
     }
   end
 
@@ -204,35 +206,18 @@ class TestFileUtils < Test::Unit::TestCase
     assert_equal '', out
   end
 
-  def test_sh_default_is_no_verbose
-    out = redirect_stderr {
-      sh %{test/shellcommand.rb}, :noop=>true
+  def test_ruby_with_a_single_string_argument
+    ENV['RAKE_TEST_SH'] = 'someval'
+    verbose(false) {
+      ruby %{test/check_expansion.rb #{env_var} someval}
     }
-    assert_equal '', out
   end
 
-  def test_ruby
-    verbose(false) do
-      ENV['RAKE_TEST_RUBY'] = "123"
-      block_run = false
-      # This one gets expanded by the shell
-      env_var = windows? ? '%RAKE_TEST_RUBY%' : '$RAKE_TEST_RUBY'
-      ruby %{-e "exit #{env_var}"} do |ok, status| # " (emacs wart)
-        assert(!ok)
-        assert_equal 123, status.exitstatus
-        block_run = true
-      end
-      assert block_run, "The block must be run"
-
-      # This one does not get expanded
-      block_run = false
-      ruby '-e', %{exit %{#{env_var}}.length} do |ok, status| # " (emacs wart)
-        assert(!ok)
-        assert_equal env_var.length, status.exitstatus
-        block_run = true
-      end
-      assert block_run, "The block must be run"
-    end
+  def test_ruby_with_multiple_arguments
+    ENV['RAKE_TEST_SH'] = 'someval'
+    verbose(false) {
+      ruby 'test/check_no_expansion.rb', env_var, 'someval'
+    }
   end
 
   def test_split_all
@@ -259,4 +244,8 @@ class TestFileUtils < Test::Unit::TestCase
     ! File::ALT_SEPARATOR.nil?
   end
 
+  def env_var
+    windows? ? '%RAKE_TEST_SH%' : '$RAKE_TEST_SH'
+  end
+  
 end

data/test/test_pseudo_status.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'rake'
+
+require 'test/capture_stdout'
+require 'test/rake_test_setup'
+
+class PseudoStatusTest < Test::Unit::TestCase
+  def test_with_zero_exit_status
+    s = Rake::PseudoStatus.new
+    assert_equal 0, s.exitstatus
+    assert_equal 0, s.to_i
+    assert_equal 0, s >> 8
+    assert ! s.stopped?
+    assert s.exited?
+  end
+  def test_with_99_exit_status
+    s = Rake::PseudoStatus.new(99)
+    assert_equal 99, s.exitstatus
+    assert_equal 25344, s.to_i
+    assert_equal 99, s >> 8
+    assert ! s.stopped?
+    assert s.exited?
+  end
+end

data/test/test_tasks.rb

@@ -181,7 +181,7 @@ class TestTask < Test::Unit::TestCase
     out = t1.investigation
     assert_match(/class:\s*Rake::Task/, out)
     assert_match(/needed:\s*true/, out)
-    assert_match(/pre-requisites:\s*--t2/, out)
+    assert_match(/pre-requisites:\s*--t[23]/, out)
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jimweirich-rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.3.100
+  version: 0.8.4.99
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 21:00:00 -08:00
+date: 2009-04-21 21:00:00 -07:00
 default_executable: rake
 dependencies: []
 
@@ -51,6 +51,7 @@ files:
 - README
 - TODO
 - bin/rake
+- lib/rake/alt_system.rb
 - lib/rake/classic_namespace.rb
 - lib/rake/clean.rb
 - lib/rake/contrib/compositepublisher.rb
@@ -64,7 +65,6 @@ files:
 - lib/rake/packagetask.rb
 - lib/rake/rake_test_loader.rb
 - lib/rake/rdoctask.rb
-- lib/rake/repaired_system.rb
 - lib/rake/ruby182_test_unit_fix.rb
 - lib/rake/runtest.rb
 - lib/rake/tasklib.rb
@@ -73,6 +73,7 @@ files:
 - lib/rake.rb
 - test/capture_stdout.rb
 - test/check_expansion.rb
+- test/check_no_expansion.rb
 - test/contrib/test_sys.rb
 - test/data/rakelib/test1.rb
 - test/data/rbext/rakefile.rb
@@ -100,6 +101,7 @@ files:
 - test/test_namespace.rb
 - test/test_package_task.rb
 - test/test_pathmap.rb
+- test/test_pseudo_status.rb
 - test/test_rake.rb
 - test/test_rdoc_task.rb
 - test/test_require.rb
@@ -161,6 +163,9 @@ rdoc_options:
 - README
 - --title
 - Rake -- Ruby Make
+- -SHN
+- -f
+- darkfish
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/rake/repaired_system.rb

@@ -1,145 +0,0 @@
-#
-# 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'
-
-module Rake
-end
-
-#
-# Alternate implementations of system() and backticks `` for Windows.
-# 
-module Rake::RepairedSystem
-  class << self
-    def define_module_function(name, &block)
-      define_method(name, &block)
-      module_function(name)
-    end
-  end
-
-  if Config::CONFIG["host_os"] !~ %r!(msdos|mswin|djgpp|mingw)!
-    define_module_function :system, &Kernel.method(:system)
-    define_module_function :'`', &Kernel.method(:'`')
-  else
-    BINARY_EXTS = %w[com exe]
-
-    BATCHFILE_EXTS = %w[bat] +
-      if (t = ENV["COMSPEC"]) and t =~ %r!command\.exe\Z!i
-        []
-      else
-        %w[cmd]
-      end
-
-    RUNNABLE_EXTS = BINARY_EXTS + BATCHFILE_EXTS
-
-    RUNNABLE_PATTERN, BINARY_PATTERN, BATCHFILE_PATTERN =
-      [RUNNABLE_EXTS, BINARY_EXTS, BATCHFILE_EXTS].map { |exts|
-        if exts.size > 1
-          %r!\.(#{exts.join('|')})\Z!i
-        else
-          %r!\.#{exts.first}\Z!i
-        end
-      }
-
-    define_module_function :system_previous, &Kernel.method(:system)
-    define_module_function :backticks_previous, &Kernel.method(:'`')
-
-    module_function
-
-    def repair_command(cmd)
-      if (match = cmd.match(%r!\A\s*\"(.*?)\"!)) or
-         (match = cmd.match(%r!\A(\S+)!))
-        if runnable = find_runnable(match.captures.first)
-          quote(to_backslashes(runnable)) + match.post_match
-        else
-          cmd
-        end
-      else
-        cmd
-      end
-    end
-
-    def join_command(*args)
-      first =
-        if args.first =~ %r!\s!
-          quote(args.first)
-        else
-          args.first
-        end
-      [to_backslashes(first), *tail(args)].join(" ")
-    end
-
-    def to_backslashes(string)
-      string.gsub("/", "\\")
-    end
-
-    def quote(string)
-      %Q!"#{string}"!
-    end
-
-    def tail(array)
-      array[1..-1]
-    end
-
-    def find_runnable(file)
-      if file =~ RUNNABLE_PATTERN
-        file
-      else
-        [nil, ".", *ENV["PATH"].split(";")].each { |path|
-          RUNNABLE_EXTS.each { |ext|
-            test = (path ? "#{path}/" : "") + "#{file}.#{ext}"
-            if File.exist?(test)
-              return test
-            end
-          }
-        }
-        nil
-      end
-    end
-
-    def system(cmd, *args)
-      file = cmd.to_s
-      repaired_args = 
-        if args.empty?
-          [repair_command(file)]
-        elsif file =~ BATCHFILE_PATTERN
-          [ENV["COMSPEC"], "/c", to_backslashes(File.expand_path(file)), *args]
-        elsif runnable = find_runnable(file)
-          [to_backslashes(File.expand_path(runnable)), *args]
-        else
-          # maybe a built-in shell command
-          [join_command(file, *args)]
-        end
-      if repaired_args.size == 1
-        system_previous("call #{repaired_args.first}")
-      else
-        system_previous(*repaired_args)
-      end
-    end
-
-    def `(cmd) #`
-      backticks_previous(repair_command(cmd))
-    end
-  end
-end