rake 0.9.3.beta.1 → 0.9.3.beta.2

data/test/test_rake_application.rb

@@ -385,6 +385,18 @@ class TestRakeApplication < Rake::TestCase
     ARGV.clear
   end
 
+  def test_bad_run_with_backtrace
+    @app.intern(Rake::Task, "default").enhance { fail }
+    ARGV.clear
+    ARGV << '-f' << '-s' << '--backtrace'
+    assert_raises(SystemExit) {
+      _, err = capture_io { @app.run }
+      refute_match(/see full trace/, err)
+    }
+  ensure
+    ARGV.clear
+  end
+
   def test_run_with_bad_options
     @app.intern(Rake::Task, "default").enhance { fail }
     ARGV.clear

data/test/test_rake_application_options.rb

@@ -29,6 +29,7 @@ class TestRakeApplicationOptions < Rake::TestCase
 
   def test_default_options
     opts = command_line
+    assert_nil opts.backtrace
     assert_nil opts.classic_namespace
     assert_nil opts.dryrun
     assert_nil opts.ignore_system
@@ -40,6 +41,7 @@ class TestRakeApplicationOptions < Rake::TestCase
     assert_nil opts.show_tasks
     assert_nil opts.silent
     assert_nil opts.trace
+    assert_nil opts.thread_pool_size
     assert_equal ['rakelib'], opts.rakelib
     assert ! Rake::FileUtilsExt.verbose_flag
     assert ! Rake::FileUtilsExt.nowrite_flag
@@ -110,6 +112,18 @@ class TestRakeApplicationOptions < Rake::TestCase
     assert_equal :exit, @exit
   end
 
+  def test_jobs
+    flags(['--jobs', '4'], ['-j', '4']) do |opts|
+      assert_equal 4, opts.thread_pool_size
+    end
+    flags(['--jobs', 'asdas'], ['-j', 'asdas']) do |opts|
+      assert_equal 2, opts.thread_pool_size
+    end
+    flags('--jobs', '-j') do |opts|
+      assert_equal 2, opts.thread_pool_size
+    end
+  end
+
   def test_libdir
     flags(['--libdir', 'xx'], ['-I', 'xx'], ['-Ixx']) do |opts|
       $:.include?('xx')
@@ -197,12 +211,21 @@ class TestRakeApplicationOptions < Rake::TestCase
 
   def test_trace
     flags('--trace', '-t') do |opts|
-      assert opts.trace
+      assert opts.trace, "should enable trace option"
+      assert opts.backtrace, "should enabled backtrace option"
       assert Rake::FileUtilsExt.verbose_flag
       assert ! Rake::FileUtilsExt.nowrite_flag
     end
   end
 
+  def test_backtrace
+    flags('--backtrace') do |opts|
+      assert opts.backtrace, "should enable backtrace option"
+      assert ! opts.trace, "should not enable trace option"
+      assert ! Rake::FileUtilsExt.verbose_flag
+    end
+  end
+
   def test_trace_rules
     flags('--rules') do |opts|
       assert opts.trace_rules
@@ -213,10 +236,17 @@ class TestRakeApplicationOptions < Rake::TestCase
     flags('--tasks', '-T') do |opts|
       assert_equal :tasks, opts.show_tasks
       assert_equal(//.to_s, opts.show_task_pattern.to_s)
+      assert_equal nil, opts.show_all_tasks
     end
     flags(['--tasks', 'xyz'], ['-Txyz']) do |opts|
       assert_equal :tasks, opts.show_tasks
       assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
+      assert_equal nil, opts.show_all_tasks
+    end
+    flags(['--tasks', 'xyz', '--comments']) do |opts|
+      assert_equal :tasks, opts.show_tasks
+      assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
+      assert_equal false, opts.show_all_tasks
     end
   end
 
@@ -224,10 +254,17 @@ class TestRakeApplicationOptions < Rake::TestCase
     flags('--where', '-W') do |opts|
       assert_equal :lines, opts.show_tasks
       assert_equal(//.to_s, opts.show_task_pattern.to_s)
+      assert_equal true, opts.show_all_tasks
     end
     flags(['--where', 'xyz'], ['-Wxyz']) do |opts|
       assert_equal :lines, opts.show_tasks
       assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
+      assert_equal true, opts.show_all_tasks
+    end
+    flags(['--where', 'xyz', '--comments'], ['-Wxyz', '--comments']) do |opts|
+      assert_equal :lines, opts.show_tasks
+      assert_equal(/xyz/.to_s, opts.show_task_pattern.to_s)
+      assert_equal false, opts.show_all_tasks
     end
   end
 
@@ -268,7 +305,7 @@ class TestRakeApplicationOptions < Rake::TestCase
         assert_equal opts.trace, $trace
         assert_equal opts.dryrun, $dryrun
         assert_equal opts.silent, $silent
-            end
+      end
     end
 
     assert_match(/deprecated/, err)
@@ -332,4 +369,3 @@ class TestRakeApplicationOptions < Rake::TestCase
     @app.options
   end
 end
-

data/test/test_rake_directory_task.rb

@@ -36,11 +36,6 @@ class TestRakeDirectoryTask < Rake::TestCase
       assert_nil             Task['c:/'].comment
       assert_equal "WIN32 DESC",   Task['c:/a/b/c'].comment
       assert_nil             Task['c:/a/b'].comment
-      verbose(false) {
-        Task['c:/a/b'].invoke
-      }
-      assert File.exist?('c:/a/b')
-      refute File.exist?('c:/a/b/c')
     end
   end
 end

data/test/test_rake_file_task.rb

@@ -1,6 +1,10 @@
 require File.expand_path('../helper', __FILE__)
 require 'fileutils'
 
+def load_phony
+  load File.dirname(__FILE__) + "/../lib/rake/phony.rb"
+end
+
 class TestRakeFileTask < Rake::TestCase
   include Rake
 
@@ -41,6 +45,23 @@ class TestRakeFileTask < Rake::TestCase
     assert ! t1.needed?, "Should not need to rebuild new file because of old"
   end
 
+  def test_file_times_new_depend_on_regular_task_timestamps
+    load_phony
+
+    name = "dummy"
+    task name
+
+    create_timed_files(NEWFILE)
+
+    t1 = Rake.application.intern(FileTask, NEWFILE).enhance([name])
+
+    assert t1.needed?, "depending on non-file task uses Time.now"
+
+    task(name => :phony)
+
+    assert ! t1.needed?, "unless the non-file task has a timestamp"
+  end
+
   def test_file_times_old_depends_on_new
     create_timed_files(OLDFILE, NEWFILE)
 
@@ -99,4 +120,3 @@ class TestRakeFileTask < Rake::TestCase
   end
 
 end
-

data/test/test_rake_functional.rb

@@ -417,6 +417,28 @@ class TestRakeFunctional < Rake::TestCase
     assert_equal "1\n", @out
   end
 
+  def can_detect_signals?
+    system "ruby -e 'Process.kill \"TERM\", $$'"
+    status = $?
+    if @verbose
+      puts "    SIG status = #{$?.inspect}"
+      puts "    SIG status.respond_to?(:signaled?) = #{$?.respond_to?(:signaled?).inspect}"
+      puts "    SIG status.signaled? = #{status.signaled?}" if status.respond_to?(:signaled?)
+    end
+    status.respond_to?(:signaled?) && status.signaled?
+  end
+
+  def test_signal_propagation_in_tests
+    if can_detect_signals?
+      rakefile_test_signal
+      rake
+      assert_match(/ATEST/, @out)
+      refute_match(/BTEST/, @out)
+    else
+      puts "\nWARNING: Signal detect seems broken on this system (#{__FILE__}:#{__LINE__})"
+    end
+  end
+
   private
 
   # Run a shell Ruby command with command line options (using the

data/test/test_rake_multi_task.rb

@@ -47,5 +47,13 @@ class TestRakeMultiTask < Rake::TestCase
     assert @runs.index("B0") < @runs.index("B1")
     assert @runs.index("B1") < @runs.index("B2")
   end
+
+  def test_multitasks_with_parameters
+    task :a, [:arg] do |t,args| add_run(args[:arg]) end
+    multitask :b, [:arg] => [:a] do |t,args| add_run(args[:arg]+'mt') end
+    Task[:b].invoke "b"
+    assert @runs[0] == "b"
+    assert @runs[1] == "bmt"
+  end
 end
 

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
@@ -264,4 +282,3 @@ class TestRakeTask < Rake::TestCase
     assert_equal "HI", t.comment
   end
 end
-

data/test/test_rake_thread_pool.rb

@@ -0,0 +1,146 @@
+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.call
+  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.call
+  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.call}
+
+    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?
+  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).call
+    end
+
+    assert_raises(Exception) do
+      pool.future(2, &deep_exception_block).call
+    end
+
+  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.call } }
+    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.call }
+    pool.join
+  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.call; sleep(rand() * 0.01) } }
+
+    common_dependency_b = pool.future { futures_a.each { |f| f.call } }
+    futures_b = 10.times.collect { pool.future{ common_dependency_b.call; sleep(rand() * 0.01) } }
+
+    futures_b.each{|f|f.call}
+    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.call }
+      end
+    end.inject(0) { |m,f| m+f.call }
+
+    assert_equal( (a*b*c), result )
+    pool.join
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 0.9.3.beta.1
+  version: 0.9.3.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-06 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70183536931420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,12 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70183536931420
+  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
@@ -58,6 +63,7 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.9.0.rdoc
 - doc/release_notes/rake-0.9.1.rdoc
 - doc/release_notes/rake-0.9.2.rdoc
+- doc/release_notes/rake-0.9.3.rdoc
 files:
 - .gemtest
 - install.rb
@@ -67,6 +73,7 @@ files:
 - Rakefile
 - TODO
 - bin/rake
+- lib/rake.rb
 - lib/rake/alt_system.rb
 - lib/rake/application.rb
 - lib/rake/backtrace.rb
@@ -99,6 +106,7 @@ files:
 - lib/rake/name_space.rb
 - lib/rake/packagetask.rb
 - lib/rake/pathmap.rb
+- lib/rake/phony.rb
 - lib/rake/pseudo_status.rb
 - lib/rake/rake_module.rb
 - lib/rake/rake_test_loader.rb
@@ -112,9 +120,9 @@ files:
 - lib/rake/task_manager.rb
 - lib/rake/tasklib.rb
 - lib/rake/testtask.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_rake.rb
@@ -156,15 +164,16 @@ 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
 - doc/command_line_usage.rdoc
+- doc/example/Rakefile1
+- doc/example/Rakefile2
 - doc/example/a.c
 - doc/example/b.c
 - doc/example/main.c
-- doc/example/Rakefile1
-- doc/example/Rakefile2
 - doc/glossary.rdoc
 - doc/jamis.rb
 - doc/proto_rake.rdoc
@@ -191,6 +200,7 @@ files:
 - doc/release_notes/rake-0.9.0.rdoc
 - doc/release_notes/rake-0.9.1.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: 
@@ -217,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.2
 requirements: []
 rubyforge_project: rake
-rubygems_version: 1.8.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby based make-like utility.