rake 10.3.2 → 10.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0caac57ec31c4e81580a89a857cea98ade615eef
-  data.tar.gz: e505354568b86ee4850b446e7f938dd8ea3872e1
+  metadata.gz: 7519244fd33678e658a64ae54dfc582789c088c6
+  data.tar.gz: 263a0d41c6235b43888c2a09a49704aa9ed2ea44
 SHA512:
-  metadata.gz: 86d3dc72939bd00ad29b791495cbbab200b4ba996237d2644384d7fa10c8dd9c761389eee573ff6767996266818cb0bb4f39096ad043610dea017cc0f9c1435e
-  data.tar.gz: 0d54d81c43e9d6de2c5d685bebde241f22d5c0e87d0dc45f7dd725bf61a95e86cfca9903195aba4a8a8617c53d50c09d9a56a0c1f44e34e0ee5b7df6ebde0895
+  metadata.gz: d83b852433be66d494050b6be1311d1f007048327e00ef27e4cbd3c96e25f0f5dee397388012791ec4c25d7aac41193da20b734abef3149bdbdbfe5f3f578a83
+  data.tar.gz: a52455043eb2744a1a78ba0a60a1856b0b306eafadcc1c0f2c9d62842a5f876c10975349a1182773f60358b385915124bee893659f6435550b6993eb44301440

data/CONTRIBUTING.rdoc

@@ -1,9 +1,9 @@
 = Source Repository
 
 Rake is currently hosted at github. The github web page is
-http://github.com/jimweirich/rake . The public git clone URL is
+http://github.com/ruby/rake . The public git clone URL is
 
-  git://github.com/jimweirich/rake.git
+  git://github.com/ruby/rake.git
 
 = Running the Rake Test Suite
 
@@ -30,5 +30,5 @@ addressed your issue.
 When submitting pull requests please check the rake Travis-CI page for test
 failures:
 
-  https://travis-ci.org/jimweirich/rake
+  https://travis-ci.org/ruby/rake
 

data/History.rdoc

@@ -1,3 +1,27 @@
+=== 10.4.0
+
+Enhancements:
+
+* Upgraded to minitest 5.  Pull request #292 by Teo Ljungberg.
+* Added support for Pathname in rake tasks.  Pull request #271 by Randy
+  Coulman.
+* Rake now ignores falsy dependencies which allows for easier programmatic
+  creation of tasks.  Pull request #273 by Manav.
+* Rake no longer edits ARGV.  This allows you to re-exec rake from a rake
+  task.  Issue #277 by Matt Palmer.
+* Etc.nprocessors is used for counting the number of CPUs.
+
+Bug fixes:
+
+* Updated rake manpage.  Issue #283 by Nathan Long, pull request #291 by
+  skittleys.
+* Add Rake::LATE to allow rebuilding of files that depend on deleted files.
+  Bug #286, pull request #287 by David Grayson.
+* Fix relinking of files when repackaging.  Bug #276 by Muenze.
+* Fixed some typos.  Pull request #280 by Jed Northridge.
+* Try counting CPUs via cpuinfo if host_os was not matched.  Pull request
+  #282 by Edouard B.
+
 === 10.3.2 / 2014-05-15
 
 Bug fixes:

data/Manifest.txt

@@ -17,7 +17,7 @@ doc/example/main.c
 doc/glossary.rdoc
 doc/jamis.rb
 doc/proto_rake.rdoc
-doc/rake.1.gz
+doc/rake.1
 doc/rakefile.rdoc
 doc/rational.rdoc
 doc/release_notes/rake-0.4.14.rdoc
@@ -69,6 +69,7 @@ lib/rake/dsl_definition.rb
 lib/rake/early_time.rb
 lib/rake/ext/core.rb
 lib/rake/ext/module.rb
+lib/rake/ext/pathname.rb
 lib/rake/ext/string.rb
 lib/rake/ext/time.rb
 lib/rake/file_creation_task.rb
@@ -79,6 +80,7 @@ lib/rake/file_utils_ext.rb
 lib/rake/gempackagetask.rb
 lib/rake/invocation_chain.rb
 lib/rake/invocation_exception_mixin.rb
+lib/rake/late_time.rb
 lib/rake/linked_list.rb
 lib/rake/loaders/makefile.rb
 lib/rake/multi_task.rb
@@ -133,6 +135,7 @@ test/test_rake_file_utils.rb
 test/test_rake_ftp_file.rb
 test/test_rake_functional.rb
 test/test_rake_invocation_chain.rb
+test/test_rake_late_time.rb
 test/test_rake_linked_list.rb
 test/test_rake_makefile_loader.rb
 test/test_rake_multi_task.rb
@@ -141,6 +144,7 @@ test/test_rake_package_task.rb
 test/test_rake_path_map.rb
 test/test_rake_path_map_explode.rb
 test/test_rake_path_map_partial.rb
+test/test_rake_pathname_extensions.rb
 test/test_rake_pseudo_status.rb
 test/test_rake_rake_test_loader.rb
 test/test_rake_reduce_compat.rb

data/README.rdoc

@@ -1,7 +1,7 @@
 = RAKE -- Ruby Make
 
-home :: https://github.com/jimweirich/rake
-bugs :: https://github.com/jimweirich/rake/issues
+home :: https://github.com/ruby/rake
+bugs :: https://github.com/ruby/rake/issues
 docs :: http://docs.seattlerb.org/rake
 
 == Description
@@ -86,6 +86,9 @@ Type "rake --help" for all available options.
   2. {Rake File Lists}[http://devblog.avdi.org/2014/04/22/rake-part-2-file-lists/]
   3. {Rake Rules}[http://devblog.avdi.org/2014/04/23/rake-part-3-rules/]
   4. {Rake Pathmap}[http://devblog.avdi.org/2014/04/24/rake-part-4-pathmap/]
+  5. {File Operations}[http://devblog.avdi.org/2014/04/25/rake-part-5-file-operations/]
+  6. {Clean and Clobber}[http://devblog.avdi.org/2014/04/28/rake-part-6-clean-and-clobber/]
+  7. {MultiTask}[http://devblog.avdi.org/2014/04/29/rake-part-7-multitask/]
 * Jim Weirich's 2003 RubyConf presentation:
   http://onestepback.org/articles/buildingwithrake/
 * Martin Fowler's article on Rake: http://martinfowler.com/articles/rake.html

data/Rakefile

@@ -28,7 +28,7 @@ hoe = Hoe.spec 'rake' do
   require_ruby_version     '>= 1.8.7'
   require_rubygems_version '>= 1.3.2'
 
-  dependency 'minitest', '~> 4.0', :developer
+  dependency 'minitest', '~> 5.0', :developer
 
   license "MIT"
 
@@ -54,7 +54,7 @@ hoe = Hoe.spec 'rake' do
   ]
 end
 
-hoe.test_prelude = 'gem "minitest", "~> 4.0"'
+hoe.test_prelude = 'gem "minitest", "~> 5.0"'
 
 # Use custom rdoc task due to existence of doc directory
 

data/doc/rake.1

@@ -0,0 +1,141 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH RAKE 1 "August 27, 2014" "rake 10.3.2" "Rake User Commands"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+rake \- a make-like build utility for Ruby 
+.SH SYNOPSIS
+\fBrake\fR [\fI\-f rakefile\fR] {\fIOPTIONS\fR} \fITARGETS...\fR
+.br
+.SH DESCRIPTION
+.B rake
+is a make-like build utility for Ruby. Tasks and dependencies are specified in
+standard Ruby syntax.
+.SH OPTIONS
+.TP
+\fB\-m\fR, \fB\-\-multitask\fR
+Treat all tasks as multitasks.
+.TP
+\fB\-B\fR, \fB\-\-build\-all\fR
+Build all prerequisites, including those which are up\-to\-date.
+
+.TP
+\fB\-j\fR, \fB\-\-jobs\fR [\fINUMBER\fR]
+Specifies the maximum number of tasks to execute in parallel (default is number of CPU cores + 4).
+
+.SS Modules
+.TP
+\fB\-I\fR, \fB\-\-libdir\fR \fILIBDIR\fR
+Include \fILIBDIR\fR in the search path for required modules.
+.TP
+\fB\-r\fR, \fB\-\-require\fR \fIMODULE\fR
+Require \fIMODULE\fR before executing rakefile.
+
+.SS Rakefile location
+.TP
+\fB\-f\fR, \fB\-\-rakefile\fR [\fIFILENAME\fR]
+Use \fIFILENAME\fR as the rakefile to search for.
+.TP
+\fB\-N\fR, \fB\-\-no\-search\fR, \fB\-\-nosearch\fR
+Do not search parent directories for the Rakefile.
+.TP
+\fB\-G\fR, \fB\-\-no\-system\fR, \fB\-\-nosystem\fR
+Use standard project Rakefile search paths, ignore system wide rakefiles.
+.TP
+\fB\-R\fR, \fB\-\-rakelibdir\fR \fIRAKELIBDIR\fR
+Auto\-import any .rake files in \fIRAKELIBDIR\fR (default is 'rakelib')
+.HP
+\fB\-\-rakelib\fR
+.TP
+\fB\-g\fR, \fB\-\-system\fR
+Using system wide (global) rakefiles (usually '\fI~/.rake/*.rake\fR').
+
+.SS Debugging
+.TP
+\fB\-\-backtrace\fR=\fI\,[OUT]\/\fR
+Enable full backtrace.  \fIOUT\fR can be stderr (default) or stdout.
+.TP
+\fB\-t\fR, \fB\-\-trace\fR=\fI\,[OUT]\/\fR
+Turn on invoke/execute tracing, enable full backtrace. \fIOUT\fR can be stderr (default) or stdout.
+.TP
+\fB\-\-suppress\-backtrace\fR \fIPATTERN\fR
+Suppress backtrace lines matching regexp \fIPATTERN\fR. Ignored if \fI\-\-trace\fR is on.
+.TP
+\fB\-\-rules\fR
+Trace the rules resolution.
+
+.TP
+\fB\-n\fR, \fB\-\-dry\-run\fR
+Do a dry run without executing actions.
+.TP
+\fB\-T\fR, \fB\-\-tasks\fR [\fIPATTERN\fR]
+Display the tasks (matching optional \fIPATTERN\fR) with descriptions, then exit.
+.TP
+\fB\-D\fR, \fB\-\-describe\fR [\fIPATTERN\fR]
+Describe the tasks (matching optional \fIPATTERN\fR), then exit.
+.TP
+\fB\-W\fR, \fB\-\-where\fR [\fIPATTERN\fR]
+Describe the tasks (matching optional \fIPATTERN\fR), then exit.
+.TP
+\fB\-P\fR, \fB\-\-prereqs\fR
+Display the tasks and dependencies, then exit.
+
+.TP
+\fB\-e\fR, \fB\-\-execute\fR \fICODE\fR
+Execute some Ruby code and exit.
+.TP
+\fB\-p\fR, \fB\-\-execute\-print\fR \fICODE\fR
+Execute some Ruby code, print the result, then exit.
+.TP
+\fB\-E\fR, \fB\-\-execute\-continue\fR \fICODE\fR
+Execute some Ruby code, then continue with normal task processing.
+
+.SS Information
+.TP
+\fB\-v\fR, \fB\-\-verbose\fR
+Log message to standard output.
+.TP
+\fB\-q\fR, \fB\-\-quiet\fR
+Do not log messages to standard output.
+.TP
+\fB\-s\fR, \fB\-\-silent\fR
+Like \fB\-\-quiet\fR, but also suppresses the 'in directory' announcement.
+.TP
+\fB\-X\fR, \fB\-\-no\-deprecation\-warnings\fR
+Disable the deprecation warnings.
+.TP
+\fB\-\-comments\fR
+Show commented tasks only
+.TP
+\fB\-A\fR, \fB\-\-all\fR
+Show all tasks, even uncommented ones (in combination with \fB\-T\fR or \fB\-D\fR)
+.TP
+\fB\-\-job\-stats\fR [\fILEVEL\fR]
+Display job statistics. \fILEVEL=history\fR displays a complete job list
+.TP
+\fB\-V\fR, \fB\-\-version\fR
+Display the program version.
+.TP
+\fB\-h\fR, \fB\-H\fR, \fB\-\-help\fR
+Display a help message.
+
+.SH SEE ALSO
+The complete documentation for \fBrake\fR has been installed at \fI/usr/share/doc/rake-doc/html/index.html\fR. It is also available online at \fIhttp://docs.seattlerb.org/rake\fR.
+.SH AUTHOR
+.B rake
+was written by Jim Weirich <jim@weirichhouse.org> 
+.PP
+This manual was created by Caitlin Matos <caitlin.matos@zoho.com> for the Debian project (but may be used by others). It was inspired by the manual by Jani Monoses <jani@iv.ro> for the Ubuntu project.

data/lib/rake.rb

@@ -21,7 +21,7 @@
 #++
 
 module Rake
-  VERSION = '10.3.2'
+  VERSION = '10.4.0'
 end
 
 require 'rake/version'
@@ -63,6 +63,7 @@ require 'rake/file_utils_ext'
 require 'rake/file_list'
 require 'rake/default_loader'
 require 'rake/early_time'
+require 'rake/late_time'
 require 'rake/name_space'
 require 'rake/task_manager'
 require 'rake/application'

data/lib/rake/application.rb

@@ -20,6 +20,9 @@ module Rake
     include TaskManager
     include TraceOutput
 
+    # The command-line arguments rake is using (defaults to ARGV)
+    attr_reader :argv # :nodoc:
+
     # The name of the application (typically 'rake')
     attr_reader :name
 
@@ -45,6 +48,7 @@ module Rake
     # Initialize a Rake::Application object.
     def initialize
       super
+      @argv = ARGV.dup
       @name = 'rake'
       @rakefiles = DEFAULT_RAKEFILES.dup
       @rakefile = nil
@@ -73,6 +77,8 @@ module Rake
     # call +top_level+ to run your top level tasks.
     def run
       standard_exception_handling do
+        @argv = argv
+
         init
         load_rakefile
         top_level
@@ -633,7 +639,7 @@ module Rake
 
         standard_rake_options.each { |args| opts.on(*args) }
         opts.environment('RAKEOPT')
-      end.parse!
+      end.parse! @argv
     end
 
     # Similar to the regular Ruby +require+ command, but will check
@@ -729,7 +735,7 @@ module Rake
     # Environmental assignments are processed at this time as well.
     def collect_command_line_tasks # :nodoc:
       @top_level_tasks = []
-      ARGV.each do |arg|
+      @argv.each do |arg|
         if arg =~ /^(\w+)=(.*)$/m
           ENV[$1] = $2
         else

data/lib/rake/backtrace.rb

@@ -1,6 +1,6 @@
 module Rake
   module Backtrace # :nodoc: all
-    SYS_KEYS  = RbConfig::CONFIG.keys.grep(/(prefix|libdir)/)
+    SYS_KEYS  = RbConfig::CONFIG.keys.grep(/(?:[a-z]prefix|libdir)\z/)
     SYS_PATHS = RbConfig::CONFIG.values_at(*SYS_KEYS).uniq +
       [ File.join(File.dirname(__FILE__), "..") ]
 

data/lib/rake/cloneable.rb

@@ -3,7 +3,7 @@ module Rake
   # Mixin for creating easily cloned objects.
 
   module Cloneable # :nodoc:
-    # The hook that invoked by 'clone' and 'dup' methods.
+    # The hook that is invoked by 'clone' and 'dup' methods.
     def initialize_copy(source)
       super
       source.instance_variables.each do |var|

data/lib/rake/contrib/sshpublisher.rb

@@ -20,7 +20,7 @@ module Rake
     # Uploads the files
 
     def upload
-      sh %{scp -rq #{@local_dir}/* #{@host}:#{@remote_dir}}
+      sh "scp", "-rq", "#{@local_dir}/*", "#{@host}:#{@remote_dir}"
     end
   end
 
@@ -30,8 +30,8 @@ module Rake
     # Uploads the files after removing the existing remote directory.
 
     def upload
-      sh %{ssh #{@host} rm -rf #{@remote_dir}} rescue nil
-      sh %{ssh #{@host} mkdir #{@remote_dir}}
+      sh "ssh", @host, "rm", "-rf", @remote_dir rescue nil
+      sh "ssh", @host, "mkdir",     @remote_dir
       super
     end
   end
@@ -54,7 +54,7 @@ module Rake
 
     def upload
       @files.each do |fn|
-        sh %{scp -q #{@local_dir}/#{fn} #{@host}:#{@remote_dir}}
+        sh "scp", "-q", "#{@local_dir}/#{fn}", "#{@host}:#{@remote_dir}"
       end
     end
   end

data/lib/rake/cpu_counter.rb

@@ -1,8 +1,3 @@
-require 'rbconfig'
-
-# TODO: replace with IO.popen using array-style arguments in Rake 11
-require 'open3'
-
 module Rake
 
   # Based on a script at:
@@ -18,6 +13,26 @@ module Rake
       default
     end
 
+    begin
+      require 'etc'
+    rescue LoadError
+    else
+      if Etc.respond_to?(:nprocessors)
+        def count
+          return Etc.nprocessors
+        end
+      end
+    end
+  end
+end
+
+unless Rake::CpuCounter.method_defined?(:count)
+  Rake::CpuCounter.class_eval <<-'end;', __FILE__, __LINE__+1
+    require 'rbconfig'
+
+    # TODO: replace with IO.popen using array-style arguments in Rake 11
+    require 'open3'
+
     def count
       if defined?(Java::Java)
         count_via_java_runtime
@@ -38,7 +53,8 @@ module Rake
           count_via_win32 ||
             count_via_sysctl ||
             count_via_hwprefs_thread_count ||
-            count_via_hwprefs_cpu_count
+            count_via_hwprefs_cpu_count ||
+            count_via_cpuinfo
         end
       end
     end
@@ -105,5 +121,5 @@ module Rake
         out.eof? ? nil : command
       end
     end
-  end
+  end;
 end

data/lib/rake/dsl_definition.rb

@@ -98,6 +98,7 @@ module Rake
     def directory(*args, &block) # :doc:
       result = file_create(*args, &block)
       dir, _ = *Rake.application.resolve_args(args)
+      dir = Rake.from_pathname(dir)
       Rake.each_dir_parent(dir) do |d|
         file_create d do |t|
           mkdir_p t.name unless File.exist?(t.name)
@@ -150,7 +151,7 @@ module Rake
     #
     # Example:
     #  rule '.o' => '.c' do |t|
-    #    sh %{cc -o #{t.name} #{t.source}}
+    #    sh 'cc', '-o', t.name, t.source
     #  end
     #
     def rule(*args, &block) # :doc: