* lib/rubygems: Update to RubyGems 1.8.11. Move Deprecate into the

  Gem namespace.


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

1 files changed, 42 insertions, 40 deletions

diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
index 4827a05ad4..a78208ec24 100644
--- a/lib/rubygems/deprecate.rb
+++ b/lib/rubygems/deprecate.rb
@@ -11,58 +11,60 @@
 #         # ...
 #       end
 #
-#       extend Deprecate
+#       extend Gem::Deprecate
 #       deprecate :instance_method, "X.z", 2011, 4
 #
 #       class << self
-#         extend Deprecate
+#         extend Gem::Deprecate
 #         deprecate :klass_method, :none, 2011, 4
 #       end
 #     end
 
-module Deprecate
+module Gem
+  module Deprecate
 
-  def self.skip # :nodoc:
-    @skip ||= false
-  end
+    def self.skip # :nodoc:
+      @skip ||= false
+    end
 
-  def self.skip= v # :nodoc:
-    @skip = v
-  end
+    def self.skip= v # :nodoc:
+      @skip = v
+    end
 
-  ##
-  # Temporarily turn off warnings. Intended for tests only.
+    ##
+    # Temporarily turn off warnings. Intended for tests only.
 
-  def skip_during
-    Deprecate.skip, original = true, Deprecate.skip
-    yield
-  ensure
-    Deprecate.skip = original
-  end
+    def skip_during
+      Gem::Deprecate.skip, original = true, Gem::Deprecate.skip
+      yield
+    ensure
+      Gem::Deprecate.skip = original
+    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.
+    ##
+    # 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 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 Deprecate.skip
-        send old, *args, &block
-      end
-    }
-  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
 
-  module_function :deprecate, :skip_during
+    module_function :deprecate, :skip_during
+  end
 end