summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbronzdoc <lsagastume1990@gmail.com>2019-07-31 06:33:40 -0600
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-05 18:44:53 +0900
commit87bc29fe28654ed6b42e87337806ce40cecbe513 (patch)
treef0a89d070769728b57636ffd09fe0d0af026ec4b
parent8eb2921f568f0ebc1a0f61b45297c77516f602b5 (diff)
[rubygems/rubygems] Revert cadb66037d9b58c80fc795f39384d533229a1f73
https://github.com/rubygems/rubygems/commit/5c3158d975
-rw-r--r--lib/rubygems/specification.rb8
-rw-r--r--lib/rubygems/specification_policy.rb3
-rw-r--r--test/rubygems/test_gem_specification.rb18
3 files changed, 29 insertions, 0 deletions
diff --git a/lib/rubygems/specification.rb b/lib/rubygems/specification.rb
index f40b9fd5fc..5aceb8d643 100644
--- a/lib/rubygems/specification.rb
+++ b/lib/rubygems/specification.rb
@@ -133,6 +133,7 @@ class Gem::Specification < Gem::BasicSpecification
@@default_value = {
:authors => [],
+ :autorequire => nil,
:bindir => 'bin',
:cert_chain => [],
:date => nil,
@@ -706,6 +707,13 @@ class Gem::Specification < Gem::BasicSpecification
alias :activated? :activated
##
+ # Autorequire was used by old RubyGems to automatically require a file.
+ #
+ # Deprecated: It is neither supported nor functional.
+
+ attr_accessor :autorequire # :nodoc:
+
+ ##
# Sets the default executable for this gem.
#
# Deprecated: You must now specify the executable name to Gem.bin_path.
diff --git a/lib/rubygems/specification_policy.rb b/lib/rubygems/specification_policy.rb
index 8413c87ea7..24c1145907 100644
--- a/lib/rubygems/specification_policy.rb
+++ b/lib/rubygems/specification_policy.rb
@@ -369,6 +369,9 @@ http://spdx.org/licenses or '#{Gem::Licenses::NONSTANDARD}' for a nonstandard li
warning "description and summary are identical"
end
+ # TODO: raise at some given date
+ warning "deprecated autorequire specified" if autorequire
+
executables.each do |executable|
validate_shebang_line_in(executable)
end
diff --git a/test/rubygems/test_gem_specification.rb b/test/rubygems/test_gem_specification.rb
index 4c68545c3b..7ed502fa08 100644
--- a/test/rubygems/test_gem_specification.rb
+++ b/test/rubygems/test_gem_specification.rb
@@ -23,6 +23,7 @@ require_paths:
- lib
files:
- lib/keyedlist.rb
+autorequire: keyedlist
author: Florian Gross
email: flgr@ccan.de
has_rdoc: true
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
s.summary = %q{A Hash which automatically computes keys.}
s.files = [%q{lib/keyedlist.rb}]
s.require_paths = [%q{lib}]
+ s.autorequire = %q{keyedlist}
s.author = %q{Florian Gross}
s.email = %q{flgr@ccan.de}
end
@@ -677,6 +679,7 @@ end
def test_self_attribute_names
expected_value = %w[
authors
+ autorequire
bindir
cert_chain
date
@@ -2691,6 +2694,21 @@ end
end
end
+ def test_validate_autorequire
+ util_setup_validate
+
+ Dir.chdir @tempdir do
+ @a1.autorequire = 'code'
+
+ use_ui @ui do
+ @a1.validate
+ end
+
+ assert_match "#{w}: deprecated autorequire specified\n",
+ @ui.error, 'error'
+ end
+ end
+
def test_validate_dependencies
util_setup_validate