rake 0.8.1 → 0.8.2

data/lib/rake/loaders/makefile.rb

@@ -7,31 +7,26 @@ module Rake
 
     # Load the makefile dependencies in +fn+.
     def load(fn)
-      buffer = ''
       open(fn) do |mf|
-        mf.each do |line|
-          next if line =~ /^\s*#/
-          buffer << line
-          if buffer =~ /\\$/
-            buffer.sub!(/\\\n/, ' ')
-            state = :append
-          else
-            process_line(buffer)
-            buffer = ''
-          end
+        lines = mf.read
+        lines.gsub!(/#[^\n]*\n/m, "")
+        lines.gsub!(/\\\n/, ' ')
+        lines.split("\n").each do |line|
+          process_line(line)
         end
       end
-      process_line(buffer) if buffer != ''
     end
 
     private
 
     # Process one logical line of makefile data.
     def process_line(line)
-      file_task, args = line.split(':')
+      file_tasks, args = line.split(':')
       return if args.nil?
       dependents = args.split
-      file file_task => dependents
+      file_tasks.strip.split.each do |file_task|
+        file file_task => dependents
+      end
     end
   end
 

data/lib/rake/packagetask.rb

@@ -122,6 +122,7 @@ module Rake
           task :package => ["#{package_dir}/#{file}"]
           file "#{package_dir}/#{file}" => [package_dir_path] + package_files do
             chdir(package_dir) do
+              sh %{env}
               sh %{#{@tar_command} #{flag}cvf #{file} #{package_name}}
             end
           end

data/lib/rake/rdoctask.rb

@@ -55,7 +55,7 @@ module Rake
     # RDoc. (default is none)
     attr_accessor :main
 
-    # Name of template to be used by rdoc. (default is 'html')
+    # Name of template to be used by rdoc. (defaults to rdoc's default)
     attr_accessor :template
 
     # List of files to be included in the rdoc generation. (default is [])
@@ -74,7 +74,7 @@ module Rake
       @rdoc_dir = 'html'
       @main = nil
       @title = nil
-      @template = 'html'
+      @template = nil
       @external = false
       @options = []
       yield self if block_given?
@@ -91,18 +91,18 @@ module Rake
       task name
       
       desc "Force a rebuild of the RDOC files"
-      task paste("re", name) => [paste("clobber_", name), name]
+      task "re#{name}" => ["clobber_#{name}", name]
       
       desc "Remove rdoc products" 
-      task paste("clobber_", name) do
+      task "clobber_#{name}" do
         rm_r rdoc_dir rescue nil
       end
-
-      task :clobber => [paste("clobber_", name)]
+      
+      task :clobber => ["clobber_#{name}"]
       
       directory @rdoc_dir
       task name => [rdoc_target]
-      file rdoc_target => @rdoc_files + [$rakefile] do
+      file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
         rm_r @rdoc_dir rescue nil
         args = option_list + @rdoc_files
         if @external

data/lib/rake/tasklib.rb

@@ -6,11 +6,16 @@ module Rake
 
   # Base class for Task Libraries.
   class TaskLib
-
     include Cloneable
 
-    # Make a symbol by pasting two strings together. 
-    def paste(a,b)
+    # Make a symbol by pasting two strings together.
+    #
+    # NOTE: DEPRECATED! This method is kinda stupid. I don't know why
+    # I didn't just use string interpolation. But now other task
+    # libraries depend on this so I can't remove it without breaking
+    # other people's code. So for now it stays for backwards
+    # compatibility. BUT DON'T USE IT.
+    def paste(a,b)              # :nodoc:
       (a.to_s + b.to_s).intern
     end
   end

data/test/check_expansion.rb

@@ -0,0 +1,5 @@
+if ARGV[0] != ARGV[1]
+  exit 1
+else
+  exit 0
+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/sample.mf

@@ -4,6 +4,9 @@ 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

data/test/functional.rb

@@ -6,7 +6,7 @@ begin
   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)

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

@@ -1,8 +1,13 @@
 #!/usr/bin/env ruby
 
+begin
+  require 'rubygems'
+rescue LoadError => ex
+end
 require 'test/unit'
 require 'fileutils'
 require 'session'
+require 'test/in_environment'
 
 # Version 2.1.9 of session has a bug where the @debug instance
 # variable is not initialized, causing warning messages.  This snippet
@@ -18,13 +23,12 @@ module Session
 end
 
 class FunctionalTest < Test::Unit::TestCase
+  include InEnvironment
 
   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?
@@ -62,15 +66,22 @@ 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
-    Dir.chdir("test/data/multidesc") do rake "--describe" end
+    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
@@ -78,17 +89,73 @@ class FunctionalTest < Test::Unit::TestCase
   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
@@ -97,18 +164,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
@@ -118,7 +193,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)
@@ -129,7 +206,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
@@ -137,12 +216,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
@@ -150,69 +229,69 @@ 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
-    Dir.chdir("test/data/statusreturn") do
+    in_environment("PWD" => "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
+    in_environment("PWD" => "test/data/statusreturn") do
       rake "normal"
       assert_status(0)
     end
@@ -239,10 +318,6 @@ class FunctionalTest < Test::Unit::TestCase
   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 = self.class.format_command[@ruby_options, @rake_path, options]
@@ -259,5 +334,4 @@ class FunctionalTest < Test::Unit::TestCase
   def assert_status(expected_status=0)
     assert_equal expected_status, @status
   end
-
 end