drake 0.8.7.0.2.4 → 0.9.0.0.3.0

data/test/{test_tasks.rb → lib/task_test.rb}

@@ -3,8 +3,6 @@
 require 'test/unit'
 require 'fileutils'
 require 'rake'
-require 'test/filecreation'
-require 'test/capture_stdout'
 require 'test/rake_test_setup'
 
 ######################################################################
@@ -12,9 +10,16 @@ class TestTask < Test::Unit::TestCase
   include CaptureStdout
   include Rake
   include TestMethods
+  include Rake::DSL
 
   def setup
     Task.clear
+    Rake::TaskManager.record_task_metadata = true
+  end
+
+  def teardown
+    super
+    Rake::TaskManager.record_task_metadata = false
   end
 
   def test_create
@@ -27,15 +32,18 @@ class TestTask < Test::Unit::TestCase
     assert_equal t, arg
     assert_nil t.source
     assert_equal [], t.sources
+    assert_equal 1, t.locations.size
+    assert_match(/#{Regexp.quote(__FILE__)}/, t.locations.first)
   end
 
   def test_inspect
-    t = task(:foo, :needs => [:bar, :baz])
+#    t = task(:foo, :needs => [:bar, :baz])
+    t = task(:foo => [:bar, :baz])
     assert_equal "<Rake::Task foo => [bar, baz]>", t.inspect
   end
 
   def test_invoke
-    runlist = SerializedArray.new
+    runlist = ThreadSafeArray.new
     t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
     t2 = task(:t2) { |t| runlist << t.name }
     t3 = task(:t3) { |t| runlist << t.name }
@@ -52,7 +60,7 @@ class TestTask < Test::Unit::TestCase
   end
 
   def test_invoke_with_circular_dependencies
-    runlist = SerializedArray.new
+    runlist = ThreadSafeArray.new
     t1 = task(:t1 => [:t2]) { |t| runlist << t.name; 3321 }
     t2 = task(:t2 => [:t1]) { |t| runlist << t.name }
     assert_equal ["t2"], t1.prerequisites
@@ -66,9 +74,9 @@ class TestTask < Test::Unit::TestCase
 
   def test_dry_run_prevents_actions
     Rake.application.options.dryrun = true
-    runlist = SerializedArray.new
+    runlist = ThreadSafeArray.new
     t1 = task(:t1) { |t| runlist << t.name; 3321 }
-    out = capture_stdout { t1.invoke }
+    out = capture_stderr { t1.invoke }
     assert_match(/execute .*t1/i, out)
     assert_match(/dry run/i, out)
     assert_no_match(/invoke/i, out)
@@ -80,7 +88,7 @@ class TestTask < Test::Unit::TestCase
   def test_tasks_can_be_traced
     Rake.application.options.trace = true
     t1 = task(:t1)
-    out = capture_stdout {
+    out = capture_stderr {
       t1.invoke
     }
     assert_match(/invoke t1/i, out)
@@ -90,7 +98,7 @@ class TestTask < Test::Unit::TestCase
   end
 
   def test_no_double_invoke
-    runlist = SerializedArray.new
+    runlist = ThreadSafeArray.new
     t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
     t2 = task(:t2 => [:t3]) { |t| runlist << t.name }
     t3 = task(:t3) { |t| runlist << t.name }
@@ -106,7 +114,7 @@ class TestTask < Test::Unit::TestCase
   end
 
   def test_can_double_invoke_with_reenable
-    runlist = SerializedArray.new
+    runlist = ThreadSafeArray.new
     t1 = task(:t1) { |t| runlist << t.name }
     t1.invoke
     t1.reenable
@@ -148,7 +156,7 @@ class TestTask < Test::Unit::TestCase
   end
 
   def test_multi_invocations
-    runs = SerializedArray.new
+    runs = ThreadSafeArray.new
     p = proc do |t| runs << t.name end
     task({:t1=>[:t2,:t3]}, &p)
     task({:t2=>[:t3]}, &p)
@@ -188,6 +196,56 @@ class TestTask < Test::Unit::TestCase
     assert_equal ["b", "c"], Task[:a].prerequisites
   end
 
+  def test_prerequiste_tasks_returns_tasks_not_strings
+    a = task :a => ["b", "c"]
+    b = task :b
+    c = task :c
+    assert_equal [b, c], a.prerequisite_tasks
+  end
+
+  def test_prerequiste_tasks_fails_if_prerequisites_are_undefined
+    a = task :a => ["b", "c"]
+    b = task :b
+    assert_exception(RuntimeError) do
+      a.prerequisite_tasks
+    end
+  end
+
+  def test_prerequiste_tasks_honors_namespaces
+    a = b = nil
+    namespace "X" do
+      a = task :a => ["b", "c"]
+      b = task :b
+    end
+    c = task :c
+
+    assert_equal [b, c], a.prerequisite_tasks
+  end
+
+  def test_timestamp_returns_now_if_all_prereqs_have_no_times
+    a = task :a => ["b", "c"]
+    b = task :b
+    c = task :c
+
+    faux_stamp = 100
+    flexmock(Time, :now => faux_stamp)
+
+    assert_equal faux_stamp, a.timestamp
+  end
+
+  def test_timestamp_returns_latest_prereq_timestamp
+    a = task :a => ["b", "c"]
+    b = task :b
+    c = task :c
+
+    faux_stamp = 100
+    flexmock(Time, :now => faux_stamp-10)
+    flexmock(b, :timestamp => faux_stamp - 1)
+    flexmock(c, :timestamp => faux_stamp)
+
+    assert_equal faux_stamp, a.timestamp
+  end
+
   def test_investigation_output
     t1 = task(:t1 => [:t2, :t3]) { |t| runlist << t.name; 3321 }
     task(:t2)
@@ -235,9 +293,17 @@ class TestTaskWithArguments < Test::Unit::TestCase
   include CaptureStdout
   include Rake
   include TestMethods
+  include Rake::DSL
 
   def setup
+    super
     Task.clear
+    Rake::TaskManager.record_task_metadata = true
+  end
+
+  def teardown
+    Rake::TaskManager.record_task_metadata = false
+    super
   end
 
   def test_no_args_given
@@ -257,23 +323,20 @@ class TestTaskWithArguments < Test::Unit::TestCase
     assert_equal ["pre"], t.prerequisites
   end
 
-  def test_name_and_explicit_needs
-    t = task(:t, :needs => [:pre])
-    assert_equal "t", t.name
-    assert_equal [], t.arg_names
-    assert_equal ["pre"], t.prerequisites
-  end
-
   def test_name_args_and_explicit_needs
-    t = task(:t, :x, :y, :needs => [:pre])
-    assert_equal "t", t.name
-    assert_equal [:x, :y], t.arg_names
-    assert_equal ["pre"], t.prerequisites
+    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
   end
 
   def test_illegal_keys_in_task_name_hash
-    assert_exception RuntimeError do
-      t = task(:t, :x, :y => 1, :needs => [:pre])
+    ignore_deprecations do
+      assert_exception RuntimeError do
+        t = task(:t, :x, :y => 1, :needs => [:pre])
+      end
     end
   end
 
@@ -296,7 +359,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
   end
 
   def test_actions_of_various_arity_are_ok_with_args
-    notes = SerializedArray.new
+    notes = ThreadSafeArray.new
     t = task(:t, :x) do
       notes << :a
     end
@@ -364,7 +427,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
   def test_named_args_are_passed_to_prereqs
     value = nil
     pre = task(:pre, :rev) { |t, args| value = args.rev }
-    t = task(:t, :name, :rev, :needs => [:pre])
+    t = task(:t, [:name, :rev] => [:pre])
     t.invoke("bill", "1.2")
     assert_equal "1.2", value
   end
@@ -374,7 +437,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
       assert_equal({}, args.to_hash)
       assert_equal "bill", args.name
     }
-    t = task(:t, :name, :rev, :needs => [:pre])
+    t = task(:t, [:name, :rev] => [:pre])
     t.invoke("bill", "1.2")
   end
 
@@ -382,7 +445,7 @@ class TestTaskWithArguments < Test::Unit::TestCase
     pre = task(:pre, :rev) { |t, args|
       assert_equal({}, args.to_hash)
     }
-    t = task(:t, :needs => [:pre])
+    t = task(:t  => [:pre])
     t.invoke("bill", "1.2")
   end
 end

data/test/{test_test_task.rb → lib/test_task_test.rb}

@@ -6,7 +6,7 @@ require 'rake/testtask'
 class TestTestTask < Test::Unit::TestCase
   include Rake
   include TestMethods
-  
+
   def setup
     Task.clear
     ENV.delete('TEST')
@@ -48,7 +48,7 @@ class TestTestTask < Test::Unit::TestCase
     tt = Rake::TestTask.new do |t|
       t.pattern = '*.rb'
     end
-    assert_equal ['install.rb'], tt.file_list.to_a
+    assert_equal ['*.rb'], tt.file_list.to_a
   end
 
   def test_env_test
@@ -71,7 +71,7 @@ class TestTestTask < Test::Unit::TestCase
       t.test_files = FileList['a.rb', 'b.rb']
       t.pattern = '*.rb'
     end
-    assert_equal ['a.rb', 'b.rb', 'install.rb'], tt.file_list.to_a
+    assert_equal ['a.rb', 'b.rb', '*.rb'], tt.file_list.to_a
   end
 
 end

data/test/lib/testtask_test.rb

@@ -0,0 +1,49 @@
+require 'test/test_helper'
+require 'rake/testtask'
+
+class TestTaskTest < Test::Unit::TestCase
+  def test_direct_run_has_quoted_paths
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.loader = :direct
+    end
+    assert_match(/-e ".*"/, test_task.run_code)
+  end
+
+  def test_testrb_run_has_quoted_paths_on_ruby_182
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.loader = :testrb
+    end
+    flexmock(test_task).should_receive(:ruby_version).and_return('1.8.2')
+    assert_match(/^-S testrb +".*"$/, test_task.run_code)
+  end
+
+  def test_testrb_run_has_quoted_paths_on_ruby_186
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.loader = :testrb
+    end
+    flexmock(test_task).should_receive(:ruby_version).and_return('1.8.6')
+    assert_match(/^-S testrb +$/, test_task.run_code)
+  end
+
+  def test_rake_run_has_quoted_paths
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.loader = :rake
+    end
+    assert_match(/".*"/, test_task.run_code)
+  end
+
+  def test_nested_libs_will_be_flattened
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.libs << ["A", "B"]
+    end
+    sep = File::PATH_SEPARATOR
+    assert_match(/lib#{sep}A#{sep}B/, test_task.ruby_opts_string)
+  end
+
+  def test_empty_lib_path_implies_no_dash_I_option
+    test_task = Rake::TestTask.new(:tx) do |t|
+      t.libs = []
+    end
+    assert_no_match(/-I/, test_task.ruby_opts_string)
+  end
+end

data/test/{test_top_level_functions.rb → lib/top_level_functions_test.rb}

@@ -20,6 +20,8 @@ class TestTopLevelFunctions < Test::Unit::TestCase
     super
     @app = Rake.application
     Rake.application = flexmock("app")
+    Rake.application.should_receive(:deprecate).
+      and_return { |old, new, call| @app.deprecate(old, new, call) }
   end
 
   def teardown
@@ -49,15 +51,15 @@ class TestTopLevelFunctions < Test::Unit::TestCase
   end
 
   def test_when_not_writing
-    RakeFileUtils.nowrite_flag = true
-    out = capture_stdout do
+    Rake::FileUtilsExt.nowrite_flag = true
+    out = capture_stderr do
       when_writing("NOTWRITING") do
         puts "WRITING"
       end
     end
     assert_equal "DRYRUN: NOTWRITING\n", out
   ensure
-    RakeFileUtils.nowrite_flag = false
+    Rake::FileUtilsExt.nowrite_flag = false
   end
 
   def test_missing_constants_task

data/test/{test_win32.rb → lib/win32_test.rb}

@@ -9,6 +9,7 @@ require 'rake'
 class TestWin32 < Test::Unit::TestCase
   include InEnvironment
   include TestMethods
+  include CaptureStdout
 
   Win32 = Rake::Win32
 
@@ -69,4 +70,22 @@ class TestWin32 < Test::Unit::TestCase
     end
   end
 
+  def test_win32_backtrace_with_different_case
+    ex = nil
+    begin
+     raise 'test exception'
+    rescue => ex
+    end
+
+    ex.set_backtrace ['abc', 'rakefile']
+
+    rake = Rake::Application.new
+    rake.options.trace = true
+    rake.instance_variable_set(:@rakefile, 'Rakefile')
+
+    err = capture_stderr { rake.display_error_message(ex) }
+
+    assert_match(/rakefile/, err)
+  end
+
 end

data/test/rake_test_setup.rb

@@ -9,22 +9,18 @@ end
 
 require 'thread'
 require 'flexmock/test_unit'
-
-if RUBY_VERSION >= "1.9.0"
-  class Test::Unit::TestCase
-#    def passed?
-#      true
-#    end
-  end
-end
+require 'test/file_creation'
+require 'test/capture_stdout'
+require 'test/test_helper'
 
 module TestMethods
-  def assert_exception(ex, msg=nil, &block)
+  # Shim method for compatibility
+  def assert_exception(ex, msg="", &block)
     assert_raise(ex, msg, &block)
   end
 end
 
-class SerializedArray
+class ThreadSafeArray
   def initialize
     @mutex = Mutex.new
     @array = Array.new

data/test/ruby_version_test.rb

@@ -0,0 +1,3 @@
+require 'test/unit'
+
+puts "\nRUBY VERSION = #{RUBY_VERSION}"

data/test/test_helper.rb

@@ -0,0 +1,19 @@
+begin
+  require 'rubygems'
+rescue LoadError
+end
+require 'test/unit'
+require 'flexmock/test_unit'
+
+require 'rake'
+
+class Test::Unit::TestCase
+  include Rake::DSL
+
+  def ignore_deprecations
+    Rake.application.options.ignore_deprecate = true
+    yield
+  ensure
+    Rake.application.options.ignore_deprecate = false
+  end
+end

metadata

@@ -1,16 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: drake
 version: !ruby/object:Gem::Version 
-  hash: 207
-  prerelease: false
-  segments: 
-  - 0
-  - 8
-  - 7
-  - 0
-  - 2
-  - 4
-  version: 0.8.7.0.2.4
+  prerelease: 
+  version: 0.9.0.0.3.0
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -18,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -04:00
-default_executable: drake
+date: 2011-05-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: comp_tree
@@ -29,25 +20,43 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
-        version: 0.7.3
+        version: 1.1.3
   type: :runtime
   version_requirements: *id001
-description: "      Rake is a Make-like program implemented in Ruby. Tasks\n      and dependencies are specified in standard Ruby syntax. \n"
+- !ruby/object:Gem::Dependency 
+  name: session
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.4"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: flexmock
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.11
+  type: :development
+  version_requirements: *id003
+description: "      Drake is an auto-parallelizing branch of Rake, a Make-like program\n      implemented in Ruby. Tasks and dependencies are specified in standard\n      Ruby syntax.\n"
 email: quixoticsycophant@gmail.com
 executables: 
 - drake
 extensions: []
 
 extra_rdoc_files: 
-- README
+- README.rdoc
 - MIT-LICENSE
 - TODO
 - CHANGES
+- CHANGES-drake
 - doc/command_line_usage.rdoc
 - doc/glossary.rdoc
 - doc/parallel.rdoc
@@ -71,35 +80,65 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.8.5.rdoc
 - doc/release_notes/rake-0.8.6.rdoc
 - doc/release_notes/rake-0.8.7.rdoc
+- doc/release_notes/rake-0.9.0.rdoc
 files: 
+- .gemtest
 - install.rb
 - CHANGES
-- CHANGES.drake
+- CHANGES-drake
 - MIT-LICENSE
-- README
+- README.rdoc
 - Rakefile
-- Rakefile.drake
+- Rakefile-drake
 - TODO
 - bin/drake
 - lib/rake/alt_system.rb
+- lib/rake/application.rb
 - lib/rake/classic_namespace.rb
 - lib/rake/clean.rb
+- lib/rake/cloneable.rb
 - lib/rake/contrib/compositepublisher.rb
 - lib/rake/contrib/ftptools.rb
 - 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.rb
+- lib/rake/dsl_definition.rb
+- lib/rake/early_time.rb
+- lib/rake/ext/core.rb
+- lib/rake/ext/module.rb
+- lib/rake/ext/string.rb
+- lib/rake/ext/time.rb
+- lib/rake/file_creation_task.rb
+- lib/rake/file_list.rb
+- 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
+- lib/rake/multi_task.rb
+- lib/rake/name_space.rb
 - lib/rake/packagetask.rb
 - lib/rake/parallel.rb
+- lib/rake/pathmap.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
+- lib/rake/task.rb
+- lib/rake/task_argument_error.rb
+- lib/rake/task_arguments.rb
+- lib/rake/task_manager.rb
 - lib/rake/tasklib.rb
 - lib/rake/testtask.rb
+- lib/rake/version.rb
 - lib/rake/win32.rb
 - lib/rake.rb
 - test/capture_stdout.rb
@@ -108,49 +147,56 @@ files:
 - test/contrib/test_sys.rb
 - test/data/rakelib/test1.rb
 - test/data/rbext/rakefile.rb
-- test/filecreation.rb
-- test/functional.rb
+- test/file_creation.rb
+- test/functional/functional_test.rb
+- test/functional/session_based_tests.rb
 - test/in_environment.rb
+- test/lib/application_test.rb
+- test/lib/clean_test.rb
+- test/lib/definitions_test.rb
+- test/lib/dsl_test.rb
+- test/lib/earlytime_test.rb
+- test/lib/extension_test.rb
+- test/lib/file_creation_task_test.rb
+- test/lib/file_task_test.rb
+- test/lib/filelist_test.rb
+- test/lib/fileutils_test.rb
+- test/lib/ftp_test.rb
+- test/lib/invocation_chain_test.rb
+- test/lib/makefile_loader_test.rb
+- test/lib/multitask_test.rb
+- test/lib/namespace_test.rb
+- test/lib/package_task_test.rb
+- test/lib/parallel_test.rb
+- test/lib/pathmap_test.rb
+- test/lib/pseudo_status_test.rb
+- test/lib/rake_test.rb
+- test/lib/rdoc_task_test.rb
+- test/lib/require_test.rb
+- test/lib/rules_test.rb
+- test/lib/task_arguments_test.rb
+- test/lib/task_manager_test.rb
+- test/lib/task_test.rb
+- test/lib/tasklib_test.rb
+- test/lib/test_task_test.rb
+- test/lib/testtask_test.rb
+- test/lib/top_level_functions_test.rb
+- test/lib/win32_test.rb
 - test/parallel_setup.rb
 - test/rake_test_setup.rb
 - test/reqfile.rb
 - test/reqfile2.rb
+- test/ruby_version_test.rb
 - test/serial_setup.rb
-- test/session_functional.rb
 - test/shellcommand.rb
-- test/test_application.rb
-- test/test_clean.rb
-- test/test_definitions.rb
-- test/test_earlytime.rb
-- test/test_extension.rb
-- test/test_file_creation_task.rb
-- test/test_file_task.rb
-- test/test_filelist.rb
-- test/test_fileutils.rb
-- test/test_ftp.rb
-- test/test_invocation_chain.rb
-- test/test_makefile_loader.rb
-- test/test_multitask.rb
-- test/test_namespace.rb
-- test/test_package_task.rb
-- test/test_parallel.rb
-- test/test_pathmap.rb
-- test/test_pseudo_status.rb
-- test/test_rake.rb
-- test/test_rdoc_task.rb
-- test/test_require.rb
-- test/test_rules.rb
-- test/test_task_arguments.rb
-- test/test_task_manager.rb
-- test/test_tasklib.rb
-- test/test_tasks.rb
-- test/test_test_task.rb
-- test/test_top_level_functions.rb
-- test/test_win32.rb
+- test/test_helper.rb
 - test/data/imports/deps.mf
 - test/data/sample.mf
+- test/data/access/Rakefile
 - test/data/chains/Rakefile
+- test/data/comments/Rakefile
 - test/data/default/Rakefile
+- test/data/deprecated_import/Rakefile
 - test/data/dryrun/Rakefile
 - test/data/file_creation_task/Rakefile
 - test/data/imports/Rakefile
@@ -158,6 +204,7 @@ files:
 - test/data/namespace/Rakefile
 - test/data/statusreturn/Rakefile
 - test/data/unittest/Rakefile
+- test/data/verbose/Rakefile
 - doc/command_line_usage.rdoc
 - doc/example/Rakefile1
 - doc/example/Rakefile2
@@ -188,15 +235,16 @@ files:
 - doc/release_notes/rake-0.8.5.rdoc
 - doc/release_notes/rake-0.8.6.rdoc
 - doc/release_notes/rake-0.8.7.rdoc
-has_rdoc: true
-homepage: http://drake.rubyforge.org
+- doc/release_notes/rake-0.9.0.rdoc
+homepage: http://quix.github.com/rake
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
+- --show-hash
 - --main
-- README
+- README.rdoc
 - --title
 - "Drake: Distributed Rake"
 require_paths: 
@@ -206,23 +254,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.2
 requirements: []
 
 rubyforge_project: drake
-rubygems_version: 1.3.7
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: A branch of Rake supporting automatic parallelizing of tasks.