Project

General

Profile

Download (13.2 KB)

Bug #13842 » rubygems-2612-ruby24.patch

hsbt (Hiroshi SHIBATA), 08/28/2017 08:03 AM

View differences:

lib/rubygems.rb
require 'thread'
module Gem
VERSION = "2.6.11"
VERSION = "2.6.12"
end
# Must be first since it unloads the prelude from 1.9.2
......
def self.finish_resolve(request_set=Gem::RequestSet.new)
request_set.import Gem::Specification.unresolved_deps.values
request_set.import Gem.loaded_specs.values.map {|s| Gem::Dependency.new(s.name, s.version) }
request_set.resolve_current.each do |s|
s.full_spec.activate
lib/rubygems/commands/open_command.rb
end
def spec_for name
spec = Gem::Specification.find_all_by_name(name, @version).last
spec = Gem::Specification.find_all_by_name(name, @version).first
return spec if spec
lib/rubygems/commands/query_command.rb
name = Array(options[:name])
else
args = options[:args].to_a
name = options[:exact] ? args : args.map{|arg| /#{arg}/i }
name = options[:exact] ? args.map{|arg| /\A#{Regexp.escape(arg)}\Z/ } : args.map{|arg| /#{arg}/i }
end
prerelease = options[:prerelease]
lib/rubygems/commands/sources_command.rb
source = Gem::Source.new source_uri
begin
if Gem.sources.include? source_uri then
if Gem.sources.include? source then
say "source #{source_uri} already present in the cache"
else
source.load_specs :released
lib/rubygems/dependency_list.rb
end
def inspect # :nodoc:
"#<%s:0x%x %p>" % [self.class, object_id, map { |s| s.full_name }]
"%s %p>" % [super[0..-2], map { |s| s.full_name }]
end
##
lib/rubygems/installer.rb
ruby_executable = true
existing = io.read.slice(%r{
^(
^\s*(
gem \s |
load \s Gem\.bin_path\( |
load \s Gem\.activate_bin_path\(
......
# Return the text for an application file.
def app_script_text(bin_file_name)
# note that the `load` lines cannot be indented, as old RG versions match
# against the beginning of the line
return <<-TEXT
#{shebang bin_file_name}
#
......
end
end
if Gem.respond_to?(:activate_bin_path)
load Gem.activate_bin_path('#{spec.name}', '#{bin_file_name}', version)
else
gem #{spec.name.dump}, version
load Gem.bin_path(#{spec.name.dump}, #{bin_file_name.dump}, version)
end
TEXT
end
lib/rubygems/platform.rb
end
def inspect
"#<%s:0x%x @cpu=%p, @os=%p, @version=%p>" % [self.class, object_id, *to_a]
"%s @cpu=%p, @os=%p, @version=%p>" % [super[0..-2], *to_a]
end
def to_a
lib/rubygems/security.rb
##
# Creates a new key pair of the specified +length+ and +algorithm+. The
# default is a 2048 bit RSA key.
# default is a 3072 bit RSA key.
def self.create_key length = KEY_LENGTH, algorithm = KEY_ALGORITHM
algorithm.new length
lib/rubygems/server.rb
"only_one_executable" => true,
"full_name" => "rubygems-#{Gem::VERSION}",
"has_deps" => false,
"homepage" => "http://docs.rubygems.org/",
"homepage" => "http://guides.rubygems.org/",
"name" => 'rubygems',
"ri_installed" => true,
"summary" => "RubyGems itself",
lib/rubygems/specification.rb
if $DEBUG
super
else
"#<#{self.class}:0x#{__id__.to_s(16)} #{full_name}>"
"#{super[0..-2]} #{full_name}>"
end
end
lib/rubygems/test_case.rb
system @git, 'add', gemspec
system @git, 'commit', '-a', '-m', 'a non-empty commit message', '--quiet'
head = Gem::Util.popen('git', 'rev-parse', 'master').strip
head = Gem::Util.popen(@git, 'rev-parse', 'master').strip
end
return name, git_spec.version, directory, head
......
begin
gem 'rdoc'
require 'rdoc'
require 'rubygems/rdoc'
rescue LoadError, Gem::LoadError
end
......
pid = $$
END {tmpdirs.each {|dir| Dir.rmdir(dir)} if $$ == pid}
Gem.clear_paths
Gem.loaded_specs.clear
test/rubygems/test_gem.rb
end
end
def test_self_finish_resolve_respects_loaded_specs
save_loaded_features do
a1 = new_spec "a", "1", "b" => "> 0"
b1 = new_spec "b", "1", "c" => ">= 1"
b2 = new_spec "b", "2", "c" => ">= 2"
c1 = new_spec "c", "1"
c2 = new_spec "c", "2"
install_specs c1, c2, b1, b2, a1
a1.activate
c1.activate
assert_equal %w(a-1 c-1), loaded_spec_names
assert_equal ["b (> 0)"], unresolved_names
Gem.finish_resolve
assert_equal %w(a-1 b-1 c-1), loaded_spec_names
assert_equal [], unresolved_names
end
end
def test_self_install
spec_fetcher do |f|
f.gem 'a', 1
......
skip if RUBY_VERSION <= "1.8.7"
cwd = File.expand_path("test/rubygems", @@project_dir)
$LOAD_PATH.unshift cwd
actual_load_path = $LOAD_PATH.unshift(cwd).dup
discover_path = File.join 'lib', 'sff', 'discover.rb'
......
expected = [
File.expand_path('test/rubygems/sff/discover.rb', @@project_dir),
File.join(foo1.full_gem_path, discover_path)
]
].sort
assert_equal expected, Gem.find_files('sff/discover')
assert_equal expected, Gem.find_files('sff/**.rb'), '[ruby-core:31730]'
assert_equal expected, Gem.find_files('sff/discover').sort
assert_equal expected, Gem.find_files('sff/**.rb').sort, '[ruby-core:31730]'
ensure
assert_equal cwd, $LOAD_PATH.shift unless RUBY_VERSION <= "1.8.7"
assert_equal cwd, actual_load_path.shift unless RUBY_VERSION <= "1.8.7"
end
def test_self_find_latest_files
test/rubygems/test_gem_commands_open_command.rb
@cmd.options[:args] = %w[foo]
@cmd.options[:editor] = "#{Gem.ruby} -e0 --"
spec = gem 'foo'
gem 'foo', '1.0.0'
spec = gem 'foo', '1.0.1'
mock = MiniTest::Mock.new
mock.expect(:call, true, [spec.full_gem_path])
test/rubygems/test_gem_commands_query_command.rb
assert_equal expected, @ui.output
end
def test_execute_exact
def test_execute_exact_remote
spec_fetcher do |fetcher|
fetcher.spec 'coolgem-omg', 3
fetcher.spec 'coolgem', '4.2.1'
......
assert_equal expected, @ui.output
end
def test_execute_exact_local
spec_fetcher do |fetcher|
fetcher.spec 'coolgem-omg', 3
fetcher.spec 'coolgem', '4.2.1'
fetcher.spec 'wow_coolgem', 1
end
@cmd.handle_options %w[--exact coolgem]
use_ui @ui do
@cmd.execute
end
expected = <<-EOF
*** LOCAL GEMS ***
coolgem (4.2.1)
EOF
assert_equal expected, @ui.output
end
def test_execute_exact_multiple
spec_fetcher do |fetcher|
fetcher.spec 'coolgem-omg', 3
fetcher.spec 'coolgem', '4.2.1'
fetcher.spec 'wow_coolgem', 1
fetcher.spec 'othergem-omg', 3
fetcher.spec 'othergem', '1.2.3'
fetcher.spec 'wow_othergem', 1
end
@cmd.handle_options %w[--exact coolgem othergem]
use_ui @ui do
@cmd.execute
end
expected = <<-EOF
*** LOCAL GEMS ***
coolgem (4.2.1)
*** LOCAL GEMS ***
othergem (1.2.3)
EOF
assert_equal expected, @ui.output
end
private
def add_gems_to_fetcher
test/rubygems/test_gem_commands_sources_command.rb
assert_equal '', @ui.error
end
def test_execute_add_redundant_source_trailing_slash
# Remove pre-existing gem source (w/ slash)
repo_with_slash = "http://gems.example.com/"
@cmd.handle_options %W[--remove #{repo_with_slash}]
use_ui @ui do
@cmd.execute
end
source = Gem::Source.new repo_with_slash
assert_equal false, Gem.sources.include?(source)
expected = <<-EOF
#{repo_with_slash} removed from sources
EOF
assert_equal expected, @ui.output
assert_equal '', @ui.error
# Re-add pre-existing gem source (w/o slash)
repo_without_slash = "http://gems.example.com"
@cmd.handle_options %W[--add #{repo_without_slash}]
use_ui @ui do
@cmd.execute
end
source = Gem::Source.new repo_without_slash
assert_equal true, Gem.sources.include?(source)
expected = <<-EOF
http://gems.example.com/ removed from sources
http://gems.example.com added to sources
EOF
assert_equal expected, @ui.output
assert_equal '', @ui.error
# Re-add original gem source (w/ slash)
@cmd.handle_options %W[--add #{repo_with_slash}]
use_ui @ui do
@cmd.execute
end
source = Gem::Source.new repo_with_slash
assert_equal true, Gem.sources.include?(source)
expected = <<-EOF
http://gems.example.com/ removed from sources
http://gems.example.com added to sources
source http://gems.example.com/ already present in the cache
EOF
assert_equal expected, @ui.output
assert_equal '', @ui.error
end
def test_execute_add_http_rubygems_org
http_rubygems_org = 'http://rubygems.org'
test/rubygems/test_gem_installer.rb
end
end
if Gem.respond_to?(:activate_bin_path)
load Gem.activate_bin_path('a', 'executable', version)
else
gem "a", version
load Gem.bin_path("a", "executable", version)
end
EOF
wrapper = @installer.app_script_text 'executable'
test/rubygems/test_require.rb
assert_equal %w(default-2.0.0.0), loaded_spec_names
end
def test_realworld_default_gem
skip "no default gems on ruby < 2.0" unless RUBY_VERSION >= "2"
cmd = <<-RUBY
$stderr = $stdout
require "json"
puts Gem.loaded_specs["json"].default_gem?
RUBY
output = Gem::Util.popen(Gem.ruby, "-e", cmd).strip
assert_equal "true", output
end
def test_default_gem_and_normal_gem
default_gem_spec = new_default_spec("default", "2.0.0.0",
nil, "default/gem.rb")
(3-3/5)