rake 0.8.3 → 0.8.4

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

@@ -95,7 +95,7 @@ module Rake
 
     # Create the tasks defined by this task lib.
     def define
-      lib_path = @libs.join(File::PATH_SEPARATOR)
+      lib_path = @libs.collect {|path| "-I\"#{File.expand_path(path)}\""}.join(' ')
       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( "-I#{lib_path}" )
+          @ruby_opts.unshift( lib_path )
           @ruby_opts.unshift( "-w" ) if @warning
           ruby @ruby_opts.join(" ") +
             " \"#{run_code}\" " +

data/lib/rake/win32.rb

@@ -1,3 +1,6 @@
+
+require 'rake/repaired_system'
+
 module Rake
   
   # Win 32 interface methods for Rake. Windows specific functionality
@@ -12,38 +15,37 @@ module Rake
     class << self
       # True if running on a windows system.
       def windows?
-        Config::CONFIG['host_os'] =~ /mswin/
+        Config::CONFIG['host_os'] =~ /mswin|mingw/
       end
 
       # 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
       # Win 32 systems. Try the following environment variables (in
       # order):
       #
-      # * APPDATA
+      # * HOME
       # * HOMEDRIVE + HOMEPATH
+      # * APPDATA
       # * USERPROFILE
       #
       # If the above are not defined, the return nil.
       def win32_system_dir #:nodoc:
-        win32_shared_path = ENV['APPDATA']
+        win32_shared_path = ENV['HOME']
         if win32_shared_path.nil? && ENV['HOMEDRIVE'] && ENV['HOMEPATH']
           win32_shared_path = ENV['HOMEDRIVE'] + ENV['HOMEPATH']
         end
+
+        win32_shared_path ||= ENV['APPDATA']
         win32_shared_path ||= ENV['USERPROFILE']
         raise Win32HomeError, "Unable to determine home path environment variable." if
           win32_shared_path.nil? or win32_shared_path.empty?
         normalize(File.join(win32_shared_path, 'Rake'))
       end
-      
+
       # Normalize a win32 path so that the slashes are all forward slashes.
       def normalize(path)
         path.gsub(/\\/, '/')

data/test/data/sample.mf

@@ -10,3 +10,5 @@ c: c1
 d: d1 d2 \
 
 e f : e1 f1
+
+g\ 0: g1 g\ 2 g\ 3 g4

data/test/rake_test_setup.rb

@@ -8,3 +8,17 @@ rescue LoadError
 end
 
 require 'flexmock/test_unit'
+
+if RUBY_VERSION >= "1.9.0"
+  class Test::Unit::TestCase
+#    def passed?
+#      true
+#    end
+  end
+end
+
+module TestMethods
+  def assert_exception(ex, msg=nil, &block)
+    assert_raise(ex, msg, &block)
+  end
+end

data/test/session_functional.rb

@@ -8,6 +8,7 @@ require 'test/unit'
 require 'fileutils'
 require 'session'
 require 'test/in_environment'
+require 'test/rake_test_setup'
 
 # Version 2.1.9 of session has a bug where the @debug instance
 # variable is not initialized, causing warning messages.  This snippet
@@ -24,6 +25,7 @@ end
 
 class FunctionalTest < Test::Unit::TestCase
   include InEnvironment
+  include TestMethods
 
   RUBY_COMMAND = 'ruby'
 

data/test/test_application.rb

@@ -18,6 +18,7 @@ TESTING_REQUIRE = [ ]
 class TestApplication < Test::Unit::TestCase
   include CaptureStdout
   include InEnvironment
+  include TestMethods
 
   def setup
     @app = Rake::Application.new
@@ -109,7 +110,7 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_finding_rakefile
-    assert_match(/[Rr]akefile/, @app.instance_eval { have_rakefile })
+    assert_match(/Rakefile/i, @app.instance_eval { have_rakefile })
   end
 
   def test_not_finding_rakefile
@@ -148,7 +149,7 @@ class TestApplication < Test::Unit::TestCase
         handle_options
         options.silent = true
       end
-      ex = assert_raise(RuntimeError) do 
+      ex = assert_exception(RuntimeError) do 
         @app.instance_eval do raw_load_rakefile end 
       end
       assert_match(/no rakefile found/i, ex.message)
@@ -162,6 +163,7 @@ class TestApplication < Test::Unit::TestCase
         handle_options
         options.silent = true
         options.load_system = true
+        options.rakelib = []
         load_rakefile
       end
       assert_equal "test/data/sys", @app.system_dir
@@ -170,9 +172,9 @@ class TestApplication < Test::Unit::TestCase
   end
 
   def test_load_from_system_rakefile_on_unix
-    flexmock(@app, :windows? => false,
-      :win32_system_dir => nil,
-      :load => nil)
+    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 }
     
@@ -182,6 +184,7 @@ class TestApplication < Test::Unit::TestCase
         handle_options
         options.silent = true
         options.load_system = true
+        options.rakelib = []
         load_rakefile
       end
       assert_equal "/HOME/.rake", @app.system_dir
@@ -195,17 +198,18 @@ class TestApplication < Test::Unit::TestCase
   def test_load_from_system_rakefile_on_windows
     flexmock(Rake::Win32, :windows? => true)
     flexmock(@app, :standard_system_dir => "XX")
-    flexmock(@app).should_receive(:directory?).with("/AD/Rake").and_return(true)
     flexmock(@app).should_receive(:load).and_return(nil)
-    in_environment('RAKE_SYSTEM' => nil, 'APPDATA' => '/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
         options.silent = true
         options.load_system = true
+        options.rakelib = []
         load_rakefile
       end
-      assert_equal "/AD/Rake", @app.system_dir
+      assert_equal "C:/AD/Rake", @app.system_dir
     end
   end
 
@@ -231,6 +235,19 @@ class TestApplication < Test::Unit::TestCase
     end
   end
 
+  def test_handle_options__should_strip_options_from_ARGV
+    assert !@app.options.trace
+
+    valid_option = '--trace'
+    ARGV.clear
+    ARGV << valid_option
+
+    @app.handle_options
+
+    assert !ARGV.include?(valid_option)
+    assert @app.options.trace
+  end
+
   def test_good_run
     ran = false
     ARGV.clear
@@ -279,7 +296,7 @@ class TestApplication < Test::Unit::TestCase
     @app.intern(Rake::Task, "default").enhance { fail }
     ARGV.clear
     ARGV << '-f' << '-s' <<  '--rakelib=""'
-    assert_raise(SystemExit) {
+    assert_exception(SystemExit) {
       err = capture_stderr { @app.run }
       assert_match(/see full trace/, err)
     }
@@ -291,7 +308,7 @@ class TestApplication < Test::Unit::TestCase
     @app.intern(Rake::Task, "default").enhance { fail }
     ARGV.clear
     ARGV << '-f' << '-s' << '-t'
-    assert_raise(SystemExit) {
+    assert_exception(SystemExit) {
       err = capture_stderr { capture_stdout { @app.run } }
       assert_no_match(/see full trace/, err)
     }
@@ -303,7 +320,7 @@ class TestApplication < Test::Unit::TestCase
     @app.intern(Rake::Task, "default").enhance { fail }
     ARGV.clear
     ARGV << '-f' << '-s' << '--xyzzy'
-    assert_raise(SystemExit) {
+    assert_exception(SystemExit) {
       err = capture_stderr { capture_stdout { @app.run } }
     }
   ensure
@@ -315,6 +332,7 @@ end
 ######################################################################
 class TestApplicationOptions < Test::Unit::TestCase
   include CaptureStdout
+  include TestMethods
 
   def setup
     clear_argv
@@ -447,7 +465,7 @@ class TestApplicationOptions < Test::Unit::TestCase
   end
 
   def test_missing_require
-    ex = assert_raises(LoadError) do
+    ex = assert_exception(LoadError) do
       flags(['--require', 'test/missing']) do |opts|
       end
     end
@@ -546,7 +564,7 @@ class TestApplicationOptions < Test::Unit::TestCase
 
   def test_bad_option
     capture_stderr do
-      ex = assert_raise(OptionParser::InvalidOption) do
+      ex = assert_exception(OptionParser::InvalidOption) do
         flags('--bad-option') 
       end
       if ex.message =~ /^While/ # Ruby 1.9 error message
@@ -594,7 +612,8 @@ class TestApplicationOptions < Test::Unit::TestCase
       throw :system_exit, :exit
     end
     @app.instance_eval do
-      collect_tasks handle_options
+      handle_options
+      collect_tasks
     end
     @tasks = @app.top_level_tasks
     @app.options

data/test/test_definitions.rb

@@ -4,10 +4,13 @@ require 'test/unit'
 require 'fileutils'
 require 'rake'
 require 'test/filecreation'
+require 'test/rake_test_setup'
 
 ######################################################################
 class TestDefinitions < Test::Unit::TestCase
   include Rake
+  include TestMethods
+  
   EXISTINGFILE = "testdata/existing"
 
   def setup
@@ -58,7 +61,7 @@ class TestDefinitions < Test::Unit::TestCase
 
   def test_missing_dependencies
     task :x => ["testdata/missing"]
-    assert_raises(RuntimeError) { Task[:x].invoke }
+    assert_exception(RuntimeError) { Task[:x].invoke }
   end
 
   def test_implicit_file_dependencies

data/test/test_file_task.rb

@@ -4,11 +4,13 @@ require 'test/unit'
 require 'fileutils'
 require 'rake'
 require 'test/filecreation'
+require 'test/rake_test_setup'
 
 ######################################################################
 class TestFileTask < Test::Unit::TestCase
   include Rake
   include FileCreation
+  include TestMethods
 
   def setup
     Task.clear
@@ -118,22 +120,24 @@ class TestDirectoryTask < Test::Unit::TestCase
     assert ! File.exist?("testdata/a/b/c")
   end
 
-  def test_directory_win32
-    desc "WIN32 DESC"
-    FileUtils.mkdir_p("testdata")
-    Dir.chdir("testdata") do
-      directory 'c:/testdata/a/b/c'
-      assert_equal FileCreationTask, Task['c:/testdata'].class
-      assert_equal FileCreationTask, Task['c:/testdata/a'].class
-      assert_equal FileCreationTask, Task['c:/testdata/a/b/c'].class
-      assert_nil             Task['c:/testdata'].comment
-      assert_equal "WIN32 DESC",   Task['c:/testdata/a/b/c'].comment
-      assert_nil             Task['c:/testdata/a/b'].comment
-      verbose(false) {
-        Task['c:/testdata/a/b'].invoke
-      }
-      assert File.exist?('c:/testdata/a/b')
-      assert ! File.exist?('c:/testdata/a/b/c')
+  if Rake::Win32.windows?
+    def test_directory_win32
+      desc "WIN32 DESC"
+      FileUtils.mkdir_p("testdata")
+      Dir.chdir("testdata") do
+        directory 'c:/testdata/a/b/c'
+        assert_equal FileCreationTask, Task['c:/testdata'].class
+        assert_equal FileCreationTask, Task['c:/testdata/a'].class
+        assert_equal FileCreationTask, Task['c:/testdata/a/b/c'].class
+        assert_nil             Task['c:/testdata'].comment
+        assert_equal "WIN32 DESC",   Task['c:/testdata/a/b/c'].comment
+        assert_nil             Task['c:/testdata/a/b'].comment
+        verbose(false) {
+          Task['c:/testdata/a/b'].invoke
+        }
+        assert File.exist?('c:/testdata/a/b')
+        assert ! File.exist?('c:/testdata/a/b/c')
+      end
     end
   end
 end