rubygems-update 3.2.2 → 3.2.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/{History.txt → CHANGELOG.md} +482 -424
- data/Manifest.txt +30 -27
- data/Rakefile +11 -15
- data/bundler/CHANGELOG.md +67 -2
- data/bundler/bundler.gemspec +1 -1
- data/bundler/lib/bundler.rb +3 -7
- data/bundler/lib/bundler/build_metadata.rb +2 -2
- data/bundler/lib/bundler/cli.rb +2 -5
- data/bundler/lib/bundler/cli/cache.rb +1 -0
- data/bundler/lib/bundler/cli/gem.rb +2 -0
- data/bundler/lib/bundler/cli/update.rb +1 -1
- data/bundler/lib/bundler/compact_index_client/cache.rb +5 -13
- data/bundler/lib/bundler/compact_index_client/gem_parser.rb +28 -0
- data/bundler/lib/bundler/compact_index_client/updater.rb +0 -8
- data/bundler/lib/bundler/definition.rb +29 -21
- data/bundler/lib/bundler/dep_proxy.rb +15 -8
- data/bundler/lib/bundler/feature_flag.rb +0 -1
- data/bundler/lib/bundler/fetcher.rb +0 -1
- data/bundler/lib/bundler/gem_helper.rb +9 -7
- data/bundler/lib/bundler/gem_helpers.rb +30 -24
- data/bundler/lib/bundler/gem_version_promoter.rb +2 -2
- data/bundler/lib/bundler/installer.rb +0 -17
- data/bundler/lib/bundler/installer/standalone.rb +14 -0
- data/bundler/lib/bundler/lazy_specification.rb +10 -11
- data/bundler/{man → lib/bundler/man}/bundle-add.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-binstubs.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-cache.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-check.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-clean.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-config.1 +4 -4
- data/bundler/lib/bundler/man/bundle-config.1.ronn +3 -3
- data/bundler/{man → lib/bundler/man}/bundle-doctor.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-exec.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-gem.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-info.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-init.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-inject.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-install.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-list.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-lock.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-open.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-outdated.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-platform.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-pristine.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-remove.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-show.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-update.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle-viz.1 +1 -1
- data/bundler/{man → lib/bundler/man}/bundle.1 +1 -1
- data/bundler/{man → lib/bundler/man}/gemfile.5 +1 -1
- data/bundler/{man → lib/bundler/man}/index.txt +0 -0
- data/bundler/lib/bundler/resolver.rb +36 -16
- data/bundler/lib/bundler/resolver/spec_group.rb +18 -23
- data/bundler/lib/bundler/rubygems_ext.rb +16 -0
- data/bundler/lib/bundler/rubygems_integration.rb +0 -5
- data/bundler/lib/bundler/settings.rb +1 -1
- data/bundler/lib/bundler/source/git.rb +19 -17
- data/bundler/lib/bundler/source/git/git_proxy.rb +54 -49
- data/bundler/lib/bundler/source/path/installer.rb +2 -0
- data/bundler/lib/bundler/source/rubygems.rb +10 -2
- data/bundler/lib/bundler/spec_set.rb +6 -9
- data/bundler/lib/bundler/templates/newgem/Gemfile.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/newgem.gemspec.tt +1 -1
- data/bundler/lib/bundler/templates/newgem/rubocop.yml.tt +3 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb +7 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/errors.rb +1 -1
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/modules/specification_provider.rb +11 -0
- data/bundler/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb +11 -7
- data/bundler/lib/bundler/version.rb +1 -1
- data/lib/rubygems.rb +2 -2
- data/lib/rubygems/commands/setup_command.rb +16 -62
- data/lib/rubygems/dependency_installer.rb +1 -0
- data/lib/rubygems/ext/builder.rb +5 -4
- data/lib/rubygems/ext/cmake_builder.rb +1 -2
- data/lib/rubygems/ext/configure_builder.rb +1 -2
- data/lib/rubygems/gemcutter_utilities.rb +2 -2
- data/lib/rubygems/installer.rb +0 -23
- data/lib/rubygems/installer_uninstaller_utils.rb +6 -1
- data/lib/rubygems/platform.rb +0 -4
- data/lib/rubygems/remote_fetcher.rb +4 -2
- data/lib/rubygems/request_set.rb +2 -13
- data/lib/rubygems/requirement.rb +1 -1
- data/lib/rubygems/resolver.rb +6 -1
- data/lib/rubygems/resolver/api_set.rb +28 -19
- data/lib/rubygems/resolver/api_set/gem_parser.rb +20 -0
- data/lib/rubygems/resolver/api_specification.rb +4 -3
- data/lib/rubygems/resolver/best_set.rb +2 -2
- data/lib/rubygems/resolver/index_specification.rb +18 -0
- data/lib/rubygems/resolver/installer_set.rb +57 -7
- data/lib/rubygems/resolver/molinillo/lib/molinillo/dependency_graph/vertex.rb +1 -1
- data/lib/rubygems/resolver/molinillo/lib/molinillo/errors.rb +1 -1
- data/lib/rubygems/resolver/spec_specification.rb +14 -0
- data/lib/rubygems/resolver/specification.rb +12 -0
- data/lib/rubygems/source.rb +10 -6
- data/lib/rubygems/specification.rb +18 -14
- data/lib/rubygems/test_case.rb +17 -4
- data/rubygems-update.gemspec +2 -2
- data/test/rubygems/data/null-required-rubygems-version.gemspec.rz +0 -0
- data/test/rubygems/test_gem.rb +5 -0
- data/test/rubygems/test_gem_commands_install_command.rb +131 -0
- data/test/rubygems/test_gem_commands_setup_command.rb +21 -37
- data/test/rubygems/test_gem_dependency_installer.rb +27 -47
- data/test/rubygems/test_gem_ext_builder.rb +30 -6
- data/test/rubygems/test_gem_ext_cmake_builder.rb +2 -4
- data/test/rubygems/test_gem_ext_configure_builder.rb +2 -2
- data/test/rubygems/test_gem_installer.rb +8 -60
- data/test/rubygems/test_gem_platform.rb +8 -0
- data/test/rubygems/test_gem_remote_fetcher.rb +1 -1
- data/test/rubygems/test_gem_requirement.rb +34 -0
- data/test/rubygems/test_gem_resolver_api_set.rb +26 -52
- data/test/rubygems/test_gem_resolver_api_specification.rb +3 -3
- data/test/rubygems/test_gem_resolver_best_set.rb +26 -3
- data/test/rubygems/test_gem_source.rb +2 -2
- data/test/rubygems/test_gem_source_subpath_problem.rb +2 -2
- data/test/rubygems/test_gem_specification.rb +9 -3
- data/test/rubygems/test_gem_stream_ui.rb +1 -1
- metadata +34 -55
@@ -0,0 +1,20 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class Gem::Resolver::APISet::GemParser
|
4
|
+
def parse(line)
|
5
|
+
version_and_platform, rest = line.split(" ", 2)
|
6
|
+
version, platform = version_and_platform.split("-", 2)
|
7
|
+
dependencies, requirements = rest.split("|", 2).map {|s| s.split(",") } if rest
|
8
|
+
dependencies = dependencies ? dependencies.map {|d| parse_dependency(d) } : []
|
9
|
+
requirements = requirements ? requirements.map {|d| parse_dependency(d) } : []
|
10
|
+
[version, platform, dependencies, requirements]
|
11
|
+
end
|
12
|
+
|
13
|
+
private
|
14
|
+
|
15
|
+
def parse_dependency(string)
|
16
|
+
dependency = string.split(":")
|
17
|
+
dependency[-1] = dependency[-1].split("&") if dependency.size > 1
|
18
|
+
dependency
|
19
|
+
end
|
20
|
+
end
|
@@ -35,6 +35,8 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
35
35
|
@dependencies = api_data[:dependencies].map do |name, ver|
|
36
36
|
Gem::Dependency.new(name, ver.split(/\s*,\s*/)).freeze
|
37
37
|
end.freeze
|
38
|
+
@required_ruby_version = Gem::Requirement.new(api_data.dig(:requirements, :ruby)).freeze
|
39
|
+
@required_rubygems_version = Gem::Requirement.new(api_data.dig(:requirements, :rubygems)).freeze
|
38
40
|
end
|
39
41
|
|
40
42
|
def ==(other) # :nodoc:
|
@@ -42,12 +44,11 @@ class Gem::Resolver::APISpecification < Gem::Resolver::Specification
|
|
42
44
|
@set == other.set and
|
43
45
|
@name == other.name and
|
44
46
|
@version == other.version and
|
45
|
-
@platform == other.platform
|
46
|
-
@dependencies == other.dependencies
|
47
|
+
@platform == other.platform
|
47
48
|
end
|
48
49
|
|
49
50
|
def hash
|
50
|
-
@set.hash ^ @name.hash ^ @version.hash ^ @platform.hash
|
51
|
+
@set.hash ^ @name.hash ^ @version.hash ^ @platform.hash
|
51
52
|
end
|
52
53
|
|
53
54
|
def fetch_development_dependencies # :nodoc:
|
@@ -58,9 +58,9 @@ class Gem::Resolver::BestSet < Gem::Resolver::ComposedSet
|
|
58
58
|
# The calling method must retry the exception to repeat the lookup.
|
59
59
|
|
60
60
|
def replace_failed_api_set(error) # :nodoc:
|
61
|
-
uri = error.
|
61
|
+
uri = error.original_uri
|
62
62
|
uri = URI uri unless URI === uri
|
63
|
-
uri
|
63
|
+
uri = uri + "."
|
64
64
|
|
65
65
|
raise error unless api_set = @sets.find do |set|
|
66
66
|
Gem::Resolver::APISet === set and set.dep_uri == uri
|
@@ -33,6 +33,24 @@ class Gem::Resolver::IndexSpecification < Gem::Resolver::Specification
|
|
33
33
|
spec.dependencies
|
34
34
|
end
|
35
35
|
|
36
|
+
##
|
37
|
+
# The required_ruby_version constraint for this specification
|
38
|
+
|
39
|
+
def required_ruby_version
|
40
|
+
spec.required_ruby_version
|
41
|
+
end
|
42
|
+
|
43
|
+
##
|
44
|
+
# The required_rubygems_version constraint for this specification
|
45
|
+
#
|
46
|
+
# A fallback is included because the original version of the specification
|
47
|
+
# API didn't include that field, so some marshalled specs in the index have it
|
48
|
+
# set to +nil+.
|
49
|
+
|
50
|
+
def required_rubygems_version
|
51
|
+
spec.required_rubygems_version || Gem::Requirement.default
|
52
|
+
end
|
53
|
+
|
36
54
|
def ==(other)
|
37
55
|
self.class === other &&
|
38
56
|
@name == other.name &&
|
@@ -25,6 +25,12 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
25
25
|
|
26
26
|
attr_reader :remote_set # :nodoc:
|
27
27
|
|
28
|
+
##
|
29
|
+
# Ignore ruby & rubygems specification constraints.
|
30
|
+
#
|
31
|
+
|
32
|
+
attr_accessor :force # :nodoc:
|
33
|
+
|
28
34
|
##
|
29
35
|
# Creates a new InstallerSet that will look for gems in +domain+.
|
30
36
|
|
@@ -41,6 +47,7 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
41
47
|
@local = {}
|
42
48
|
@local_source = Gem::Source::Local.new
|
43
49
|
@remote_set = Gem::Resolver::BestSet.new
|
50
|
+
@force = false
|
44
51
|
@specs = {}
|
45
52
|
end
|
46
53
|
|
@@ -63,15 +70,30 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
63
70
|
Gem::Platform.local === s.platform
|
64
71
|
end
|
65
72
|
|
66
|
-
|
67
|
-
|
68
|
-
exc.errors = errors
|
69
|
-
|
70
|
-
raise exc
|
73
|
+
found = found.sort_by do |s|
|
74
|
+
[s.version, s.platform == Gem::Platform::RUBY ? -1 : 1]
|
71
75
|
end
|
72
76
|
|
73
|
-
newest = found.
|
74
|
-
|
77
|
+
newest = found.last
|
78
|
+
|
79
|
+
unless @force
|
80
|
+
found_matching_metadata = found.select do |spec|
|
81
|
+
metadata_satisfied?(spec)
|
82
|
+
end
|
83
|
+
|
84
|
+
if found_matching_metadata.empty?
|
85
|
+
if newest
|
86
|
+
ensure_required_ruby_version_met(newest.spec)
|
87
|
+
ensure_required_rubygems_version_met(newest.spec)
|
88
|
+
else
|
89
|
+
exc = Gem::UnsatisfiableDependencyError.new request
|
90
|
+
exc.errors = errors
|
91
|
+
|
92
|
+
raise exc
|
93
|
+
end
|
94
|
+
else
|
95
|
+
newest = found_matching_metadata.last
|
96
|
+
end
|
75
97
|
end
|
76
98
|
|
77
99
|
@always_install << newest.spec
|
@@ -221,4 +243,32 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
|
|
221
243
|
@domain = :local unless remote
|
222
244
|
end
|
223
245
|
end
|
246
|
+
|
247
|
+
private
|
248
|
+
|
249
|
+
def metadata_satisfied?(spec)
|
250
|
+
spec.required_ruby_version.satisfied_by?(Gem.ruby_version) &&
|
251
|
+
spec.required_rubygems_version.satisfied_by?(Gem.rubygems_version)
|
252
|
+
end
|
253
|
+
|
254
|
+
def ensure_required_ruby_version_met(spec) # :nodoc:
|
255
|
+
if rrv = spec.required_ruby_version
|
256
|
+
ruby_version = Gem.ruby_version
|
257
|
+
unless rrv.satisfied_by? ruby_version
|
258
|
+
raise Gem::RuntimeRequirementNotMetError,
|
259
|
+
"#{spec.full_name} requires Ruby version #{rrv}. The current ruby version is #{ruby_version}."
|
260
|
+
end
|
261
|
+
end
|
262
|
+
end
|
263
|
+
|
264
|
+
def ensure_required_rubygems_version_met(spec) # :nodoc:
|
265
|
+
if rrgv = spec.required_rubygems_version
|
266
|
+
unless rrgv.satisfied_by? Gem.rubygems_version
|
267
|
+
rg_version = Gem::VERSION
|
268
|
+
raise Gem::RuntimeRequirementNotMetError,
|
269
|
+
"#{spec.full_name} requires RubyGems version #{rrgv}. The current RubyGems version is #{rg_version}. " +
|
270
|
+
"Try 'gem update --system' to update RubyGems itself."
|
271
|
+
end
|
272
|
+
end
|
273
|
+
end
|
224
274
|
end
|
@@ -128,7 +128,7 @@ module Gem::Resolver::Molinillo
|
|
128
128
|
|
129
129
|
# Is there a path from `self` to `other` following edges in the
|
130
130
|
# dependency graph?
|
131
|
-
# @return
|
131
|
+
# @return whether there is a path following edges within this {#graph}
|
132
132
|
def path_to?(other)
|
133
133
|
_path_to?(other)
|
134
134
|
end
|
@@ -34,7 +34,7 @@ module Gem::Resolver::Molinillo
|
|
34
34
|
|
35
35
|
# An error caused by attempting to fulfil a dependency that was circular
|
36
36
|
#
|
37
|
-
# @note This exception will be thrown
|
37
|
+
# @note This exception will be thrown if and only if a {Vertex} is added to a
|
38
38
|
# {DependencyGraph} that has a {DependencyGraph::Vertex#path_to?} an
|
39
39
|
# existing {DependencyGraph::Vertex}
|
40
40
|
class CircularDependencyError < ResolverError
|
@@ -22,6 +22,20 @@ class Gem::Resolver::SpecSpecification < Gem::Resolver::Specification
|
|
22
22
|
spec.dependencies
|
23
23
|
end
|
24
24
|
|
25
|
+
##
|
26
|
+
# The required_ruby_version constraint for this specification
|
27
|
+
|
28
|
+
def required_ruby_version
|
29
|
+
spec.required_ruby_version
|
30
|
+
end
|
31
|
+
|
32
|
+
##
|
33
|
+
# The required_rubygems_version constraint for this specification
|
34
|
+
|
35
|
+
def required_rubygems_version
|
36
|
+
spec.required_rubygems_version
|
37
|
+
end
|
38
|
+
|
25
39
|
##
|
26
40
|
# The name and version of the specification.
|
27
41
|
#
|
@@ -43,6 +43,16 @@ class Gem::Resolver::Specification
|
|
43
43
|
|
44
44
|
attr_reader :version
|
45
45
|
|
46
|
+
##
|
47
|
+
# The required_ruby_version constraint for this specification.
|
48
|
+
|
49
|
+
attr_reader :required_ruby_version
|
50
|
+
|
51
|
+
##
|
52
|
+
# The required_ruby_version constraint for this specification.
|
53
|
+
|
54
|
+
attr_reader :required_rubygems_version
|
55
|
+
|
46
56
|
##
|
47
57
|
# Sets default instance variables for the specification.
|
48
58
|
|
@@ -53,6 +63,8 @@ class Gem::Resolver::Specification
|
|
53
63
|
@set = nil
|
54
64
|
@source = nil
|
55
65
|
@version = nil
|
66
|
+
@required_ruby_version = Gem::Requirement.default
|
67
|
+
@required_rubygems_version = Gem::Requirement.default
|
56
68
|
end
|
57
69
|
|
58
70
|
##
|
data/lib/rubygems/source.rb
CHANGED
@@ -79,7 +79,15 @@ class Gem::Source
|
|
79
79
|
def dependency_resolver_set # :nodoc:
|
80
80
|
return Gem::Resolver::IndexSet.new self if 'file' == uri.scheme
|
81
81
|
|
82
|
-
|
82
|
+
fetch_uri = if uri.host == "rubygems.org"
|
83
|
+
index_uri = uri.dup
|
84
|
+
index_uri.host = "index.rubygems.org"
|
85
|
+
index_uri
|
86
|
+
else
|
87
|
+
uri
|
88
|
+
end
|
89
|
+
|
90
|
+
bundler_api_uri = enforce_trailing_slash(fetch_uri)
|
83
91
|
|
84
92
|
begin
|
85
93
|
fetcher = Gem::RemoteFetcher.fetcher
|
@@ -87,11 +95,7 @@ class Gem::Source
|
|
87
95
|
rescue Gem::RemoteFetcher::FetchError
|
88
96
|
Gem::Resolver::IndexSet.new self
|
89
97
|
else
|
90
|
-
|
91
|
-
Gem::Resolver::APISet.new response.uri
|
92
|
-
else
|
93
|
-
Gem::Resolver::APISet.new bundler_api_uri
|
94
|
-
end
|
98
|
+
Gem::Resolver::APISet.new response.uri + "./info/"
|
95
99
|
end
|
96
100
|
end
|
97
101
|
|
@@ -182,6 +182,7 @@ class Gem::Specification < Gem::BasicSpecification
|
|
182
182
|
@@default_value[k].nil?
|
183
183
|
end
|
184
184
|
|
185
|
+
@@stubs = nil
|
185
186
|
@@stubs_by_name = {}
|
186
187
|
|
187
188
|
# Sentinel object to represent "not found" stubs
|
@@ -800,10 +801,8 @@ class Gem::Specification < Gem::BasicSpecification
|
|
800
801
|
def self.stubs
|
801
802
|
@@stubs ||= begin
|
802
803
|
pattern = "*.gemspec"
|
803
|
-
stubs =
|
804
|
-
stubs = stubs.uniq {|stub| stub.full_name }
|
804
|
+
stubs = stubs_for_pattern(pattern, false)
|
805
805
|
|
806
|
-
_resort!(stubs)
|
807
806
|
@@stubs_by_name = stubs.select {|s| Gem::Platform.match_spec? s }.group_by(&:name)
|
808
807
|
stubs
|
809
808
|
end
|
@@ -820,26 +819,31 @@ class Gem::Specification < Gem::BasicSpecification
|
|
820
819
|
end
|
821
820
|
end
|
822
821
|
|
823
|
-
EMPTY = [].freeze # :nodoc:
|
824
|
-
|
825
822
|
##
|
826
823
|
# Returns a Gem::StubSpecification for installed gem named +name+
|
827
824
|
# only returns stubs that match Gem.platforms
|
828
825
|
|
829
826
|
def self.stubs_for(name)
|
830
|
-
if @@
|
831
|
-
@@stubs_by_name[name]
|
827
|
+
if @@stubs
|
828
|
+
@@stubs_by_name[name] || []
|
832
829
|
else
|
833
|
-
|
834
|
-
stubs = installed_stubs(dirs, pattern).select {|s| Gem::Platform.match_spec? s } + default_stubs(pattern)
|
835
|
-
stubs = stubs.uniq {|stub| stub.full_name }.group_by(&:name)
|
836
|
-
stubs.each_value {|v| _resort!(v) }
|
837
|
-
|
838
|
-
@@stubs_by_name.merge! stubs
|
839
|
-
@@stubs_by_name[name] ||= EMPTY
|
830
|
+
@@stubs_by_name[name] ||= stubs_for_pattern("#{name}-*.gemspec")
|
840
831
|
end
|
841
832
|
end
|
842
833
|
|
834
|
+
##
|
835
|
+
# Finds stub specifications matching a pattern from the standard locations,
|
836
|
+
# optionally filtering out specs not matching the current platform
|
837
|
+
#
|
838
|
+
def self.stubs_for_pattern(pattern, match_platform = true) # :nodoc:
|
839
|
+
installed_stubs = installed_stubs(Gem::Specification.dirs, pattern)
|
840
|
+
installed_stubs.select! {|s| Gem::Platform.match_spec? s } if match_platform
|
841
|
+
stubs = installed_stubs + default_stubs(pattern)
|
842
|
+
stubs = stubs.uniq {|stub| stub.full_name }
|
843
|
+
_resort!(stubs)
|
844
|
+
stubs
|
845
|
+
end
|
846
|
+
|
843
847
|
def self._resort!(specs) # :nodoc:
|
844
848
|
specs.sort! do |a, b|
|
845
849
|
names = a.name <=> b.name
|
data/lib/rubygems/test_case.rb
CHANGED
@@ -26,7 +26,20 @@ begin
|
|
26
26
|
rescue LoadError
|
27
27
|
end
|
28
28
|
|
29
|
-
|
29
|
+
if File.exist?(bundler_gemspec)
|
30
|
+
require_relative '../../bundler/lib/bundler'
|
31
|
+
else
|
32
|
+
require 'bundler'
|
33
|
+
end
|
34
|
+
|
35
|
+
# Enable server plugin needed for bisection
|
36
|
+
if ENV["RG_BISECT_SERVER_PLUGIN"]
|
37
|
+
require ENV["RG_BISECT_SERVER_PLUGIN"]
|
38
|
+
|
39
|
+
Minitest.extensions << "server"
|
40
|
+
end
|
41
|
+
|
42
|
+
ENV["MT_NO_PLUGINS"] = "true"
|
30
43
|
|
31
44
|
require 'minitest/autorun'
|
32
45
|
|
@@ -250,16 +263,16 @@ class Gem::TestCase < Minitest::Test
|
|
250
263
|
def assert_contains_make_command(target, output, msg = nil)
|
251
264
|
if output.match(/\n/)
|
252
265
|
msg = message(msg) do
|
253
|
-
|
266
|
+
"Expected output containing make command \"%s\", but was \n\nBEGIN_OF_OUTPUT\n%sEND_OF_OUTPUT" % [
|
254
267
|
('%s %s' % [make_command, target]).rstrip,
|
255
|
-
output
|
268
|
+
output,
|
256
269
|
]
|
257
270
|
end
|
258
271
|
else
|
259
272
|
msg = message(msg) do
|
260
273
|
'Expected make command "%s": %s' % [
|
261
274
|
('%s %s' % [make_command, target]).rstrip,
|
262
|
-
output
|
275
|
+
output,
|
263
276
|
]
|
264
277
|
end
|
265
278
|
end
|
data/rubygems-update.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = "rubygems-update"
|
5
|
-
s.version = "3.2.
|
5
|
+
s.version = "3.2.7"
|
6
6
|
s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
|
7
7
|
s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
|
8
8
|
|
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
|
|
21
21
|
s.require_paths = ["hide_lib_for_update"]
|
22
22
|
s.rdoc_options = ["--main", "README.md", "--title=RubyGems Update Documentation"]
|
23
23
|
s.extra_rdoc_files = [
|
24
|
-
"
|
24
|
+
"CHANGELOG.md", "LICENSE.txt", "MAINTAINERS.txt",
|
25
25
|
"MIT.txt", "Manifest.txt", "README.md",
|
26
26
|
"UPGRADING.md", "POLICIES.md", "CODE_OF_CONDUCT.md",
|
27
27
|
"CONTRIBUTING.md", "bundler/CHANGELOG.md",
|
Binary file
|
data/test/rubygems/test_gem.rb
CHANGED
@@ -692,6 +692,11 @@ class TestGem < Gem::TestCase
|
|
692
692
|
ensure
|
693
693
|
FileUtils.chmod 0600, parent
|
694
694
|
end
|
695
|
+
|
696
|
+
def test_self_ensure_gem_directories_non_existent_paths
|
697
|
+
Gem.ensure_gem_subdirectories '/proc/0123456789/bogus' # should not raise
|
698
|
+
Gem.ensure_gem_subdirectories 'classpath:/bogus/x' # JRuby embed scenario
|
699
|
+
end
|
695
700
|
end
|
696
701
|
|
697
702
|
def test_self_extension_dir_shared
|
@@ -504,6 +504,137 @@ ERROR: Possible alternatives: non_existent_with_hint
|
|
504
504
|
assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
|
505
505
|
end
|
506
506
|
|
507
|
+
def test_execute_required_ruby_version
|
508
|
+
next_ruby = Gem.ruby_version.segments.map.with_index{|n, i| i == 1 ? n + 1 : n }.join(".")
|
509
|
+
|
510
|
+
local = Gem::Platform.local
|
511
|
+
spec_fetcher do |fetcher|
|
512
|
+
fetcher.download 'a', 2
|
513
|
+
fetcher.download 'a', 2 do |s|
|
514
|
+
s.required_ruby_version = "< #{RUBY_VERSION}.a"
|
515
|
+
s.platform = local
|
516
|
+
end
|
517
|
+
fetcher.download 'a', 3 do |s|
|
518
|
+
s.required_ruby_version = ">= #{next_ruby}"
|
519
|
+
end
|
520
|
+
fetcher.download 'a', 3 do |s|
|
521
|
+
s.required_ruby_version = ">= #{next_ruby}"
|
522
|
+
s.platform = local
|
523
|
+
end
|
524
|
+
end
|
525
|
+
|
526
|
+
@cmd.options[:args] = %w[a]
|
527
|
+
|
528
|
+
use_ui @ui do
|
529
|
+
assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
|
530
|
+
@cmd.execute
|
531
|
+
end
|
532
|
+
end
|
533
|
+
|
534
|
+
assert_equal %w[a-2], @cmd.installed_specs.map {|spec| spec.full_name }
|
535
|
+
end
|
536
|
+
|
537
|
+
def test_execute_required_ruby_version_upper_bound
|
538
|
+
local = Gem::Platform.local
|
539
|
+
spec_fetcher do |fetcher|
|
540
|
+
fetcher.gem 'a', 2.0
|
541
|
+
fetcher.gem 'a', 2.0 do |s|
|
542
|
+
s.required_ruby_version = "< #{RUBY_VERSION}.a"
|
543
|
+
s.platform = local
|
544
|
+
end
|
545
|
+
end
|
546
|
+
|
547
|
+
@cmd.options[:args] = %w[a]
|
548
|
+
|
549
|
+
use_ui @ui do
|
550
|
+
assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
|
551
|
+
@cmd.execute
|
552
|
+
end
|
553
|
+
end
|
554
|
+
|
555
|
+
assert_equal %w[a-2.0], @cmd.installed_specs.map {|spec| spec.full_name }
|
556
|
+
end
|
557
|
+
|
558
|
+
def test_execute_required_ruby_version_specific_not_met
|
559
|
+
spec_fetcher do |fetcher|
|
560
|
+
fetcher.gem 'a', '1.0' do |s|
|
561
|
+
s.required_ruby_version = '= 1.4.6'
|
562
|
+
end
|
563
|
+
end
|
564
|
+
|
565
|
+
@cmd.options[:args] = %w[a]
|
566
|
+
|
567
|
+
use_ui @ui do
|
568
|
+
assert_raises Gem::MockGemUi::TermError do
|
569
|
+
@cmd.execute
|
570
|
+
end
|
571
|
+
end
|
572
|
+
|
573
|
+
errs = @ui.error.split("\n")
|
574
|
+
assert_equal "ERROR: Error installing a:", errs.shift
|
575
|
+
assert_equal "\ta-1.0 requires Ruby version = 1.4.6. The current ruby version is #{Gem.ruby_version}.", errs.shift
|
576
|
+
end
|
577
|
+
|
578
|
+
def test_execute_required_ruby_version_specific_prerelease_met
|
579
|
+
spec_fetcher do |fetcher|
|
580
|
+
fetcher.gem 'a', '1.0' do |s|
|
581
|
+
s.required_ruby_version = '>= 1.4.6.preview2'
|
582
|
+
end
|
583
|
+
end
|
584
|
+
|
585
|
+
@cmd.options[:args] = %w[a]
|
586
|
+
|
587
|
+
use_ui @ui do
|
588
|
+
assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
|
589
|
+
@cmd.execute
|
590
|
+
end
|
591
|
+
end
|
592
|
+
|
593
|
+
assert_equal %w[a-1.0], @cmd.installed_specs.map {|spec| spec.full_name }
|
594
|
+
end
|
595
|
+
|
596
|
+
def test_execute_required_ruby_version_specific_prerelease_not_met
|
597
|
+
next_ruby_pre = Gem.ruby_version.segments.map.with_index{|n, i| i == 1 ? n + 1 : n }.join(".") + ".a"
|
598
|
+
|
599
|
+
spec_fetcher do |fetcher|
|
600
|
+
fetcher.gem 'a', '1.0' do |s|
|
601
|
+
s.required_ruby_version = "> #{next_ruby_pre}"
|
602
|
+
end
|
603
|
+
end
|
604
|
+
|
605
|
+
@cmd.options[:args] = %w[a]
|
606
|
+
|
607
|
+
use_ui @ui do
|
608
|
+
assert_raises Gem::MockGemUi::TermError do
|
609
|
+
@cmd.execute
|
610
|
+
end
|
611
|
+
end
|
612
|
+
|
613
|
+
errs = @ui.error.split("\n")
|
614
|
+
assert_equal "ERROR: Error installing a:", errs.shift
|
615
|
+
assert_equal "\ta-1.0 requires Ruby version > #{next_ruby_pre}. The current ruby version is #{Gem.ruby_version}.", errs.shift
|
616
|
+
end
|
617
|
+
|
618
|
+
def test_execute_required_rubygems_version_wrong
|
619
|
+
spec_fetcher do |fetcher|
|
620
|
+
fetcher.gem 'a', '1.0' do |s|
|
621
|
+
s.required_rubygems_version = '< 0'
|
622
|
+
end
|
623
|
+
end
|
624
|
+
|
625
|
+
@cmd.options[:args] = %w[a]
|
626
|
+
|
627
|
+
use_ui @ui do
|
628
|
+
assert_raises Gem::MockGemUi::TermError do
|
629
|
+
@cmd.execute
|
630
|
+
end
|
631
|
+
end
|
632
|
+
|
633
|
+
errs = @ui.error.split("\n")
|
634
|
+
assert_equal "ERROR: Error installing a:", errs.shift
|
635
|
+
assert_equal "\ta-1.0 requires RubyGems version < 0. The current RubyGems version is #{Gem.rubygems_version}. Try 'gem update --system' to update RubyGems itself.", errs.shift
|
636
|
+
end
|
637
|
+
|
507
638
|
def test_execute_rdoc
|
508
639
|
specs = spec_fetcher do |fetcher|
|
509
640
|
fetcher.gem 'a', 2
|