rake 0.9.2.2 → 0.9.4

data/test/test_rake_task.rb

@@ -104,10 +104,12 @@ class TestRakeTask < Rake::TestCase
   end
 
   def test_clear
+    desc "a task"
     t = task("t" => "a") { }
     t.clear
     assert t.prerequisites.empty?, "prerequisites should be empty"
     assert t.actions.empty?, "actions should be empty"
+    assert_nil t.comment, "comments should be empty"
   end
 
   def test_clear_prerequisites
@@ -123,6 +125,22 @@ class TestRakeTask < Rake::TestCase
     assert t.actions.empty?, "actions should be empty"
   end
 
+  def test_clear_comments
+    desc "the original foo"
+    task :foo => [:x] do
+      # Dummy action
+    end
+
+    task(:foo).clear_comments
+
+    desc "a slightly different foo"
+    task :foo
+
+    assert_equal "a slightly different foo", task(:foo).comment
+    assert_equal ["x"], task(:foo).prerequisites
+    assert_equal 1, task(:foo).actions.size
+  end
+
   def test_find
     task :tfind
     assert_equal "tfind", Task[:tfind].name
@@ -223,6 +241,38 @@ class TestRakeTask < Rake::TestCase
     assert_in_delta now + 10, a.timestamp, 0.1, 'computer too slow?'
   end
 
+  def test_always_multitask
+    mx = Mutex.new
+    result = []
+
+    t_a = task(:a) do |t|
+      sleep 0.02
+      mx.synchronize{ result << t.name }
+    end
+
+    t_b = task(:b) do |t|
+      mx.synchronize{ result << t.name }
+    end
+
+    t_c = task(:c => [:a,:b]) do |t|
+      mx.synchronize{ result << t.name }
+    end
+
+    t_c.invoke
+
+    # task should always run in order
+    assert_equal ['a', 'b', 'c'], result
+
+    [t_a, t_b, t_c].each { |t| t.reenable }
+    result.clear
+
+    Rake.application.options.always_multitask = true
+    t_c.invoke
+
+    # with multitask, task 'b' should grab the mutex first
+    assert_equal ['b', 'a', 'c'], result
+  end
+
   def test_investigation_output
     t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
     task(:t2)
@@ -264,4 +314,3 @@ class TestRakeTask < Rake::TestCase
     assert_equal "HI", t.comment
   end
 end
-

data/test/test_rake_thread_pool.rb

@@ -0,0 +1,123 @@
+require File.expand_path('../helper', __FILE__)
+require 'rake/thread_pool'
+require 'test/unit/assertions'
+
+class TestRakeTestThreadPool < Rake::TestCase
+  include Rake
+
+  def test_pool_executes_in_current_thread_for_zero_threads
+    pool = ThreadPool.new(0)
+    f = pool.future{Thread.current}
+    pool.join
+    assert_equal Thread.current, f.value
+  end
+
+  def test_pool_executes_in_other_thread_for_pool_of_size_one
+    pool = ThreadPool.new(1)
+    f = pool.future{Thread.current}
+    pool.join
+    refute_equal Thread.current, f.value
+  end
+
+  def test_pool_executes_in_two_other_threads_for_pool_of_size_two
+    pool = ThreadPool.new(2)
+    threads = 2.times.collect{ pool.future{ sleep 0.1; Thread.current } }.each{|f|f.value}
+
+    refute_equal threads[0], threads[1]
+    refute_equal Thread.current, threads[0]
+    refute_equal Thread.current, threads[1]
+  end
+
+  def test_pool_creates_the_correct_number_of_threads
+    pool = ThreadPool.new(2)
+    threads = Set.new
+    t_mutex = Mutex.new
+    10.times.each do
+      pool.future do
+        sleep 0.02
+        t_mutex.synchronize{ threads << Thread.current }
+      end
+    end
+    pool.join
+    assert_equal 2, threads.count
+  end
+
+  def test_pool_future_captures_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! }
+    pool.join
+    assert_equal 'a', a
+    assert_equal 'b'.capitalize, b
+  end
+
+  def test_pool_join_empties_queue
+    pool = ThreadPool.new(2)
+    repeat = 25
+    repeat.times {
+      pool.future do
+        repeat.times {
+          pool.future do
+            repeat.times {
+              pool.future do end
+            }
+          end
+        }
+      end
+    }
+
+    pool.join
+    assert_equal true, pool.__send__(:__queue__).empty?, "queue should be empty"
+  end
+
+  # 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 )
+      pool.future(count-1, &deep_exception_block).value
+    end
+
+    assert_raises(Exception) do
+      pool.future(2, &deep_exception_block).value
+    end
+
+  end
+
+  def test_pool_prevents_deadlock
+    pool = ThreadPool.new(5)
+
+    common_dependency_a = pool.future { sleep 0.2 }
+    futures_a = 10.times.collect { pool.future{ common_dependency_a.value; sleep(rand() * 0.01) } }
+
+    common_dependency_b = pool.future { futures_a.each { |f| f.value } }
+    futures_b = 10.times.collect { pool.future{ common_dependency_b.value; sleep(rand() * 0.01) } }
+
+    futures_b.each{|f|f.value}
+    pool.join
+  end
+
+  def test_pool_reports_correct_results
+    pool = ThreadPool.new(7)
+
+    a = 18
+    b = 5
+    c = 3
+
+    result = a.times.collect do
+      pool.future do
+        b.times.collect do
+          pool.future { sleep rand * 0.001; c }
+        end.inject(0) { |m,f| m+f.value }
+      end
+    end.inject(0) { |m,f| m+f.value }
+
+    assert_equal( (a*b*c), result )
+    pool.join
+  end
+
+end

data/test/test_thread_history_display.rb

@@ -0,0 +1,91 @@
+require File.expand_path('../helper', __FILE__)
+
+require 'rake/thread_history_display'
+
+class TestThreadHistoryDisplay < Rake::TestCase
+  def setup
+    super
+    @time = 1000000
+    @stats = []
+    @display = Rake::ThreadHistoryDisplay.new(@stats)
+  end
+
+  def test_banner
+    out, _ = capture_io do
+      @display.show
+    end
+    assert_match(/Job History/i, out)
+  end
+
+  def test_item_queued
+    @stats << event(:item_queued,  :item_id => 123)
+    out, _ = capture_io do
+      @display.show
+    end
+    assert_match(/^ *1000000 +A +item_queued +item_id:1$/, out)
+  end
+
+  def test_item_dequeued
+    @stats << event(:item_dequeued,  :item_id => 123)
+    out, _ = capture_io do
+      @display.show
+    end
+    assert_match(/^ *1000000 +A +item_dequeued +item_id:1$/, out)
+  end
+
+  def test_multiple_items
+    @stats << event(:item_queued,  :item_id => 123)
+    @stats << event(:item_queued,  :item_id => 124)
+    out, _ = capture_io do
+      @display.show
+    end
+    assert_match(/^ *1000000 +A +item_queued +item_id:1$/, out)
+    assert_match(/^ *1000001 +A +item_queued +item_id:2$/, out)
+  end
+
+  def test_waiting
+    @stats << event(:waiting, :item_id => 123)
+    out, _ = capture_io do
+      @display.show
+    end
+    assert_match(/^ *1000000 +A +waiting +item_id:1$/, out)
+  end
+
+  def test_continue
+    @stats << event(:continue, :item_id => 123)
+    out, _ = capture_io do
+      @display.show
+    end
+    assert_match(/^ *1000000 +A +continue +item_id:1$/, out)
+  end
+
+  def test_thread_deleted
+    @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)
+  end
+
+  def test_thread_created
+    @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)
+  end
+
+  private
+
+  def event(type, data={})
+    result = {
+      :event => type,
+      :time  => @time / 1_000_000.0,
+      :data  => data,
+      :thread => Thread.current.object_id
+    }
+    @time += 1
+    result
+  end
+
+end

metadata

@@ -1,35 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rake
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.9.4
   prerelease: 
-  version: 0.9.2.2
 platform: ruby
-authors: 
+authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
-  version_requirements: *id001
-description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies
+  arespecified in standard Ruby syntax.
 email: jim@weirichhouse.org
-executables: 
+executables:
 - rake
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - MIT-LICENSE
 - TODO
@@ -58,18 +62,21 @@ 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
-files: 
+- doc/release_notes/rake-0.9.3.rdoc
+files:
 - .gemtest
 - install.rb
 - CHANGES
 - MIT-LICENSE
-- Rakefile
 - README.rdoc
+- Rakefile
 - TODO
 - bin/rake
 - 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
@@ -99,6 +106,9 @@ files:
 - lib/rake/name_space.rb
 - 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
@@ -112,14 +122,18 @@ files:
 - lib/rake/task_manager.rb
 - lib/rake/tasklib.rb
 - lib/rake/testtask.rb
+- lib/rake/thread_history_display.rb
+- lib/rake/thread_pool.rb
 - lib/rake/version.rb
 - lib/rake/win32.rb
 - lib/rake.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
+- test/test_rake_backtrace.rb
 - test/test_rake_clean.rb
 - test/test_rake_definitions.rb
 - test/test_rake_directory_task.rb
@@ -144,6 +158,7 @@ files:
 - 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
 - test/test_rake_task.rb
@@ -154,9 +169,11 @@ files:
 - test/test_rake_task_manager_argument_resolution.rb
 - test/test_rake_task_with_arguments.rb
 - test/test_rake_test_task.rb
+- 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
 - doc/command_line_usage.rdoc
 - doc/example/a.c
 - doc/example/b.c
@@ -188,38 +205,37 @@ 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
 homepage: http://rake.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --show-hash
 - --main
 - README.rdoc
 - --title
 - Rake -- Ruby Make
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.2
 requirements: []
-
 rubyforge_project: rake
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby based make-like utility.
 test_files: []
-