jimweirich-rake 0.8.3.99 → 0.8.3.100

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/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

data/lib/rake/repaired_system.rb

@@ -0,0 +1,145 @@
+#
+# 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

data/lib/rake/win32.rb

@@ -1,3 +1,6 @@
+
+require 'rake/repaired_system'
+
 module Rake
   
   # Win 32 interface methods for Rake. Windows specific functionality
@@ -17,11 +20,7 @@ module Rake
 
       # Run a command line on windows.
       def rake_system(*cmd)
-        if cmd.size == 1
-          system("call #{cmd}")
-        else
-          system(*cmd)
-        end
+        RepairedSystem.system(*cmd)
       end
       
       # The standard directory containing system wide rake files on

data/lib/rake.rb

@@ -2,7 +2,7 @@
 
 #--
 
-# Copyright (c) 2003, 2004, 2005, 2006, 2007  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 "Software"), to
@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.3.99'
+RAKEVERSION = '0.8.3.100'
 
 require 'rbconfig'
 require 'fileutils'
@@ -74,7 +74,7 @@ end # module Module
 #
 class String
   rake_extension("ext") do
-    # Replace the file extension with +newext+.  If there is no extenson on
+    # Replace the file extension with +newext+.  If there is no extension on
     # the string, append the new extension to the end.  If the new extension
     # is not given, or is the empty string, remove any existing extension.
     #
@@ -1461,8 +1461,8 @@ module Rake
       collect { |fn| fn.pathmap(spec) }
     end
 
-    # Return a new array with <tt>String#ext</tt> method applied to each
-    # member of the array.
+    # Return a new file list with <tt>String#ext</tt> method applied
+    # to each member of the array.
     #
     # This method is a shortcut for:
     #
@@ -2050,7 +2050,7 @@ module Rake
         exit(1)
       rescue Exception => ex
         # Exit with error message
-        $stderr.puts "rake aborted!"
+        $stderr.puts "#{name} aborted!"
         $stderr.puts ex.message
         if options.trace
           $stderr.puts ex.backtrace.join("\n")
@@ -2092,14 +2092,14 @@ module Rake
       tty_output? || ENV['RAKE_COLUMNS']
     end
 
-    # Display the tasks and dependencies.
+    # Display the tasks and comments.
     def display_tasks_and_comments
       displayable_tasks = tasks.select { |t|
         t.comment && t.name =~ options.show_task_pattern
       }
       if options.full_description
         displayable_tasks.each do |t|
-          puts "rake #{t.name_with_args}"
+          puts "#{name} #{t.name_with_args}"
           t.full_comment.split("\n").each do |line|
             puts "    #{line}"
           end
@@ -2158,7 +2158,7 @@ module Rake
     # Display the tasks and prerequisites
     def display_prerequisites
       tasks.each do |t|
-        puts "rake #{t.name}"
+        puts "#{name} #{t.name}"
         t.prerequisites.each { |pre| puts "    #{pre}" }
       end
     end
@@ -2270,7 +2270,7 @@ module Rake
             verbose(true)
           }
         ],
-        ['--verbose', '-v', "Log message to standard output (default).",
+        ['--verbose', '-v', "Log message to standard output.",
           lambda { |value| verbose(true) }
         ],
         ['--version', '-V', "Display the program version.",

data/test/test_application.rb

@@ -199,8 +199,8 @@ class TestApplication < Test::Unit::TestCase
     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("D:/AD/Rake").and_return(true)
-    in_environment('RAKE_SYSTEM' => nil, 'HOME' => nil, 'HOMEDRIVE' => 'D:', 'HOMEPATH' => '\\AD') do
+    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
@@ -209,7 +209,7 @@ class TestApplication < Test::Unit::TestCase
         options.rakelib = []
         load_rakefile
       end
-      assert_equal "D:/AD/Rake", @app.system_dir
+      assert_equal "C:/AD/Rake", @app.system_dir
     end
   end
 

data/test/test_fileutils.rb

@@ -224,18 +224,14 @@ class TestFileUtils < Test::Unit::TestCase
       end
       assert block_run, "The block must be run"
 
-      if windows?
-        puts "SKIPPING test_ruby/part 2 when in windows"
-      else
-        # This one does not get expanded
-        block_run = false
-        ruby '-e', %{exit "#{env_var}".length} do |ok, status| # " (emacs wart)
-          assert(!ok)
-          assert_equal 15, 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
   end
 

data/test/test_rules.rb

@@ -25,7 +25,7 @@ class TestRules < Test::Unit::TestCase
   end
 
   def teardown
-    FileList['testdata/*'].each do |f| rm_r(f, :verbose=>false) end
+    FileList['testdata/*'].uniq.each do |f| rm_r(f, :verbose=>false) end
   end
 
   def test_multiple_rules1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jimweirich-rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.3.99
+  version: 0.8.3.100
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-31 21:00:00 -07:00
+date: 2008-12-12 21:00:00 -08:00
 default_executable: rake
 dependencies: []
 
@@ -49,7 +49,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README
-- TAGS
 - TODO
 - bin/rake
 - lib/rake/classic_namespace.rb
@@ -65,6 +64,7 @@ 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