rake 0.7.3 → 0.8.7

data/test/check_expansion.rb

@@ -0,0 +1,5 @@
+if ARGV[0] != ARGV[1]
+  exit 1
+else
+  exit 0
+end

data/test/check_no_expansion.rb

@@ -0,0 +1,5 @@
+if ARGV[0] != ARGV[1]
+  exit 0
+else
+  exit 1
+end

data/test/data/file_creation_task/Rakefile

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 N = 2
 
 task :default => :run
@@ -17,7 +19,7 @@ FileList['src/*'].each do |src|
   target = File.join TARGET_DIR, File.basename(src)
   file target => [src, TARGET_DIR] do
     cp src, target
-    sleep 3 if src !~ /foo#{N-1}$/
+    # sleep 3 if src !~ /foo#{N-1}$/   # I'm commenting out this sleep, it doesn't seem to do anything.
   end
   task :run => target
 end
@@ -25,6 +27,7 @@ end
 task :prep => :clean do
   mkdir_p 'src'
   N.times do |n|
+    puts "DBG: Touching src/foo#{n}"
     touch "src/foo#{n}"
   end
 end

data/test/data/multidesc/Rakefile

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

data/test/data/sample.mf

@@ -4,6 +4,11 @@ b: b1 b2 b3 \
    b4 b5 b6\
 # Mid: Comment
 b7
-a: a5 a6 a7
+
+ a : a5 a6 a7
 c: c1
 d: d1 d2 \
+
+e f : e1 f1
+
+g\ 0: g1 g\ 2 g\ 3 g4

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/filecreation.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'ftools'
-
 module FileCreation
   OLDFILE = "testdata/old"
   NEWFILE = "testdata/new"

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"
+  puts "No Session Found (gem install session)"
 end
 
 if defined?(Session)
+  puts "RUNNING WITH SESSIONS"
   require 'test/session_functional'
 end

data/test/in_environment.rb

@@ -0,0 +1,30 @@
+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    
+  ensure
+    set_env(original_settings)
+  end
+
+  # Set the environment according to the settings hash.
+  def set_env(settings)         # :nodoc:
+    result = {}
+    settings.each do |k, v|
+      result[k] = ENV[k]
+      if k == 'PWD'
+        result[k] = Dir.pwd
+        Dir.chdir(v)
+      elsif v.nil?
+        ENV.delete(k)
+      else
+        ENV[k] = v
+      end
+    end
+    result
+  end
+
+end

data/test/rake_test_setup.rb

@@ -0,0 +1,24 @@
+# Common setup for all test files.
+
+begin
+  require 'rubygems'
+  gem 'flexmock'
+rescue LoadError
+  # got no gems
+end
+
+require 'flexmock/test_unit'
+
+if RUBY_VERSION >= "1.9.0"
+  class Test::Unit::TestCase
+#    def passed?
+#      true
+#    end
+  end
+end
+
+module TestMethods
+  def assert_exception(ex, msg=nil, &block)
+    assert_raise(ex, msg, &block)
+  end
+end

data/test/session_functional.rb

@@ -1,7 +1,14 @@
 #!/usr/bin/env ruby
 
+begin
+  require 'rubygems'
+rescue LoadError => ex
+end
 require 'test/unit'
 require 'fileutils'
+require 'session'
+require 'test/in_environment'
+require 'test/rake_test_setup'
 
 # Version 2.1.9 of session has a bug where the @debug instance
 # variable is not initialized, causing warning messages.  This snippet
@@ -17,6 +24,11 @@ module Session
 end
 
 class FunctionalTest < Test::Unit::TestCase
+  include InEnvironment
+  include TestMethods
+
+  RUBY_COMMAND = 'ruby'
+
   def setup
     @rake_path = File.expand_path("bin/rake")
     lib_path = File.expand_path("lib")
@@ -56,24 +68,96 @@ class FunctionalTest < Test::Unit::TestCase
   end
 
   def test_multi_desc
-    Dir.chdir("test/data/multidesc") do rake "-T" end
+    in_environment(
+      'RAKE_COLUMNS' => "80",
+      "PWD" => "test/data/multidesc"
+      ) do
+      rake "-T"
+    end
     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
+    in_environment("PWD" => "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
-    Dir.chdir("test/data/rbext") do rake "-N" end
+    in_environment("PWD" => "test/data/rbext") do
+      rake "-N"
+    end
     assert_match %r{^OK$}, @out
   end
 
-  def test_nosearch
-    Dir.chdir("test/data/nosearch") do rake "-N" end
+  def test_system
+    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
+      rake '-g', "sys1"
+    end
+    assert_match %r{^SYS1}, @out
+  end
+
+  def test_system_excludes_rakelib_files_too
+    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
+      rake '-g', "sys1", '-T', 'extra'
+    end
+    assert_no_match %r{extra:extra}, @out
+  end
+
+  def test_by_default_rakelib_files_are_include
+    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
+      rake '-T', 'extra'
+    end
+    assert_match %r{extra:extra}, @out
+  end
+
+  def test_implicit_system
+    in_environment('RAKE_SYSTEM' => File.expand_path('test/data/sys'), "PWD" => "/") do
+      rake "sys1", "--trace"
+    end
+    assert_match %r{^SYS1}, @out
+  end
+
+  def test_no_system
+    in_environment('RAKE_SYSTEM' => 'test/data/sys') do
+      rake '-G', "sys1"
+    end
+    assert_match %r{^Don't know how to build task}, @err # emacs wart: '
+  end
+
+  def test_nosearch_with_rakefile_uses_local_rakefile
+    in_environment("PWD" => "test/data/default") do
+      rake "--nosearch"
+    end
+    assert_match %r{^DEFAULT}, @out
+  end
+
+  def test_nosearch_without_rakefile_finds_system
+    in_environment(
+      "PWD" => "test/data/nosearch",
+      "RAKE_SYSTEM" => File.expand_path("test/data/sys")
+      ) do
+      rake "--nosearch", "sys1"
+    end
+    assert_match %r{^SYS1}, @out
+  end
+
+  def test_nosearch_without_rakefile_and_no_system_fails
+    in_environment("PWD" => "test/data/nosearch", "RAKE_SYSTEM" => "not_exist") do
+      rake "--nosearch"
+    end
     assert_match %r{^No Rakefile found}, @err
   end
 
   def test_dry_run
-    Dir.chdir("test/data/default") do rake "-n", "other" end
+    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_no_match %r{DEFAULT}, @out
@@ -82,18 +166,26 @@ class FunctionalTest < Test::Unit::TestCase
 
   # Test for the trace/dry_run bug found by Brian Chandler
   def test_dry_run_bug
-    Dir.chdir("test/data/dryrun") do rake end
+    in_environment("PWD" => "test/data/dryrun") do
+      rake
+    end
     FileUtils.rm_f "test/data/dryrun/temp_one"
-    Dir.chdir("test/data/dryrun") do rake "--dry-run" end
+    in_environment("PWD" => "test/data/dryrun") do
+      rake "--dry-run"
+    end
     assert_no_match(/No such file/, @out)
     assert_status
   end
 
   # Test for the trace/dry_run bug found by Brian Chandler
   def test_trace_bug
-    Dir.chdir("test/data/dryrun") do rake end
+    in_environment("PWD" => "test/data/dryrun") do
+      rake
+    end
     FileUtils.rm_f "test/data/dryrun/temp_one"
-    Dir.chdir("test/data/dryrun") do rake "--trace" end
+    in_environment("PWD" => "test/data/dryrun") do
+      rake "--trace"
+    end
     assert_no_match(/No such file/, @out)
     assert_status
   end
@@ -103,7 +195,9 @@ class FunctionalTest < Test::Unit::TestCase
       f.puts 'puts "STATIC"'
     end
     FileUtils.rm_f "test/data/imports/dynamic_deps"
-    Dir.chdir("test/data/imports") do rake end
+    in_environment("PWD" => "test/data/imports") do
+      rake
+    end
     assert File.exist?("test/data/imports/dynamic_deps"),
       "'dynamic_deps' file should exist"
     assert_match(/^FIRST$\s+^DYNAMIC$\s+^STATIC$\s+^OTHER$/, @out)
@@ -114,7 +208,9 @@ class FunctionalTest < Test::Unit::TestCase
 
   def test_rules_chaining_to_file_task
     remove_chaining_files
-    Dir.chdir("test/data/chains") do rake end
+    in_environment("PWD" => "test/data/chains") do
+      rake
+    end
     assert File.exist?("test/data/chains/play.app"),
       "'play.app' file should exist"
     assert_status
@@ -122,12 +218,12 @@ class FunctionalTest < Test::Unit::TestCase
   end
 
   def test_file_creation_task
-    Dir.chdir("test/data/file_creation_task") do
+    in_environment("PWD" => "test/data/file_creation_task") do
       rake "prep"
       rake "run"
       rake "run"
-      assert(@err !~ /^cp src/, "Should not recopy data")
     end
+    assert(@err !~ /^cp src/, "Should not recopy data")
   end
 
   def test_dash_f_with_no_arg_foils_rakefile_lookup
@@ -135,59 +231,73 @@ class FunctionalTest < Test::Unit::TestCase
     assert_match(/^TEST1$/, @out)
   end
 
-  def test_dot_rake_files_can_be_laoded_with_dash_r
+  def test_dot_rake_files_can_be_loaded_with_dash_r
     rake "-I test/data/rakelib -rtest2 -f"
     assert_match(/^TEST2$/, @out)
   end
 
   def test_can_invoke_task_in_toplevel_namespace
-    Dir.chdir("test/data/namespace") do
+    in_environment("PWD" => "test/data/namespace") do
       rake "copy"
-      assert_match(/^COPY$/, @out)
     end
+    assert_match(/^COPY$/, @out)
   end
 
   def test_can_invoke_task_in_nested_namespace
-    Dir.chdir("test/data/namespace") do
+    in_environment("PWD" => "test/data/namespace") do
       rake "nest:copy"
       assert_match(/^NEST COPY$/, @out)
     end
   end
 
   def test_tasks_can_reference_task_in_same_namespace
-    Dir.chdir("test/data/namespace") do
+    in_environment("PWD" => "test/data/namespace") do
       rake "nest:xx"
       assert_match(/^NEST COPY$/m, @out)
     end
   end
 
   def test_tasks_can_reference_task_in_other_namespaces
-    Dir.chdir("test/data/namespace") do
+    in_environment("PWD" => "test/data/namespace") do
       rake "b:run"
       assert_match(/^IN A\nIN B$/m, @out)
     end
   end
 
   def test_anonymous_tasks_can_be_invoked_indirectly
-    Dir.chdir("test/data/namespace") do
+    in_environment("PWD" => "test/data/namespace") do
       rake "anon"
       assert_match(/^ANON COPY$/m, @out)
     end
   end
 
   def test_rake_namespace_refers_to_toplevel
-    Dir.chdir("test/data/namespace") do
+    in_environment("PWD" => "test/data/namespace") do
       rake "very:nested:run"
       assert_match(/^COPY$/m, @out)
     end
   end
 
   def test_file_task_are_not_scoped_by_namespaces
-    Dir.chdir("test/data/namespace") do
+    in_environment("PWD" => "test/data/namespace") do
       rake "xyz.rb"
       assert_match(/^XYZ1\nXYZ2$/m, @out)
     end
   end
+  
+  def test_rake_returns_status_error_values
+    in_environment("PWD" => "test/data/statusreturn") do
+      rake "exit5"
+      assert_status(5)
+    end
+  end
+
+  def test_rake_returns_no_status_error_on_normal_exit
+    in_environment("PWD" => "test/data/statusreturn") do
+      rake "normal"
+      assert_status(0)
+    end
+  end
 
   private
 
@@ -197,10 +307,22 @@ 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)
     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
@@ -214,5 +336,4 @@ class FunctionalTest < Test::Unit::TestCase
   def assert_status(expected_status=0)
     assert_equal expected_status, @status
   end
-
 end