rake 10.0.4 → 10.1.0

data/test/support/rakefile_definitions.rb

@@ -0,0 +1,444 @@
+module RakefileDefinitions
+  include FileUtils
+
+  def rakefile_access
+    rakefile <<-ACCESS
+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
+
+# TODO: remove `disabled_' when DeprecatedObjectDSL removed
+task :obj
+task :disabled_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
+    ACCESS
+  end
+
+  def rakefile_chains
+    rakefile <<-DEFAULT
+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
+    DEFAULT
+  end
+
+  def rakefile_comments
+    rakefile <<-COMMENTS
+# 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
+    COMMENTS
+  end
+
+  def rakefile_default
+    rakefile <<-DEFAULT
+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
+    DEFAULT
+  end
+
+  def rakefile_dryrun
+    rakefile <<-DRYRUN
+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
+    DRYRUN
+
+    FileUtils.touch 'temp_main'
+    FileUtils.touch 'temp_two'
+  end
+
+  def rakefile_extra
+    rakefile 'task :default'
+
+    FileUtils.mkdir_p 'rakelib'
+
+    open File.join('rakelib', 'extra.rake'), 'w' do |io|
+      io << <<-EXTRA_RAKE
+# Added for testing
+
+namespace :extra do
+  desc "An Extra Task"
+  task :extra do
+    puts "Read all about it"
+  end
+end
+      EXTRA_RAKE
+    end
+  end
+
+  def rakefile_file_creation
+    rakefile <<-'FILE_CREATION'
+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
+  end
+  task :run => target
+end
+
+task :prep => :clean do
+  mkdir_p 'src'
+  N.times do |n|
+    touch "src/foo#{n}"
+  end
+end
+    FILE_CREATION
+  end
+
+  def rakefile_imports
+    rakefile <<-IMPORTS
+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"
+    IMPORTS
+
+    open 'deps.mf', 'w' do |io|
+      io << <<-DEPS
+default: other
+      DEPS
+    end
+
+    open "static_deps", "w" do |f|
+      f.puts 'puts "STATIC"'
+    end
+  end
+
+  def rakefile_multidesc
+    rakefile <<-MULTIDESC
+task :b
+
+desc "A"
+task :a
+
+desc "B"
+task :b
+
+desc "A2"
+task :a
+
+task :c
+
+desc "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+task :d
+    MULTIDESC
+  end
+
+  def rakefile_namespace
+    rakefile <<-NAMESPACE
+desc "copy"
+task :copy do
+  puts "COPY"
+end
+
+namespace "nest" do
+  desc "nest copy"
+  task :copy do
+    puts "NEST COPY"
+  end
+  task :xx => :copy
+end
+
+anon_ns = namespace do
+  desc "anonymous copy task"
+  task :copy do
+    puts "ANON COPY"
+  end
+end
+
+desc "Top level task to run the anonymous version of copy"
+task :anon => anon_ns[:copy]
+
+namespace "very" do
+  namespace "nested" do
+    task "run" => "rake:copy"
+  end
+end
+
+namespace "a" do
+  desc "Run task in the 'a' namespace"
+  task "run" do
+    puts "IN A"
+  end
+end
+
+namespace "b" do
+  desc "Run task in the 'b' namespace"
+  task "run" => "a:run" do
+    puts "IN B"
+  end
+end
+
+namespace "file1" do
+  file "xyz.rb" do
+    puts "XYZ1"
+  end
+end
+
+namespace "file2" do
+  file "xyz.rb" do
+    puts "XYZ2"
+  end
+end
+
+namespace "scopedep" do
+  task :prepare do
+    touch "scopedep.rb"
+    puts "PREPARE"
+  end
+  file "scopedep.rb" => [:prepare] do
+    puts "SCOPEDEP"
+  end
+end
+    NAMESPACE
+  end
+
+  def rakefile_nosearch
+    FileUtils.touch 'dummy'
+  end
+
+  def rakefile_rakelib
+    FileUtils.mkdir_p 'rakelib'
+
+    Dir.chdir 'rakelib' do
+      open 'test1.rb', 'w' do |io|
+        io << <<-TEST1
+task :default do
+  puts "TEST1"
+end
+        TEST1
+      end
+
+      open 'test2.rake', 'w' do |io|
+        io << <<-TEST1
+task :default do
+  puts "TEST2"
+end
+        TEST1
+      end
+    end
+  end
+
+  def rakefile_rbext
+    open 'rakefile.rb', 'w' do |io|
+      io << 'task :default do puts "OK" end'
+    end
+  end
+
+  def rakefile_unittest
+    rakefile '# Empty Rakefile for Unit Test'
+
+    readme = File.join 'subdir', 'README'
+    FileUtils.mkdir_p File.dirname readme
+
+    FileUtils.touch readme
+  end
+
+  def rakefile_verbose
+    rakefile <<-VERBOSE
+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
+    VERBOSE
+  end
+
+  def rakefile_test_signal
+    rakefile <<-TEST_SIGNAL
+require 'rake/testtask'
+
+Rake::TestTask.new(:a) do |t|
+  t.test_files = ['a_test.rb']
+end
+
+Rake::TestTask.new(:b) do |t|
+  t.test_files = ['b_test.rb']
+end
+
+task :test do
+  Rake::Task[:a].invoke
+  Rake::Task[:b].invoke
+end
+
+task :default => :test
+    TEST_SIGNAL
+    open 'a_test.rb', 'w' do |io|
+      io << 'puts "ATEST"' << "\n"
+      io << '$stdout.flush' << "\n"
+      io << 'Process.kill("TERM", $$)' << "\n"
+    end
+    open 'b_test.rb', 'w' do |io|
+      io << 'puts "BTEST"' << "\n"
+      io << '$stdout.flush' << "\n"
+    end
+  end
+
+  def rakefile_failing_test_task
+    rakefile <<-TEST_TASK
+require 'rake/testtask'
+
+task :default => :test
+Rake::TestTask.new(:test) do |t|
+  t.test_files = ['a_test.rb']
+end
+    TEST_TASK
+    open 'a_test.rb', 'w' do |io|
+      io << "require 'minitest/autorun'\n"
+      io << "class ExitTaskTest < MiniTest::Unit::TestCase\n"
+      io << "  def test_exit\n"
+      io << "    assert false, 'this should fail'\n"
+      io << "  end\n"
+      io << "end\n"
+    end
+  end
+
+  def rakefile_stand_alone_filelist
+    open 'stand_alone_filelist.rb', 'w' do |io|
+      io << "require 'rake/file_list'\n"
+      io << "FL = Rake::FileList['*.rb']\n"
+      io << "puts FL\n"
+    end
+  end
+end

data/test/support/ruby_runner.rb

@@ -0,0 +1,33 @@
+module RubyRunner
+  include FileUtils
+
+  # Run a shell Ruby command with command line options (using the
+  # default test options). Output is captured in @out and @err
+  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 and @err
+  def rake(*rake_options)
+    run_ruby @ruby_options + [@rake_exec] + rake_options
+  end
+
+  # Low level ruby command runner ...
+  def run_ruby(option_list)
+    puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose
+
+    inn, out, err, wait = Open3.popen3(RUBY, *option_list)
+    inn.close
+
+    @exit = wait ? wait.value : $?
+    @out = out.read
+    @err = err.read
+
+    puts "OUTPUT:  [#{@out}]" if @verbose
+    puts "ERROR:   [#{@err}]" if @verbose
+    puts "EXIT:    [#{@exit.inspect}]" if @verbose
+    puts "PWD:     [#{Dir.pwd}]" if @verbose
+  end
+end

data/test/test_rake_application.rb

@@ -23,13 +23,14 @@ class TestRakeApplication < Rake::TestCase
     @app.terminal_columns = 80
     @app.options.show_tasks = :tasks
     @app.options.show_task_pattern = //
-    @app.last_description = "1234567890" * 8
+    numbers = "1234567890" * 8
+    @app.last_description = numbers
     @app.define_task(Rake::Task, "t")
 
     out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
 
     assert_match(/^rake t/, out)
-    assert_match(/# 12345678901234567890123456789012345678901234567890123456789012345\.\.\./, out)
+    assert_match(/# #{numbers[0, 65]}\.\.\./, out)
   end
 
   def test_display_tasks_with_task_name_wider_than_tty_display
@@ -38,7 +39,7 @@ class TestRakeApplication < Rake::TestCase
     @app.options.show_task_pattern = //
     task_name = "task name" * 80
     @app.last_description = "something short"
-    @app.define_task(Rake::Task, task_name )
+    @app.define_task(Rake::Task, task_name)
 
     out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
 
@@ -53,7 +54,7 @@ class TestRakeApplication < Rake::TestCase
     description = "something short"
     task_name = "task name" * 80
     @app.last_description = "something short"
-    @app.define_task(Rake::Task, task_name )
+    @app.define_task(Rake::Task, task_name)
 
     out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
 
@@ -72,18 +73,19 @@ class TestRakeApplication < Rake::TestCase
     assert_match(/# #{@app.last_description}/, out)
   end
 
-  def test_display_tasks_with_long_comments_to_a_non_tty_with_columns_set_truncates_comments
+  def test_truncating_comments_to_a_non_tty
     @app.terminal_columns = 80
     @app.options.show_tasks = :tasks
     @app.options.show_task_pattern = //
     @app.tty_output = false
-    @app.last_description = "1234567890" * 8
+    numbers = "1234567890" * 8
+    @app.last_description = numbers
     @app.define_task(Rake::Task, "t")
 
     out, = capture_io do @app.instance_eval { display_tasks_and_comments } end
 
     assert_match(/^rake t/, out)
-    assert_match(/# 12345678901234567890123456789012345678901234567890123456789012345\.\.\./, out)
+    assert_match(/# #{numbers[0, 65]}\.\.\./, out)
   end
 
   def test_describe_tasks
@@ -114,7 +116,7 @@ class TestRakeApplication < Rake::TestCase
 
   def test_not_finding_rakefile
     @app.instance_eval { @rakefiles = ['NEVER_FOUND'] }
-    assert( ! @app.instance_eval do have_rakefile end )
+    assert(! @app.instance_eval do have_rakefile end)
     assert_nil @app.rakefile
   end
 
@@ -245,7 +247,7 @@ class TestRakeApplication < Rake::TestCase
   end
 
   def test_terminal_columns
-    old_RAKE_COLUMNS = ENV['RAKE_COLUMNS']
+    old_rake_columns = ENV['RAKE_COLUMNS']
 
     ENV['RAKE_COLUMNS'] = '42'
 
@@ -253,10 +255,10 @@ class TestRakeApplication < Rake::TestCase
 
     assert_equal 42, app.terminal_columns
   ensure
-    if old_RAKE_COLUMNS then
+    if old_rake_columns
       ENV['RAKE_COLUMNS'].delete
     else
-      ENV['RAKE_COLUMNS'] = old_RAKE_COLUMNS
+      ENV['RAKE_COLUMNS'] = old_rake_columns
     end
   end
 
@@ -289,7 +291,7 @@ class TestRakeApplication < Rake::TestCase
     # HACK no assertions
   end
 
-  def test_handle_options_should_strip_options_from_ARGV
+  def test_handle_options_should_strip_options_from_argv
     assert !@app.options.trace
 
     valid_option = '--trace'

data/test/test_rake_application_options.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-TESTING_REQUIRE = [ ]
+TESTING_REQUIRE = []
 
 class TestRakeApplicationOptions < Rake::TestCase
 
@@ -22,9 +22,7 @@ class TestRakeApplicationOptions < Rake::TestCase
   end
 
   def clear_argv
-    while ! ARGV.empty?
-      ARGV.pop
-    end
+    ARGV.pop until ARGV.empty?
   end
 
   def test_default_options
@@ -146,7 +144,11 @@ class TestRakeApplicationOptions < Rake::TestCase
 
   def test_rakelib
     dirs = %w(A B C).join(File::PATH_SEPARATOR)
-    flags(['--rakelibdir', dirs], ["--rakelibdir=#{dirs}"], ['-R', dirs], ["-R#{dirs}"]) do |opts|
+    flags(
+      ['--rakelibdir', dirs],
+      ["--rakelibdir=#{dirs}"],
+      ['-R', dirs],
+      ["-R#{dirs}"]) do |opts|
       assert_equal ['A', 'B', 'C'], opts.rakelib
     end
   end

data/test/test_rake_backtrace.rb

@@ -1,7 +1,36 @@
 require File.expand_path('../helper', __FILE__)
 require 'open3'
 
+class TestBacktraceSuppression < Rake::TestCase
+  def test_bin_rake_suppressed
+    paths = ["something/bin/rake:12"]
+
+    actual = Rake::Backtrace.collapse(paths)
+
+    assert_equal [], actual
+  end
+
+  def test_system_dir_suppressed
+    path = RbConfig::CONFIG['rubylibprefix']
+    paths = [path + ":12"]
+
+    actual = Rake::Backtrace.collapse(paths)
+
+    assert_equal [], actual
+  end
+
+  def test_near_system_dir_isnt_suppressed
+    path = RbConfig::CONFIG['rubylibprefix']
+    paths = [" " + path + ":12"]
+
+    actual = Rake::Backtrace.collapse(paths)
+
+    assert_equal paths, actual
+  end
+end
+
 class TestRakeBacktrace < Rake::TestCase
+  include RubyRunner
 
   def setup
     super
@@ -10,15 +39,9 @@ class TestRakeBacktrace < Rake::TestCase
       Dir.pwd =~ Rake::Backtrace::SUPPRESS_PATTERN
   end
 
-  # TODO: factor out similar code in test_rake_functional.rb
-  def rake(*args)
-    Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, _, err, _|
-      err.read
-    }
-  end
-
-  def invoke(task_name)
-    rake task_name.to_s
+  def invoke(*args)
+    rake(*args)
+    @err
   end
 
   def test_single_collapse
@@ -28,7 +51,7 @@ class TestRakeBacktrace < Rake::TestCase
       end
     }
 
-    lines = invoke(:foo).split("\n")
+    lines = invoke("foo").split("\n")
 
     assert_equal "rake aborted!", lines[0]
     assert_equal "foooo!", lines[1]
@@ -46,7 +69,7 @@ class TestRakeBacktrace < Rake::TestCase
       end
     }
 
-    lines = invoke(:foo).split("\n")
+    lines = invoke("foo").split("\n")
 
     assert_equal "rake aborted!", lines[0]
     assert_equal "barrr!", lines[1]
@@ -62,12 +85,12 @@ class TestRakeBacktrace < Rake::TestCase
       end
     }
 
-    lines = rake("baz").split("\n")
+    lines = invoke("baz").split("\n")
     assert_equal "rake aborted!", lines[0]
     assert_equal "bazzz!", lines[1]
     assert_something_matches %r!Rakefile!i, lines
 
-    lines = rake("--suppress-backtrace", ".ak.file", "baz").split("\n")
+    lines = invoke("--suppress-backtrace", ".ak.file", "baz").split("\n")
     assert_equal "rake aborted!", lines[0]
     assert_equal "bazzz!", lines[1]
     refute_match %r!Rakefile!i, lines[2]
@@ -83,7 +106,8 @@ class TestRakeBacktrace < Rake::TestCase
         return
       end
     end
-    flunk "expected #{pattern.inspect} to match something in:\n    #{lines.join("\n    ")}"
+    flunk "expected #{pattern.inspect} to match something in:\n" +
+      "#{lines.join("\n    ")}"
   end
 
 end