* lib/rubygems*: Updated to RubyGems 2.0

* test/rubygems*:  ditto.

* common.mk (prelude):  Updated for RubyGems 2.0 source rearrangement.

* tool/change_maker.rb:  Allow invalid UTF-8 characters in source
  files.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 40 insertions, 40 deletions

diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
index a78208ec24..274d6a5c12 100644
--- a/lib/rubygems/deprecate.rb
+++ b/lib/rubygems/deprecate.rb
@@ -20,51 +20,51 @@
 #       end
 #     end
 
-module Gem
-  module Deprecate
+module Gem::Deprecate
 
-    def self.skip # :nodoc:
-      @skip ||= false
-    end
-
-    def self.skip= v # :nodoc:
-      @skip = v
-    end
+  def self.skip # :nodoc:
+    @skip ||= false
+  end
 
-    ##
-    # Temporarily turn off warnings. Intended for tests only.
+  def self.skip= v # :nodoc:
+    @skip = v
+  end
 
-    def skip_during
-      Gem::Deprecate.skip, original = true, Gem::Deprecate.skip
-      yield
-    ensure
-      Gem::Deprecate.skip = original
-    end
+  ##
+  # Temporarily turn off warnings. Intended for tests only.
 
-    ##
-    # Simple deprecation method that deprecates +name+ by wrapping it up
-    # in a dummy method. It warns on each call to the dummy method
-    # telling the user of +repl+ (unless +repl+ is :none) and the
-    # year/month that it is planned to go away.
+  def skip_during
+    Gem::Deprecate.skip, original = true, Gem::Deprecate.skip
+    yield
+  ensure
+    Gem::Deprecate.skip = original
+  end
 
-    def deprecate name, repl, year, month
-      class_eval {
-        old = "_deprecated_#{name}"
-        alias_method old, name
-        define_method name do |*args, &block| # TODO: really works on 1.8.7?
-          klass = self.kind_of? Module
-          target = klass ? "#{self}." : "#{self.class}#"
-          msg = [ "NOTE: #{target}#{name} is deprecated",
-            repl == :none ? " with no replacement" : ", use #{repl}",
-            ". It will be removed on or after %4d-%02d-01." % [year, month],
-            "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
-          ]
-          warn "#{msg.join}." unless Gem::Deprecate.skip
-          send old, *args, &block
-        end
-      }
-    end
+  ##
+  # Simple deprecation method that deprecates +name+ by wrapping it up
+  # in a dummy method. It warns on each call to the dummy method
+  # telling the user of +repl+ (unless +repl+ is :none) and the
+  # year/month that it is planned to go away.
 
-    module_function :deprecate, :skip_during
+  def deprecate name, repl, year, month
+    class_eval {
+      old = "_deprecated_#{name}"
+      alias_method old, name
+      define_method name do |*args, &block| # TODO: really works on 1.8.7?
+        klass = self.kind_of? Module
+        target = klass ? "#{self}." : "#{self.class}#"
+        msg = [ "NOTE: #{target}#{name} is deprecated",
+          repl == :none ? " with no replacement" : "; use #{repl} instead",
+          ". It will be removed on or after %4d-%02d-01." % [year, month],
+          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+        ]
+        warn "#{msg.join}." unless Gem::Deprecate.skip
+        send old, *args, &block
+      end
+    }
   end
+
+  module_function :deprecate, :skip_during
+
 end
+