Merge pull request #7612 from rubygems/deivid-rodriguez/circular-require

Fix circular require warning

(cherry picked from commit 0ecd098)

Author: simi

bundler/spec/runtime/setup_spec.rb

@@ -767,6 +767,18 @@ def clean_load_path(lp)
     expect(err).to be_empty
   end
 
+  it "can require rubygems without warnings, when using a local cache", rubygems: ">= 3.5.10" do
+    install_gemfile <<-G
+      source "#{file_uri_for(gem_repo1)}"
+      gem "rack"
+    G
+
+    bundle "package"
+    bundle %(exec ruby -w -e "require 'rubygems'")
+
+    expect(err).to be_empty
+  end
+
   context "when the user has `MANPATH` set", :man do
     before { ENV["MANPATH"] = "/foo#{File::PATH_SEPARATOR}" }
 

lib/rubygems/deprecate.rb

@@ -69,99 +69,101 @@
 #       end
 #     end
 
-module Gem::Deprecate
-  def self.skip # :nodoc:
-    @skip ||= false
-  end
+module Gem
+  module Deprecate
+    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
-    original = Gem::Deprecate.skip
-    Gem::Deprecate.skip = true
-    yield
-  ensure
-    Gem::Deprecate.skip = original
-  end
+    def skip_during
+      original = Gem::Deprecate.skip
+      Gem::Deprecate.skip = true
+      yield
+    ensure
+      Gem::Deprecate.skip = original
+    end
 
-  def self.next_rubygems_major_version # :nodoc:
-    Gem::Version.new(Gem.rubygems_version.segments.first).bump
-  end
+    def self.next_rubygems_major_version # :nodoc:
+      Gem::Version.new(Gem.rubygems_version.segments.first).bump
+    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 do
-      old = "_deprecated_#{name}"
-      alias_method old, name
-      define_method name do |*args, &block|
-        klass = is_a? Module
-        target = klass ? "#{self}." : "#{self.class}#"
-        msg = [
-          "NOTE: #{target}#{name} is deprecated",
-          repl == :none ? " with no replacement" : "; use #{repl} instead",
-          format(". It will be removed on or after %4d-%02d.", year, month),
-          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
-        ]
-        warn "#{msg.join}." unless Gem::Deprecate.skip
-        send old, *args, &block
+    def deprecate(name, repl, year, month)
+      class_eval do
+        old = "_deprecated_#{name}"
+        alias_method old, name
+        define_method name do |*args, &block|
+          klass = is_a? Module
+          target = klass ? "#{self}." : "#{self.class}#"
+          msg = [
+            "NOTE: #{target}#{name} is deprecated",
+            repl == :none ? " with no replacement" : "; use #{repl} instead",
+            format(". It will be removed on or after %4d-%02d.", year, month),
+            "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+          ]
+          warn "#{msg.join}." unless Gem::Deprecate.skip
+          send old, *args, &block
+        end
+        ruby2_keywords name if respond_to?(:ruby2_keywords, true)
       end
-      ruby2_keywords name if respond_to?(:ruby2_keywords, true)
     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
-  # Rubygems version 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
+    # Rubygems version that it is planned to go away.
 
-  def rubygems_deprecate(name, replacement=:none)
-    class_eval do
-      old = "_deprecated_#{name}"
-      alias_method old, name
-      define_method name do |*args, &block|
-        klass = is_a? Module
-        target = klass ? "#{self}." : "#{self.class}#"
-        msg = [
-          "NOTE: #{target}#{name} is deprecated",
-          replacement == :none ? " with no replacement" : "; use #{replacement} instead",
-          ". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
-          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
-        ]
-        warn "#{msg.join}." unless Gem::Deprecate.skip
-        send old, *args, &block
+    def rubygems_deprecate(name, replacement=:none)
+      class_eval do
+        old = "_deprecated_#{name}"
+        alias_method old, name
+        define_method name do |*args, &block|
+          klass = is_a? Module
+          target = klass ? "#{self}." : "#{self.class}#"
+          msg = [
+            "NOTE: #{target}#{name} is deprecated",
+            replacement == :none ? " with no replacement" : "; use #{replacement} instead",
+            ". It will be removed in Rubygems #{Gem::Deprecate.next_rubygems_major_version}",
+            "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+          ]
+          warn "#{msg.join}." unless Gem::Deprecate.skip
+          send old, *args, &block
+        end
+        ruby2_keywords name if respond_to?(:ruby2_keywords, true)
       end
-      ruby2_keywords name if respond_to?(:ruby2_keywords, true)
     end
-  end
 
-  # Deprecation method to deprecate Rubygems commands
-  def rubygems_deprecate_command(version = Gem::Deprecate.next_rubygems_major_version)
-    class_eval do
-      define_method "deprecated?" do
-        true
-      end
+    # Deprecation method to deprecate Rubygems commands
+    def rubygems_deprecate_command(version = Gem::Deprecate.next_rubygems_major_version)
+      class_eval do
+        define_method "deprecated?" do
+          true
+        end
 
-      define_method "deprecation_warning" do
-        msg = [
-          "#{command} command is deprecated",
-          ". It will be removed in Rubygems #{version}.\n",
-        ]
+        define_method "deprecation_warning" do
+          msg = [
+            "#{command} command is deprecated",
+            ". It will be removed in Rubygems #{version}.\n",
+          ]
 
-        alert_warning msg.join.to_s unless Gem::Deprecate.skip
+          alert_warning msg.join.to_s unless Gem::Deprecate.skip
+        end
       end
     end
-  end
 
-  module_function :rubygems_deprecate, :rubygems_deprecate_command, :skip_during
+    module_function :rubygems_deprecate, :rubygems_deprecate_command, :skip_during
+  end
 end

lib/rubygems/package.rb

@@ -7,7 +7,6 @@
 
 # rubocop:enable Style/AsciiComments
 
-require_relative "../rubygems"
 require_relative "security"
 require_relative "user_interaction"