Skip to content

Commit

Permalink
Showing 14 changed files with 65 additions and 36 deletions.
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
require 'thread'

module Gem
VERSION = '2.6.8'
VERSION = "2.6.10"
end

# Must be first since it unloads the prelude from 1.9.2
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems/commands/setup_command.rb
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ def initialize
end

add_option '--[no-]document [TYPES]', Array,
'Generate documentation for RubyGems.',
'Generate documentation for RubyGems',
'List the documentation types you wish to',
'generate. For example: rdoc,ri' do |value, options|
options[:document] = case value
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems/core_ext/kernel_require.rb
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ def require path
spec = Gem.find_unresolved_default_spec(path)
if spec
Gem.remove_unresolved_default_spec(spec)
gem(spec.name)
Kernel.send(:gem, spec.name)
end

# If there are no unresolved deps, then we can use just try
8 changes: 5 additions & 3 deletions lib/ruby/stdlib/rubygems/ext/ext_conf_builder.rb
Original file line number Diff line number Diff line change
@@ -48,9 +48,11 @@ def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
run cmd, results
ensure
if File.exist? 'mkmf.log'
results << "To see why this extension failed to compile, please check" \
" the mkmf.log which can be found here:\n"
results << " " + File.join(dest_path, 'mkmf.log') + "\n"
unless $?.success? then
results << "To see why this extension failed to compile, please check" \
" the mkmf.log which can be found here:\n"
results << " " + File.join(dest_path, 'mkmf.log') + "\n"
end
FileUtils.mv 'mkmf.log', dest_path
end
siteconf.unlink
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems/ext/rake_builder.rb
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder

def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
if File.basename(extension) =~ /mkrf_conf/i then
cmd = "#{Gem.ruby} #{File.basename extension}"
cmd = "#{Gem.ruby} #{File.basename extension}".dup
cmd << " #{args.join " "}" unless args.empty?
run cmd, results
end
Original file line number Diff line number Diff line change
@@ -119,6 +119,7 @@ def to_dot
# {Vertex#successors}
def ==(other)
return false unless other
return true if equal?(other)
vertices.each do |name, vertex|
other_vertex = other.vertex_named(name)
return false unless other_vertex
@@ -134,6 +135,7 @@ def ==(other)
def add_child_vertex(name, payload, parent_names, requirement)
root = !parent_names.delete(nil) { true }
vertex = add_vertex(name, payload, root)
vertex.explicit_requirements << requirement if root
parent_names.each do |parent_name|
parent_node = vertex_named(parent_name)
add_edge(parent_node, vertex, requirement)
@@ -152,7 +154,7 @@ def add_vertex(name, payload, root = false)
# Detaches the {#vertex_named} `name` {Vertex} from the graph, recursively
# removing any non-root vertices that were orphaned in the process
# @param [String] name
# @return [void]
# @return [Array<Vertex>] the vertices which have been detached
def detach_vertex_named(name)
log.detach_vertex_named(self, name)
end
Original file line number Diff line number Diff line change
@@ -14,16 +14,23 @@ def self.action_name

# (see Action#up)
def up(graph)
return unless @vertex = graph.vertices.delete(name)
return [] unless @vertex = graph.vertices.delete(name)

removed_vertices = [@vertex]
@vertex.outgoing_edges.each do |e|
v = e.destination
v.incoming_edges.delete(e)
graph.detach_vertex_named(v.name) unless v.root? || v.predecessors.any?
if !v.root? && v.incoming_edges.empty?
removed_vertices.concat graph.detach_vertex_named(v.name)
end
end

@vertex.incoming_edges.each do |e|
v = e.origin
v.outgoing_edges.delete(e)
end

removed_vertices
end

# (see Action#down)
Original file line number Diff line number Diff line change
@@ -81,6 +81,7 @@ def inspect
# @return [Boolean] whether the two vertices are equal, determined
# by a recursive traversal of each {Vertex#successors}
def ==(other)
return true if equal?(other)
shallow_eql?(other) &&
successors.to_set == other.successors.to_set
end
@@ -89,6 +90,7 @@ def ==(other)
# @return [Boolean] whether the two vertices are equal, determined
# solely by {#name} and {#payload} equality
def shallow_eql?(other)
return true if equal?(other)
other &&
name == other.name &&
payload == other.payload
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true
module Gem::Resolver::Molinillo
# The version of Gem::Resolver::Molinillo.
VERSION = '0.5.3'.freeze
VERSION = '0.5.5'.freeze
end
Original file line number Diff line number Diff line change
@@ -194,18 +194,20 @@ def unwind_for_conflict
def state_index_for_unwind
current_requirement = requirement
existing_requirement = requirement_for_existing_name(name)
until current_requirement.nil?
current_state = find_state_for(current_requirement)
return states.index(current_state) if state_any?(current_state)
current_requirement = parent_of(current_requirement)
index = -1
[current_requirement, existing_requirement].each do |r|
until r.nil?
current_state = find_state_for(r)
if state_any?(current_state)
current_index = states.index(current_state)
index = current_index if current_index > index
break
end
r = parent_of(r)
end
end

until existing_requirement.nil?
existing_state = find_state_for(existing_requirement)
return states.index(existing_state) if state_any?(existing_state)
existing_requirement = parent_of(existing_requirement)
end
-1
index
end

# @return [Object] the requirement that led to `requirement` being added
@@ -364,19 +366,17 @@ def fixup_swapped_children(vertex)
if matching_deps.empty? && !succ.root? && succ.predecessors.to_a == [vertex]
debug(depth) { "Removing orphaned spec #{succ.name} after swapping #{name}" }
succ.requirements.each { |r| @parent_of.delete(r) }
activated.detach_vertex_named(succ.name)

all_successor_names = succ.recursive_successors.map(&:name)

requirements.delete_if do |requirement|
requirement_name = name_for(requirement)
(requirement_name == succ.name) || all_successor_names.include?(requirement_name)
removed_names = activated.detach_vertex_named(succ.name).map(&:name)
requirements.delete_if do |r|
# the only removed vertices are those with no other requirements,
# so it's safe to delete only based upon name here
removed_names.include?(name_for(r))
end
elsif !matching_deps.include?(outgoing_edge.requirement)
activated.delete_edge(outgoing_edge)
requirements.delete(outgoing_edge.requirement)
end
matching_deps.delete(outgoing_edge.requirement)
end
end

15 changes: 11 additions & 4 deletions lib/ruby/stdlib/rubygems/server.rb
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
require 'webrick'
require 'zlib'
require 'erb'
require 'uri'

require 'rubygems'
require 'rubygems/rdoc'
@@ -68,7 +69,7 @@ class Gem::Server
<h1>Summary</h1>
<p>There are <%=values["gem_count"]%> gems installed:</p>
<p>
<%= values["specs"].map { |v| "<a href\"##{u v["name"]}\">#{h v["name"]}</a>" }.join ', ' %>.
<%= values["specs"].map { |v| "<a href=\"##{u v["name"]}\">#{h v["name"]}</a>" }.join ', ' %>.
<h1>Gems</h1>
<dl>
@@ -81,20 +82,20 @@ class Gem::Server
<b><%=h spec["name"]%> <%=h spec["version"]%></b>
<% if spec["ri_installed"] || spec["rdoc_installed"] then %>
<a href="<%=u spec["doc_path"]%>">[rdoc]</a>
<a href="<%=spec["doc_path"]%>">[rdoc]</a>
<% else %>
<span title="rdoc not installed">[rdoc]</span>
<% end %>
<% if spec["homepage"] then %>
<a href="<%=u spec["homepage"]%>" title="<%=h spec["homepage"]%>">[www]</a>
<a href="<%=uri_encode spec["homepage"]%>" title="<%=h spec["homepage"]%>">[www]</a>
<% else %>
<span title="no homepage available">[www]</span>
<% end %>
<% if spec["has_deps"] then %>
- depends on
<%= spec["dependencies"].map { |v| "<a href=\"##{u v["name"]}>#{h v["name"]}</a>" }.join ', ' %>.
<%= spec["dependencies"].map { |v| "<a href=\"##{u v["name"]}\">#{h v["name"]}</a>" }.join ', ' %>.
<% end %>
</dt>
<dd>
@@ -455,6 +456,12 @@ def add_date res
end.max
end

def uri_encode(str)
str.gsub(URI::UNSAFE) do |match|
match.each_byte.map { |c| sprintf('%%%02X', c.ord) }.join
end
end

def doc_root gem_name
if have_rdoc_4_plus? then
"/doc_root/#{u gem_name}/"
2 changes: 1 addition & 1 deletion lib/ruby/stdlib/rubygems/specification.rb
Original file line number Diff line number Diff line change
@@ -2698,7 +2698,7 @@ def validate packaging = true

unless specification_version.is_a?(Integer)
raise Gem::InvalidSpecificationException,
'specification_version must be a Integer (did you mean version?)'
'specification_version must be an Integer (did you mean version?)'
end

case platform
7 changes: 6 additions & 1 deletion lib/ruby/stdlib/rubygems/stub_specification.rb
Original file line number Diff line number Diff line change
@@ -39,7 +39,12 @@ class StubLine # :nodoc: all
def initialize data, extensions
parts = data[PREFIX.length..-1].split(" ".freeze, 4)
@name = parts[0].freeze
@version = Gem::Version.new parts[1]
@version = if Gem::Version.correct?(parts[1])
Gem::Version.new(parts[1])
else
Gem::Version.new(0)
end

@platform = Gem::Platform.new parts[2]
@extensions = extensions
@full_name = if platform == Gem::Platform::RUBY
8 changes: 6 additions & 2 deletions lib/ruby/stdlib/rubygems/version.rb
Original file line number Diff line number Diff line change
@@ -204,8 +204,12 @@ def self.new version # :nodoc:
# series of digits or ASCII letters separated by dots.

def initialize version
raise ArgumentError, "Malformed version number string #{version}" unless
self.class.correct?(version)
unless self.class.correct?(version)
raise ArgumentError, "Malformed version number string #{version}"
end

# If version is an empty string convert it to 0
version = 0 if version =~ /\A\s*\Z/

@version = version.to_s.strip.gsub("-",".pre.")
@segments = nil

0 comments on commit 7ce6c89

Please sign in to comment.