rake 10.0.3 → 10.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bf7d33e05203253446a5a4015f7b1085e268eaaf
+  data.tar.gz: 488ec5fee795191c32c674c6838232ee8d824e56
+SHA512:
+  metadata.gz: 8498a095b32e5713ad22930c03d577e1601a2be95c2aa23333c4768ebb27059eecdeaa5c986b8218b32ee80f71401559c77b96e676053ea6a32b9b040bf2f0d3
+  data.tar.gz: 420607f28d7de1fc5cecf40da9d0daff39701a333277d3db884bc2537b3cce60582957921cd26d0485b6b6f79974475b340a4f1bd8b2a93ca0d48ea5dcceaa16

data/CHANGES

@@ -1,5 +1,9 @@
 = Rake Changelog
 
+NOTE: Refer to the individual release documents (in the
+      doc/release_notes directory) for changes after in version 0.9.4
+      and later.
+
 == Master (for 0.9.3)
 
 * The rake test loader now removes arguments it has processed.  Issue #51

data/README.rdoc

@@ -174,8 +174,8 @@ jim dot weirich at gmail.com.
 = Other stuff
 
 Author::   Jim Weirich <jim.weirich@gmail.com>
-Requires:: Ruby 1.8.6 or later
-License::  Copyright 2003-2011 by Jim Weirich.
+Requires:: Ruby 1.8.7 or later
+License::  Copyright 2003-2013 by Jim Weirich.
            Released under an MIT-style license.  See the MIT-LICENSE
            file included in the distribution.
 

data/Rakefile

@@ -163,6 +163,7 @@ else
     s.name = 'rake'
     s.version = $package_version
     s.summary = "Ruby based make-like utility."
+    s.license = "MIT"
     s.description = <<-EOF.delete "\n"
 Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
 specified in standard Ruby syntax.

data/doc/rakefile.rdoc

@@ -79,7 +79,7 @@ method).  In addition, file tasks are usually named with a string
 rather than a symbol.
 
 The following file task creates a executable program (named +prog+)
-given two object files name <tt>a.o</tt> and <tt>b.o</tt>.  The tasks
+given two object files named <tt>a.o</tt> and <tt>b.o</tt>.  The tasks
 for creating <tt>a.o</tt> and <tt>b.o</tt> are not shown.
 
   file "prog" => ["a.o", "b.o"] do |t|
@@ -193,12 +193,25 @@ example, if the "release" task expected a parameter named
 
 or
 
-   RELEASE_VERSION rake release
+   RELEASE_VERSION=0.8.2 rake release
+
+or, alternatively
+
+   rake release RELEASE_VERSION=0.8.2
 
 will work.  Environment variable names must either match the task
 parameter exactly, or match an all-uppercase version of the task
 parameter.
 
+<b>NOTE:</b> A variable declared within a rake command will
+not persist in the environment:
+
+   $ export VALUE=old
+   $ rake print_value VALUE=new
+   new
+   $ rake print_value
+   old
+
 === Tasks that Expect Parameters
 
 Parameters are only given to tasks that are setup to expect them.  In
@@ -291,7 +304,7 @@ Running this example:
 
 The ability to programmatically manipulate tasks gives rake very
 powerful meta-programming capabilities w.r.t. task execution, but
-should be used with cation.
+should be used with caution.
 
 == Rules
 
@@ -337,7 +350,7 @@ required on *rule* when the first argument is a regular expression.
 
 The following rule might be used for Java files ...
 
-  rule '.java' => [
+  rule '.class' => [
     proc { |tn| tn.sub(/\.class$/, '.java').sub(/^classes\//, 'src/') }
   ] do |t|
     java_compile(t.source, t.name)
@@ -550,6 +563,39 @@ This is the proper way to specify the task ...
     # Actions go here
   end
 
+== Rakefile Path
+
+When issuing the <tt>rake</tt> command in a terminal, Rake will look
+for a Rakefile in the current directory. If a Rakefile  is not found,
+it will search parent directories until one is found.
+
+For example, if a Rakefile resides in the <tt>project/</tt> directory,
+moving deeper into the project's directory tree will not have an adverse
+effect on rake tasks:
+
+  $ pwd
+  /home/user/project
+
+  $ cd lib/foo/bar
+  $ pwd
+  /home/user/project/lib/foo/bar
+
+  $ rake run_pwd
+  /home/user/project
+
+As far as rake is concerned, all tasks are run from the directory in
+which the Rakefile resides.
+
+=== Multiple Rake Files
+
+Not all tasks need to be included in a single Rakefile. Additional
+rake files (with the file extension "<tt>.rake</tt>") may be placed in
+<tt>rakelib</tt> directory located at the top level of a project (i.e.
+the same directory that contains the main <tt>Rakefile</tt>).
+
+Also, rails projects may include additional rake files in the
+<tt>lib/tasks</tt> directory.
+
 ----
 
 == See

data/lib/rake/application.rb

@@ -167,10 +167,16 @@ module Rake
       rescue Exception => ex
         # Exit with error message
         display_error_message(ex)
-        exit(false)
+        exit_because_of_exception(ex)
       end
     end
 
+    # Exit the program because of an unhandle exception.
+    # (may be overridden by subclasses)
+    def exit_because_of_exception(ex)
+      exit(false)
+    end
+
     # Display the error message that caused the exception.
     def display_error_message(ex)
       trace "#{name} aborted!"
@@ -625,13 +631,19 @@ module Rake
     def collect_tasks
       @top_level_tasks = []
       ARGV.each do |arg|
-        if arg =~ /^(\w+)=(.*)$/
+        if arg =~ /^(\w+)=(.*)$/m
           ENV[$1] = $2
         else
           @top_level_tasks << arg unless arg =~ /^-/
         end
       end
-      @top_level_tasks.push("default") if @top_level_tasks.size == 0
+      @top_level_tasks.push(default_task_name) if @top_level_tasks.empty?
+    end
+
+    # Default task name ("default").
+    # (May be overridden by subclasses)
+    def default_task_name
+      "default"
     end
 
     # Add a file to the list of files to be imported.

data/lib/rake/backtrace.rb

@@ -5,6 +5,7 @@ module Rake
                                  keys.grep(/(prefix|libdir)/)).uniq + [
         File.join(File.dirname(__FILE__), ".."),
       ].map { |f| Regexp.quote(File.expand_path(f)) }
+    SUPPRESSED_PATHS.map! { |s| s.gsub("\\", "/") }
     SUPPRESSED_PATHS.reject! { |s| s.nil? || s =~ /^ *$/ }
 
     SUPPRESS_PATTERN = %r!(\A#{SUPPRESSED_PATHS.join('|')}|bin/rake:\d+)!i

data/lib/rake/file_utils.rb

@@ -41,7 +41,7 @@ module FileUtils
     unless options[:noop]
       res = rake_system(*cmd)
       status = $?
-      status = PseudoStatus.new(1) if !res && status.nil?
+      status = Rake::PseudoStatus.new(1) if !res && status.nil?
       shell_runner.call(res, status)
     end
   end
@@ -58,7 +58,7 @@ module FileUtils
   def set_verbose_option(options) # :nodoc:
     unless options.key? :verbose
       options[:verbose] =
-        Rake::FileUtilsExt.verbose_flag == Rake::FileUtilsExt::DEFAULT ||
+        (Rake::FileUtilsExt.verbose_flag == Rake::FileUtilsExt::DEFAULT) ||
         Rake::FileUtilsExt.verbose_flag
     end
   end

data/lib/rake/file_utils_ext.rb

@@ -18,9 +18,6 @@ module Rake
     FileUtilsExt.verbose_flag = DEFAULT
     FileUtilsExt.nowrite_flag = false
 
-    $fileutils_verbose = true
-    $fileutils_nowrite = false
-
     FileUtils.commands.each do |name|
       opts = FileUtils.options_of name
       default_options = []

data/lib/rake/promise.rb

@@ -17,7 +17,7 @@ module Rake
       @mutex = Mutex.new
       @result = NOT_SET
       @error = NOT_SET
-      @args = args.collect { |a| begin; a.dup; rescue; a; end }
+      @args = args
       @block = block
     end
 

data/lib/rake/task.rb

@@ -61,6 +61,24 @@ module Rake
     end
     private :lookup_prerequisite
 
+    # List of all unique prerequisite tasks including prerequisite tasks'
+    # prerequisites.
+    # Includes self when cyclic dependencies are found.
+    def all_prerequisite_tasks
+      seen = {}
+      collect_prerequisites(seen)
+      seen.values
+    end
+
+    def collect_prerequisites(seen)
+      prerequisite_tasks.each do |pre|
+        next if seen[pre.name]
+        seen[pre.name] = pre
+        pre.collect_prerequisites(seen)
+      end
+    end
+    protected :collect_prerequisites
+
     # First source from a rule (nil if no sources)
     def source
       @sources.first if defined?(@sources)
@@ -69,17 +87,17 @@ module Rake
     # Create a task named +task_name+ with no actions or prerequisites. Use
     # +enhance+ to add actions and prerequisites.
     def initialize(task_name, app)
-      @name = task_name.to_s
-      @prerequisites = []
-      @actions = []
+      @name            = task_name.to_s
+      @prerequisites   = []
+      @actions         = []
       @already_invoked = false
-      @full_comment = nil
-      @comment = nil
-      @lock = Monitor.new
-      @application = app
-      @scope = app.current_scope
-      @arg_names = nil
-      @locations = []
+      @full_comment    = nil
+      @comment         = nil
+      @lock            = Monitor.new
+      @application     = app
+      @scope           = app.current_scope
+      @arg_names       = nil
+      @locations       = []
     end
 
     # Enhance a task with prerequisites or actions.  Returns self.

data/lib/rake/trace_output.rb

@@ -11,7 +11,10 @@ module Rake
       if strings.empty?
         output = sep
       else
-        output = strings.map { |s| s.end_with?(sep) ? s : s + sep }.join
+        output = strings.map { |s|
+          next if s.nil?
+          s =~ /#{sep}$/ ? s : s + sep
+        }.join
       end
       out.print(output)
     end

data/lib/rake/version.rb

@@ -1,5 +1,5 @@
 module Rake
-  VERSION = '10.0.3'
+  VERSION = '10.0.4'
 
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, = Rake::VERSION.split '.'

data/test/test_rake_application_options.rb

@@ -185,9 +185,10 @@ class TestRakeApplicationOptions < Rake::TestCase
   end
 
   def test_quiet
+    Rake::FileUtilsExt.verbose_flag = true
     flags('--quiet', '-q') do |opts|
-      assert ! Rake::FileUtilsExt.verbose_flag
-      assert ! opts.silent
+      assert ! Rake::FileUtilsExt.verbose_flag, "verbose flag shoud be false"
+      assert ! opts.silent, "should not be silent"
     end
   end
 
@@ -198,9 +199,10 @@ class TestRakeApplicationOptions < Rake::TestCase
   end
 
   def test_silent
+    Rake::FileUtilsExt.verbose_flag = true
     flags('--silent', '-s') do |opts|
-      assert ! Rake::FileUtilsExt.verbose_flag
-      assert opts.silent
+      assert ! Rake::FileUtilsExt.verbose_flag, "verbose flag should be false"
+      assert opts.silent, "should be silent"
     end
   end
 
@@ -352,18 +354,16 @@ class TestRakeApplicationOptions < Rake::TestCase
   end
 
   def test_verbose
-    out, = capture_io do
-      flags('--verbose', '-V') do |opts|
-        assert Rake::FileUtilsExt.verbose_flag
-        assert ! opts.silent
+    capture_io do
+      flags('--verbose', '-v') do |opts|
+        assert Rake::FileUtilsExt.verbose_flag, "verbose should be true"
+        assert ! opts.silent, "opts should not be silent"
       end
     end
-
-    assert_equal "rake, version #{Rake::VERSION}\n", out
   end
 
   def test_version
-    out, = capture_io do
+    out, _ = capture_io do
       flags '--version', '-V'
     end
 
@@ -401,9 +401,21 @@ class TestRakeApplicationOptions < Rake::TestCase
 
   def test_environment_definition
     ENV.delete('TESTKEY')
-    command_line("a", "TESTKEY=12")
-    assert_equal ["a"], @tasks.sort
-    assert '12', ENV['TESTKEY']
+    command_line("TESTKEY=12")
+    assert_equal '12', ENV['TESTKEY']
+  end
+
+  def test_multiline_environment_definition
+    ENV.delete('TESTKEY')
+    command_line("TESTKEY=a\nb\n")
+    assert_equal "a\nb\n", ENV['TESTKEY']
+  end
+
+  def test_environment_and_tasks_together
+    ENV.delete('TESTKEY')
+    command_line("a", "b", "TESTKEY=12")
+    assert_equal ["a", "b"], @tasks.sort
+    assert_equal '12', ENV['TESTKEY']
   end
 
   def test_rake_explicit_task_library

data/test/test_rake_directory_task.rb

@@ -43,7 +43,7 @@ class TestRakeDirectoryTask < Rake::TestCase
     runlist = []
 
     t1 = directory("a/b/c" => :t2) { |t| runlist << t.name }
-    t2 = task(:t2) { |t| runlist << t.name }
+    task(:t2) { |t| runlist << t.name }
 
     verbose(false) {
       t1.invoke

data/test/test_rake_task.rb

@@ -32,7 +32,6 @@ class TestRakeTask < Rake::TestCase
   end
 
   def test_inspect
-#    t = task(:foo, :needs => [:bar, :baz])
     t = task(:foo => [:bar, :baz])
     assert_equal "<Rake::Task foo => [bar, baz]>", t.inspect
   end
@@ -40,8 +39,8 @@ class TestRakeTask < Rake::TestCase
   def test_invoke
     runlist = []
     t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
-    t2 = task(:t2) { |t| runlist << t.name }
-    t3 = task(:t3) { |t| runlist << t.name }
+    task(:t2) { |t| runlist << t.name }
+    task(:t3) { |t| runlist << t.name }
     assert_equal ["t2", "t3"], t1.prerequisites
     t1.invoke
     assert_equal ["t2", "t3", "t1"], runlist
@@ -88,8 +87,8 @@ class TestRakeTask < Rake::TestCase
   def test_no_double_invoke
     runlist = []
     t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
-    t2 = task(:t2 => [:t3]) { |t| runlist << t.name }
-    t3 = task(:t3) { |t| runlist << t.name }
+    task(:t2 => [:t3]) { |t| runlist << t.name }
+    task(:t3) { |t| runlist << t.name }
     t1.invoke
     assert_equal ["t3", "t2", "t1"], runlist
   end
@@ -204,7 +203,7 @@ class TestRakeTask < Rake::TestCase
 
   def test_prerequiste_tasks_fails_if_prerequisites_are_undefined
     a = task :a => ["b", "c"]
-    b = task :b
+    task :b
     assert_raises(RuntimeError) do
       a.prerequisite_tasks
     end
@@ -221,11 +220,36 @@ class TestRakeTask < Rake::TestCase
     assert_equal [b, c], a.prerequisite_tasks
   end
 
-  def test_timestamp_returns_now_if_all_prereqs_have_no_times
+  def test_all_prerequisite_tasks_includes_all_prerequisites
+    a = task :a => "b"
+    b = task :b => ["c", "d"]
+    c = task :c => "e"
+    d = task :d
+    e = task :e
+
+    assert_equal [b, c, d, e], a.all_prerequisite_tasks.sort_by { |t| t.name }
+  end
+
+  def test_all_prerequisite_tasks_does_not_include_duplicates
     a = task :a => ["b", "c"]
-    b = task :b
+    b = task :b => "c"
     c = task :c
 
+    assert_equal [b, c], a.all_prerequisite_tasks.sort_by { |t| t.name }
+  end
+
+  def test_all_prerequisite_tasks_includes_self_on_cyclic_dependencies
+    a = task :a => "b"
+    b = task :b => "a"
+
+    assert_equal [a, b], a.all_prerequisite_tasks.sort_by { |t| t.name }
+  end
+
+  def test_timestamp_returns_now_if_all_prereqs_have_no_times
+    a = task :a => ["b", "c"]
+    task :b
+    task :c
+
     assert_in_delta Time.now, a.timestamp, 0.1, 'computer too slow?'
   end
 

data/test/test_rake_task_with_arguments.rb

@@ -126,14 +126,14 @@ class TestRakeTaskWithArguments < Rake::TestCase
 
   def test_named_args_are_passed_to_prereqs
     value = nil
-    pre = task(:pre, :rev) { |t, args| value = args.rev }
+    task(:pre, :rev) { |t, args| value = args.rev }
     t = task(:t, [:name, :rev] => [:pre])
     t.invoke("bill", "1.2")
     assert_equal "1.2", value
   end
 
   def test_args_not_passed_if_no_prereq_names_on_task
-    pre = task(:pre) { |t, args|
+    task(:pre) { |t, args|
       assert_equal({}, args.to_hash)
       assert_equal "bill", args.name
     }
@@ -142,7 +142,7 @@ class TestRakeTaskWithArguments < Rake::TestCase
   end
 
   def test_args_not_passed_if_no_prereq_names_on_multitask
-    pre = task(:pre) { |t, args|
+    task(:pre) { |t, args|
       assert_equal({}, args.to_hash)
       assert_equal "bill", args.name
     }
@@ -151,7 +151,7 @@ class TestRakeTaskWithArguments < Rake::TestCase
   end
 
   def test_args_not_passed_if_no_arg_names
-    pre = task(:pre, :rev) { |t, args|
+    task(:pre, :rev) { |t, args|
       assert_equal({}, args.to_hash)
     }
     t = task(:t  => [:pre])

data/test/test_rake_thread_pool.rb

@@ -42,15 +42,13 @@ class TestRakeTestThreadPool < Rake::TestCase
     assert_equal 2, threads.count
   end
 
-  def test_pool_future_captures_arguments
+  def test_pool_future_does_NOT_duplicate_arguments
     pool = ThreadPool.new(2)
-    a = 'a'
-    b = 'b'
-    c = 5 # 5 throws an execption with 5.dup. It should be ignored
-    pool.future(a,c){ |a_var,ignore| a_var.capitalize!; b.capitalize! }
+    obj = Object.new
+    captured = nil
+    pool.future(obj) { |var| captured = var }
     pool.join
-    assert_equal 'a', a
-    assert_equal 'b'.capitalize, b
+    assert_equal obj, captured
   end
 
   def test_pool_join_empties_queue
@@ -72,20 +70,21 @@ class TestRakeTestThreadPool < Rake::TestCase
     assert_equal true, pool.__send__(:__queue__).empty?, "queue should be empty"
   end
 
+  CustomError = Class.new(StandardError)
+
   # test that throwing an exception way down in the blocks propagates
   # to the top
   def test_exceptions
     pool = ThreadPool.new(10)
 
     deep_exception_block = lambda do |count|
-      next raise Exception.new if ( count < 1 )
+      raise CustomError if ( count < 1 )
       pool.future(count-1, &deep_exception_block).value
     end
 
-    assert_raises(Exception) do
+    assert_raises(CustomError) do
       pool.future(2, &deep_exception_block).value
     end
-
   end
 
   def test_pool_prevents_deadlock

data/test/test_trace_output.rb

@@ -30,6 +30,13 @@ class TestTraceOutput < Rake::TestCase
     assert_equal 1, spy.calls
   end
 
+  def test_trace_handles_nil_objects
+    spy = PrintSpy.new
+    trace_on(spy, "HI\n", nil, "LO")
+    assert_equal "HI\nLO\n", spy.result
+    assert_equal 1, spy.calls
+  end
+
   def test_trace_issues_single_io_for_args_multiple_strings_and_alternate_sep
     old_sep = $\
     $\ = "\r"

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 10.0.3
-  prerelease: 
+  version: 10.0.4
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -222,7 +219,9 @@ files:
 - doc/release_notes/rake-10.0.2.rdoc
 - doc/release_notes/rake-10.0.3.rdoc
 homepage: http://rake.rubyforge.org
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -234,21 +233,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.6
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.2
 requirements: []
 rubyforge_project: rake
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby based make-like utility.
 test_files: []