rake 0.9.2.2 → 0.9.3.beta.1

data/CHANGES

@@ -8,6 +8,8 @@
 * Rake tests are now directory-independent
 * Rake tests are no longer require flexmock
 * Commands constant is no longer polluting top level namespace.
+* Show only the interesting portion of the backtrace by default (James M. Lawrence).
+* Added --reduce-compat optiont to remove backward compatible DSL hacks (James M. Lawrence).
 
 == Version 0.9.2
 

data/Rakefile

@@ -141,7 +141,11 @@ end
 PKG_FILES = FileList[
   '.gemtest',
   'install.rb',
-  '[A-Z]*',
+  'CHANGES',
+  'MIT-LICENSE',
+  'README.rdoc',
+  'Rakefile',
+  'TODO',
   'bin/rake',
   'lib/**/*.rb',
   'test/**/*.rb',

data/bin/rake

@@ -28,6 +28,10 @@ begin
 rescue LoadError
 end
 
+module Rake
+  REDUCE_COMPAT = true if ARGV.include?("--reduce-compat")
+end
+
 require 'rake'
 
 Rake.application.run

data/lib/rake.rb

@@ -58,6 +58,7 @@ require 'rake/early_time'
 require 'rake/name_space'
 require 'rake/task_manager'
 require 'rake/application'
+require 'rake/backtrace'
 
 $trace = false
 

data/lib/rake/application.rb

@@ -85,14 +85,12 @@ module Rake
 
     # Run the top level tasks of a Rake application.
     def top_level
-      standard_exception_handling do
-        if options.show_tasks
-          display_tasks_and_comments
-        elsif options.show_prereqs
-          display_prerequisites
-        else
-          top_level_tasks.each { |task_name| invoke_task(task_name) }
-        end
+      if options.show_tasks
+        display_tasks_and_comments
+      elsif options.show_prereqs
+        display_prerequisites
+      else
+        top_level_tasks.each { |task_name| invoke_task(task_name) }
       end
     end
 
@@ -151,7 +149,7 @@ module Rake
       if options.trace
         $stderr.puts ex.backtrace.join("\n")
       else
-        $stderr.puts rakefile_location(ex.backtrace)
+        $stderr.puts Backtrace.collapse(ex.backtrace)
       end
       $stderr.puts "Tasks: #{ex.chain}" if has_chain?(ex)
       $stderr.puts "(See full trace by running task with --trace)" unless options.trace
@@ -351,6 +349,11 @@ module Rake
           # HACK Use File::PATH_SEPARATOR
           lambda { |value| options.rakelib = value.split(':') }
         ],
+        ['--reduce-compat', "Remove DSL in Object; remove Module#const_missing which defines ::Task etc.",
+          # Load-time option.
+          # Handled in bin/rake where Rake::REDUCE_COMPAT is defined (or not).
+          lambda { |_| }
+        ],
         ['--require', '-r MODULE', "Require MODULE before executing rakefile.",
           lambda { |value|
             begin

data/lib/rake/backtrace.rb

@@ -0,0 +1,15 @@
+module Rake
+  module Backtrace
+    SUPPRESSED_PATHS = [
+      RbConfig::CONFIG["prefix"],
+      File.join(File.dirname(__FILE__), ".."),
+    ].map { |f| Regexp.quote(File.expand_path(f)) }
+
+    SUPPRESS_PATTERN = %r!(\A#{SUPPRESSED_PATHS.join('|')}|bin/rake:\d+)!
+
+    # Elide backtrace elements which match one of SUPPRESS_PATHS.
+    def self.collapse(backtrace)
+      backtrace.reject { |elem| elem =~ SUPPRESS_PATTERN }
+    end
+  end
+end

data/lib/rake/dsl_definition.rb

@@ -167,10 +167,10 @@ module Rake
         private :#{name}
       }, __FILE__, line
     end
-  end
+  end unless defined? Rake::REDUCE_COMPAT
 
   extend FileUtilsExt
 end
 
 self.extend Rake::DSL
-include Rake::DeprecatedObjectDSL
+include Rake::DeprecatedObjectDSL unless defined? Rake::REDUCE_COMPAT

data/lib/rake/ext/module.rb

@@ -36,4 +36,4 @@ class Module
       rake_original_const_missing(const_name)
     end
   end
-end
+end unless defined? Rake::REDUCE_COMPAT

data/lib/rake/version.rb

@@ -1,8 +1,8 @@
 module Rake
-  VERSION = '0.9.2.2'
+  VERSION = '0.9.3.beta.1'
 
   module Version # :nodoc: all
-    MAJOR, MINOR, BUILD, PATCH = VERSION.split('.')
-    NUMBERS = [ MAJOR, MINOR, BUILD, PATCH ]
+    MAJOR, MINOR, BUILD = VERSION.split '.'
+    NUMBERS = [ MAJOR, MINOR, BUILD ]
   end
 end

data/test/test_rake_backtrace.rb

@@ -0,0 +1,49 @@
+require File.expand_path('../helper', __FILE__)
+require 'open3'
+
+class TestRakeBacktrace < 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) { |_, _, err, _| err.read }
+  end
+
+  def invoke(task_name)
+    rake task_name.to_s
+  end
+
+  def test_single_collapse
+    rakefile %q{
+      task :foo do
+        raise "foooo!"
+      end
+    }
+
+    lines = invoke(:foo).split("\n")
+
+    assert_equal "rake aborted!", lines[0]
+    assert_equal "foooo!", lines[1]
+    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!, lines[2]
+    assert_match %r!\ATasks:!, lines[3]
+  end
+
+  def test_multi_collapse
+    rakefile %q{
+      task :foo do
+        Rake.application.invoke_task(:bar)
+      end
+      task :bar do
+        raise "barrr!"
+      end
+    }
+
+    lines = invoke(:foo).split("\n")
+
+    assert_equal "rake aborted!", lines[0]
+    assert_equal "barrr!", lines[1]
+    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:6!, lines[2]
+    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!, lines[3]
+    assert_match %r!\ATasks:!, lines[4]
+  end
+end

data/test/test_rake_reduce_compat.rb

@@ -0,0 +1,65 @@
+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)
+    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 }
+  end
+  
+  def invoke_normal(task_name)
+    rake task_name.to_s
+  end
+
+  def invoke_reduce_compat(task_name)
+    rake "--reduce-compat", task_name.to_s
+  end
+
+  def test_no_deprecated_dsl
+    rakefile %q{
+      task :check_task do
+        Module.new { p defined?(task) }
+      end
+
+      task :check_file do
+        Module.new { p defined?(file) }
+      end
+    }
+    
+    assert_equal %{"method"}, invoke_normal(:check_task).chomp
+    assert_equal %{"method"}, invoke_normal(:check_file).chomp
+
+    assert_equal "nil", invoke_reduce_compat(:check_task).chomp
+    assert_equal "nil", invoke_reduce_compat(:check_file).chomp
+  end
+
+  def test_no_classic_namespace
+    rakefile %q{
+      task :check_task do
+        begin
+          Task
+          print "present"
+        rescue NameError
+          print "absent"
+        end
+      end
+
+      task :check_file_task do
+        begin
+          FileTask
+          print "present"
+        rescue NameError
+          print "absent"
+        end
+      end
+    }
+
+    assert_equal "present", invoke_normal(:check_task)
+    assert_equal "present", invoke_normal(:check_file_task)
+
+    assert_equal "absent", invoke_reduce_compat(:check_task)
+    assert_equal "absent", invoke_reduce_compat(:check_file_task)
+  end
+end

metadata

@@ -1,35 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rake
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.9.2.2
+version: !ruby/object:Gem::Version
+  version: 0.9.3.beta.1
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70183536931420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :development
-  version_requirements: *id001
-description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.
+  prerelease: false
+  version_requirements: *70183536931420
+description: Rake is a Make-like program implemented in Ruby. Tasks and dependencies
+  arespecified in standard Ruby syntax.
 email: jim@weirichhouse.org
-executables: 
+executables:
 - rake
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - MIT-LICENSE
 - TODO
@@ -59,17 +58,18 @@ extra_rdoc_files:
 - doc/release_notes/rake-0.9.0.rdoc
 - doc/release_notes/rake-0.9.1.rdoc
 - doc/release_notes/rake-0.9.2.rdoc
-files: 
+files:
 - .gemtest
 - install.rb
 - CHANGES
 - MIT-LICENSE
-- Rakefile
 - README.rdoc
+- Rakefile
 - TODO
 - bin/rake
 - lib/rake/alt_system.rb
 - lib/rake/application.rb
+- lib/rake/backtrace.rb
 - lib/rake/classic_namespace.rb
 - lib/rake/clean.rb
 - lib/rake/cloneable.rb
@@ -120,6 +120,7 @@ files:
 - test/test_rake.rb
 - test/test_rake_application.rb
 - test/test_rake_application_options.rb
+- test/test_rake_backtrace.rb
 - test/test_rake_clean.rb
 - test/test_rake_definitions.rb
 - test/test_rake_directory_task.rb
@@ -144,6 +145,7 @@ files:
 - test/test_rake_pseudo_status.rb
 - test/test_rake_rake_test_loader.rb
 - test/test_rake_rdoc_task.rb
+- test/test_rake_reduce_compat.rb
 - test/test_rake_require.rb
 - test/test_rake_rules.rb
 - test/test_rake_task.rb
@@ -191,35 +193,32 @@ files:
 - doc/release_notes/rake-0.9.2.rdoc
 homepage: http://rake.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --show-hash
 - --main
 - README.rdoc
 - --title
 - Rake -- Ruby Make
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.6
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.2
 requirements: []
-
 rubyforge_project: rake
-rubygems_version: 1.8.11
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Ruby based make-like utility.
 test_files: []
-