rake 0.8.7 → 0.9.0

data/test/contrib/test_sys.rb

@@ -1,41 +1,18 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
-require 'test/filecreation'
-require 'rake/contrib/sys'
+require 'test/file_creation'
+begin
+  old_verbose = $VERBOSE
+  $VERBOSE = nil
+  require 'rake/contrib/sys'
+ensure
+  $VERBOSE = old_verbose
+end
 
 class TestSys < Test::Unit::TestCase
   include FileCreation
 
-#   def test_delete
-#     create_file("testdata/a")
-#     Sys.delete_all("testdata/a")
-#     assert ! File.exist?("testdata/a")
-#   end
-
-#   def test_copy
-#     create_file("testdata/a")
-#     Sys.copy("testdata/a", "testdata/b")
-#     assert File.exist?("testdata/b")
-#   end
-
-#   def test_for_files
-#     test_files = ["testdata/a.pl", "testdata/c.pl", "testdata/b.rb"]
-#     test_files.each { |fn| create_file(fn) }
-#     list = []
-#     Sys.for_files("testdata/*.pl", "testdata/*.rb") { |fn|
-#       list << fn
-#     }
-#     assert_equal test_files.sort, list.sort
-#   end
-
-#   def test_indir
-#     here = Dir.pwd
-#     Sys.makedirs("testdata/dir")
-#     assert_equal "#{here}/testdata/dir", Sys.indir("testdata/dir") { Dir.pwd }
-#     assert_equal here, Dir.pwd
-#   end
-
   def test_split_all
     assert_equal ['a'], Sys.split_all('a')
     assert_equal ['..'], Sys.split_all('..')

data/test/data/access/Rakefile

@@ -0,0 +1,33 @@
+TOP_LEVEL_CONSTANT = 0
+
+def a_top_level_function
+end
+
+task :default => [:work, :obj, :const]
+
+task :work do
+  begin
+    a_top_level_function
+    puts "GOOD:M Top level methods can be called in tasks"
+  rescue NameError => ex
+    puts "BAD:M  Top level methods can not be called in tasks"
+  end
+end
+
+task :obj do
+  begin
+    Object.new.instance_eval { task :xyzzy }
+    puts "BAD:D  Rake DSL are polluting objects"
+  rescue StandardError => ex
+    puts "GOOD:D Rake DSL are not polluting objects"
+  end
+end
+
+task :const do
+  begin
+    TOP_LEVEL_CONSTANT
+    puts "GOOD:C Top level constants are available in tasks"
+  rescue StandardError => ex
+    puts "BAD:C  Top level constants are NOT available in tasks"
+  end
+end

data/test/data/comments/Rakefile

@@ -0,0 +1,18 @@
+# comment for t1
+task :t1 do
+end
+
+# no comment or task because there's a blank line
+
+task :t2 do
+end
+
+desc "override comment for t3"
+# this is not the description
+multitask :t3 do
+end
+
+# this is not the description
+desc "override comment for t4"
+file :t4 do
+end

data/test/data/default/Rakefile

@@ -16,4 +16,4 @@ task :task_scope do
   if ENV['TESTTASKSCOPE']
     puts "TASKSCOPE"
   end
-end    
+end

data/test/data/deprecated_import/Rakefile

@@ -0,0 +1 @@
+import "a"

data/test/data/dryrun/Rakefile

@@ -1,4 +1,4 @@
-# 
+#
 
 task :default => ["temp_main"]
 

data/test/data/file_creation_task/Rakefile

@@ -5,7 +5,7 @@ N = 2
 task :default => :run
 
 BUILD_DIR = 'build'
-task :clean do 
+task :clean do
   rm_rf 'build'
   rm_rf 'src'
 end

data/test/data/namespace/Rakefile

@@ -55,3 +55,12 @@ namespace "file2" do
   end
 end
 
+namespace "scopedep" do
+  task :prepare do
+    touch "scopedep.rb"
+    puts "PREPARE"
+  end
+  file "scopedep.rb" => [:prepare] do
+    puts "SCOPEDEP"
+  end
+end

data/test/data/rakelib/test1.rb

@@ -1,3 +1,4 @@
+
 task :default do
   puts "TEST1"
 end

data/test/data/verbose/Rakefile

@@ -0,0 +1,34 @@
+
+task :standalone_verbose_true do
+  verbose true
+  sh "ruby -e '0'"
+end
+
+task :standalone_verbose_false do
+  verbose false
+  sh "ruby -e '0'"
+end
+
+task :inline_verbose_default do
+  sh "ruby -e '0'"
+end
+
+task :inline_verbose_false do
+  sh "ruby -e '0'", :verbose => false
+end
+
+task :inline_verbose_true do
+  sh "ruby -e '0'", :verbose => true
+end
+
+task :block_verbose_true do
+  verbose(true) do
+    sh "ruby -e '0'"
+  end
+end
+
+task :block_verbose_false do
+  verbose(false) do
+    sh "ruby -e '0'"
+  end
+end

data/test/{filecreation.rb → file_creation.rb}

@@ -5,13 +5,16 @@ module FileCreation
   NEWFILE = "testdata/new"
 
   def create_timed_files(oldfile, *newfiles)
-    return if File.exist?(oldfile) && newfiles.all? { |newfile| File.exist?(newfile) }
-    old_time = create_file(oldfile)
+    return if (File.exist?(oldfile) &&
+      newfiles.all? { |newfile|
+        File.exist?(newfile) && File.stat(newfile).mtime > File.stat(oldfile).mtime
+      })
+    now = Time.now
+
+    create_file(oldfile, now - 60)
+
     newfiles.each do |newfile|
-      while create_file(newfile) <= old_time
-        sleep(0.1)
-        File.delete(newfile) rescue nil
-      end
+      create_file(newfile, now)
     end
   end
 
@@ -20,9 +23,10 @@ module FileCreation
     File.stat(dirname).mtime
   end
 
-  def create_file(name)
+  def create_file(name, file_time=nil)
     create_dir(File.dirname(name))
     FileUtils.touch(name) unless File.exist?(name)
+    File.utime(file_time, file_time, name) unless file_time.nil?
     File.stat(name).mtime
   end
 

data/test/functional/functional_test.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+begin
+  old_verbose = $VERBOSE
+  require 'rubygems'
+  $VERBOSE = nil
+  gem 'session'
+  require 'session'
+rescue LoadError
+  if File::ALT_SEPARATOR
+    puts "Unable to run functional tests on MS Windows. Skipping."
+  else
+    puts "Unable to run functional tests -- please run \"gem install session\""
+  end
+ensure
+  $VERBOSE = old_verbose
+end
+
+if defined?(Session)
+  if File::ALT_SEPARATOR
+    puts "Unable to run functional tests on MS Windows. Skipping."
+  else
+    require 'test/functional/session_based_tests.rb'
+  end
+end

data/test/{session_functional.rb → functional/session_based_tests.rb}

@@ -2,13 +2,14 @@
 
 begin
   require 'rubygems'
-rescue LoadError => ex
+rescue LoadError
 end
 require 'test/unit'
 require 'fileutils'
 require 'session'
 require 'test/in_environment'
 require 'test/rake_test_setup'
+require 'rake'
 
 # Version 2.1.9 of session has a bug where the @debug instance
 # variable is not initialized, causing warning messages.  This snippet
@@ -23,7 +24,7 @@ module Session
   end
 end
 
-class FunctionalTest < Test::Unit::TestCase
+class SessionBasedTests < Test::Unit::TestCase
   include InEnvironment
   include TestMethods
 
@@ -32,7 +33,7 @@ class FunctionalTest < Test::Unit::TestCase
   def setup
     @rake_path = File.expand_path("bin/rake")
     lib_path = File.expand_path("lib")
-    @ruby_options = "-I#{lib_path} -I."
+    @ruby_options = ["-I#{lib_path}", "-I."]
     @verbose = ! ENV['VERBOSE'].nil?
     if @verbose
       puts
@@ -55,13 +56,13 @@ class FunctionalTest < Test::Unit::TestCase
     assert_status(1)
   end
 
-  def test_env_availabe_at_top_scope
+  def test_env_available_at_top_scope
     Dir.chdir("test/data/default") do rake "TESTTOPSCOPE=1" end
     assert_match(/^TOPSCOPE$/, @out)
     assert_status
   end
 
-  def test_env_availabe_at_task_scope
+  def test_env_available_at_task_scope
     Dir.chdir("test/data/default") do rake "TESTTASKSCOPE=1 task_scope" end
     assert_match(/^TASKSCOPE$/, @out)
     assert_status
@@ -79,7 +80,7 @@ class FunctionalTest < Test::Unit::TestCase
     assert_no_match %r{^rake c}, @out
     assert_match %r{^rake d *# x{65}\.\.\.$}, @out
   end
-  
+
   def test_long_description
     in_environment("PWD" => "test/data/multidesc") do
       rake "--describe"
@@ -90,6 +91,13 @@ class FunctionalTest < Test::Unit::TestCase
     assert_no_match %r{^rake c\n}m, @out
   end
 
+  def test_proper_namespace_access
+    in_environment("PWD" => "test/data/access") do
+      rake
+    end
+    assert_not_match %r{^BAD:}, @out
+  end
+
   def test_rbext
     in_environment("PWD" => "test/data/rbext") do
       rake "-N"
@@ -111,7 +119,7 @@ class FunctionalTest < Test::Unit::TestCase
     assert_no_match %r{extra:extra}, @out
   end
 
-  def test_by_default_rakelib_files_are_include
+  def test_by_default_rakelib_files_are_included
     in_environment('RAKE_SYSTEM' => 'test/data/sys') do
       rake '-T', 'extra'
     end
@@ -156,10 +164,66 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match %r{^No Rakefile found}, @err
   end
 
+  def test_invalid_command_line_options
+    in_environment("PWD" => "test/data/default") do
+      rake "--bad-options"
+    end
+    assert_match %r{invalid +option}i, @err
+  end
+
+  def test_inline_verbose_default_should_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "inline_verbose_default"
+    end
+    assert_match(/ruby -e/, @err)
+  end
+
+  def test_inline_verbose_true_should_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "inline_verbose_true"
+    end
+    assert_match(/ruby -e/, @err)
+  end
+
+  def test_inline_verbose_false_should_not_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "inline_verbose_false"
+    end
+    assert_no_match(/ruby -e/, @err)
+  end
+
+  def test_block_verbose_false_should_not_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "block_verbose_false"
+    end
+    assert_no_match(/ruby -e/, @err)
+  end
+
+  def test_block_verbose_true_should_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "block_verbose_true"
+    end
+    assert_match(/ruby -e/, @err)
+  end
+
+  def test_standalone_verbose_true_should_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "standalone_verbose_true"
+    end
+    assert_match(/ruby -e/, @err)
+  end
+
+  def test_standalone_verbose_false_should_not_show_command
+    in_environment("PWD" => "test/data/verbose") do
+      rake "standalone_verbose_false"
+    end
+    assert_no_match(/ruby -e/, @err)
+  end
+
   def test_dry_run
     in_environment("PWD" => "test/data/default") do rake "-n", "other" end
-    assert_match %r{Execute \(dry run\) default}, @out
-    assert_match %r{Execute \(dry run\) other}, @out
+    assert_match %r{Execute \(dry run\) default}, @err
+    assert_match %r{Execute \(dry run\) other}, @err
     assert_no_match %r{DEFAULT}, @out
     assert_no_match %r{OTHER}, @out
   end
@@ -284,7 +348,16 @@ class FunctionalTest < Test::Unit::TestCase
       assert_match(/^XYZ1\nXYZ2$/m, @out)
     end
   end
-  
+
+  def test_file_task_dependencies_scoped_by_namespaces
+    in_environment("PWD" => "test/data/namespace") do
+      rake "scopedep.rb"
+      assert_match(/^PREPARE\nSCOPEDEP$/m, @out)
+    end
+  ensure
+    remove_namespace_files
+  end
+
   def test_rake_returns_status_error_values
     in_environment("PWD" => "test/data/statusreturn") do
       rake "exit5"
@@ -299,30 +372,75 @@ class FunctionalTest < Test::Unit::TestCase
     end
   end
 
+  def test_comment_before_task_acts_like_desc
+    in_environment("PWD" => "test/data/comments") do
+      rake "-T"
+    end
+    assert_no_match(/comment for t1/, @out)
+  end
+
+  def test_comment_separated_from_task_by_blank_line_is_not_picked_up
+    Dir.chdir("test/data/comments") { rake("-T")}
+    assert_not_match("t2", @out)
+  end
+
+  def test_comment_after_desc_is_ignored
+    Dir.chdir("test/data/comments") { rake("-T")}
+    assert_match("override comment for t3", @out)
+  end
+
+  def test_comment_before_desc_is_ignored
+    Dir.chdir("test/data/comments") { rake("-T")}
+    assert_match("override comment for t4", @out)
+  end
+
+  def test_correct_number_of_tasks_reported
+    Dir.chdir("test/data/comments") { rake("-T")}
+    assert_equal(2, @out.split(/\n/).grep(/t\d/).size)
+  end
+
+  def test_file_list_is_requirable_separately
+    ruby "-rrake/file_list", "-e 'puts Rake::FileList[\"a\"].size'"
+    assert_equal "1\n", @out
+    assert_equal 0, @status
+  end
+
   private
 
+  def assert_not_match(pattern, string, comment="'#{pattern}' was found (incorrectly) in '#{string}.inspect")
+    assert_nil Regexp.new(pattern).match(string), comment
+  end
+
   def remove_chaining_files
     %w(play.scpt play.app base).each do |fn|
       FileUtils.rm_f File.join("test/data/chains", fn)
     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
+  def remove_namespace_files
+    %w(scopedep.rb).each do |fn|
+      FileUtils.rm_f File.join("test/data/namespace", fn)
     end
   end
-  
-  def rake(*option_list)
-    options = option_list.join(' ')
+
+  # Run a shell Ruby command with command line options (using the
+  # default test options). Output is captured in @out, @err and
+  # @status.
+  def ruby(*option_list)
+    run_ruby(@ruby_options + option_list)
+  end
+
+  # Run a command line rake with the give rake options.  Default
+  # command line ruby options are included.  Output is captured in
+  # @out, @err and @status.
+  def rake(*rake_options)
+    run_ruby @ruby_options + [@rake_path] + rake_options
+  end
+
+  # Low level ruby command runner ...
+  def run_ruby(option_list)
     shell = Session::Shell.new
-    command = self.class.format_command[@ruby_options, @rake_path, options]
+    command = "#{RUBY_COMMAND} " + option_list.join(' ')
     puts "COMMAND: [#{command}]" if @verbose
     @out, @err = shell.execute command
     @status = shell.exit_status

data/test/in_environment.rb

@@ -1,13 +1,15 @@
 module InEnvironment
   private
-  
+
   # Create an environment for a test. At the completion of the yielded
   # block, the environment is restored to its original conditions.
-  def in_environment(settings)
-    original_settings = set_env(settings)
-    yield    
+  def in_environment(settings=nil)
+    settings ||= {}
+    full_settings = {"RAKEOPT" => nil}.merge(settings)
+    original_settings = set_env(full_settings)
+    yield
   ensure
-    set_env(original_settings)
+    set_env(original_settings) rescue nil
   end
 
   # Set the environment according to the settings hash.