rake 0.4.9 → 0.4.10

data/CHANGES

@@ -1,5 +1,20 @@
 = Rake Changelog
 
+== Version 0.4.10
+
+* Added block support to the "sh" command, allowing users to take
+  special actions on the result of the system call.  E.g.
+
+    sh "shell_command" do |ok, res|
+      puts "Program returned #{res.exitstatus}" if ! ok
+    end
+
+== Version 0.4.9
+
+* Switched to Jamis Buck's RDoc template.
+* Removed autorequire from Rake's gem spec.  This prevents the Rake
+  libraries from loading while using rails.
+
 == Version 0.4.8
 
 * Added support for .rb versions of Rakefile.

data/lib/rake.rb

@@ -29,7 +29,7 @@
 # referenced as a library via a require statement, but it can be
 # distributed independently as an application.
 
-RAKEVERSION = '0.4.9'
+RAKEVERSION = '0.4.10'
 
 require 'rbconfig'
 require 'ftools'
@@ -364,11 +364,24 @@ module FileUtils
   # Example:
   #   sh %{ls -ltr}
   #
-  def sh(cmd, options={})
+  #   # check exit status after command runs
+  #   sh %{grep pattern file} do |ok, res|
+  #     if ! ok
+  #       puts "pattern not found (status = #{res.exitstatus})"
+  #     end
+  #   end
+  #
+  def sh(cmd, options={}, &block)
+    unless block_given?
+      block = lambda { |ok, status|
+	ok or fail "Command failed with status (#{status.exitstatus}): [#{cmd}]"
+      }
+    end
     fu_check_options options, :noop, :verbose
     fu_output_message cmd if options[:verbose]
     unless options[:noop]
-      system(cmd) or fail "Command Failed: [#{cmd}]"
+      res = system(cmd)      
+      block.call(res, $?)
     end
   end
 
@@ -431,10 +444,11 @@ module RakeFileUtils
   FileUtils::OPT_TABLE.each do |name, opts|
     next unless opts.include?('verbose')
     module_eval(<<-EOS, __FILE__, __LINE__ + 1)
-    def #{name}( *args )
+    def #{name}( *args, &block )
       super(*fu_merge_option(args,
 	  :verbose => $fileutils_verbose,
-	  :noop => $fileutils_nowrite))
+	  :noop => $fileutils_nowrite),
+	&block)
     end
     EOS
   end

data/test/shellcommand.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+exit((ARGV[0] || "0").to_i)

data/test/testfileutils.rb

@@ -52,4 +52,32 @@ class TestFileUtils < Test::Unit::TestCase
     assert_equal false, nowrite
   end
 
+  def test_sh
+    verbose(false) { sh %{test/shellcommand.rb} }
+    assert true, "should not fail"
+  end
+
+  def test_sh_failure
+    assert_raises(RuntimeError) { 
+      verbose(false) { sh %{test/shellcommand.rb 1} }
+    }
+  end
+
+  def test_sh_special_handling
+    count = 0
+    verbose(false) {
+      sh(%{test/shellcommand.rb}) do |ok, res|
+	assert(ok)
+	assert_equal 0, res.exitstatus
+	count += 1
+      end
+      sh(%{test/shellcommand.rb 1}) do |ok, res|
+	assert(!ok)
+	assert_equal 1, res.exitstatus
+	count += 1
+      end
+    }
+    assert_equal 2, count, "Block count should be 2"
+end
+
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.4.9
-date: 2004-10-30
+  version: 0.4.10
+date: 2004-11-05
 summary: Ruby based make-like utility.
 require_paths: 
   - lib
@@ -53,6 +53,7 @@ files:
   - test/testtasks.rb
   - test/testftp.rb
   - test/testfileutils.rb
+  - test/shellcommand.rb
   - test/testpackagetask.rb
   - test/functional.rb
   - test/testtesttask.rb