rake 0.7.3 → 0.8.0

data/lib/rake/gempackagetask.rb

@@ -6,6 +6,8 @@
 require 'rubygems'
 require 'rake'
 require 'rake/packagetask'
+require 'rubygems/user_interaction'
+require 'rubygems/builder'
 
 begin
   Gem.manage_gems

data/test/data/multidesc/Rakefile

@@ -12,3 +12,6 @@ desc "A2"
 task :a
 
 task :c
+
+desc "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+task :d

data/test/data/statusreturn/Rakefile

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+task :exit5 do
+  exit(5)
+end
+
+task :normal do
+end

data/test/functional.rb

@@ -3,11 +3,13 @@
 begin
   require 'rubygems'
   gem 'session'
+  require 'session'
 rescue LoadError
   puts "UNABLE TO RUN FUNCTIONAL TESTS"
   puts "No Session Found"
 end
 
 if defined?(Session)
+  puts "RUNNING WITH SESSIONS"
   require 'test/session_functional'
 end

data/test/rake_test_setup.rb

@@ -0,0 +1,5 @@
+# Common setup for all test files.
+
+require 'rubygems'
+gem 'flexmock'
+require 'flexmock/test_unit'

data/test/session_functional.rb

@@ -2,6 +2,7 @@
 
 require 'test/unit'
 require 'fileutils'
+require 'session'
 
 # Version 2.1.9 of session has a bug where the @debug instance
 # variable is not initialized, causing warning messages.  This snippet
@@ -17,8 +18,13 @@ module Session
 end
 
 class FunctionalTest < Test::Unit::TestCase
+
+  RUBY_COMMAND = 'ruby'
+
   def setup
     @rake_path = File.expand_path("bin/rake")
+    @coverage_aggregate_file = File.expand_path("rcov_aggregate")
+    @rcov_dir = File.expand_path("coverage")
     lib_path = File.expand_path("lib")
     @ruby_options = "-I#{lib_path} -I."
     @verbose = ! ENV['VERBOSE'].nil?
@@ -60,6 +66,15 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match %r{^rake a *# A / A2 *$}, @out
     assert_match %r{^rake b *# B *$}, @out
     assert_no_match %r{^rake c}, @out
+    assert_match %r{^rake d *# x{65}\.\.\.$}, @out
+  end
+
+  def test_long_description
+    Dir.chdir("test/data/multidesc") do rake "--describe" end
+    assert_match %r{^rake a\n *A / A2 *$}m, @out
+    assert_match %r{^rake b\n *B *$}m, @out
+    assert_match %r{^rake d\n *x{80}}m, @out
+    assert_no_match %r{^rake c\n}m, @out
   end
 
   def test_rbext
@@ -188,6 +203,20 @@ class FunctionalTest < Test::Unit::TestCase
       assert_match(/^XYZ1\nXYZ2$/m, @out)
     end
   end
+  
+  def test_rake_returns_status_error_values
+    Dir.chdir("test/data/statusreturn") do
+      rake "exit5"
+      assert_status(5)
+    end
+  end
+
+  def test_rake_returns_no_status_error_on_normal_exit
+    Dir.chdir("test/data/statusreturn") do
+      rake "normal"
+      assert_status(0)
+    end
+  end
 
   private
 
@@ -197,10 +226,26 @@ class FunctionalTest < Test::Unit::TestCase
     end
   end
 
+  class << self
+    def format_command
+      @format_command ||= lambda { |ruby_options, rake_path, options|
+        "ruby #{ruby_options} #{rake_path} #{options}"
+      }
+    end
+    
+    def format_command=(fmt_command)
+      @format_command = fmt_command
+    end
+  end
+  
   def rake(*option_list)
+#     self.class.format_command = lambda { |ruby_options, rake_path, options|
+#       "rcov --output=#{@rcov_dir} --aggregate=#{@coverage_aggregate_file} #{ruby_options} #{rake_path} -- #{options}"
+#     }
+
     options = option_list.join(' ')
     shell = Session::Shell.new
-    command = "ruby #{@ruby_options} #{@rake_path} #{options}"
+    command = self.class.format_command[@ruby_options, @rake_path, options]
     puts "COMMAND: [#{command}]" if @verbose
     @out, @err = shell.execute command
     @status = shell.exit_status

data/test/test_application.rb

@@ -8,18 +8,18 @@ end
 
 require 'test/unit'
 require 'rake'
+require 'test/rake_test_setup'
 require 'test/capture_stdout'
-require 'flexmock'
 
 TESTING_REQUIRE = [ ]
 
 ######################################################################
 class TestApplication < Test::Unit::TestCase
   include CaptureStdout
-  include FlexMock::TestCase
 
   def setup
     @app = Rake::Application.new
+    @app.options.rakelib = []
   end
 
   def test_constant_warning
@@ -31,13 +31,32 @@ class TestApplication < Test::Unit::TestCase
 
   def test_display_tasks
     @app.options.show_task_pattern = //
-    @app.last_comment = "COMMENT"
+    @app.last_description = "COMMENT"
     @app.define_task(Rake::Task, "t")
     out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
     assert_match(/^rake t/, out)
     assert_match(/# COMMENT/, out)
   end
 
+  def test_display_tasks_with_long_comments
+    @app.options.show_task_pattern = //
+    @app.last_description = "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
+    @app.define_task(Rake::Task, "t")
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    assert_match(/^rake t/, out)
+    assert_match(/# 12345678901234567890123456789012345678901234567890123456789012345\.\.\./, out)
+  end
+
+  def test_display_tasks_with_full_descriptions
+    @app.options.show_task_pattern = //
+    @app.options.full_description = true
+    @app.last_description = "COMMENT"
+    @app.define_task(Rake::Task, "t")
+    out = capture_stdout do @app.instance_eval { display_tasks_and_comments } end
+    assert_match(/^rake t$/, out)
+    assert_match(/^ {4}COMMENT$/, out)
+  end
+
   def test_finding_rakefile
     assert @app.instance_eval { have_rakefile }
     assert_equal "rakefile", @app.rakefile.downcase
@@ -122,6 +141,8 @@ class TestApplication < Test::Unit::TestCase
 
   def test_good_run
     ran = false
+    ARGV.clear
+    ARGV << '--rakelib=""'
     @app.options.silent = true
     @app.instance_eval do
       intern(Rake::Task, "default").enhance { ran = true }
@@ -133,8 +154,8 @@ class TestApplication < Test::Unit::TestCase
   def test_display_task_run
     ran = false
     ARGV.clear
-    ARGV << '-f' << '-s' << '--tasks'
-    @app.last_comment = "COMMENT"
+    ARGV << '-f' << '-s' << '--tasks' << '--rakelib=""'
+    @app.last_description = "COMMENT"
     @app.define_task(Rake::Task, "default")
     out = capture_stdout { @app.run }
     assert @app.options.show_tasks
@@ -146,8 +167,8 @@ class TestApplication < Test::Unit::TestCase
   def test_display_prereqs
     ran = false
     ARGV.clear
-    ARGV << '-f' << '-s' << '--prereqs'
-    @app.last_comment = "COMMENT"
+    ARGV << '-f' << '-s' << '--prereqs' << '--rakelib=""'
+    @app.last_description = "COMMENT"
     t = @app.define_task(Rake::Task, "default")
     t.enhance([:a, :b])
     @app.define_task(Rake::Task, "a")
@@ -163,7 +184,7 @@ class TestApplication < Test::Unit::TestCase
   def test_bad_run
     @app.intern(Rake::Task, "default").enhance { fail }
     ARGV.clear
-    ARGV << '-f' << '-s'
+    ARGV << '-f' << '-s' <<  '--rakelib=""'
     assert_raise(SystemExit) {
       err = capture_stderr { @app.run }
       assert_match(/see full trace/, err)
@@ -230,11 +251,20 @@ class TestApplicationOptions < Test::Unit::TestCase
     assert_nil opts.show_prereqs
     assert_nil opts.show_tasks
     assert_nil opts.classic_namespace
-    assert_equal 'rakelib', opts.rakelib
+    assert_equal ['rakelib'], opts.rakelib
     assert ! RakeFileUtils.verbose_flag
     assert ! RakeFileUtils.nowrite_flag
   end
 
+  def test_bad_options
+    assert_raise GetoptLong::InvalidOption do
+      capture_stderr do
+        flags('--bad', '-t') do |opts|
+        end
+      end
+    end
+  end
+  
   def test_trace_option
     flags('--trace', '-t') do |opts|
       assert opts.trace
@@ -253,19 +283,20 @@ class TestApplicationOptions < Test::Unit::TestCase
   end
 
   def test_help
-    flags('--help', '-H') do |opts, output|
+    flags('--help', '-H', '-h') do |opts|
       assert_match(/\Arake/, @out)
-      assert_match(/--help/, @out)
+      assert_match(/\boptions\b/, @out)
+      assert_match(/\btargets\b/, @out)
+      assert_equal :exit, @exit
       assert_equal :exit, @exit
     end
   end
 
-  def test_usage
-    flags('--usage', '-h') do |opts, output|
-      assert_match(/\Arake/, @out)
-      assert_match(/\boptions\b/, @out)
-      assert_match(/\btargets\b/, @out)
-      assert_equal :exit, @exit
+  def test_describe
+    flags('--describe') do |opts|
+      assert opts.full_description
+      assert opts.show_tasks
+      assert_equal(//.to_s, opts.show_task_pattern.to_s)
     end
   end
 
@@ -375,8 +406,12 @@ class TestApplicationOptions < Test::Unit::TestCase
       ex = assert_raise(GetoptLong::InvalidOption) do
         flags('--bad-option') 
       end
-      assert_match(/unrecognized option/, ex.message)
-      assert_match(/--bad-option/, ex.message)
+      if ex.message =~ /^While/ # Ruby 1.9 error message
+        assert_match(/while parsing/i, ex.message)
+      else                      # Ruby 1.8 error message
+        assert_match(/unrecognized option/i, ex.message)
+        assert_match(/--bad-option/, ex.message)
+      end
     end
   end
 
@@ -391,12 +426,12 @@ class TestApplicationOptions < Test::Unit::TestCase
   end
   
   def test_environment_definition
-    ENV['TESTKEY'] = nil
+    ENV.delete('TESTKEY')
     command_line("a", "TESTKEY=12")
     assert_equal ["a"], @tasks.sort
     assert '12', ENV['TESTKEY']
   end
-  
+
   private 
 
   def flags(*sets)
@@ -423,3 +458,45 @@ class TestApplicationOptions < Test::Unit::TestCase
   end
 end
 
+class TestTaskArgumentParsing < Test::Unit::TestCase
+  def setup
+    @app = Rake::Application.new
+  end
+  
+  def test_name_only
+    name, args = @app.parse_task_string("name")
+    assert_equal "name", name
+    assert_equal [], args
+  end
+  
+  def test_empty_args
+    name, args = @app.parse_task_string("name[]")
+    assert_equal "name", name
+    assert_equal [], args
+  end
+  
+  def test_one_argument
+    name, args = @app.parse_task_string("name[one]")
+    assert_equal "name", name
+    assert_equal ["one"], args
+  end
+  
+  def test_two_arguments
+    name, args = @app.parse_task_string("name[one,two]")
+    assert_equal "name", name
+    assert_equal ["one", "two"], args
+  end
+  
+  def test_can_handle_spaces_between_args
+    name, args = @app.parse_task_string("name[one, two,\tthree , \tfour]")
+    assert_equal "name", name
+    assert_equal ["one", "two", "three", "four"], args
+  end
+
+  def test_keeps_embedded_spaces
+    name, args = @app.parse_task_string("name[a one ana, two]")
+    assert_equal "name", name
+    assert_equal ["a one ana", "two"], args
+  end
+
+end

data/test/test_extension.rb

@@ -0,0 +1,63 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'rake'
+require 'stringio'
+
+######################################################################
+class TestExtension < Test::Unit::TestCase
+
+  module Redirect
+    def error_redirect
+      old_err = $stderr
+      result = StringIO.new
+      $stderr = result
+      yield
+      result
+    ensure
+      $stderr = old_err
+    end
+  end
+  
+  class Sample
+    extend Redirect
+
+    def duplicate_method
+      :original
+    end
+    
+    OK_ERRS = error_redirect do
+      rake_extension("a") do
+        def ok_method
+        end
+      end
+    end
+
+
+    DUP_ERRS = error_redirect do
+      rake_extension("duplicate_method") do
+        def duplicate_method
+          :override
+        end
+      end
+    end
+  end
+
+  def test_methods_actually_exist
+    sample = Sample.new
+    sample.ok_method
+    sample.duplicate_method
+  end
+
+  def test_no_warning_when_defining_ok_method
+    assert_equal "", Sample::OK_ERRS.string
+  end
+
+  def test_extension_complains_when_a_method_that_is_present
+    assert_match(/warning:/i, Sample::DUP_ERRS.string)
+    assert_match(/already exists/i, Sample::DUP_ERRS.string)
+    assert_match(/duplicate_method/i, Sample::DUP_ERRS.string)
+    assert_equal :original, Sample.new.duplicate_method
+  end
+
+end

data/test/test_filelist.rb

@@ -2,6 +2,7 @@
 
 require 'test/unit'
 require 'rake'
+
 require 'test/capture_stdout'
 
 class TestFileList < Test::Unit::TestCase
@@ -13,10 +14,17 @@ class TestFileList < Test::Unit::TestCase
   end
 
   def teardown
-    FileList.select_default_ignore_patterns
+#    FileList.select_default_ignore_patterns
     FileUtils.rm_rf("testdata")
   end
 
+  def test_delgating_methods_do_not_include_to_a_or_to_ary
+    assert ! FileList::DELEGATING_METHODS.include?("to_a"), "should not include to_a"
+    assert ! FileList::DELEGATING_METHODS.include?(:to_a), "should not include to_a"
+    assert ! FileList::DELEGATING_METHODS.include?("to_ary"), "should not include to_ary"
+    assert ! FileList::DELEGATING_METHODS.include?(:to_ary), "should not include to_ary"
+  end
+
   def test_create
     fl = FileList.new
     assert_equal 0, fl.size
@@ -196,7 +204,7 @@ class TestFileList < Test::Unit::TestCase
 
   def test_to_s_pending
     fl = FileList['testdata/abc.*']
-    assert_equal  %{testdata/abc.c testdata/abc.h testdata/abc.x}.sort, fl.to_s.sort
+    assert_equal  %{testdata/abc.c testdata/abc.h testdata/abc.x}, fl.to_s
   end
 
   def test_inspect_pending
@@ -467,7 +475,7 @@ class TestFileList < Test::Unit::TestCase
     assert_equal FileList,  b[0].class
     assert_equal FileList,  b[1].class
 
-    b = a.zip(['x', 'y'])
+    b = a.zip(['x', 'y']).to_a
     assert_equal [['a', 'x'], ['b', 'y']], b
     assert_equal Array, b.class
     assert_equal Array, b[0].class
@@ -543,7 +551,7 @@ class TestFileList < Test::Unit::TestCase
   def test_file_utils_can_use_filelists
     cfiles = FileList['testdata/*.c']
     
-    cp cfiles, @cdir
+    cp cfiles, @cdir, :verbose => false
     
     assert File.exist?(File.join(@cdir, 'abc.c'))
     assert File.exist?(File.join(@cdir, 'xyz.c'))