summaryrefslogtreecommitdiff
path: root/lib/rubygems
diff options
context:
space:
mode:
authorbronzdoc <lsagastume1990@gmail.com>2020-04-19 07:41:54 -0600
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2020-05-08 07:38:50 +0900
commit7db538a7c92bcbcccb97d2ffcf505bee4d85e7d3 (patch)
treef39b14d36e148245a1b91f09b3bd0db1c2f4e1eb /lib/rubygems
parent361ed8d0a65df513f527c62539abb71b4c34a006 (diff)
[rubygems/rubygems] Rename version horizon deprecation methods
https://github.com/rubygems/rubygems/commit/6afd914fda
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/3087
Diffstat (limited to 'lib/rubygems')
-rw-r--r--lib/rubygems/basic_specification.rb2
-rw-r--r--lib/rubygems/commands/query_command.rb2
-rw-r--r--lib/rubygems/dependency_installer.rb2
-rw-r--r--lib/rubygems/deprecate.rb6
-rw-r--r--lib/rubygems/installer.rb2
-rw-r--r--lib/rubygems/specification.rb12
6 files changed, 13 insertions, 13 deletions
diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb
index c9dff0704c7..816fc8cb8f4 100644
--- a/lib/rubygems/basic_specification.rb
+++ b/lib/rubygems/basic_specification.rb
@@ -41,7 +41,7 @@ class Gem::BasicSpecification
class << self
extend Gem::Deprecate
- deprecate :default_specifications_dir, "Gem.default_specifications_dir"
+ rubygems_deprecate :default_specifications_dir, "Gem.default_specifications_dir"
end
diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb
index ed245f1b8f6..7a26b55ac62 100644
--- a/lib/rubygems/commands/query_command.rb
+++ b/lib/rubygems/commands/query_command.rb
@@ -6,7 +6,7 @@ require 'rubygems/deprecate'
class Gem::Commands::QueryCommand < Gem::Command
extend Gem::Deprecate
- deprecate_command
+ rubygems_deprecate_command
include Gem::QueryUtils
diff --git a/lib/rubygems/dependency_installer.rb b/lib/rubygems/dependency_installer.rb
index 082a6cedfad..f7add4ea420 100644
--- a/lib/rubygems/dependency_installer.rb
+++ b/lib/rubygems/dependency_installer.rb
@@ -195,7 +195,7 @@ class Gem::DependencyInstaller
set
end
- deprecate :find_gems_with_sources
+ rubygems_deprecate :find_gems_with_sources
def in_background(what) # :nodoc:
fork_happened = false
diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
index 815d9dcdc18..5f2140c0a36 100644
--- a/lib/rubygems/deprecate.rb
+++ b/lib/rubygems/deprecate.rb
@@ -51,7 +51,7 @@ module Gem::Deprecate
# telling the user of +repl+ (unless +repl+ is :none) and the
# Rubygems version that it is planned to go away.
- def deprecate(name, replacement=:none)
+ def rubygems_deprecate(name, replacement=:none)
class_eval do
old = "_deprecated_#{name}"
alias_method old, name
@@ -70,7 +70,7 @@ module Gem::Deprecate
end
# Deprecation method to deprecate Rubygems commands
- def deprecate_command
+ def rubygems_deprecate_command
class_eval do
define_method "deprecated?" do
true
@@ -86,6 +86,6 @@ module Gem::Deprecate
end
end
- module_function :deprecate, :deprecate_command, :skip_during
+ module_function :rubygems_deprecate, :rubygems_deprecate_command, :skip_during
end
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index eb63029bd95..241f541bb41 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -422,7 +422,7 @@ class Gem::Installer
@gem_dir = directory
extract_files
end
- deprecate :unpack
+ rubygems_deprecate :unpack
##
# The location of the spec file that is installed.
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index ac44f73e986..18e3f2d20d7 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -720,7 +720,7 @@ class Gem::Specification < Gem::BasicSpecification
# Deprecated: You must now specify the executable name to Gem.bin_path.
attr_writer :default_executable
- deprecate :default_executable=
+ rubygems_deprecate :default_executable=
##
# Allows deinstallation of gems with legacy platforms.
@@ -733,7 +733,7 @@ class Gem::Specification < Gem::BasicSpecification
# Formerly used to set rubyforge project.
attr_writer :rubyforge_project
- deprecate :rubyforge_project=
+ rubygems_deprecate :rubyforge_project=
##
# The Gem::Specification version of this gemspec.
@@ -1725,7 +1725,7 @@ class Gem::Specification < Gem::BasicSpecification
end
result
end
- deprecate :default_executable
+ rubygems_deprecate :default_executable
##
# The default value for specification attribute +name+
@@ -1928,7 +1928,7 @@ class Gem::Specification < Gem::BasicSpecification
def has_rdoc # :nodoc:
true
end
- deprecate :has_rdoc
+ rubygems_deprecate :has_rdoc
##
# Deprecated and ignored.
@@ -1938,10 +1938,10 @@ class Gem::Specification < Gem::BasicSpecification
def has_rdoc=(ignored) # :nodoc:
@has_rdoc = true
end
- deprecate :has_rdoc=
+ rubygems_deprecate :has_rdoc=
alias :has_rdoc? :has_rdoc # :nodoc:
- deprecate :has_rdoc?
+ rubygems_deprecate :has_rdoc?
##
# True if this gem has files in test_files