rake 0.5.4 → 0.6.0

data/lib/rake/classic_namespace.rb

@@ -0,0 +1,8 @@
+# The following classes used to be in the top level namespace.
+# Loading this file enables compatibility with older Rakefile that
+# referenced Task from the top level.
+
+Task = Rake::Task
+FileTask = Rake::FileTask
+FileCreationTask = Rake::FileCreationTask
+RakeApp = Rake::Application

data/lib/rake/gempackagetask.rb

@@ -88,10 +88,12 @@ module Rake
       end
     end
     
-    private
-    
     def gem_file
-      "#{package_name}.gem"
+      if @gem_spec.platform == Gem::Platform::RUBY
+	"#{package_name}.gem"
+      else
+	"#{package_name}-#{@gem_spec.platform}.gem"
+      end
     end
     
   end

data/lib/rake/packagetask.rb

@@ -148,8 +148,6 @@ module Rake
       self
     end
 
-    private
-
     def package_name
       @version ? "#{@name}-#{@version}" : @name
     end

data/lib/rake/rake_test_loader.rb

@@ -2,4 +2,4 @@
 
 # Load the test files from the command line.
 
-ARGV.each { |f| load f }
+ARGV.each { |f| load f unless f =~ /^-/  }

data/lib/rake/testtask.rb

@@ -66,6 +66,9 @@ module Rake
     # 
     attr_accessor :loader
 
+    # Array of commandline options to pass to ruby when running test loader.
+    attr_accessor :ruby_opts
+
     # Explicitly define the list of test files to be included in a
     # test.  +list+ is expected to be an array of file names (a
     # FileList is acceptable).  If both +pattern+ and +test_files+ are
@@ -84,6 +87,7 @@ module Rake
       @verbose = false
       @warning = false
       @loader = :rake
+      @ruby_opts = []
       yield self if block_given?
       @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
       define
@@ -92,7 +96,6 @@ module Rake
     # Create the tasks defined by this task lib.
     def define
       lib_path = @libs.join(File::PATH_SEPARATOR)
-      warning_flag = (@warning ? "-w " : "")
       desc "Run tests" + (@name==:test ? "" : " for #{@name}")
       task @name do
 	run_code = ''
@@ -106,7 +109,10 @@ module Rake
 	    when :rake
 	      rake_loader
 	    end
-	  ruby "-I#{lib_path} #{warning_flag}\"#{run_code}\" " +
+          @ruby_opts.unshift( "-I#{lib_path}" )
+	  @ruby_opts.unshift( "-w" ) if @warning
+	  ruby @ruby_opts.join(" ") +
+            " \"#{run_code}\" " +
 	    file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
 	    " #{option_list}"
 	end

data/test/data/chains/Rakefile

@@ -0,0 +1,15 @@
+# -*- ruby -*-
+
+task :default => "play.app"
+
+file "play.scpt" => "base" do |t|
+  cp t.prerequisites.first, t.name
+end
+
+rule ".app" => ".scpt" do |t|
+  cp t.source, t.name
+end
+
+file 'base' do
+  touch 'base'
+end

data/test/data/default/Rakefile

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+if ENV['TESTTOPSCOPE']
+  puts "TOPSCOPE"
+end
+
+task :default do
+  puts "DEFAULT"
+end
+
+task :other => [:default] do
+  puts "OTHER"
+end
+
+task :task_scope do
+  if ENV['TESTTASKSCOPE']
+    puts "TASKSCOPE"
+  end
+end    

data/test/data/dryrun/Rakefile

@@ -0,0 +1,22 @@
+# 
+
+task :default => ["temp_main"]
+
+file "temp_main" => [:all_apps]  do touch "temp_main" end
+
+task :all_apps => [:one, :two]
+task :one => ["temp_one"]
+task :two => ["temp_two"]
+
+file "temp_one" do |t|
+  touch "temp_one"
+end
+file "temp_two" do |t|
+  touch "temp_two"
+end
+
+task :clean do
+  ["temp_one", "temp_two", "temp_main"].each do |file|
+    rm_f file
+  end
+end

data/test/data/file_creation_task/Rakefile

@@ -0,0 +1,30 @@
+N = 2
+
+task :default => :run
+
+BUILD_DIR = 'build'
+task :clean do 
+  rm_rf 'build'
+  rm_rf 'src'
+end
+
+task :run
+
+TARGET_DIR = 'build/copies'
+
+FileList['src/*'].each do |src|
+  directory TARGET_DIR
+  target = File.join TARGET_DIR, File.basename(src)
+  file target => [src, TARGET_DIR] do
+    cp src, target
+    sleep 3 if src !~ /foo#{N-1}$/
+  end
+  task :run => target
+end
+
+task :prep => :clean do
+  mkdir_p 'src'
+  N.times do |n|
+    touch "src/foo#{n}"
+  end
+end

data/test/data/imports/Rakefile

@@ -0,0 +1,19 @@
+# -*- ruby -*-
+
+require 'rake/loaders/makefile'
+
+task :default
+
+task :other do
+  puts "OTHER"
+end
+
+file "dynamic_deps" do |t|
+  open(t.name, "w") do |f| f.puts "puts 'DYNAMIC'" end
+end
+
+import "dynamic_deps"
+import "static_deps"
+import "static_deps"
+import "deps.mf"
+puts "FIRST"

data/test/data/imports/deps.mf

@@ -0,0 +1 @@
+default: other

data/test/data/multidesc/Rakefile

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+task :b
+
+desc "A"
+task :a
+
+desc "B"
+task :b
+
+desc "A2"
+task :a
+
+task :c

data/test/data/sample.mf

@@ -0,0 +1,9 @@
+# Comments
+a: a1 a2 a3 a4
+b: b1 b2 b3 \
+   b4 b5 b6\
+# Mid: Comment
+b7
+a: a5 a6 a7
+c: c1
+d: d1 d2 \

data/test/filecreation.rb

@@ -3,20 +3,29 @@
 require 'ftools'
 
 module FileCreation
-  def create_timed_files(oldfile, newfile)
-    return if File.exist?(oldfile) && File.exist?(newfile)
+  OLDFILE = "testdata/old"
+  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)
-    while create_file(newfile) <= old_time
-      sleep(0.1)
-      File.delete(newfile) rescue nil
+    newfiles.each do |newfile|
+      while create_file(newfile) <= old_time
+	sleep(0.1)
+	File.delete(newfile) rescue nil
+      end
     end
   end
 
-  def create_file(name)
-    dirname = File.dirname(name)
+  def create_dir(dirname)
     FileUtils.mkdir_p(dirname) unless File.exist?(dirname)
-    open(name, "w") {|f| f.puts "HI" } unless File.exist?(name)
-    File.new(name).mtime
+    File.stat(dirname).mtime
+  end
+
+  def create_file(name)
+    create_dir(File.dirname(name))
+    FileUtils.touch(name) unless File.exist?(name)
+    File.stat(name).mtime
   end
 
   def delete_file(name)

data/test/functional.rb

@@ -8,134 +8,6 @@ rescue LoadError
   puts "No Session Found"
 end
 
-require 'test/unit'
-require 'fileutils'
-
-# Version 2.1.9 of session has a bug where the @debug instance
-# variable is not initialized, causing warning messages.  This snippet
-# of code fixes that problem.
-module Session
-  class AbstractSession
-    alias old_initialize initialize
-    def initialize(*args)
-      @debug = nil
-      old_initialize(*args)
-    end
-  end
-end
-
-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."
-    @verbose = ! ENV['VERBOSE'].nil?
-  end
-
-  def test_rake_default
-    Dir.chdir("test/data/default") do rake end
-    assert_match(/^DEFAULT$/, @out)
-    assert_status
-  end
-
-  def test_rake_error_on_bad_task
-    Dir.chdir("test/data/default") do rake "xyz" end
-    assert_match(/rake aborted/, @out)
-    assert_status(1)
-  end
-
-  def test_env_availabe_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
-    Dir.chdir("test/data/default") do rake "TESTTASKSCOPE=1 task_scope" end
-    assert_match(/^TASKSCOPE$/, @out)
-    assert_status
-  end
-
-  def test_multi_desc
-    Dir.chdir("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
-  end
-
-  def test_rbext
-    Dir.chdir("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
-    assert_match %r{^No Rakefile found}, @out
-  end
-
-  def test_dry_run
-    Dir.chdir("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
-    assert_no_match %r{OTHER}, @out
-  end
-
-  # Test for the trace/dry_run bug found by Brian Chandler
-  def test_dry_run_bug
-    Dir.chdir("test/data/dryrun") do rake end
-    FileUtils.rm_f "test/data/dryrun/temp_one"
-    Dir.chdir("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
-    FileUtils.rm_f "test/data/dryrun/temp_one"
-    Dir.chdir("test/data/dryrun") do rake "--trace" end
-    assert_no_match(/No such file/, @out)
-    assert_status
-  end
-
-  def test_imports
-    FileUtils.rm_f "test/data/imports/dynamic_deps"
-    Dir.chdir("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)
-    assert_status
-  end
-
-  def test_rules_chaining_to_file_task
-    %w(play.scpt play.app).each do |fn|
-      FileUtils.rm_f File.join("test/data/chains", fn)
-    end
-    Dir.chdir("test/data/chains") do rake end
-    assert File.exist?("test/data/chains/play.app"),
-      "'play.app' file should exist"
-    assert_status
-  end
-
-  private
-
-  def rake(*option_list)
-    options = option_list.join(' ')
-    shell = Session::Shell.new
-    command = "ruby #{@ruby_options} #{@rake_path} #{options}"
-    puts "COMMAND: [#{command}]" if @verbose
-    @out, @err = shell.execute command
-    @status = shell.exit_status
-    puts "STATUS:  [#{@status}]" if @verbose
-    puts "OUTPUT:  [#{@out}]" if @verbose
-    puts "ERROR:   [#{@err}]" if @verbose
-    puts "PWD:     [#{Dir.pwd}]" if @verbose
-    shell.close
-  end
-
-  def assert_status(expected_status=0)
-    assert_equal expected_status, @status
-  end
-
+if defined?(Session)
+  require 'test/session_functional'
 end

data/test/session_functional.rb

@@ -0,0 +1,159 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'fileutils'
+
+# Version 2.1.9 of session has a bug where the @debug instance
+# variable is not initialized, causing warning messages.  This snippet
+# of code fixes that problem.
+module Session
+  class AbstractSession
+    alias old_initialize initialize
+    def initialize(*args)
+      @debug = nil
+      old_initialize(*args)
+    end
+  end
+end
+
+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."
+    @verbose = ! ENV['VERBOSE'].nil?
+    if @verbose
+      puts
+      puts
+      puts "--------------------------------------------------------------------"
+      puts name
+      puts "--------------------------------------------------------------------"
+    end
+  end
+
+  def test_rake_default
+    Dir.chdir("test/data/default") do rake end
+    assert_match(/^DEFAULT$/, @out)
+    assert_status
+  end
+
+  def test_rake_error_on_bad_task
+    Dir.chdir("test/data/default") do rake "xyz" end
+    assert_match(/rake aborted/, @out)
+    assert_status(1)
+  end
+
+  def test_env_availabe_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
+    Dir.chdir("test/data/default") do rake "TESTTASKSCOPE=1 task_scope" end
+    assert_match(/^TASKSCOPE$/, @out)
+    assert_status
+  end
+
+  def test_multi_desc
+    Dir.chdir("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
+  end
+
+  def test_rbext
+    Dir.chdir("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
+    assert_match %r{^No Rakefile found}, @out
+  end
+
+  def test_dry_run
+    Dir.chdir("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
+    assert_no_match %r{OTHER}, @out
+  end
+
+  # Test for the trace/dry_run bug found by Brian Chandler
+  def test_dry_run_bug
+    Dir.chdir("test/data/dryrun") do rake end
+    FileUtils.rm_f "test/data/dryrun/temp_one"
+    Dir.chdir("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
+    FileUtils.rm_f "test/data/dryrun/temp_one"
+    Dir.chdir("test/data/dryrun") do rake "--trace" end
+    assert_no_match(/No such file/, @out)
+    assert_status
+  end
+
+  def test_imports
+    open("test/data/imports/static_deps", "w") do |f|
+      f.puts 'puts "STATIC"'
+    end
+    FileUtils.rm_f "test/data/imports/dynamic_deps"
+    Dir.chdir("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)
+    assert_status
+    FileUtils.rm_f "test/data/imports/dynamic_deps"
+    FileUtils.rm_f "test/data/imports/static_deps"
+  end
+
+  def test_rules_chaining_to_file_task
+    remove_chaining_files
+    Dir.chdir("test/data/chains") do rake end
+    assert File.exist?("test/data/chains/play.app"),
+      "'play.app' file should exist"
+    assert_status
+    remove_chaining_files
+  end
+
+  def test_file_creation_task
+    Dir.chdir("test/data/file_creation_task") do
+      rake "prep"
+      rake "run"
+      rake "run"
+      assert(@err !~ /^cp src/, "Should not recopy data")
+    end
+  end
+
+  private
+
+  def remove_chaining_files
+    %w(play.scpt play.app base).each do |fn|
+      FileUtils.rm_f File.join("test/data/chains", fn)
+    end
+  end
+
+  def rake(*option_list)
+    options = option_list.join(' ')
+    shell = Session::Shell.new
+    command = "ruby #{@ruby_options} #{@rake_path} #{options}"
+    puts "COMMAND: [#{command}]" if @verbose
+    @out, @err = shell.execute command
+    @status = shell.exit_status
+    puts "STATUS:  [#{@status}]" if @verbose
+    puts "OUTPUT:  [#{@out}]" if @verbose
+    puts "ERROR:   [#{@err}]" if @verbose
+    puts "PWD:     [#{Dir.pwd}]" if @verbose
+    shell.close
+  end
+
+  def assert_status(expected_status=0)
+    assert_equal expected_status, @status
+  end
+
+end