rake 0.9.6 → 10.0.0.beta.1

data/test/test_rake_rake_test_loader.rb

@@ -10,7 +10,7 @@ class TestRakeRakeTestLoader < Rake::TestCase
 
     ARGV.replace %w[foo.rb test_*.rb -v]
 
-    load File.join(@rake_lib, 'rake/rake_test_loader.rb')
+    load File.join(@orig_PWD, 'lib/rake/rake_test_loader.rb')
 
     assert_equal %w[-v], ARGV
   ensure

data/test/test_rake_reduce_compat.rb

@@ -4,9 +4,9 @@ require 'open3'
 class TestRakeReduceCompat < Rake::TestCase
   # TODO: factor out similar code in test_rake_functional.rb
   def rake(*args)
-    Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, out, _, _|
-      out.read
-    }
+    lib = File.join(@orig_PWD, "lib")
+    bin_rake = File.join(@orig_PWD, "bin", "rake")
+    Open3.popen3(RUBY, "-I", lib, bin_rake, *args) { |_, out, _, _| out.read }
   end
 
   def invoke_normal(task_name)
@@ -28,38 +28,10 @@ class TestRakeReduceCompat < Rake::TestCase
       end
     }
 
-    assert_equal %{"method"}, invoke_normal(:check_task).chomp
-    assert_equal %{"method"}, invoke_normal(:check_file).chomp
+    assert_equal "nil", invoke_normal(:check_task).chomp
+    assert_equal "nil", invoke_normal(:check_file).chomp
 
     assert_equal "nil", invoke_reduce_compat(:check_task).chomp
     assert_equal "nil", invoke_reduce_compat(:check_file).chomp
   end
-
-  def test_no_classic_namespace
-    rakefile %q{
-      task :check_task do
-        begin
-          Task
-          print "present"
-        rescue NameError
-          print "absent"
-        end
-      end
-
-      task :check_file_task do
-        begin
-          FileTask
-          print "present"
-        rescue NameError
-          print "absent"
-        end
-      end
-    }
-
-    assert_equal "present", invoke_normal(:check_task)
-    assert_equal "present", invoke_normal(:check_file_task)
-
-    assert_equal "absent", invoke_reduce_compat(:check_task)
-    assert_equal "absent", invoke_reduce_compat(:check_file_task)
-  end
 end

data/test/test_rake_task_manager_argument_resolution.rb

@@ -19,11 +19,6 @@ class TestRakeTaskManagerArgumentResolution < Rake::TestCase
     assert_equal [:t, [], [:x]],     task(:t => :x)
     assert_equal [:t, [], [:x, :y]], task(:t => [:x, :y])
 
-    assert_equal [:t, [:a, :b], []],       task(:t, :a, :b)
-    assert_equal [:t, [], [:x]],           task(:t, :needs => :x)
-    assert_equal [:t, [:a, :b], [:x]],     task(:t, :a, :b, :needs => :x)
-    assert_equal [:t, [:a, :b], [:x, :y]], task(:t, :a, :b, :needs => [:x, :y])
-
     assert_equal [:t, [:a, :b], []],       task(:t, [:a, :b])
     assert_equal [:t, [:a, :b], [:x]],     task(:t, [:a, :b] => :x)
     assert_equal [:t, [:a, :b], [:x, :y]], task(:t, [:a, :b] => [:x, :y])

data/test/test_rake_task_with_arguments.rb

@@ -33,13 +33,11 @@ class TestRakeTaskWithArguments < Rake::TestCase
     assert_equal ["pre"], t.prerequisites
   end
 
-  def test_name_args_and_explicit_needs
-    ignore_deprecations do
-      t = task(:t, :x, :y, :needs => [:pre])
-      assert_equal "t", t.name
-      assert_equal [:x, :y], t.arg_names
-      assert_equal ["pre"], t.prerequisites
-    end
+  def test_name_args_and_prereqs
+    t = task(:t, [:x, :y] => [:pre])
+    assert_equal "t", t.name
+    assert_equal [:x, :y], t.arg_names
+    assert_equal ["pre"], t.prerequisites
   end
 
   def test_illegal_keys_in_task_name_hash
@@ -142,7 +140,7 @@ class TestRakeTaskWithArguments < Rake::TestCase
     assert_equal "1.2", value
   end
 
-  def test_args_not_passed_if_no_prereq_names_on_task
+  def test_args_not_passed_if_no_prereq_names
     pre = task(:pre) { |t, args|
       assert_equal({}, args.to_hash)
       assert_equal "bill", args.name
@@ -151,15 +149,6 @@ class TestRakeTaskWithArguments < Rake::TestCase
     t.invoke("bill", "1.2")
   end
 
-  def test_args_not_passed_if_no_prereq_names_on_multitask
-    pre = task(:pre) { |t, args|
-      assert_equal({}, args.to_hash)
-      assert_equal "bill", args.name
-    }
-    t = multitask(:t, [:name, :rev] => [:pre])
-    t.invoke("bill", "1.2")
-  end
-
   def test_args_not_passed_if_no_arg_names
     pre = task(:pre, :rev) { |t, args|
       assert_equal({}, args.to_hash)

data/test/test_rake_thread_pool.rb

@@ -69,7 +69,7 @@ class TestRakeTestThreadPool < Rake::TestCase
     }
 
     pool.join
-    assert_equal true, pool.__send__(:__queue__).empty?, "queue should be empty"
+    assert_equal true, pool.__send__(:__queue__).empty?
   end
 
   # test that throwing an exception way down in the blocks propagates
@@ -88,6 +88,29 @@ class TestRakeTestThreadPool < Rake::TestCase
 
   end
 
+  def test_pool_always_has_max_threads_doing_work
+    # here we need to test that even if some threads are halted, there
+    # are always at least max_threads that are not sleeping.
+    pool = ThreadPool.new(2)
+    initial_sleep_time = 0.2
+    future1 = pool.future { sleep initial_sleep_time }
+    dependent_futures = 5.times.collect { pool.future{ future1.value } }
+    future2 = pool.future { sleep initial_sleep_time }
+    future3 = pool.future { sleep 0.01 }
+
+    sleep initial_sleep_time / 2.0 # wait for everything to queue up
+
+    # at this point, we should have 5 threads sleeping depending on future1, and
+    # two threads doing work on future1 and future 2.
+    assert_equal pool.__send__(:__threads__).count, 7
+
+    # future 3 is in the queue because there aren't enough active threads to work on it.
+    assert_equal pool.__send__(:__queue__).size, 1
+
+    [future1, dependent_futures, future2, future3].flatten.each { |f| f.value }
+    pool.join
+  end
+
   def test_pool_prevents_deadlock
     pool = ThreadPool.new(5)
 

data/test/test_rake_top_level_functions.rb

@@ -65,46 +65,6 @@ class TestRakeTopLevelFunctions < Rake::TestCase
     Rake::FileUtilsExt.nowrite_flag = false
   end
 
-  def test_missing_constants_task
-    Object.const_missing(:Task)
-
-    expected = [
-      [[:const_warning, :Task], nil]
-    ]
-
-    assert_equal expected, @app.called
-  end
-
-  def test_missing_constants_file_task
-    Object.const_missing(:FileTask)
-
-    expected = [
-      [[:const_warning, :FileTask], nil]
-    ]
-
-    assert_equal expected, @app.called
-  end
-
-  def test_missing_constants_file_creation_task
-    Object.const_missing(:FileCreationTask)
-
-    expected = [
-      [[:const_warning, :FileCreationTask], nil]
-    ]
-
-    assert_equal expected, @app.called
-  end
-
-  def test_missing_constants_rake_app
-    Object.const_missing(:RakeApp)
-
-    expected = [
-      [[:const_warning, :RakeApp], nil]
-    ]
-
-    assert_equal expected, @app.called
-  end
-
   def test_missing_other_constant
     assert_raises(NameError) do Object.const_missing(:Xyz) end
   end

data/test/test_thread_history_display.rb

@@ -18,7 +18,7 @@ class TestThreadHistoryDisplay < Rake::TestCase
   end
 
   def test_item_queued
-    @stats << event(:item_queued,  :item_id => 123)
+    @stats << event(:item_queued,  item_id: 123)
     out, _ = capture_io do
       @display.show
     end
@@ -26,7 +26,7 @@ class TestThreadHistoryDisplay < Rake::TestCase
   end
 
   def test_item_dequeued
-    @stats << event(:item_dequeued,  :item_id => 123)
+    @stats << event(:item_dequeued,  item_id: 123)
     out, _ = capture_io do
       @display.show
     end
@@ -34,8 +34,8 @@ class TestThreadHistoryDisplay < Rake::TestCase
   end
 
   def test_multiple_items
-    @stats << event(:item_queued,  :item_id => 123)
-    @stats << event(:item_queued,  :item_id => 124)
+    @stats << event(:item_queued,  item_id: 123)
+    @stats << event(:item_queued,  item_id: 124)
     out, _ = capture_io do
       @display.show
     end
@@ -44,7 +44,7 @@ class TestThreadHistoryDisplay < Rake::TestCase
   end
 
   def test_waiting
-    @stats << event(:waiting, :item_id => 123)
+    @stats << event(:waiting, item_id: 123)
     out, _ = capture_io do
       @display.show
     end
@@ -52,7 +52,7 @@ class TestThreadHistoryDisplay < Rake::TestCase
   end
 
   def test_continue
-    @stats << event(:continue, :item_id => 123)
+    @stats << event(:continue, item_id: 123)
     out, _ = capture_io do
       @display.show
     end
@@ -60,29 +60,29 @@ class TestThreadHistoryDisplay < Rake::TestCase
   end
 
   def test_thread_deleted
-    @stats << event(:thread_deleted, :deleted_thread => 123456, :thread_count => 12)
+    @stats << event(:thread_deleted, deleted_thread: 123456, thread_count: 12)
     out, _ = capture_io do
       @display.show
     end
-    assert_match(/^ *1000000 +A +thread_deleted( +deleted_thread:B| +thread_count:12){2}$/, out)
+    assert_match(/^ *1000000 +A +thread_deleted +deleted_thread:B +thread_count:12$/, out)
   end
 
   def test_thread_created
-    @stats << event(:thread_created, :new_thread => 123456, :thread_count => 13)
+    @stats << event(:thread_created, new_thread: 123456, thread_count: 13)
     out, _ = capture_io do
       @display.show
     end
-    assert_match(/^ *1000000 +A +thread_created( +new_thread:B| +thread_count:13){2}$/, out)
+    assert_match(/^ *1000000 +A +thread_created +new_thread:B +thread_count:13$/, out)
   end
 
   private
 
   def event(type, data={})
     result = {
-      :event => type,
-      :time  => @time / 1_000_000.0,
-      :data  => data,
-      :thread => Thread.current.object_id
+      event: type,
+      time: @time / 1_000_000.0,
+      data: data,
+      thread: Thread.current.object_id
     }
     @time += 1
     result

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 0.9.6
-  prerelease: 
+  version: 10.0.0.beta.1
+  prerelease: 7
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -62,12 +62,8 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.8.7.rdoc
 - doc/release_notes/rake-0.9.0.rdoc
 - doc/release_notes/rake-0.9.1.rdoc
-- doc/release_notes/rake-0.9.2.2.rdoc
 - doc/release_notes/rake-0.9.2.rdoc
 - doc/release_notes/rake-0.9.3.rdoc
-- doc/release_notes/rake-0.9.4.rdoc
-- doc/release_notes/rake-0.9.5.rdoc
-- doc/release_notes/rake-0.9.6.rdoc
 files:
 - .gemtest
 - install.rb
@@ -81,7 +77,6 @@ files:
 - lib/rake/alt_system.rb
 - lib/rake/application.rb
 - lib/rake/backtrace.rb
-- lib/rake/classic_namespace.rb
 - lib/rake/clean.rb
 - lib/rake/cloneable.rb
 - lib/rake/contrib/compositepublisher.rb
@@ -89,7 +84,6 @@ files:
 - lib/rake/contrib/publisher.rb
 - lib/rake/contrib/rubyforgepublisher.rb
 - lib/rake/contrib/sshpublisher.rb
-- lib/rake/contrib/sys.rb
 - lib/rake/default_loader.rb
 - lib/rake/dsl_definition.rb
 - lib/rake/early_time.rb
@@ -102,7 +96,6 @@ files:
 - lib/rake/file_task.rb
 - lib/rake/file_utils.rb
 - lib/rake/file_utils_ext.rb
-- lib/rake/gempackagetask.rb
 - lib/rake/invocation_chain.rb
 - lib/rake/invocation_exception_mixin.rb
 - lib/rake/loaders/makefile.rb
@@ -111,12 +104,9 @@ files:
 - lib/rake/packagetask.rb
 - lib/rake/pathmap.rb
 - lib/rake/phony.rb
-- lib/rake/private_reader.rb
-- lib/rake/promise.rb
 - lib/rake/pseudo_status.rb
 - lib/rake/rake_module.rb
 - lib/rake/rake_test_loader.rb
-- lib/rake/rdoctask.rb
 - lib/rake/ruby182_test_unit_fix.rb
 - lib/rake/rule_recursion_overflow_error.rb
 - lib/rake/runtest.rb
@@ -128,12 +118,10 @@ files:
 - lib/rake/testtask.rb
 - lib/rake/thread_history_display.rb
 - lib/rake/thread_pool.rb
-- lib/rake/trace_output.rb
 - lib/rake/version.rb
 - lib/rake/win32.rb
 - test/file_creation.rb
 - test/helper.rb
-- test/test_private_reader.rb
 - test/test_rake.rb
 - test/test_rake_application.rb
 - test/test_rake_application_options.rb
@@ -161,7 +149,6 @@ files:
 - test/test_rake_path_map_partial.rb
 - test/test_rake_pseudo_status.rb
 - test/test_rake_rake_test_loader.rb
-- test/test_rake_rdoc_task.rb
 - test/test_rake_reduce_compat.rb
 - test/test_rake_require.rb
 - test/test_rake_rules.rb
@@ -176,9 +163,7 @@ files:
 - test/test_rake_thread_pool.rb
 - test/test_rake_top_level_functions.rb
 - test/test_rake_win32.rb
-- test/test_sys.rb
 - test/test_thread_history_display.rb
-- test/test_trace_output.rb
 - doc/command_line_usage.rdoc
 - doc/example/Rakefile1
 - doc/example/Rakefile2
@@ -210,12 +195,8 @@ files:
 - doc/release_notes/rake-0.8.7.rdoc
 - doc/release_notes/rake-0.9.0.rdoc
 - doc/release_notes/rake-0.9.1.rdoc
-- doc/release_notes/rake-0.9.2.2.rdoc
 - doc/release_notes/rake-0.9.2.rdoc
 - doc/release_notes/rake-0.9.3.rdoc
-- doc/release_notes/rake-0.9.4.rdoc
-- doc/release_notes/rake-0.9.5.rdoc
-- doc/release_notes/rake-0.9.6.rdoc
 homepage: http://rake.rubyforge.org
 licenses: []
 post_install_message: 

data/doc/release_notes/rake-0.9.2.2.rdoc

@@ -1,55 +0,0 @@
-= Rake 0.9.3 Released
-
-Rake version 0.9.3 is mainly bug fixes.
-
-== Changes
-
-* The rake test loader now removes arguments it has processed.  Issue #51
-* Rake::TaskArguments now responds to #values_at
-* RakeFileUtils.verbose_flag = nil silences output the same as 0.8.7
-* Rake tests are now directory-independent
-* Rake tests are no longer require flexmock
-* Commands constant is no longer polluting top level namespace.
-* Show only the interesting portion of the backtrace by default (James M. Lawrence).
-* Added --reduce-compat option to remove backward compatible DSL hacks (James M. Lawrence).
-
-== 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 traditional places:
-
-Home Page:: http://rake.rubyforge.org/
-Download::  http://rubyforge.org/project/showfiles.php?group_id=50
-GitHub::    git://github.com/jimweirich/rake.git
-
-== Thanks
-
-As usual, it was input from users that drove a alot of these changes. The
-following people either contributed patches, made suggestions or made
-otherwise helpful comments.  Thanks to ...
-
-* James M. Lawrence (quix)
-* Roger Pack
-* Cezary Baginski
-* Sean Scot August Moon
-* R.T. Lechow
-* Alex Chaffee
-* James Tucker
-* Matthias Lüdtke
-* Santiago Pastorino
-
-Also, bit thanks to Eric Hodel for assisting with getting this release
-out the door (where "assisting" includes, but is not by any means
-limited to, "pushing" me to get it done).
-
--- Jim Weirich