rake 10.1.0.beta.3 → 10.1.0

data/test/test_rake_backtrace.rb

@@ -30,6 +30,7 @@ class TestBacktraceSuppression < Rake::TestCase
 end
 
 class TestRakeBacktrace < Rake::TestCase
+  include RubyRunner
 
   def setup
     super
@@ -38,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
@@ -56,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]
@@ -74,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]
@@ -90,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]

data/test/test_rake_clean.rb

@@ -2,13 +2,45 @@ require File.expand_path('../helper', __FILE__)
 require 'rake/clean'
 
 class TestRakeClean < Rake::TestCase
-  include Rake
   def test_clean
     load 'rake/clean.rb', true
 
-    assert Task['clean'], "Should define clean"
-    assert Task['clobber'], "Should define clobber"
-    assert Task['clobber'].prerequisites.include?("clean"),
+    assert Rake::Task['clean'], "Should define clean"
+    assert Rake::Task['clobber'], "Should define clobber"
+    assert Rake::Task['clobber'].prerequisites.include?("clean"),
       "Clobber should require clean"
   end
+
+  def test_cleanup
+    file_name = create_undeletable_file
+
+    out, _ = capture_io do
+      Rake::Cleaner.cleanup(file_name, verbose: false)
+    end
+    assert_match(/failed to remove/i, out)
+
+  ensure
+    remove_undeletable_file
+  end
+
+  private
+
+  def create_undeletable_file
+    dir_name = File.join(@tempdir, "deletedir")
+    file_name = File.join(dir_name, "deleteme")
+    FileUtils.mkdir(dir_name)
+    FileUtils.touch(file_name)
+    FileUtils.chmod(0, file_name)
+    FileUtils.chmod(0, dir_name)
+    file_name
+  end
+
+  def remove_undeletable_file
+    dir_name = File.join(@tempdir, "deletedir")
+    file_name = File.join(dir_name, "deleteme")
+    FileUtils.chmod(0777, dir_name)
+    FileUtils.chmod(0777, file_name)
+    Rake::Cleaner.cleanup(file_name, verbose: false)
+    Rake::Cleaner.cleanup(dir_name, verbose: false)
+  end
 end

data/test/test_rake_functional.rb

@@ -3,13 +3,11 @@ require 'fileutils'
 require 'open3'
 
 class TestRakeFunctional < Rake::TestCase
+  include RubyRunner
 
   def setup
     super
 
-    @ruby_options = ["-I#{@rake_lib}", "-I."]
-    @verbose = ENV['VERBOSE']
-
     if @verbose
       puts
       puts
@@ -465,34 +463,4 @@ class TestRakeFunctional < Rake::TestCase
     RUBY_VERSION < "1.9" || defined?(JRUBY_VERSION)
   end
 
-  # 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_reduce_compat.rb

@@ -2,15 +2,11 @@ require File.expand_path('../helper', __FILE__)
 require 'open3'
 
 class TestRakeReduceCompat < Rake::TestCase
-  # TODO: factor out similar code in test_rake_functional.rb
-  def rake(*args)
-    Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, out, _, _|
-      out.read
-    }
-  end
+  include RubyRunner
 
   def invoke_normal(task_name)
     rake task_name.to_s
+    @out
   end
 
   def test_no_deprecated_dsl

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 10.1.0.beta.3
+  version: 10.1.0
 platform: ruby
 authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -69,6 +69,7 @@ extra_rdoc_files:
 - doc/release_notes/rake-10.0.1.rdoc
 - doc/release_notes/rake-10.0.2.rdoc
 - doc/release_notes/rake-10.0.3.rdoc
+- doc/release_notes/rake-10.1.0.rdoc
 files:
 - .gemtest
 - install.rb
@@ -135,6 +136,8 @@ files:
 - lib/rake/win32.rb
 - test/file_creation.rb
 - test/helper.rb
+- test/support/rakefile_definitions.rb
+- test/support/ruby_runner.rb
 - test/test_private_reader.rb
 - test/test_rake.rb
 - test/test_rake_application.rb
@@ -222,6 +225,7 @@ files:
 - doc/release_notes/rake-10.0.1.rdoc
 - doc/release_notes/rake-10.0.2.rdoc
 - doc/release_notes/rake-10.0.3.rdoc
+- doc/release_notes/rake-10.1.0.rdoc
 homepage: http://rake.rubyforge.org
 licenses:
 - MIT