rake 10.1.0.beta.3 → 10.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2850cf97cf095ac6f5e6ddd8707b82af6aa5a3d
-  data.tar.gz: 23f65fae241482950f55439de060be976a9542db
+  metadata.gz: d9ac6688e8d46823918ca8cd748b966dee93b7ff
+  data.tar.gz: 5f05d5240b1dd8fcebea6018e9568b9f36d5e5f0
 SHA512:
-  metadata.gz: c1354901f1c9384ea1aa86c48f66ef2a80713a91908e30992a16044a80091569dc0c9e487f42293e703137d036951d4ee93a94d326f6b5b83af98e430e24a1b8
-  data.tar.gz: 635cc2a75db35c4bb490ef6daebc86cec0823b6e77fc76b20736873ee9ba34ec54e43331b45eb114eedefbeb9c04489dbc47471b28b3e6f6e2cd3bea1af10080
+  metadata.gz: c6617192f68ee233d4cabf2f58fdef451ff54fbeb35b06fc9bea87fb19c59f95a78e41e9d08afa0b8e0301e62dd2587ed6712ba8c74bb544ca164d1d2f656b54
+  data.tar.gz: 37536f5ea5bd04eca463ad8c78d524249960c4a5a612cfa840ea20487a4f9971c5703e5be2c7249eb558dacf4421a252ec0aea9d7dac0dde217eb842cab3c85e

data/doc/command_line_usage.rdoc

@@ -144,7 +144,7 @@ Options are:
     number where the task is defined. By default this option will
     display all tasks, not just the tasks that have descriptions.
 
-[<tt>--no-deprecation-warnings</tt> (-W)]
+[<tt>--no-deprecation-warnings</tt> (-X)]
     Do not display the deprecation warnings.
 
 In addition, any command line option of the form

data/doc/rakefile.rdoc

@@ -280,7 +280,7 @@ parameters as well:
    end
 
 There is also the convenience method to_a that returns all parameters
-in the sequential order they were given, including those associated 
+in the sequential order they were given, including those associated
 with named parameters.
 
 === Deprecated Task Parameters Format
@@ -386,21 +386,16 @@ required file are just added to the definitions already accumulated.
 
 Because the files are loaded _before_ the rake targets are evaluated,
 the loaded files must be "ready to go" when the rake command is
-invoked.  This make generated dependency files difficult to use.  By
+invoked. This makes generated dependency files difficult to use. By
 the time rake gets around to updating the dependencies file, it is too
 late to load it.
 
-The +Rake.import+ command addresses this by specifying a file to be
-loaded _after_ the main rakefile is loaded, but _before_ any targets
-on the command line are invoked.  In addition, if the file name
-matches an explicit task, that task is invoked before loading the
-file.  This allows dependency files to be generated and used in a
-single rake command invocation.
-
-<b>NOTE:</b> Starting in Rake version 0.9.0, the top level +import+
-command is deprecated and we recommend using the scoped
-"+Rake.import+" command mentioned above.  Future versions of Rake will
-drop support for the top level +import+ command.
+The +import+ command addresses this by specifying a file to be loaded
+_after_ the main rakefile is loaded, but _before_ any targets on the
+command line are invoked. In addition, if the file name matches an
+explicit task, that task is invoked before loading the file. This
+allows dependency files to be generated and used in a single rake
+command invocation.
 
 === Example:
 
@@ -410,7 +405,7 @@ drop support for the top level +import+ command.
     sh "makedepend -f- -- #{CFLAGS} -- #{t.prerequisites} > #{t.name}"
   end
 
-  Rake.import ".depends.mf"
+  import ".depends.mf"
 
 If ".depends" does not exist, or is out of date w.r.t. the source
 files, a new ".depends" file is generated using +makedepend+ before

data/doc/release_notes/rake-10.1.0.rdoc

@@ -0,0 +1,61 @@
+= Rake 10.1.0 Released
+
+== Changes in Version 10.1
+
+Here are new features in this version of Rake:
+
+* Add support for variable length task argument lists. If more actual
+  arguments are supplied than named arguments, then the extra
+  arguments values will be in args.extras.
+
+* Application name is not displayed in the help banner. (Previously
+  "rake" was hardcoded, now rake-based applications can display their
+  own names).
+
+=== Bug Fixes (in 10.1)
+
+Bug fixes include:
+
+* Fix backtrace suppression issues.
+
+* Rules now explicit get task arguments passed to them.
+
+* Rename FileList#exclude? to FileList#exclude_from_list? to avoid
+  conflict with new Rails method.
+
+* Clean / Clobber tasks now report failure to remove files.
+
+* Plus heaps of internal code cleanup.
+
+== What is Rake
+
+Rake is a build tool similar to the make program in many ways. But
+instead of cryptic make recipes, Rake uses standard Ruby code to
+declare tasks and dependencies. You have the full power of a modern
+scripting language built right into your build tool.
+
+== Availability
+
+The easiest way to get and install rake is via RubyGems ...
+
+  gem install rake    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more from GitHub:
+
+GitHub::    git://github.com/jimweirich/rake.git
+
+== Thanks
+
+As usual, it was input from users that drove a lot of these changes.
+The following people contributed patches, made suggestions or made
+otherwise helpful comments. Thanks to ...
+
+* Michael Nikitochkin (general code cleanup)
+* Vipul A M (general code cleanup)
+* Dennis Bell (variable length task argument lists)
+* Jacob Swanner (rules arguments)
+* Rafael Rosa Fu (documentation typo)
+* Stuart Nelson (install.rb fixes)
+* Lee Hambley (application name in help banner)
+
+-- Jim Weirich

data/install.rb

@@ -1,6 +1,7 @@
 require 'rbconfig'
 require 'find'
 require 'fileutils'
+require 'tempfile'
 
 include RbConfig
 
@@ -11,22 +12,12 @@ $ruby = CONFIG['ruby_install_name']
 # insert a #! line. If this is a Unix install, we name
 # the command (for example) 'rake' and let the shebang line
 # handle running it. Under windows, we add a '.rb' extension
-# and let file associations to their stuff
+# and let file associations do their stuff
 #
 
 def installBIN(from, opfile)
 
-  tmp_dir = nil
-  for t in [".", "/tmp", "c:/temp", $bindir]
-    stat = File.stat(t) rescue next
-    if stat.directory? and stat.writable?
-      tmp_dir = t
-      break
-    end
-  end
-
-  fail "Cannot find a temporary directory" unless tmp_dir
-  tmp_file = File.join(tmp_dir, "_tmp")
+  tmp_file = Tempfile.new("_tmp")
 
   File.open(from) do |ip|
     File.open(tmp_file, "w") do |op|
@@ -39,7 +30,7 @@ def installBIN(from, opfile)
   opfile += ".rb" if CONFIG["target_os"] =~ /mswin/i
   FileUtils.install(tmp_file, File.join($bindir, opfile),
     {:mode => 0755, :verbose => true})
-  File.unlink(tmp_file)
+  tmp_file.unlink
 end
 
 $sitedir = CONFIG["sitelibdir"]
@@ -54,11 +45,10 @@ unless $sitedir
   end
 end
 
-$bindir =  CONFIG["bindir"]
+$bindir = CONFIG["bindir"]
 
 $realbindir = $bindir
 
-bindir = CONFIG["bindir"]
 if (destdir = ENV['DESTDIR'])
   $bindir  = destdir + $bindir
   $sitedir = destdir + $sitedir

data/lib/rake/application.rb

@@ -572,7 +572,7 @@ module Rake
       options.trace_output = $stderr
 
       OptionParser.new do |opts|
-        opts.banner = "rake [-f rakefile] {options} targets..."
+        opts.banner = "#{Rake.application.name} [-f rakefile] {options} targets..."
         opts.separator ""
         opts.separator "Options are ..."
 

data/lib/rake/clean.rb

@@ -14,19 +14,42 @@
 require 'rake'
 
 # :stopdoc:
-CLEAN = Rake::FileList["**/*~", "**/*.bak", "**/core"]
+
+module Rake
+  module Cleaner
+    extend FileUtils
+
+    module_function
+
+    def cleanup_files(file_names)
+      file_names.each do |file_name|
+        cleanup(file_name)
+      end
+    end
+
+    def cleanup(file_name, opts={})
+      begin
+        rm_r file_name, opts
+      rescue StandardError => ex
+        puts "Failed to remove #{file_name}: #{ex}"
+      end
+    end
+  end
+end
+
+CLEAN = ::Rake::FileList["**/*~", "**/*.bak", "**/core"]
 CLEAN.clear_exclude.exclude { |fn|
   fn.pathmap("%f").downcase == 'core' && File.directory?(fn)
 }
 
 desc "Remove any temporary products."
 task :clean do
-  CLEAN.each { |fn| rm_r fn rescue nil }
+  Rake::Cleaner.cleanup_files(CLEAN)
 end
 
-CLOBBER = Rake::FileList.new
+CLOBBER = ::Rake::FileList.new
 
 desc "Remove any generated file."
 task :clobber => [:clean] do
-  CLOBBER.each { |fn| rm_r fn rescue nil }
+  Rake::Cleaner.cleanup_files(CLOBBER)
 end

data/lib/rake/gempackagetask.rb

@@ -1,2 +1,2 @@
 fail "ERROR: 'rake/gempackagetask' is obsolete and no longer supported. " +
-  "Use 'rubygems/package_task' instead."
+  "Use 'rubygems/packagetask' instead."

data/lib/rake/version.rb

@@ -1,5 +1,5 @@
 module Rake
-  VERSION = '10.1.0.beta.3'
+  VERSION = '10.1.0'
 
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split '.'

data/test/helper.rb

@@ -11,6 +11,9 @@ require 'rake'
 require 'tmpdir'
 require File.expand_path('../file_creation', __FILE__)
 
+require 'test/support/ruby_runner'
+require 'test/support/rakefile_definitions'
+
 begin
   require_relative '../ruby/envutil'
 rescue NoMethodError, LoadError
@@ -42,8 +45,11 @@ class Rake::TestCase < MiniTest::Unit::TestCase
         File.expand_path '../../../', __FILE__
       end
 
+    @verbose = ENV['VERBOSE']
+
     @rake_exec = File.join @rake_root, 'bin', 'rake'
     @rake_lib  = File.join @rake_root, 'lib'
+    @ruby_options = ["-I#{@rake_lib}", "-I."]
 
     @orig_pwd = Dir.pwd
     @orig_appdata      = ENV['APPDATA']
@@ -118,445 +124,5 @@ end
     end
   end
 
-  def rakefile_access
-    rakefile <<-ACCESS
-TOP_LEVEL_CONSTANT = 0
-
-def a_top_level_function
-end
-
-task :default => [:work, :obj, :const]
-
-task :work do
-  begin
-    a_top_level_function
-    puts "GOOD:M Top level methods can be called in tasks"
-  rescue NameError => ex
-    puts "BAD:M  Top level methods can not be called in tasks"
-  end
-end
-
-# TODO: remove `disabled_' when DeprecatedObjectDSL removed
-task :obj
-task :disabled_obj do
-  begin
-    Object.new.instance_eval { task :xyzzy }
-    puts "BAD:D  Rake DSL are polluting objects"
-  rescue StandardError => ex
-    puts "GOOD:D Rake DSL are not polluting objects"
-  end
-end
-
-task :const do
-  begin
-    TOP_LEVEL_CONSTANT
-    puts "GOOD:C Top level constants are available in tasks"
-  rescue StandardError => ex
-    puts "BAD:C  Top level constants are NOT available in tasks"
-  end
-end
-    ACCESS
-  end
-
-  def rakefile_chains
-    rakefile <<-DEFAULT
-task :default => "play.app"
-
-file "play.scpt" => "base" do |t|
-  cp t.prerequisites.first, t.name
-end
-
-rule ".app" => ".scpt" do |t|
-  cp t.source, t.name
-end
-
-file 'base' do
-  touch 'base'
-end
-    DEFAULT
-  end
-
-  def rakefile_comments
-    rakefile <<-COMMENTS
-# comment for t1
-task :t1 do
-end
-
-# no comment or task because there's a blank line
-
-task :t2 do
-end
-
-desc "override comment for t3"
-# this is not the description
-multitask :t3 do
-end
-
-# this is not the description
-desc "override comment for t4"
-file :t4 do
-end
-    COMMENTS
-  end
-
-  def rakefile_default
-    rakefile <<-DEFAULT
-if ENV['TESTTOPSCOPE']
-  puts "TOPSCOPE"
-end
-
-task :default do
-  puts "DEFAULT"
-end
-
-task :other => [:default] do
-  puts "OTHER"
-end
-
-task :task_scope do
-  if ENV['TESTTASKSCOPE']
-    puts "TASKSCOPE"
-  end
-end
-    DEFAULT
-  end
-
-  def rakefile_dryrun
-    rakefile <<-DRYRUN
-task :default => ["temp_main"]
-
-file "temp_main" => [:all_apps]  do touch "temp_main" end
-
-task :all_apps => [:one, :two]
-task :one => ["temp_one"]
-task :two => ["temp_two"]
-
-file "temp_one" do |t|
-  touch "temp_one"
-end
-file "temp_two" do |t|
-  touch "temp_two"
-end
-
-task :clean do
-  ["temp_one", "temp_two", "temp_main"].each do |file|
-    rm_f file
-  end
-end
-    DRYRUN
-
-    FileUtils.touch 'temp_main'
-    FileUtils.touch 'temp_two'
-  end
-
-  def rakefile_extra
-    rakefile 'task :default'
-
-    FileUtils.mkdir_p 'rakelib'
-
-    open File.join('rakelib', 'extra.rake'), 'w' do |io|
-      io << <<-EXTRA_RAKE
-# Added for testing
-
-namespace :extra do
-  desc "An Extra Task"
-  task :extra do
-    puts "Read all about it"
-  end
-end
-      EXTRA_RAKE
-    end
-  end
-
-  def rakefile_file_creation
-    rakefile <<-'FILE_CREATION'
-N = 2
-
-task :default => :run
-
-BUILD_DIR = 'build'
-task :clean do
-  rm_rf 'build'
-  rm_rf 'src'
-end
-
-task :run
-
-TARGET_DIR = 'build/copies'
-
-FileList['src/*'].each do |src|
-  directory TARGET_DIR
-  target = File.join TARGET_DIR, File.basename(src)
-  file target => [src, TARGET_DIR] do
-    cp src, target
-  end
-  task :run => target
-end
-
-task :prep => :clean do
-  mkdir_p 'src'
-  N.times do |n|
-    touch "src/foo#{n}"
-  end
-end
-    FILE_CREATION
-  end
-
-  def rakefile_imports
-    rakefile <<-IMPORTS
-require 'rake/loaders/makefile'
-
-task :default
-
-task :other do
-  puts "OTHER"
-end
-
-file "dynamic_deps" do |t|
-  open(t.name, "w") do |f| f.puts "puts 'DYNAMIC'" end
-end
-
-import "dynamic_deps"
-import "static_deps"
-import "static_deps"
-import "deps.mf"
-puts "FIRST"
-    IMPORTS
-
-    open 'deps.mf', 'w' do |io|
-      io << <<-DEPS
-default: other
-      DEPS
-    end
-
-    open "static_deps", "w" do |f|
-      f.puts 'puts "STATIC"'
-    end
-  end
-
-  def rakefile_multidesc
-    rakefile <<-MULTIDESC
-task :b
-
-desc "A"
-task :a
-
-desc "B"
-task :b
-
-desc "A2"
-task :a
-
-task :c
-
-desc "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-task :d
-    MULTIDESC
-  end
-
-  def rakefile_namespace
-    rakefile <<-NAMESPACE
-desc "copy"
-task :copy do
-  puts "COPY"
-end
-
-namespace "nest" do
-  desc "nest copy"
-  task :copy do
-    puts "NEST COPY"
-  end
-  task :xx => :copy
-end
-
-anon_ns = namespace do
-  desc "anonymous copy task"
-  task :copy do
-    puts "ANON COPY"
-  end
-end
-
-desc "Top level task to run the anonymous version of copy"
-task :anon => anon_ns[:copy]
-
-namespace "very" do
-  namespace "nested" do
-    task "run" => "rake:copy"
-  end
-end
-
-namespace "a" do
-  desc "Run task in the 'a' namespace"
-  task "run" do
-    puts "IN A"
-  end
-end
-
-namespace "b" do
-  desc "Run task in the 'b' namespace"
-  task "run" => "a:run" do
-    puts "IN B"
-  end
-end
-
-namespace "file1" do
-  file "xyz.rb" do
-    puts "XYZ1"
-  end
-end
-
-namespace "file2" do
-  file "xyz.rb" do
-    puts "XYZ2"
-  end
-end
-
-namespace "scopedep" do
-  task :prepare do
-    touch "scopedep.rb"
-    puts "PREPARE"
-  end
-  file "scopedep.rb" => [:prepare] do
-    puts "SCOPEDEP"
-  end
-end
-    NAMESPACE
-  end
-
-  def rakefile_nosearch
-    FileUtils.touch 'dummy'
-  end
-
-  def rakefile_rakelib
-    FileUtils.mkdir_p 'rakelib'
-
-    Dir.chdir 'rakelib' do
-      open 'test1.rb', 'w' do |io|
-        io << <<-TEST1
-task :default do
-  puts "TEST1"
-end
-        TEST1
-      end
-
-      open 'test2.rake', 'w' do |io|
-        io << <<-TEST1
-task :default do
-  puts "TEST2"
-end
-        TEST1
-      end
-    end
-  end
-
-  def rakefile_rbext
-    open 'rakefile.rb', 'w' do |io|
-      io << 'task :default do puts "OK" end'
-    end
-  end
-
-  def rakefile_unittest
-    rakefile '# Empty Rakefile for Unit Test'
-
-    readme = File.join 'subdir', 'README'
-    FileUtils.mkdir_p File.dirname readme
-
-    FileUtils.touch readme
-  end
-
-  def rakefile_verbose
-    rakefile <<-VERBOSE
-task :standalone_verbose_true do
-  verbose true
-  sh "#{RUBY} -e '0'"
-end
-
-task :standalone_verbose_false do
-  verbose false
-  sh "#{RUBY} -e '0'"
-end
-
-task :inline_verbose_default do
-  sh "#{RUBY} -e '0'"
-end
-
-task :inline_verbose_false do
-  sh "#{RUBY} -e '0'", :verbose => false
-end
-
-task :inline_verbose_true do
-  sh "#{RUBY} -e '0'", :verbose => true
-end
-
-task :block_verbose_true do
-  verbose(true) do
-    sh "#{RUBY} -e '0'"
-  end
-end
-
-task :block_verbose_false do
-  verbose(false) do
-    sh "#{RUBY} -e '0'"
-  end
-end
-    VERBOSE
-  end
-
-  def rakefile_test_signal
-    rakefile <<-TEST_SIGNAL
-require 'rake/testtask'
-
-Rake::TestTask.new(:a) do |t|
-  t.test_files = ['a_test.rb']
-end
-
-Rake::TestTask.new(:b) do |t|
-  t.test_files = ['b_test.rb']
-end
-
-task :test do
-  Rake::Task[:a].invoke
-  Rake::Task[:b].invoke
-end
-
-task :default => :test
-    TEST_SIGNAL
-    open 'a_test.rb', 'w' do |io|
-      io << 'puts "ATEST"' << "\n"
-      io << '$stdout.flush' << "\n"
-      io << 'Process.kill("TERM", $$)' << "\n"
-    end
-    open 'b_test.rb', 'w' do |io|
-      io << 'puts "BTEST"' << "\n"
-      io << '$stdout.flush' << "\n"
-    end
-  end
-
-  def rakefile_failing_test_task
-    rakefile <<-TEST_TASK
-require 'rake/testtask'
-
-task :default => :test
-Rake::TestTask.new(:test) do |t|
-  t.test_files = ['a_test.rb']
-end
-    TEST_TASK
-    open 'a_test.rb', 'w' do |io|
-      io << "require 'minitest/autorun'\n"
-      io << "class ExitTaskTest < MiniTest::Unit::TestCase\n"
-      io << "  def test_exit\n"
-      io << "    assert false, 'this should fail'\n"
-      io << "  end\n"
-      io << "end\n"
-    end
-  end
-
-  def rakefile_stand_alone_filelist
-    open 'stand_alone_filelist.rb', 'w' do |io|
-      io << "require 'rake/file_list'\n"
-      io << "FL = Rake::FileList['*.rb']\n"
-      io << "puts FL\n"
-    end
-  end
-
+  include RakefileDefinitions
 end