rake 0.9.6 → 10.0.0.beta.1

data/lib/rake/version.rb

@@ -1,13 +1,12 @@
 module Rake
-  VERSION = '0.9.6'
-
   module Version # :nodoc: all
-    MAJOR, MINOR, BUILD, = Rake::VERSION.split '.'
-
     NUMBERS = [
-      MAJOR,
-      MINOR,
-      BUILD,
+      MAJOR = 10,
+      MINOR = 0,
+      BUILD = 0,
+      'beta',
+      BETA = 1,
     ]
   end
+  VERSION = Version::NUMBERS.join('.')
 end

data/test/helper.rb

@@ -12,8 +12,8 @@ require 'tmpdir'
 require File.expand_path('../file_creation', __FILE__)
 
 begin
-  require_relative '../ruby/envutil'
-rescue NoMethodError, LoadError
+  require 'test/ruby/envutil'
+rescue LoadError
   # for ruby trunk
 end
 
@@ -31,19 +31,6 @@ class Rake::TestCase < MiniTest::Unit::TestCase
   def setup
     ARGV.clear
 
-    test_dir = File.basename File.dirname File.expand_path __FILE__
-
-    @rake_root = if test_dir == 'test' then
-                   # rake repository
-                   File.expand_path '../../', __FILE__
-                 else
-                   # ruby repository
-                   File.expand_path '../../../', __FILE__
-                 end
-
-    @rake_exec = File.join @rake_root, 'bin', 'rake'
-    @rake_lib  = File.join @rake_root, 'lib'
-
     @orig_PWD = Dir.pwd
     @orig_APPDATA      = ENV['APPDATA']
     @orig_HOME         = ENV['HOME']
@@ -515,8 +502,8 @@ Rake::TestTask.new(:b) do |t|
 end
 
 task :test do
-  Rake::Task[:a].invoke
-  Rake::Task[:b].invoke
+  Rake::Task[:a].invoke rescue nil
+  Rake::Task[:b].invoke rescue nil
 end
 
 task :default => :test
@@ -532,31 +519,4 @@ task :default => :test
     end
   end
 
-  def rakefile_failing_test_task
-    rakefile <<-TEST_TASK
-require 'rake/testtask'
-
-task :default => :test
-Rake::TestTask.new(:test) do |t|
-  t.test_files = ['a_test.rb']
-end
-    TEST_TASK
-    open 'a_test.rb', 'w' do |io|
-      io << "require 'minitest/autorun'\n"
-      io << "class ExitTaskTest < MiniTest::Unit::TestCase\n"
-      io << "  def test_exit\n"
-      io << "    assert false, 'this should fail'\n"
-      io << "  end\n"
-      io << "end\n"
-    end
-  end
-
-  def rakefile_stand_alone_filelist
-    open 'stand_alone_filelist.rb', 'w' do |io|
-      io << "require 'rake/file_list'\n"
-      io << "FL = Rake::FileList['*.rb']\n"
-      io << "puts FL\n"
-    end
-  end
-
 end

data/test/test_rake_application.rb

@@ -9,13 +9,6 @@ class TestRakeApplication < Rake::TestCase
     @app.options.rakelib = []
   end
 
-  def test_constant_warning
-    _, err = capture_io do @app.instance_eval { const_warning("Task") } end
-    assert_match(/warning/i, err)
-    assert_match(/deprecated/i, err)
-    assert_match(/Task/i, err)
-  end
-
   def test_display_tasks
     @app.options.show_tasks = :tasks
     @app.options.show_task_pattern = //
@@ -309,37 +302,6 @@ class TestRakeApplication < Rake::TestCase
     assert @app.options.trace
   end
 
-  def test_handle_options_trace_default_is_stderr
-    ARGV.clear
-    ARGV << "--trace"
-
-    @app.handle_options
-
-    assert_equal STDERR, @app.options.trace_output
-    assert @app.options.trace
-  end
-
-  def test_handle_options_trace_overrides_to_stdout
-    ARGV.clear
-    ARGV << "--trace=stdout"
-
-    @app.handle_options
-
-    assert_equal STDOUT, @app.options.trace_output
-    assert @app.options.trace
-  end
-
-  def test_handle_options_trace_does_not_eat_following_task_names
-    assert !@app.options.trace
-
-    ARGV.clear
-    ARGV << "--trace" << "sometask"
-
-    @app.handle_options
-    assert ARGV.include?("sometask")
-    assert @app.options.trace
-  end
-
   def test_good_run
     ran = false
 
@@ -439,15 +401,6 @@ class TestRakeApplication < Rake::TestCase
     ARGV.clear
   end
 
-  def test_deprecation_message
-    _, err = capture_io do
-      @app.deprecate("a", "b", "c")
-    end
-    assert_match(/'a' is deprecated/i, err)
-    assert_match(/use 'b' instead/i, err)
-    assert_match(/at c$/i, err)
-  end
-
   def test_standard_exception_handling_invalid_option
     out, err = capture_io do
       e = assert_raises SystemExit do

data/test/test_rake_application_options.rb

@@ -30,7 +30,6 @@ 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
     assert_nil opts.load_system
@@ -146,8 +145,7 @@ class TestRakeApplicationOptions < Rake::TestCase
   end
 
   def test_rakelib
-    dirs = %w(A B C).join(File::PATH_SEPARATOR)
-    flags(['--rakelibdir', dirs], ["--rakelibdir=#{dirs}"], ['-R', dirs], ["-R#{dirs}"]) do |opts|
+    flags(['--rakelibdir', 'A:B:C'], ['--rakelibdir=A:B:C'], ['-R', 'A:B:C'], ['-RA:B:C']) do |opts|
       assert_equal ['A', 'B', 'C'], opts.rakelib
     end
   end
@@ -228,7 +226,7 @@ class TestRakeApplicationOptions < Rake::TestCase
   end
 
   def test_trace_with_stdout
-    flags('--trace=stdout', '-tstdout') do |opts|
+    flags('--trace=stdout', '-tstdout', '-t stdout') do |opts|
       assert opts.trace, "should enable trace option"
       assert opts.backtrace, "should enabled backtrace option"
       assert_equal $stdout, opts.trace_output
@@ -238,7 +236,7 @@ class TestRakeApplicationOptions < Rake::TestCase
   end
 
   def test_trace_with_stderr
-    flags('--trace=stderr', '-tstderr') do |opts|
+    flags('--trace=stderr', '-tstderr', '-t stderr') do |opts|
       assert opts.trace, "should enable trace option"
       assert opts.backtrace, "should enabled backtrace option"
       assert_equal $stderr, opts.trace_output
@@ -254,21 +252,13 @@ class TestRakeApplicationOptions < Rake::TestCase
     assert_match(/un(known|recognized).*\btrace\b.*xyzzy/i, ex.message)
   end
 
-  def test_trace_with_following_task_name
-    flags(['--trace', 'taskname'], ['-t', 'taskname']) do |opts|
-      assert opts.trace, "should enable trace option"
-      assert opts.backtrace, "should enabled backtrace option"
-      assert_equal $stderr, opts.trace_output
-      assert Rake::FileUtilsExt.verbose_flag
-      assert_equal ['taskname'], @app.top_level_tasks
-    end
-  end
 
   def test_backtrace
     flags('--backtrace') do |opts|
       assert opts.backtrace, "should enable backtrace option"
       assert_equal $stderr, opts.trace_output
       assert ! opts.trace, "should not enable trace option"
+      assert ! Rake::FileUtilsExt.verbose_flag
     end
   end
 
@@ -277,6 +267,7 @@ class TestRakeApplicationOptions < Rake::TestCase
       assert opts.backtrace, "should enable backtrace option"
       assert_equal $stdout, opts.trace_output
       assert ! opts.trace, "should not enable trace option"
+      assert ! Rake::FileUtilsExt.verbose_flag
     end
   end
 
@@ -285,6 +276,7 @@ class TestRakeApplicationOptions < Rake::TestCase
       assert opts.backtrace, "should enable backtrace option"
       assert_equal $stderr, opts.trace_output
       assert ! opts.trace, "should not enable trace option"
+      assert ! Rake::FileUtilsExt.verbose_flag
     end
   end
 
@@ -295,15 +287,6 @@ class TestRakeApplicationOptions < Rake::TestCase
     assert_match(/un(known|recognized).*\bbacktrace\b.*xyzzy/i, ex.message)
   end
 
-  def test_backtrace_with_following_task_name
-    flags(['--backtrace', 'taskname']) do |opts|
-      assert ! opts.trace, "should enable trace option"
-      assert opts.backtrace, "should enabled backtrace option"
-      assert_equal $stderr, opts.trace_output
-      assert_equal ['taskname'], @app.top_level_tasks
-    end
-  end
-
   def test_trace_rules
     flags('--rules') do |opts|
       assert opts.trace_rules
@@ -373,22 +356,6 @@ class TestRakeApplicationOptions < Rake::TestCase
     assert_equal :exit, @exit
   end
 
-  def test_classic_namespace
-    _, err = capture_io do
-      flags(['--classic-namespace'],
-            ['-C', '-T', '-P', '-n', '-s', '-t']) do |opts|
-        assert opts.classic_namespace
-        assert_equal opts.show_tasks, $show_tasks
-        assert_equal opts.show_prereqs, $show_prereqs
-        assert_equal opts.trace, $trace
-        assert_equal opts.dryrun, $dryrun
-        assert_equal opts.silent, $silent
-      end
-    end
-
-    assert_match(/deprecated/, err)
-  end
-
   def test_bad_option
     _, err = capture_io do
       ex = assert_raises(OptionParser::InvalidOption) do

data/test/test_rake_backtrace.rb

@@ -2,19 +2,11 @@ require File.expand_path('../helper', __FILE__)
 require 'open3'
 
 class TestRakeBacktrace < Rake::TestCase
-
-  def setup
-    super
-
-    skip 'tmpdir is suppressed in backtrace' if
-      Dir.pwd =~ Rake::Backtrace::SUPPRESS_PATTERN
-  end
-
   # TODO: factor out similar code in test_rake_functional.rb
   def rake(*args)
-    Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, _, err, _|
-      err.read
-    }
+    lib = File.join(@orig_PWD, "lib")
+    bin_rake = File.join(@orig_PWD, "bin", "rake")
+    Open3.popen3(RUBY, "-I", lib, bin_rake, *args) { |_, _, err, _| err.read }
   end
 
   def invoke(task_name)
@@ -32,8 +24,8 @@ class TestRakeBacktrace < Rake::TestCase
 
     assert_equal "rake aborted!", lines[0]
     assert_equal "foooo!", lines[1]
-    assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!i, lines
-    assert_something_matches %r!\ATasks:!, lines
+    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!, lines[2]
+    assert_match %r!\ATasks:!, lines[3]
   end
 
   def test_multi_collapse
@@ -50,9 +42,9 @@ class TestRakeBacktrace < Rake::TestCase
 
     assert_equal "rake aborted!", lines[0]
     assert_equal "barrr!", lines[1]
-    assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:6!i, lines
-    assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!i, lines
-    assert_something_matches %r!\ATasks:!, lines
+    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:6!, lines[2]
+    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!, lines[3]
+    assert_match %r!\ATasks:!, lines[4]
   end
 
   def test_suppress_option
@@ -65,25 +57,11 @@ class TestRakeBacktrace < Rake::TestCase
     lines = rake("baz").split("\n")
     assert_equal "rake aborted!", lines[0]
     assert_equal "bazzz!", lines[1]
-    assert_something_matches %r!Rakefile!i, lines
+    assert_match %r!Rakefile!, lines[2]
 
-    lines = rake("--suppress-backtrace", ".ak.file", "baz").split("\n")
+    lines = rake("--suppress-backtrace", "R.k.file", "baz").split("\n")
     assert_equal "rake aborted!", lines[0]
     assert_equal "bazzz!", lines[1]
-    refute_match %r!Rakefile!i, lines[2]
+    refute_match %r!Rakefile!, lines[2]
   end
-
-  private
-
-  # Assert that the pattern matches at least one line in +lines+.
-  def assert_something_matches(pattern, lines)
-    lines.each do |ln|
-      if pattern =~ ln
-        assert_match pattern, ln
-        return
-      end
-    end
-    flunk "expected #{pattern.inspect} to match something in:\n    #{lines.join("\n    ")}"
-  end
-
 end

data/test/test_rake_dsl.rb

@@ -33,45 +33,8 @@ class TestRakeDsl < Rake::TestCase
     refute_nil Rake::Task["bob:t"]
   end
 
-  class Foo
-    def initialize
-      task :foo_deprecated_a => "foo_deprecated_b" do
-        print "a"
-      end
-      file "foo_deprecated_b" do
-        print "b"
-      end
-    end
-  end
-
-  def test_deprecated_object_dsl
-    out, err = capture_io do
-      Foo.new
-      Rake.application.invoke_task :foo_deprecated_a
-    end
-    assert_equal("ba", out)
-    assert_match(/deprecated/, err)
-    assert_match(/Foo\#task/, err)
-    assert_match(/Foo\#file/, err)
-    assert_match(/test_rake_dsl\.rb:\d+/, err)
-  end
-
   def test_no_commands_constant
     assert ! defined?(Commands), "should not define Commands"
   end
 
-  def test_deprecated_object_dsl_with_suppressed_warnings
-    Rake.application.options.ignore_deprecate = true
-    out, err = capture_io do
-      Foo.new
-      Rake.application.invoke_task :foo_deprecated_a
-    end
-    assert_equal("ba", out)
-    refute_match(/deprecated/, err)
-    refute_match(/Foo\#task/, err)
-    refute_match(/Foo\#file/, err)
-    refute_match(/test_rake_dsl\.rb:\d+/, err)
-  ensure
-    Rake.application.options.ignore_deprecate = false
-  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
 
@@ -115,8 +119,4 @@ class TestRakeFileTask < Rake::TestCase
     assert( ! File.exist?(NEWFILE), "NEWFILE should be deleted")
   end
 
-  def load_phony
-    load File.join(@rake_lib, "rake/phony.rb")
-  end
-
 end

data/test/test_rake_functional.rb

@@ -5,9 +5,9 @@ require 'open3'
 class TestRakeFunctional < Rake::TestCase
 
   def setup
-    super
-
-    @ruby_options = ["-I#{@rake_lib}", "-I."]
+    @rake_path = File.expand_path("bin/rake")
+    lib_path = File.expand_path("lib")
+    @ruby_options = ["-I#{lib_path}", "-I."]
     @verbose = ENV['VERBOSE']
 
     if @verbose
@@ -17,6 +17,8 @@ class TestRakeFunctional < Rake::TestCase
       puts @__name__
       puts '-' * 80
     end
+
+    super
   end
 
   def test_rake_default
@@ -433,36 +435,12 @@ class TestRakeFunctional < Rake::TestCase
       assert_match(/ATEST/, @out)
       refute_match(/BTEST/, @out)
     else
-      skip "Signal detect seems broken on this system"
+      puts "\nWARNING: Signal detect seems broken on this system (#{__FILE__}:#{__LINE__})"
     end
   end
 
-  def test_failing_test_sets_exit_status
-    skip if uncertain_exit_status?
-    rakefile_failing_test_task
-    rake
-    assert @exit.exitstatus > 0, "should be non-zero"
-  end
-
-  def test_stand_alone_filelist
-    rakefile_stand_alone_filelist
-
-    run_ruby @ruby_options + ["stand_alone_filelist.rb"]
-
-    assert_match(/^stand_alone_filelist\.rb$/, @out)
-    assert_equal 0, @exit.exitstatus unless uncertain_exit_status?
-  end
-
   private
 
-  # We are unable to accurately verify that Rake returns a proper
-  # error exit status using popen3 in Ruby 1.8.7 and JRuby. This
-  # predicate function can be used to skip tests or assertions as
-  # needed.
-  def uncertain_exit_status?
-    RUBY_VERSION < "1.9" || defined?(JRUBY_VERSION)
-  end
-
   # Run a shell Ruby command with command line options (using the
   # default test options). Output is captured in @out and @err
   def ruby(*option_list)
@@ -473,23 +451,21 @@ class TestRakeFunctional < Rake::TestCase
   # command line ruby options are included.  Output is captured in
   # @out and @err
   def rake(*rake_options)
-    run_ruby @ruby_options + [@rake_exec] + rake_options
+    run_ruby @ruby_options + [@rake_path] + rake_options
   end
 
   # Low level ruby command runner ...
   def run_ruby(option_list)
     puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose
 
-    inn, out, err, wait = Open3.popen3(RUBY, *option_list)
+    inn, out, err = Open3.popen3(Gem.ruby, *option_list)
     inn.close
 
-    @exit = wait ? wait.value : $?
     @out = out.read
     @err = err.read
 
     puts "OUTPUT:  [#{@out}]" if @verbose
     puts "ERROR:   [#{@err}]" if @verbose
-    puts "EXIT:    [#{@exit.inspect}]" if @verbose
     puts "PWD:     [#{Dir.pwd}]" if @verbose
   end