rake 0.4.12 → 0.4.13

data/CHANGES

@@ -1,6 +1,16 @@
 = Rake Changelog
 
-== pre Version 0.4.11
+== Version 0.4.13
+
+* Fixed the dry-run flag so it is operating again.
+* Multiple arguments to sh and ruby commands will not be interpreted
+  by the shell (patch provided by Jonathan Paisley).
+
+== Version 0.4.12
+
+* Added --silent (-s) to suppress the (in directory) rake message.
+
+== Version 0.4.11
 
 * Changed the "don't know how to rake" message (finally)
 * Changes references to a literal "Rakefile" to reference the global

data/Rakefile

@@ -32,11 +32,20 @@ SRC_RB = FileList['lib/**/*.rb']
 # The default task is run if rake is given no explicit arguments.
 
 desc "Default Task"
-task :default => :test
+task :default => :testall
 
 # Test Tasks ---------------------------------------------------------
 
-Rake::TestTask.new do |t|
+Rake::TestTask.new(:testall) do |t|
+  t.test_files = FileList[
+    'test/test*.rb',
+    'test/contrib/test*.rb',
+    'test/fun*.rb'
+  ]
+  t.verbose = true
+end
+
+Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/test*.rb']
   t.verbose = true
 end
@@ -54,8 +63,6 @@ end
 directory 'testdata'
 task :test => ['testdata']
 
-desc "Run all test targets"
-task :testall => [:test, :testcontrib, :testfun]
 
 # Abbreviations
 

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.12'
+RAKEVERSION = '0.4.13'
 
 require 'rbconfig'
 require 'ftools'
@@ -111,7 +111,13 @@ class Task
 
   # Execute the actions associated with this task.
   def execute
-    puts "** Execute #{name}" if $trace
+    if $dryrun
+      puts "** Execute (dry run) #{name}"
+      return
+    end
+    if $trace
+      puts "** Execute #{name}"
+    end
     self.class.enhance_with_matching_rule(name) if @actions.empty?
     @actions.each { |act| result = act.call(self) }
   end
@@ -360,11 +366,15 @@ module FileUtils
   OPT_TABLE['sh']  = %w(noop verbose)
   OPT_TABLE['ruby'] = %w(noop verbose)
 
-  # Run the system command +cmd+.
+  # Run the system command +cmd+. If multiple arguments are given
+  # the command is not run with the shell (same semantics as
+  # Kernel::exec and Kernel::system).
   #
   # Example:
   #   sh %{ls -ltr}
   #
+  #   sh 'ls', 'file with spaces'
+  #
   #   # check exit status after command runs
   #   sh %{grep pattern file} do |ok, res|
   #     if ! ok
@@ -372,16 +382,21 @@ module FileUtils
   #     end
   #   end
   #
-  def sh(cmd, options={}, &block)
+  def sh(*cmd, &block)
+    if Hash === cmd.last then
+      options = cmd.pop
+    else
+      options = {}
+    end
     unless block_given?
       block = lambda { |ok, status|
-	ok or fail "Command failed with status (#{status.exitstatus}): [#{cmd}]"
+	ok or fail "Command failed with status (#{status.exitstatus}): [#{cmd.join(" ")}]"
       }
     end
     fu_check_options options, :noop, :verbose
-    fu_output_message cmd if options[:verbose]
+    fu_output_message cmd.join(" ") if options[:verbose]
     unless options[:noop]
-      res = system(cmd)      
+      res = system(*cmd)      
       block.call(res, $?)
     end
   end
@@ -391,13 +406,17 @@ module FileUtils
   # Example:
   #   ruby %{-pe '$_.upcase!' <README}
   #
-  def ruby(*args)
+  def ruby(*args,&block)
     if Hash === args.last
       options = args.pop
     else
       options = {}
     end
-    sh "#{RUBY} #{args.join(' ')}", options
+    if args.length > 1 then
+      sh *([RUBY] + args + [options]), &block
+    else
+      sh "#{RUBY} #{args}", options, &block
+    end
   end
   
   LN_SUPPORTED = [true]

data/test/functional.rb

@@ -60,9 +60,18 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match %r{^No Rakefile found}, @out
   end
 
+  def test_dry_run
+    Dir.chdir("test/data/default") do rake "-n", "other" end
+    assert_match %r{Execute \(dry run\) default}, @out
+    assert_match %r{Execute \(dry run\) other}, @out
+    assert_no_match %r{DEFAULT}, @out
+    assert_no_match %r{OTHER}, @out
+  end
+
   private
 
-  def rake(options="")
+  def rake(*option_list)
+    options = option_list.join(' ')
     shell = Session::Shell.new
     command = "ruby #{@ruby_options} #{@rake_path} #{options}"
     puts "COMMAND: [#{command}]" if @verbose

data/test/testfileutils.rb

@@ -56,6 +56,17 @@ class TestFileUtils < Test::Unit::TestCase
     verbose(false) { sh %{test/shellcommand.rb} }
     assert true, "should not fail"
   end
+  
+  def test_sh_multiple_arguments
+    ENV['RAKE_TEST_SH'] = 'someval'
+    # This one gets expanded by the shell
+    verbose(false) { sh %{test $RAKE_TEST_SH = someval} }
+    assert true, "should not fail"
+    assert_raises(RuntimeError) {
+      # This one does not get expanded
+      verbose(false) { sh 'test','$RAKE_TEST_SH', '=', 'someval' }
+    }
+  end
 
   def test_sh_failure
     assert_raises(RuntimeError) { 
@@ -78,6 +89,22 @@ class TestFileUtils < Test::Unit::TestCase
       end
     }
     assert_equal 2, count, "Block count should be 2"
-end
+  end
+
+  def test_ruby
+    verbose(false) do
+      ENV['RAKE_TEST_RUBY'] = "123"
+      # This one gets expanded by the shell
+      ruby %{-e "exit $RAKE_TEST_RUBY"} do |ok, status|
+        assert(!ok)
+        assert_equal 123, status.exitstatus
+      end
+      # This one does not get expanded
+      ruby '-e', 'exit "$RAKE_TEST_RUBY".length' do |ok, status|
+        assert(!ok)
+        assert_equal 15, status.exitstatus
+      end
+    end
+  end
 
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1.2
+rubygems_version: 0.8.3
 specification_version: 1
 name: rake
 version: !ruby/object:Gem::Version 
-  version: 0.4.12
-date: 2004-12-03
+  version: 0.4.13
+date: 2004-12-22
 summary: Ruby based make-like utility.
 require_paths: 
   - lib