rake 10.2.2 → 10.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b66c8db881d40c6377afd994a676debcc3c45e66
-  data.tar.gz: a6f5c565ddeb55cfe056ecaf2b5c9fe1ea4fc12c
+  metadata.gz: 7e051b1f1a97aa88b0d3436bbb7ac9878d51b94c
+  data.tar.gz: e0065135845a6d264193616f9c686fc2661960e5
 SHA512:
-  metadata.gz: b5f1c1d7803af1168613c18408d39861dcfc92674453428e08a2d39ca3e4065dc0aa385368cd628e930fbe1d40923eb6366fdcee42781294e5c409a7765f612b
-  data.tar.gz: dd436ff37c98c0159ee4e33762e6a82806304e85e92cc23fb72378f03fc8af0410226ba54197fed860e852c10cd8ac86e5a12dd54f3651ca1a3d1f3240c93a9b
+  metadata.gz: 7ee50f4cb44444171b20ce5f5359152d874f600fca75467f92d3aa8da69b275177a7752ab8b9a6ccea86186616c180e06ba1c6ad67a06334b6a1c11de50436bc
+  data.tar.gz: 20c3f24c190b6cc1230bfe92d4ece47ece4cd2c5dcf007fb7e94ac7cfec28372862a2b02c0a39f71a0400ed52480b54e4c221edd75f4bf50a199a09a534b53e4

data/History.rdoc

@@ -1,3 +1,21 @@
+=== 10.3 / 2014-04-15
+
+Enhancements:
+
+* Added --build-all option to rake which treats all file prerequisites as
+  out-of-date.  Pull request #254 by Andrew Gilbert.
+* Added Rake::NameSpace#scope.  Issue #263 by Jon San Miguel.
+
+Bug fixes:
+
+* Suppress org.jruby package files in rake error messages for JRuby users.
+  Issue #213 by Charles Nutter.
+* Fixed typo, removed extra "h".  Pull request #267 by Hsing-Hui Hsu.
+* Rake no longer reports an error when cleaning already-deleted files.  Pull
+  request #266 by Randy Coulman.
+* Consume stderr while determining CPU count to avoid hang.  Issue #268 by
+  Albert Sun.
+
 === 10.2.2 / 2014-03-27
 
 Bug fixes:

data/Rakefile

@@ -17,6 +17,7 @@ end
 
 require 'hoe'
 
+Hoe.plugin :git
 Hoe.plugin :minitest
 Hoe.plugin :travis
 

data/lib/rake.rb

@@ -21,7 +21,7 @@
 #++
 
 module Rake
-  VERSION = '10.2.2'
+  VERSION = '10.3.0'
 end
 
 require 'rake/version'

data/lib/rake/application.rb

@@ -397,6 +397,12 @@ module Rake
               select_trace_output(options, 'backtrace', value)
             }
           ],
+          ['--build-all', '-B',
+           "Build all prerequisites, including those which are up-to-date.",
+           lambda { |value|
+             options.build_all = true
+           }
+          ],
           ['--comments',
             "Show commented tasks only",
             lambda { |value|

data/lib/rake/backtrace.rb

@@ -9,6 +9,9 @@ module Rake
       map { |f| File.expand_path(f) }.
       reject { |s| s.nil? || s =~ /^ *$/ }
     SUPPRESSED_PATHS_RE = SUPPRESSED_PATHS.map { |f| Regexp.quote(f) }.join("|")
+    SUPPRESSED_PATHS_RE << "|^org\\/jruby\\/\\w+\\.java" if
+      Object.const_defined?(:RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+
     SUPPRESS_PATTERN = %r!(\A(#{SUPPRESSED_PATHS_RE})|bin/rake:\d+)!i
 
     def self.collapse(backtrace)

data/lib/rake/clean.rb

@@ -31,9 +31,21 @@ module Rake
       begin
         rm_r file_name, opts
       rescue StandardError => ex
-        puts "Failed to remove #{file_name}: #{ex}"
+        puts "Failed to remove #{file_name}: #{ex}" unless file_already_gone?(file_name)
       end
     end
+
+    def file_already_gone?(file_name)
+      return false if File.exist?(file_name)
+
+      path = file_name
+      while path = File.dirname(path)
+        return false unless File.readable?(path) && File.executable?(path)
+        break if ["/", "."].include?(path)
+      end
+      true
+    end
+    private_class_method :file_already_gone?
   end
 end
 

data/lib/rake/cpu_counter.rb

@@ -79,7 +79,9 @@ module Rake
     def run(command, *args)
       cmd = resolve_command(command)
       if cmd
-        Open3.popen3 cmd, *args do |_, out|
+        Open3.popen3 cmd, *args do |inn, out, err,|
+          inn.close
+          err.read
           out.read.to_i
         end
       else

data/lib/rake/file_task.rb

@@ -13,7 +13,7 @@ module Rake
     # Is this file task needed?  Yes if it doesn't exist, or if its time stamp
     # is out of date.
     def needed?
-      ! File.exist?(name) || out_of_date?(timestamp)
+      ! File.exist?(name) || out_of_date?(timestamp) || @application.options.build_all
     end
 
     # Time stamp for file task.

data/lib/rake/linked_list.rb

@@ -13,7 +13,7 @@ module Rake
     end
 
     # Polymorphically add a new element to the head of a list. The
-    # type of head node will be the same list type has the tail.
+    # type of head node will be the same list type as the tail.
     def conj(item)
       self.class.cons(item, self)
     end

data/lib/rake/name_space.rb

@@ -1,25 +1,38 @@
-module Rake
-
-  # The NameSpace class will lookup task names in the the scope
-  # defined by a +namespace+ command.
-  #
-  class NameSpace
-
-    # Create a namespace lookup object using the given task manager
-    # and the list of scopes.
-    def initialize(task_manager, scope_list)
-      @task_manager = task_manager
-      @scope = scope_list.dup
-    end
-
-    # Lookup a task named +name+ in the namespace.
-    def [](name)
-      @task_manager.lookup(name, @scope)
-    end
-
-    # Return the list of tasks defined in this and nested namespaces.
-    def tasks
-      @task_manager.tasks_in_scope(@scope)
-    end
+##
+# The NameSpace class will lookup task names in the scope defined by a
+# +namespace+ command.
+
+class Rake::NameSpace
+
+  ##
+  # Create a namespace lookup object using the given task manager
+  # and the list of scopes.
+
+  def initialize(task_manager, scope_list)
+    @task_manager = task_manager
+    @scope = scope_list.dup
+  end
+
+  ##
+  # Lookup a task named +name+ in the namespace.
+
+  def [](name)
+    @task_manager.lookup(name, @scope)
+  end
+
+  ##
+  # The scope of the namespace (a LinkedList)
+
+  def scope
+    @scope.dup
   end
+
+  ##
+  # Return the list of tasks defined in this and nested namespaces.
+
+  def tasks
+    @task_manager.tasks_in_scope(@scope)
+  end
+
 end
+

data/test/test_rake_clean.rb

@@ -23,6 +23,15 @@ class TestRakeClean < Rake::TestCase
     remove_undeletable_file
   end
 
+  def test_cleanup_ignores_missing_files
+    file_name = File.join(@tempdir, "missing_directory" "no_such_file")
+
+    out, _ = capture_io do
+      Rake::Cleaner.cleanup(file_name, :verbose => false)
+    end
+    refute_match(/failed to remove/i, out)
+  end
+
   private
 
   def create_undeletable_file

data/test/test_rake_file_task.rb

@@ -98,6 +98,60 @@ class TestRakeFileTask < Rake::TestCase
     assert @ran
   end
 
+  def test_needed_eh_build_all
+    create_file 'a'
+
+    file 'a'
+
+    a_task = Task['a']
+
+    refute a_task.needed?
+
+    Rake.application.options.build_all = true
+
+    assert a_task.needed?
+  ensure
+    delete_file 'a'
+  end
+
+  def test_needed_eh_dependency
+    create_file 'a', Time.now
+    create_file 'b', Time.now - 60
+
+    create_file 'c', Time.now
+    create_file 'd', Time.now - 60
+
+    file 'b' => 'a'
+
+    b_task = Task['b']
+
+    assert b_task.needed?
+
+    file 'c' => 'd'
+
+    c_task = Task['c']
+
+    refute c_task.needed?
+  ensure
+    delete_file 'old'
+    delete_file 'new'
+  end
+
+  def test_needed_eh_exists
+    name = "dummy"
+    file name
+
+    ftask = Task[name]
+
+    assert ftask.needed?
+
+    create_file name
+
+    refute ftask.needed?
+  ensure
+    delete_file name
+  end
+
   def test_source_is_first_prerequisite
     t = file :f => ["preqA", "preqB"]
     assert_equal "preqA", t.source

data/test/test_rake_name_space.rb

@@ -40,4 +40,18 @@ class TestRakeNameSpace < Rake::TestCase
       ns.tasks.map { |tsk| tsk.name }
     assert_equal ["n:nn:z"], nns.tasks.map { |t| t.name }
   end
+
+  def test_scope
+    mgr = TM.new
+
+    scope = Rake::LinkedList.new 'b'
+    scope = scope.conj 'a'
+
+    ns = Rake::NameSpace.new mgr, scope
+
+    assert_equal scope, ns.scope
+
+    refute_same scope, ns.scope
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 10.2.2
+  version: 10.3.0
 platform: ruby
 authors:
 - Eric Hodel
@@ -30,7 +30,7 @@ cert_chain:
   pfkQPF5Ezsi73pEpFN93Fy21NKCYQH1jCwWeKUF29MIMGd6kE3ZmHW/7fz5GwKIM
   Ls5SgY48a0l7Hw==
   -----END CERTIFICATE-----
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest