rake 10.4.1 → 10.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842cc620ee6d0c6f5f4a58250c93d7e8b520548b
-  data.tar.gz: 15037f167a7df18b9fe79a9727f4f26eab8db672
+  metadata.gz: 45b8e70b002f64d653a6a1400190c4165526670b
+  data.tar.gz: 1f0916c16ca6c44e83d86d2112285a0d726e24a3
 SHA512:
-  metadata.gz: f9c007b3406b682f796fcbd923c47530d0fb62e3a80f7ee7975e7dadf80152c3ea7b9e1b6de82571d57530d639d2923e2f50bf0660dd7eadcd0b5ae833afb92f
-  data.tar.gz: e520c8de40171fce8261454f418a02ecca1666f0a9988652c3c4dfe1719568e2799778c698b9e7335665af69751c0d71f554beb8f33ac1eb38e04394d9294b7c
+  metadata.gz: c1433e6f142ab2dc8fa9f765a7d683b8ff8dee7fa54c4a20245cb2a9a933fe537a57d41d10484d4e55f4c4ca267b5cf22c7c2162f1d1d05e35510211940e8f6e
+  data.tar.gz: f60648962e6247b98fd29d6a8cc51c97ab9408aca5ec22fdacbfec778bd6ab90a394c03b9fb1b56f50ae4f43dfa577338981ffa9e4719109eb09a1340c30f082

data/History.rdoc

@@ -1,3 +1,14 @@
+=== 10.4.2 / 2014-12-02
+
+Bug fixes:
+
+* Rake no longer edits ARGV.  This allows you to re-exec rake from a rake
+  task.  Pull requset #9 by Matt Palmer.
+* Documented how Rake::DSL#desc handles sentences in task descriptions.
+  Issue #7 by Raza Sayed.
+* Fixed test error on 1.9.3 with legacy RubyGems.  Issue #8 by Matt Palmer.
+* Deleted duplicated History entry.  Pull request #10 by Yuji Yamamoto.
+
 === 10.4.1 / 2014-12-01
 
 Bug fixes:
@@ -17,8 +28,6 @@ Enhancements:
 * 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.
-* Rake no longer edits ARGV.  This allows you to re-exec rake from a rake
-  task.  Issue #277 by Matt Palmer.
 
 Bug fixes:
 

data/lib/rake.rb

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

data/lib/rake/application.rb

@@ -83,8 +83,8 @@ module Rake
     def init(app_name='rake')
       standard_exception_handling do
         @name = app_name
-        handle_options
-        collect_command_line_tasks
+        args = handle_options
+        collect_command_line_tasks(args)
       end
     end
 
@@ -616,7 +616,9 @@ module Rake
     end
     private :select_trace_output
 
-    # Read and handle the command line options.
+    # Read and handle the command line options.  Returns the command line
+    # arguments that we didn't understand, which should (in theory) be just
+    # task names and env vars.
     def handle_options # :nodoc:
       options.rakelib = ['rakelib']
       options.trace_output = $stderr
@@ -633,7 +635,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
@@ -727,9 +729,14 @@ module Rake
     # Collect the list of tasks on the command line.  If no tasks are
     # given, return a list containing only the default task.
     # Environmental assignments are processed at this time as well.
-    def collect_command_line_tasks # :nodoc:
+    #
+    # `args` is the list of arguments to peruse to get the list of tasks.
+    # It should be the command line that was given to rake, less any
+    # recognised command-line options, which OptionParser.parse will
+    # have taken care of already.
+    def collect_command_line_tasks(args) # :nodoc:
       @top_level_tasks = []
-      ARGV.each do |arg|
+      args.each do |arg|
         if arg =~ /^(\w+)=(.*)$/m
           ENV[$1] = $2
         else

data/lib/rake/dsl_definition.rb

@@ -159,6 +159,8 @@ module Rake
     end
 
     # Describes the next rake task.  Duplicate descriptions are discarded.
+    # Descriptions are shown with <code>rake -T</code> (up to the first
+    # sentence) and <code>rake -D</code> (the entire description).
     #
     # Example:
     #   desc "Run the Unit Tests"

data/test/test_rake_application.rb

@@ -370,7 +370,7 @@ class TestRakeApplication < Rake::TestCase
     # HACK no assertions
   end
 
-  def test_handle_options_should_strip_options_from_argv
+  def test_handle_options_should_not_strip_options_from_argv
     assert !@app.options.trace
 
     valid_option = '--trace'
@@ -378,7 +378,7 @@ class TestRakeApplication < Rake::TestCase
 
     @app.handle_options
 
-    assert !ARGV.include?(valid_option)
+    assert ARGV.include?(valid_option)
     assert @app.options.trace
   end
 

data/test/test_rake_application_options.rb

@@ -457,8 +457,8 @@ class TestRakeApplicationOptions < Rake::TestCase
       throw :system_exit, :exit
     end
     @app.instance_eval do
-      handle_options
-      collect_command_line_tasks
+      args = handle_options
+      collect_command_line_tasks(args)
     end
     @tasks = @app.top_level_tasks
     @app.options

data/test/test_rake_test_task.rb

@@ -97,17 +97,22 @@ class TestRakeTestTask < Rake::TestCase
   end
 
   def test_run_code_rake_default_gem
+    skip 'this ruby does not have default gems' unless
+      Gem::Specification.method_defined? :default_specifications_dir
+
     default_spec = Gem::Specification.new 'rake', 0
     default_spec.loaded_from = File.join Gem::Specification.default_specifications_dir, 'rake-0.gemspec'
-    rake, Gem.loaded_specs['rake'] = Gem.loaded_specs['rake'], default_spec
+    begin
+      rake, Gem.loaded_specs['rake'] = Gem.loaded_specs['rake'], default_spec
 
-    test_task = Rake::TestTask.new do |t|
-      t.loader = :rake
-    end
+      test_task = Rake::TestTask.new do |t|
+        t.loader = :rake
+      end
 
-    assert_match(/\A(-I".*?" *)* ".*?"\Z/, test_task.run_code)
-  ensure
-    Gem.loaded_specs['rake'] = rake
+      assert_match(/\A(-I".*?" *)* ".*?"\Z/, test_task.run_code)
+    ensure
+      Gem.loaded_specs['rake'] = rake
+    end
   end
 
   def test_run_code_testrb_ruby_1_8_2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 10.4.1
+  version: 10.4.2
 platform: ruby
 authors:
 - Eric Hodel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest