jimweirich-rake 0.8.1.10 → 0.8.1.11

data/CHANGES

@@ -53,6 +53,10 @@
   However, if RAKE_COLUMNS is explicitly set, it will be honored in
   any case. (Patch provided by Gavin Stark).
 
+* Numerous fixes for running under windows. A big thanks to Bheeshmar
+  Redheendran for spending a good part of the afternoon at the
+  Lonestar Ruby Conference to help me work out these issues.
+
 == Version 0.8.1
 
 * Removed requires on parsedate.rb (in Ftptools)

data/README

@@ -1,6 +1,6 @@
 = RAKE -- Ruby Make 
 
-Supporting Rake version: 0.8.2
+Supporting Rake version: 0.8.3
 
 This package contains Rake, a simple ruby build program with
 capabilities similar to make.
@@ -53,7 +53,8 @@ Download and install  rake with the following.
 
 If you wish to run the unit and functional tests that come with Rake:
 
-* Install the 'session' gem in order to run the functional tests.
+* Install the 'session' gem in order to run the functional tests. adf
+  asdf asdf
 * CD into the top project directory of rake.
 * Type one of the following:
 
@@ -208,10 +209,10 @@ Options are:
     Do not echo commands from FileUtils.
 
 [<tt>--rakefile</tt> _filename_ (-f)]
-    Use _filename_ as the name of the rakefile.  The default rakefile
+    Use _filename_ as the name of the rakefile. The default rakefile
     names are +rakefile+ and +Rakefile+ (with +rakefile+ taking
-    precedence).  If the rakefile is not found in the current
-    directory, +rake+ will search parent directories for a match.  The
+    precedence). If the rakefile is not found in the current
+    directory, +rake+ will search parent directories for a match. The
     directory where the Rakefile is found will become the current
     directory for the actions executed in the Rakefile.
 
@@ -227,12 +228,24 @@ Options are:
 [<tt>--silent (-s)]
     Like --quiet, but also suppresses the 'in directory' announcement.
 
+[<tt>--system</tt> (-g)]
+    Use the system wide (global) rakefiles. The project Rakefile is
+    ignored. By default, the system wide rakefiles are used only if no
+    project Rakefile is found. On Unix-like system, the system wide
+    rake files are located in $HOME/.rake. On a windows system they
+    are stored in $APPDATA/Rake.
+
+[<tt>--no-system</tt> (-G)]
+    Use the project level Rakefile, ignoring the system-wide (global)
+    rakefiles.
+
 [<tt>--tasks</tt> (-T)]
     Display a list of the major tasks and their comments.  Comments
     are defined using the "desc" command.
 
 [<tt>--trace</tt> (-t)]
-    Turn on invoke/execute tracing.  Also enable full backtrace on errors.
+    Turn on invoke/execute tracing. Also enable full backtrace on
+    errors.
 
 [<tt>--usage</tt> (-h)]
     Display a usage message and exit.

data/Rakefile

@@ -16,7 +16,7 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-CLEAN.include('**/*.o', '*.dot')
+CLEAN.include('**/*.o', '*.dot', '**/.*.rbc')
 CLOBBER.include('doc/example/main', 'testdata')
 CLOBBER.include('test/data/**/temp_*')
 CLOBBER.include('test/data/chains/play.*')

data/lib/rake/rdoctask.rb

@@ -102,7 +102,7 @@ module Rake
       
       directory @rdoc_dir
       task name => [rdoc_target]
-      file rdoc_target => @rdoc_files + [$rakefile] do
+      file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
         rm_r @rdoc_dir rescue nil
         args = option_list + @rdoc_files
         if @external

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.1.10'
+RAKEVERSION = '0.8.1.11'
 
 require 'rbconfig'
 require 'getoptlong'
@@ -983,11 +983,29 @@ module FileUtils
     rake_check_options options, :noop, :verbose
     rake_output_message cmd.join(" ") if options[:verbose]
     unless options[:noop]
-      res = system(*cmd)
+      res = rake_system(*cmd)
       block.call(res, $?)
     end
   end
 
+  def rake_system(*cmd)
+    if Rake.application.windows?
+      rake_win32_system(*cmd)
+    else
+      system(*cmd)
+    end
+  end
+  private :rake_system
+
+  def rake_win32_system(*cmd)
+    if cmd.size == 1
+      system("call #{cmd}")
+    else
+      system(*cmd)
+    end
+  end
+  private :rake_win32_system
+
   # Run a Ruby interpreter with the given arguments.
   #
   # Example:
@@ -2123,7 +2141,7 @@ module Rake
     end
 
     def unix?
-      RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux|)/i
+      RUBY_PLATFORM =~ /(aix|darwin|linux|(net|free|open)bsd|cygwin|solaris|irix|hpux)/i
     end
     
     def windows?
@@ -2330,7 +2348,7 @@ module Rake
           (options.load_system || rakefile.nil?) &&
           directory?(system_dir)
         puts "(in #{Dir.pwd})" unless options.silent
-        Dir["#{system_dir}/*.rake"].each do |name|
+        glob("#{system_dir}/*.rake") do |name|
           add_import name
         end
       else
@@ -2341,13 +2359,20 @@ module Rake
         puts "(in #{Dir.pwd})" unless options.silent
         $rakefile = @rakefile if options.classic_namespace
         load File.expand_path(@rakefile) if @rakefile && @rakefile != ''
-      end
-      options.rakelib.each do |rlib|
-        Dir["#{rlib}/*.rake"].each do |name| add_import name end
+        options.rakelib.each do |rlib|
+          glob("#{rlib}/*.rake") do |name|
+            add_import name
+          end
+        end
       end
       load_imports
     end
 
+    def glob(path, &block)
+      Dir[path.gsub("\\", '/')].each(&block)
+    end
+    private :glob
+
     # The directory path containing the system wide rakefiles.
     def system_dir
       if ENV['RAKE_SYSTEM']

data/test/check_expansion.rb

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

data/test/in_environment.rb

@@ -4,7 +4,6 @@ module InEnvironment
   # Create an environment for a test. At the completion of the yielded
   # block, the environment is restored to its original conditions.
   def in_environment(settings)
-    original_dir = Dir.pwd
     original_settings = set_env(settings)
     yield    
   ensure
@@ -17,6 +16,7 @@ module InEnvironment
     settings.each do |k, v|
       result[k] = ENV[k]
       if k == 'PWD'
+        result[k] = Dir.pwd
         Dir.chdir(v)
       elsif v.nil?
         ENV.delete(k)

data/test/session_functional.rb

@@ -102,6 +102,20 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match %r{^SYS1}, @out
   end
 
+  def test_system_excludes_rakelib_files_too
+    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
+      rake '-g', "sys1", '-T', 'extra'
+    end
+    assert_no_match %r{extra:extra}, @out
+  end
+
+  def test_by_default_rakelib_files_are_include
+    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
+      rake '-T', 'extra'
+    end
+    assert_match %r{extra:extra}, @out
+  end
+
   def test_implicit_system
     in_environment('RAKE_SYSTEM' => File.expand_path('test/data/sys'), "PWD" => "/") do
       rake "sys1", "--trace"
@@ -320,5 +334,4 @@ class FunctionalTest < Test::Unit::TestCase
   def assert_status(expected_status=0)
     assert_equal expected_status, @status
   end
-
 end

data/test/test_earlytime.rb

@@ -6,7 +6,7 @@ require 'rake'
 class TestEarlyTime < Test::Unit::TestCase
   def test_create
     early = Rake::EarlyTime.instance
-    time = Time.mktime(1920, 1, 1, 0, 0, 0)
+    time = Time.mktime(1970, 1, 1, 0, 0, 0)
     assert early <= Time.now
     assert early < Time.now
     assert early != Time.now
@@ -21,7 +21,7 @@ class TestEarlyTime < Test::Unit::TestCase
   end
 
   def test_original_time_compare_is_not_messed_up
-    t1 = Time.mktime(1920, 1, 1, 0, 0, 0)
+    t1 = Time.mktime(1970, 1, 1, 0, 0, 0)
     t2 = Time.now
     assert t1 < t2
     assert t2 > t1

data/test/test_fileutils.rb

@@ -119,36 +119,37 @@ class TestFileUtils < Test::Unit::TestCase
   end
 
   def test_sh
-    verbose(false) { sh %{test/shellcommand.rb} }
+    verbose(false) { sh %{ruby test/shellcommand.rb} }
     assert true, "should not fail"
   end
 
   def test_sh_multiple_arguments
     ENV['RAKE_TEST_SH'] = 'someval'
+    expanded = windows? ? '%RAKE_TEST_SH%' : '$RAKE_TEST_SH'
     # This one gets expanded by the shell
-    verbose(false) { sh %{test $RAKE_TEST_SH = someval} }
+    verbose(false) { sh %{ruby test/check_expansion.rb #{expanded} someval} }
     assert true, "should not fail"
     assert_raises(RuntimeError) {
       # This one does not get expanded
-      verbose(false) { sh 'test','$RAKE_TEST_SH', '=', 'someval' }
+      verbose(false) { sh 'ruby', 'test/check_expansion.rb', expanded, 'someval' }
     }
   end
 
   def test_sh_failure
     assert_raises(RuntimeError) { 
-      verbose(false) { sh %{test/shellcommand.rb 1} }
+      verbose(false) { sh %{ruby test/shellcommand.rb 1} }
     }
   end
 
   def test_sh_special_handling
     count = 0
     verbose(false) {
-      sh(%{test/shellcommand.rb}) do |ok, res|
+      sh(%{ruby test/shellcommand.rb}) do |ok, res|
         assert(ok)
         assert_equal 0, res.exitstatus
         count += 1
       end
-      sh(%{test/shellcommand.rb 1}) do |ok, res|
+      sh(%{ruby test/shellcommand.rb 1}) do |ok, res|
         assert(!ok)
         assert_equal 1, res.exitstatus
         count += 1
@@ -199,21 +200,26 @@ class TestFileUtils < Test::Unit::TestCase
       ENV['RAKE_TEST_RUBY'] = "123"
       block_run = false
       # This one gets expanded by the shell
-      ruby %{-e "exit $RAKE_TEST_RUBY"} do |ok, status|
+      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 "$RAKE_TEST_RUBY".length' do |ok, status|
-        assert(!ok)
-        assert_equal 15, status.exitstatus
-        block_run = true
+      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"
       end
-      assert block_run, "The block must be run"
     end
   end
 
@@ -236,4 +242,9 @@ class TestFileUtils < Test::Unit::TestCase
   ensure
     $stderr = old_err
   end
+
+  def windows?
+    ! File::ALT_SEPARATOR.nil?
+  end
+
 end

data/test/test_rake.rb

@@ -8,8 +8,15 @@ class TestRake < Test::Unit::TestCase
     assert_equal ['a'], alldirs('a')
     assert_equal ['a/b', 'a'], alldirs('a/b')
     assert_equal ['/a/b', '/a', '/'], alldirs('/a/b')
-    assert_equal ['c:/a/b', 'c:/a', 'c:'], alldirs('c:/a/b')
-    assert_equal ['c:a/b', 'c:a'], alldirs('c:a/b')
+    if File.dirname("c:/foo") == "c:"
+      # Under Unix
+      assert_equal ['c:/a/b', 'c:/a', 'c:'], alldirs('c:/a/b')
+      assert_equal ['c:a/b', 'c:a'], alldirs('c:a/b')
+    else
+      # Under Windows
+      assert_equal ['c:/a/b', 'c:/a', 'c:/'], alldirs('c:/a/b')
+      assert_equal ['c:a/b', 'c:a'], alldirs('c:a/b')
+    end
   end
 
   def alldirs(fn)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jimweirich-rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.1.10
+  version: 0.8.1.11
 platform: ruby
 authors: 
 - Jim Weirich
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-31 21:00:00 -07:00
+date: 2008-09-07 21:00:00 -07:00
 default_executable: rake
 dependencies: []
 
@@ -46,7 +46,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README
-- TAGS
 - TODO
 - bin/rake
 - lib/rake/classic_namespace.rb
@@ -68,6 +67,7 @@ files:
 - lib/rake/testtask.rb
 - lib/rake.rb
 - test/capture_stdout.rb
+- test/check_expansion.rb
 - test/contrib/test_sys.rb
 - test/data/rakelib/test1.rb
 - test/data/rbext/rakefile.rb