craigmarksmith-rake 0.8.3.100 → 0.8.4.101

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

@@ -29,7 +29,7 @@
 # as a library via a require statement, but it can be distributed
 # independently as an application.
 
-RAKEVERSION = '0.8.4.1'
+RAKEVERSION = '0.8.4.101'
 
 require 'rbconfig'
 require 'fileutils'
@@ -2137,9 +2137,10 @@ module Rake
               t.name_with_args, max_column ? truncate(t.comment, max_column) : t.comment
           end
         end
-        if options.interactive
+        if options.interactive && !displayable_tasks.empty?
           printf "Choose a task: "
-          displayable_tasks[readline.to_i].invoke
+          task_input = readline
+          displayable_tasks[task_input.to_i].invoke unless task_input.nil? || task_input.empty?
         end
       end
     end

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

@@ -43,7 +43,7 @@ class TestApplication < Test::Unit::TestCase
   
   def test_interactive_task
     flexmock(@app)
-    @app.should_receive(:readline).and_return(0).once
+    @app.should_receive(:readline).and_return('0').once
     @app.options.show_task_pattern = //
     @app.options.interactive = true
     @app.last_description = "COMMENT"
@@ -55,6 +55,31 @@ class TestApplication < Test::Unit::TestCase
     assert_match(/^0\) rake t/, out)
     assert_match(/# COMMENT/, out)
   end
+  
+  def test_should_not_run_any_tasks_when_user_enters_nothing
+    flexmock(@app)
+    @app.should_receive(:readline).and_return('').once
+    @app.options.show_task_pattern = //
+    @app.options.interactive = true
+    @app.last_description = "COMMENT"
+    test_task = Rake::Task
+    flexmock(test_task)
+    test_task.new_instances.should_receive(:invoke).never
+    @app.define_task(test_task, "t")
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    assert_match(/^0\) rake t/, out)
+    assert_match(/# COMMENT/, out)
+  end
+  
+  def test_should_not_ask_the_user_to_enter_an_option_when_no_tasks_are_listed
+    flexmock(@app)
+    @app.options.show_task_pattern = //
+    @app.options.interactive = true
+    @app.last_description = "COMMENT"
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    assert_no_match(/^0\) rake t/, out)
+    assert_no_match(/Choose a task:/, out)
+  end
 
   def test_display_tasks_with_long_comments
     in_environment('RAKE_COLUMNS' => '80') do

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: craigmarksmith-rake
 version: !ruby/object:Gem::Version 
-  version: 0.8.3.100
+  version: 0.8.4.101
 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-05 16: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