RubyGems - rake - Versions diffs - 0.9.5 → 0.9.6 - Mend

rake 0.9.5 → 0.9.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of rake might be problematic. Click here for more details.

Files changed (20) hide show

data/Rakefile +1 -1
data/doc/release_notes/rake-0.9.6.rdoc +127 -0
data/lib/rake.rb +1 -0
data/lib/rake/application.rb +5 -3
data/lib/rake/backtrace.rb +1 -1
data/lib/rake/file_utils.rb +1 -1
data/lib/rake/ruby182_test_unit_fix.rb +0 -0
data/lib/rake/task.rb +8 -7
data/lib/rake/trace_output.rb +19 -0
data/lib/rake/version.rb +7 -4
data/test/helper.rb +17 -4
data/test/test_rake_backtrace.rb +11 -3
data/test/test_rake_file_task.rb +1 -1
data/test/test_rake_functional.rb +17 -10
data/test/test_rake_rake_test_loader.rb +1 -1
data/test/test_rake_reduce_compat.rb +5 -5
data/test/test_rake_task_with_arguments.rb +10 -2
data/test/test_rake_top_level_functions.rb +1 -1
data/test/test_trace_output.rb +43 -0
metadata +6 -2

data/Rakefile CHANGED

@@ -60,7 +60,7 @@ task :default => :test
 Rake::TestTask.new do |t|
   files = FileList['test/helper.rb', 'test/test_*.rb']
-  t.loader = :testrb
+  t.loader = :rake
   t.test_files = files
   t.libs << "."
   t.warning = true

data/doc/release_notes/rake-0.9.6.rdoc ADDED

@@ -0,0 +1,127 @@
+= Rake 0.9.6 Released
+Rake version 0.9.6 contains a number of fixes mainly for merging
+Rake into the Ruby source tree and fixing tests.
+== Changes
+=== New Features (in 0.9.3)
+* Multitask tasks now use a thread pool. Use -j to limit the number of
+  available threads.
+* Use -m to turn regular tasks into multitasks (use at your own risk).
+* You can now do "Rake.add_rakelib 'dir'" in your Rakefile to
+  programatically add rake task libraries.
+* You can specific backtrace suppression patterns (see
+  --supress-backtrace)
+* Directory tasks can now take prerequisites and actions
+* Use --backtrace to request a full backtrace without the task trace.
+* You can say "--backtrace=stdout" and "--trace=stdout" to route trace
+  output to standard output rather than standard error.
+* Optional 'phony' target (enable with 'require 'rake/phony'") for
+  special purpose builds.
+* Task#clear now clears task comments as well as actions and
+  prerequisites. Task#clear_comment will specifically target comments.
+* The --all option will force -T and -D to consider all the tasks,
+  with and without descriptions.
+=== Bug Fixes (0.9.3)
+* Semi-colons in windows rakefile paths now work.
+* Improved Control-C support when invoking multiple test suites.
+* egrep method now reads files in text mode (better support for
+  Windows)
+* Better deprecation line number reporting.
+* The -W option now works with all tasks, whether they have a
+  description or not.
+* File globs in rake should not be sorted alphabetically, independent
+  of file system and platform.
+* Numerous internal improvements.
+* Documentation typos and fixes.
+=== Bug Fixes (0.9.4)
+* Exit status with failing tests is not correctly set to non-zero.
+* Simplified syntax for phony task (for older versions of RDoc).
+* Stand alone FileList usage gets glob function (without loading in
+  extra dependencies)
+=== Bug Fixes (0.9.5)
+* --trace and --backtrace no longer swallow following task names.
+=== Bug Fixes (0.9.6)
+* Better trace output when using a multi-threaded Rakefile.
+* Arg parsing is now consistent for tasks and multitasks.
+* Skip exit code test in versions of Ruby that don't support it well.
+Changes for better integration with the Ruby source tree:
+* Fix version literal for Ruby source tree build.
+* Better loading of libraries for testing in Ruby build.
+* Use the ruby version provided by Ruby's tests.
+== What is Rake
+Rake is a build tool similar to the make program in many ways. But
+instead of cryptic make recipes, Rake uses standard Ruby code to
+declare tasks and dependencies. You have the full power of a modern
+scripting language built right into your build tool.
+== Availability
+The easiest way to get and install rake is via RubyGems ...
+  gem install rake    (you may need root/admin privileges)
+Otherwise, you can get it from the more traditional places:
+Home Page:: http://github.com/jimweirich/rake
+Download::  http://rubyforge.org/project/showfiles.php?group_id=50
+GitHub::    git://github.com/jimweirich/rake.git
+== Thanks
+As usual, it was input from users that drove a alot of these changes. The
+following people either contributed patches, made suggestions or made
+otherwise helpful comments.  Thanks to ...
+* Aaron Patterson
+* Dylan Smith
+* Jo Liss
+* Jonas Pfenniger
+* Kazuki Tsujimoto
+* Michael Bishop
+* Michael Elufimov
+* NAKAMURA Usaku
+* Ryan Davis
+* Sam Grönblom
+* Sam Phippen
+* Sergio Wong
+* Tay Ray Chuan
+* grosser
+* quix
+Also, many thanks to Eric Hodel for assisting with getting this release
+out the door.
+-- Jim Weirich

data/lib/rake.rb CHANGED

@@ -43,6 +43,7 @@ require 'rake/win32'
 require 'rake/task_argument_error'
 require 'rake/rule_recursion_overflow_error'
 require 'rake/rake_module'
+require 'rake/trace_output'
 require 'rake/pseudo_status'
 require 'rake/task_arguments'
 require 'rake/invocation_chain'

data/lib/rake/application.rb CHANGED

@@ -5,6 +5,7 @@ require 'rake/task_manager'
 require 'rake/file_list'
 require 'rake/thread_pool'
 require 'rake/thread_history_display'
+require 'rake/trace_output'
 require 'rake/win32'
 module Rake
@@ -17,6 +18,7 @@ module Rake
   #
   class Application
     include TaskManager
+    include TraceOutput
     # The name of the application (typically 'rake')
     attr_reader :name
@@ -176,7 +178,7 @@ module Rake
       if options.backtrace
         trace ex.backtrace.join("\n")
       else
-        trace Backtrace.collapse(ex.backtrace)
+        trace Backtrace.collapse(ex.backtrace).join("\n")
       end
       trace "Tasks: #{ex.chain}" if has_chain?(ex)
       trace "(See full trace by running task with --trace)" unless options.backtrace
@@ -314,9 +316,9 @@ module Rake
       end
     end
-    def trace(*str)
+    def trace(*strings)
       options.trace_output ||= $stderr
-      options.trace_output.puts(*str)
+      trace_on(options.trace_output, *strings)
     end
     def sort_options(options)

data/lib/rake/backtrace.rb CHANGED

@@ -2,7 +2,7 @@ module Rake
   module Backtrace
     SUPPRESSED_PATHS =
       RbConfig::CONFIG.values_at(*RbConfig::CONFIG.
-                                 keys.grep(/(prefix|libdir)/)) + [
+                                 keys.grep(/(prefix|libdir)/)).uniq + [
         File.join(File.dirname(__FILE__), ".."),
       ].map { |f| Regexp.quote(File.expand_path(f)) }
     SUPPRESSED_PATHS.reject! { |s| s.nil? || s =~ /^ *$/ }

data/lib/rake/file_utils.rb CHANGED

@@ -6,7 +6,7 @@ require 'fileutils'
 # added to the FileUtils utility functions.
 module FileUtils
   # Path to the currently running Ruby program
-  RUBY = File.join(
+  RUBY = ENV['RUBY'] || File.join(
     RbConfig::CONFIG['bindir'],
     RbConfig::CONFIG['ruby_install_name'] + RbConfig::CONFIG['EXEEXT']).
     sub(/.*\s.*/m, '"\&"')

data/lib/rake/ruby182_test_unit_fix.rb CHANGED

File without changes

data/lib/rake/task.rb CHANGED

@@ -105,7 +105,7 @@ module Rake
     # Argument description (nil if none).
     def arg_description # :nodoc:
-      @arg_names ? "[#{(arg_names || []).join(',')}]" : nil
+      @arg_names ? "[#{arg_names.join(',')}]" : nil
     end
     # Name of arguments for this task.
@@ -182,18 +182,19 @@ module Rake
       if application.options.always_multitask
         invoke_prerequisites_concurrently(task_args, invocation_chain)
       else
-        prerequisite_tasks.each { |prereq|
-          prereq_args = task_args.new_scope(prereq.arg_names)
-          prereq.invoke_with_call_chain(prereq_args, invocation_chain)
+        prerequisite_tasks.each { |p|
+          prereq_args = task_args.new_scope(p.arg_names)
+          p.invoke_with_call_chain(prereq_args, invocation_chain)
         }
       end
     end
     # Invoke all the prerequisites of a task in parallel.
-    def invoke_prerequisites_concurrently(args, invocation_chain) # :nodoc:
-      futures = @prerequisites.collect do |p|
+    def invoke_prerequisites_concurrently(task_args, invocation_chain) # :nodoc:
+      futures = prerequisite_tasks.collect do |p|
+        prereq_args = task_args.new_scope(p.arg_names)
         application.thread_pool.future(p) do |r|
-          application[r, @scope].invoke_with_call_chain(args, invocation_chain)
+          r.invoke_with_call_chain(prereq_args, invocation_chain)
         end
       end
       futures.each { |f| f.value }

data/lib/rake/trace_output.rb ADDED

@@ -0,0 +1,19 @@
+module Rake
+  module TraceOutput
+    # Write trace output to output stream +out+.
+    #
+    # The write is done as a single IO call (to print) to lessen the
+    # chance that the trace output is interrupted by other tasks also
+    # producing output.
+    def trace_on(out, *strings)
+      sep = $\ || "\n"
+      if strings.empty?
+        output = sep
+      else
+        output = strings.map { |s| s.end_with?(sep) ? s : s + sep }.join
+      end
+      out.print(output)
+    end
+  end
+end

data/lib/rake/version.rb CHANGED

@@ -1,10 +1,13 @@
 module Rake
+  VERSION = '0.9.6'
   module Version # :nodoc: all
+    MAJOR, MINOR, BUILD, = Rake::VERSION.split '.'
     NUMBERS = [
-      MAJOR = 0,
-      MINOR = 9,
-      BUILD = 5,
+      MAJOR,
+      MINOR,
+      BUILD,
     ]
   end
-  VERSION = Version::NUMBERS.join('.')
 end

data/test/helper.rb CHANGED

@@ -12,8 +12,8 @@ require 'tmpdir'
 require File.expand_path('../file_creation', __FILE__)
 begin
-  require 'test/ruby/envutil'
-rescue LoadError
+  require_relative '../ruby/envutil'
+rescue NoMethodError, LoadError
   # for ruby trunk
 end
@@ -31,6 +31,19 @@ class Rake::TestCase < MiniTest::Unit::TestCase
   def setup
     ARGV.clear
+    test_dir = File.basename File.dirname File.expand_path __FILE__
+    @rake_root = if test_dir == 'test' then
+                   # rake repository
+                   File.expand_path '../../', __FILE__
+                 else
+                   # ruby repository
+                   File.expand_path '../../../', __FILE__
+                 end
+    @rake_exec = File.join @rake_root, 'bin', 'rake'
+    @rake_lib  = File.join @rake_root, 'lib'
     @orig_PWD = Dir.pwd
     @orig_APPDATA      = ENV['APPDATA']
     @orig_HOME         = ENV['HOME']
@@ -502,8 +515,8 @@ Rake::TestTask.new(:b) do |t|
 end
 task :test do
-  Rake::Task[:a].invoke rescue nil
-  Rake::Task[:b].invoke rescue nil
+  Rake::Task[:a].invoke
+  Rake::Task[:b].invoke
 end
 task :default => :test

data/test/test_rake_backtrace.rb CHANGED

@@ -2,11 +2,19 @@ require File.expand_path('../helper', __FILE__)
 require 'open3'
 class TestRakeBacktrace < Rake::TestCase
+  def setup
+    super
+    skip 'tmpdir is suppressed in backtrace' if
+      Dir.pwd =~ Rake::Backtrace::SUPPRESS_PATTERN
+  end
   # TODO: factor out similar code in test_rake_functional.rb
   def rake(*args)
-    lib = File.join(@orig_PWD, "lib")
-    bin_rake = File.join(@orig_PWD, "bin", "rake")
-    Open3.popen3(RUBY, "-I", lib, bin_rake, *args) { |_, _, err, _| err.read }
+    Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, _, err, _|
+      err.read
+    }
   end
   def invoke(task_name)

data/test/test_rake_file_task.rb CHANGED

@@ -116,7 +116,7 @@ class TestRakeFileTask < Rake::TestCase
   end
   def load_phony
-    load File.join(@orig_PWD, "lib/rake/phony.rb")
+    load File.join(@rake_lib, "rake/phony.rb")
   end
 end

data/test/test_rake_functional.rb CHANGED

@@ -5,9 +5,9 @@ require 'open3'
 class TestRakeFunctional < Rake::TestCase
   def setup
-    @rake_path = File.expand_path("bin/rake")
-    lib_path = File.expand_path("lib")
-    @ruby_options = ["-I#{lib_path}", "-I."]
+    super
+    @ruby_options = ["-I#{@rake_lib}", "-I."]
     @verbose = ENV['VERBOSE']
     if @verbose
@@ -17,8 +17,6 @@ class TestRakeFunctional < Rake::TestCase
       puts @__name__
       puts '-' * 80
     end
-    super
   end
   def test_rake_default
@@ -440,9 +438,10 @@ class TestRakeFunctional < Rake::TestCase
   end
   def test_failing_test_sets_exit_status
+    skip if uncertain_exit_status?
     rakefile_failing_test_task
     rake
-    assert_equal 1, @exit.exitstatus
+    assert @exit.exitstatus > 0, "should be non-zero"
   end
   def test_stand_alone_filelist
@@ -451,11 +450,19 @@ class TestRakeFunctional < Rake::TestCase
     run_ruby @ruby_options + ["stand_alone_filelist.rb"]
     assert_match(/^stand_alone_filelist\.rb$/, @out)
-    assert_equal 0, @exit.exitstatus
+    assert_equal 0, @exit.exitstatus unless uncertain_exit_status?
   end
   private
+  # We are unable to accurately verify that Rake returns a proper
+  # error exit status using popen3 in Ruby 1.8.7 and JRuby. This
+  # predicate function can be used to skip tests or assertions as
+  # needed.
+  def uncertain_exit_status?
+    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)
@@ -466,19 +473,19 @@ class TestRakeFunctional < Rake::TestCase
   # command line ruby options are included.  Output is captured in
   # @out and @err
   def rake(*rake_options)
-    run_ruby @ruby_options + [@rake_path] + 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(Gem.ruby, *option_list)
+    inn, out, err, wait = Open3.popen3(RUBY, *option_list)
     inn.close
+    @exit = wait ? wait.value : $?
     @out = out.read
     @err = err.read
-    @exit = wait.value
     puts "OUTPUT:  [#{@out}]" if @verbose
     puts "ERROR:   [#{@err}]" if @verbose

data/test/test_rake_rake_test_loader.rb CHANGED

@@ -10,7 +10,7 @@ class TestRakeRakeTestLoader < Rake::TestCase
     ARGV.replace %w[foo.rb test_*.rb -v]
-    load File.join(@orig_PWD, 'lib/rake/rake_test_loader.rb')
+    load File.join(@rake_lib, 'rake/rake_test_loader.rb')
     assert_equal %w[-v], ARGV
   ensure

data/test/test_rake_reduce_compat.rb CHANGED

@@ -4,11 +4,11 @@ require 'open3'
 class TestRakeReduceCompat < Rake::TestCase
   # TODO: factor out similar code in test_rake_functional.rb
   def rake(*args)
-    lib = File.join(@orig_PWD, "lib")
-    bin_rake = File.join(@orig_PWD, "bin", "rake")
-    Open3.popen3(RUBY, "-I", lib, bin_rake, *args) { |_, out, _, _| out.read }
+    Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, out, _, _|
+      out.read
+    }
   end
   def invoke_normal(task_name)
     rake task_name.to_s
   end
@@ -27,7 +27,7 @@ class TestRakeReduceCompat < Rake::TestCase
         Module.new { p defined?(file) }
       end
     }
     assert_equal %{"method"}, invoke_normal(:check_task).chomp
     assert_equal %{"method"}, invoke_normal(:check_file).chomp

data/test/test_rake_task_with_arguments.rb CHANGED

@@ -142,7 +142,7 @@ class TestRakeTaskWithArguments < Rake::TestCase
     assert_equal "1.2", value
   end
-  def test_args_not_passed_if_no_prereq_names
+  def test_args_not_passed_if_no_prereq_names_on_task
     pre = task(:pre) { |t, args|
       assert_equal({}, args.to_hash)
       assert_equal "bill", args.name
@@ -151,6 +151,15 @@ class TestRakeTaskWithArguments < Rake::TestCase
     t.invoke("bill", "1.2")
   end
+  def test_args_not_passed_if_no_prereq_names_on_multitask
+    pre = task(:pre) { |t, args|
+      assert_equal({}, args.to_hash)
+      assert_equal "bill", args.name
+    }
+    t = multitask(:t, [:name, :rev] => [:pre])
+    t.invoke("bill", "1.2")
+  end
   def test_args_not_passed_if_no_arg_names
     pre = task(:pre, :rev) { |t, args|
       assert_equal({}, args.to_hash)
@@ -170,4 +179,3 @@ class TestRakeTaskWithArguments < Rake::TestCase
     # HACK no assertions
   end
 end

data/test/test_rake_top_level_functions.rb CHANGED

@@ -23,7 +23,7 @@ class TestRakeTopLevelFunctions < Rake::TestCase
   def test_namespace
     block = proc do end
-    namespace("xyz", &block)
+    namespace("xyz", &block)
     expected = [
       [[:in_namespace, 'xyz'], block]

data/test/test_trace_output.rb ADDED

@@ -0,0 +1,43 @@
+require File.expand_path('../helper', __FILE__)
+require 'stringio'
+class TestTraceOutput < Rake::TestCase
+  include Rake::TraceOutput
+  class PrintSpy
+    attr_reader :result, :calls
+    def initialize
+      @result = ""
+      @calls = 0
+    end
+    def print(string)
+      @result << string
+      @calls += 1
+    end
+  end
+  def test_trace_issues_single_io_for_args_with_empty_args
+    spy = PrintSpy.new
+    trace_on(spy)
+    assert_equal "\n", spy.result
+    assert_equal 1, spy.calls
+  end
+  def test_trace_issues_single_io_for_args_multiple_strings
+    spy = PrintSpy.new
+    trace_on(spy, "HI\n", "LO")
+    assert_equal "HI\nLO\n", spy.result
+    assert_equal 1, spy.calls
+  end
+  def test_trace_issues_single_io_for_args_multiple_strings_and_alternate_sep
+    old_sep = $\
+    $\ = "\r"
+    spy = PrintSpy.new
+    trace_on(spy, "HI\r", "LO")
+    assert_equal "HI\rLO\r", spy.result
+    assert_equal 1, spy.calls
+  ensure
+    $\ = old_sep
+  end
+end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -67,6 +67,7 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.9.3.rdoc
 - doc/release_notes/rake-0.9.4.rdoc
 - doc/release_notes/rake-0.9.5.rdoc
+- doc/release_notes/rake-0.9.6.rdoc
 files:
 - .gemtest
 - install.rb
@@ -127,6 +128,7 @@ files:
 - lib/rake/testtask.rb
 - lib/rake/thread_history_display.rb
 - lib/rake/thread_pool.rb
+- lib/rake/trace_output.rb
 - lib/rake/version.rb
 - lib/rake/win32.rb
 - test/file_creation.rb
@@ -176,6 +178,7 @@ files:
 - test/test_rake_win32.rb
 - test/test_sys.rb
 - test/test_thread_history_display.rb
+- test/test_trace_output.rb
 - doc/command_line_usage.rdoc
 - doc/example/Rakefile1
 - doc/example/Rakefile2
@@ -212,6 +215,7 @@ files:
 - doc/release_notes/rake-0.9.3.rdoc
 - doc/release_notes/rake-0.9.4.rdoc
 - doc/release_notes/rake-0.9.5.rdoc
+- doc/release_notes/rake-0.9.6.rdoc
 homepage: http://rake.rubyforge.org
 licenses: []
 post_install_message: