naruse	2011-09-15 23:00:34 +0900 (Thu, 15 Sep 2011)

  New Revision: 33276

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33276

  Log:
    Revert r32944 and r33092.
    
    Those commits break tests on Windows and no response.

  Modified files:
    branches/ruby_1_9_3/NEWS
    branches/ruby_1_9_3/lib/rake/application.rb
    branches/ruby_1_9_3/lib/rake/dsl_definition.rb
    branches/ruby_1_9_3/lib/rake/version.rb
    branches/ruby_1_9_3/test/rake/helper.rb
    branches/ruby_1_9_3/test/rake/test_rake_dsl.rb
    branches/ruby_1_9_3/test/rake/test_rake_functional.rb

Index: ruby_1_9_3/lib/rake/dsl_definition.rb
===================================================================
--- ruby_1_9_3/lib/rake/dsl_definition.rb	(revision 33275)
+++ ruby_1_9_3/lib/rake/dsl_definition.rb	(revision 33276)
@@ -144,12 +144,10 @@
         Rake.application.add_import(fn)
       end
     end
-
   end
 
-  DeprecatedCommands = Object.new.extend(DSL)
-
   module DeprecatedObjectDSL # :nodoc:
+    Commands = Object.new.extend DSL
     DSL.private_instance_methods(false).each do |name|
       line = __LINE__+1
       class_eval %{
@@ -162,8 +160,8 @@
             end
             $stderr.puts "WARNING: DSL method \#{self.class}##{name} called at \#{caller.first}"
           end
-          Rake::DeprecatedCommands.send(:#{name}, *args, &block)
-        end
+          Rake::DeprecatedObjectDSL::Commands.send(:#{name}, *args, &block)
+          end
         private :#{name}
       }, __FILE__, line
     end
Index: ruby_1_9_3/lib/rake/application.rb
===================================================================
--- ruby_1_9_3/lib/rake/application.rb	(revision 33275)
+++ ruby_1_9_3/lib/rake/application.rb	(revision 33276)
@@ -348,7 +348,6 @@
         ],
         ['--rakelibdir', '--rakelib', '-R RAKELIBDIR',
           "Auto-import any .rake files in RAKELIBDIR. (default is 'rakelib')",
-          # HACK Use File::PATH_SEPARATOR
           lambda { |value| options.rakelib = value.split(':') }
         ],
         ['--require', '-r MODULE', "Require MODULE before executing rakefile.",
Index: ruby_1_9_3/lib/rake/version.rb
===================================================================
--- ruby_1_9_3/lib/rake/version.rb	(revision 33275)
+++ ruby_1_9_3/lib/rake/version.rb	(revision 33276)
@@ -1,5 +1,5 @@
 module Rake
-  VERSION = '0.9.2.2'
+  VERSION = '0.9.2.1'
 
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD = VERSION.split '.'
Index: ruby_1_9_3/NEWS
===================================================================
--- ruby_1_9_3/NEWS	(revision 33275)
+++ ruby_1_9_3/NEWS	(revision 33276)
@@ -270,7 +270,7 @@
   * support for bash/zsh completion.
 
 * Rake
-  * Rake has been upgraded from 0.8.7 to 0.9.2.2.  For full release notes see
+  * Rake has been upgraded from 0.8.7 to 0.9.2.1.  For full release notes see
     https://github.com/jimweirich/rake/blob/master/CHANGES
 
 * RDoc
Index: ruby_1_9_3/test/rake/test_rake_functional.rb
===================================================================
--- ruby_1_9_3/test/rake/test_rake_functional.rb	(revision 33275)
+++ ruby_1_9_3/test/rake/test_rake_functional.rb	(revision 33276)
@@ -436,7 +436,7 @@
   def run_ruby(option_list)
     puts "COMMAND: [#{RUBY} #{option_list.join ' '}]" if @verbose
 
-    inn, out, err = Open3.popen3(Gem.ruby, *option_list)
+    inn, out, err, wait = Open3.popen3(Gem.ruby, *option_list)
     inn.close
 
     @out = out.read
Index: ruby_1_9_3/test/rake/helper.rb
===================================================================
--- ruby_1_9_3/test/rake/helper.rb	(revision 33275)
+++ ruby_1_9_3/test/rake/helper.rb	(revision 33276)
@@ -282,6 +282,7 @@
 task :prep => :clean do
   mkdir_p 'src'
   N.times do |n|
+    puts "DBG: Touching src/foo#{n}"
     touch "src/foo#{n}"
   end
 end
Index: ruby_1_9_3/test/rake/test_rake_dsl.rb
===================================================================
--- ruby_1_9_3/test/rake/test_rake_dsl.rb	(revision 33275)
+++ ruby_1_9_3/test/rake/test_rake_dsl.rb	(revision 33276)
@@ -56,10 +56,6 @@
     assert_match(/test_rake_dsl\.rb:\d+/, err)
   end
 
-  def test_no_commands_constant
-    assert ! defined?(Commands), "should not define Commands"
-  end
-
   def test_deprecated_object_dsl_with_suppressed_warnings
     Rake.application.options.ignore_deprecate = true
     out, err = capture_io do

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/