mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rubygems: Update to RubyGems 2.1.3
Fixed installing platform gems Restored concurrent requires Fixed installing gems with extensions with --install-dir Fixed `gem fetch -v` to install the latest version Fixed installing gems with "./" in their files entries * test/rubygems/test_gem_package.rb: Tests for the above. * NEWS: Updated for RubyGems 2.1.3 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42938 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain
parent
85995e88d4
commit
1daa0b113d
110 changed files with 3493 additions and 4942 deletions
|
|
@ -37,165 +37,103 @@ class Gem::Commands::SourcesCommand < Gem::Command
|
|||
add_proxy_option
|
||||
end
|
||||
|
||||
def add_source source_uri # :nodoc:
|
||||
check_rubygems_https source_uri
|
||||
|
||||
source = Gem::Source.new source_uri
|
||||
|
||||
begin
|
||||
if Gem.sources.include? source_uri then
|
||||
say "source #{source_uri} already present in the cache"
|
||||
else
|
||||
source.load_specs :released
|
||||
Gem.sources << source
|
||||
Gem.configuration.write
|
||||
|
||||
say "#{source_uri} added to sources"
|
||||
end
|
||||
rescue URI::Error, ArgumentError
|
||||
say "#{source_uri} is not a URI"
|
||||
terminate_interaction 1
|
||||
rescue Gem::RemoteFetcher::FetchError => e
|
||||
say "Error fetching #{source_uri}:\n\t#{e.message}"
|
||||
terminate_interaction 1
|
||||
end
|
||||
end
|
||||
|
||||
def check_rubygems_https source_uri # :nodoc:
|
||||
uri = URI source_uri
|
||||
|
||||
if uri.scheme and uri.scheme.downcase == 'http' and
|
||||
uri.host.downcase == 'rubygems.org' then
|
||||
question = <<-QUESTION.chomp
|
||||
https://rubygems.org is recommended for security over #{uri}
|
||||
|
||||
Do you want to add this insecure source?
|
||||
QUESTION
|
||||
|
||||
terminate_interaction 1 unless ask_yes_no question
|
||||
end
|
||||
end
|
||||
|
||||
def clear_all # :nodoc:
|
||||
path = Gem.spec_cache_dir
|
||||
FileUtils.rm_rf path
|
||||
|
||||
unless File.exist? path then
|
||||
say "*** Removed specs cache ***"
|
||||
else
|
||||
unless File.writable? path then
|
||||
say "*** Unable to remove source cache (write protected) ***"
|
||||
else
|
||||
say "*** Unable to remove source cache ***"
|
||||
end
|
||||
|
||||
terminate_interaction 1
|
||||
end
|
||||
end
|
||||
|
||||
def defaults_str # :nodoc:
|
||||
def defaults_str
|
||||
'--list'
|
||||
end
|
||||
|
||||
def description # :nodoc:
|
||||
<<-EOF
|
||||
RubyGems fetches gems from the sources you have configured (stored in your
|
||||
~/.gemrc).
|
||||
|
||||
The default source is https://rubygems.org, but you may have older sources
|
||||
configured. This guide will help you update your sources or configure
|
||||
yourself to use your own gem server.
|
||||
|
||||
Without any arguments the sources lists your currently configured sources:
|
||||
|
||||
$ gem sources
|
||||
*** CURRENT SOURCES ***
|
||||
|
||||
https://rubygems.org
|
||||
|
||||
This may list multiple sources or non-rubygems sources. You probably
|
||||
configured them before or have an old `~/.gemrc`. If you have sources you
|
||||
do not recognize you should remove them.
|
||||
|
||||
RubyGems has been configured to serve gems via the following URLs through
|
||||
its history:
|
||||
|
||||
* http://gems.rubyforge.org (RubyGems 1.3.6 and earlier)
|
||||
* http://rubygems.org (RubyGems 1.3.7 through 1.8.25)
|
||||
* https://rubygems.org (RubyGems 2.0.1 and newer)
|
||||
|
||||
Since all of these sources point to the same set of gems you only need one
|
||||
of them in your list. https://rubygems.org is recommended as it brings the
|
||||
protections of an SSL connection to gem downloads.
|
||||
|
||||
To add a source use the --add argument:
|
||||
|
||||
$ gem sources --add https://rubygems.org
|
||||
https://rubygems.org added to sources
|
||||
|
||||
RubyGems will check to see if gems can be installed from the source given
|
||||
before it is added.
|
||||
|
||||
To remove a source use the --remove argument:
|
||||
|
||||
$ gem sources --remove http://rubygems.org
|
||||
http://rubygems.org removed from sources
|
||||
|
||||
EOF
|
||||
end
|
||||
|
||||
def list # :nodoc:
|
||||
say "*** CURRENT SOURCES ***"
|
||||
say
|
||||
|
||||
Gem.sources.each do |src|
|
||||
say src
|
||||
end
|
||||
end
|
||||
|
||||
def list? # :nodoc:
|
||||
!(options[:list] ||
|
||||
options[:add] ||
|
||||
options[:clear_all] ||
|
||||
options[:remove] ||
|
||||
options[:update])
|
||||
end
|
||||
|
||||
def execute
|
||||
clear_all if options[:clear_all]
|
||||
options[:list] = !(options[:add] ||
|
||||
options[:clear_all] ||
|
||||
options[:remove] ||
|
||||
options[:update])
|
||||
|
||||
source_uri = options[:add]
|
||||
add_source source_uri if source_uri
|
||||
if options[:clear_all] then
|
||||
path = File.join Gem.user_home, '.gem', 'specs'
|
||||
FileUtils.rm_rf path
|
||||
|
||||
source_uri = options[:remove]
|
||||
remove_source source_uri if source_uri
|
||||
unless File.exist? path then
|
||||
say "*** Removed specs cache ***"
|
||||
else
|
||||
unless File.writable? path then
|
||||
say "*** Unable to remove source cache (write protected) ***"
|
||||
else
|
||||
say "*** Unable to remove source cache ***"
|
||||
end
|
||||
|
||||
update if options[:update]
|
||||
terminate_interaction 1
|
||||
end
|
||||
end
|
||||
|
||||
list if list?
|
||||
end
|
||||
if source_uri = options[:add] then
|
||||
uri = URI source_uri
|
||||
|
||||
def remove_source source_uri # :nodoc:
|
||||
unless Gem.sources.include? source_uri then
|
||||
say "source #{source_uri} not present in cache"
|
||||
else
|
||||
Gem.sources.delete source_uri
|
||||
Gem.configuration.write
|
||||
if uri.scheme and uri.scheme.downcase == 'http' and
|
||||
uri.host.downcase == 'rubygems.org' then
|
||||
question = <<-QUESTION.chomp
|
||||
https://rubygems.org is recommended for security over #{uri}
|
||||
|
||||
say "#{source_uri} removed from sources"
|
||||
Do you want to add this insecure source?
|
||||
QUESTION
|
||||
|
||||
terminate_interaction 1 unless ask_yes_no question
|
||||
end
|
||||
|
||||
source = Gem::Source.new source_uri
|
||||
|
||||
begin
|
||||
if Gem.sources.include? source_uri then
|
||||
say "source #{source_uri} already present in the cache"
|
||||
else
|
||||
source.load_specs :released
|
||||
Gem.sources << source
|
||||
Gem.configuration.write
|
||||
|
||||
say "#{source_uri} added to sources"
|
||||
end
|
||||
rescue URI::Error, ArgumentError
|
||||
say "#{source_uri} is not a URI"
|
||||
terminate_interaction 1
|
||||
rescue Gem::RemoteFetcher::FetchError => e
|
||||
say "Error fetching #{source_uri}:\n\t#{e.message}"
|
||||
terminate_interaction 1
|
||||
end
|
||||
end
|
||||
|
||||
if options[:remove] then
|
||||
source_uri = options[:remove]
|
||||
|
||||
unless Gem.sources.include? source_uri then
|
||||
say "source #{source_uri} not present in cache"
|
||||
else
|
||||
Gem.sources.delete source_uri
|
||||
Gem.configuration.write
|
||||
|
||||
say "#{source_uri} removed from sources"
|
||||
end
|
||||
end
|
||||
|
||||
if options[:update] then
|
||||
Gem.sources.each_source do |src|
|
||||
src.load_specs :released
|
||||
src.load_specs :latest
|
||||
end
|
||||
|
||||
say "source cache successfully updated"
|
||||
end
|
||||
|
||||
if options[:list] then
|
||||
say "*** CURRENT SOURCES ***"
|
||||
say
|
||||
|
||||
Gem.sources.each do |src|
|
||||
say src
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def update # :nodoc:
|
||||
Gem.sources.each_source do |src|
|
||||
src.load_specs :released
|
||||
src.load_specs :latest
|
||||
end
|
||||
private
|
||||
|
||||
say "source cache successfully updated"
|
||||
end
|
||||
|
||||
def remove_cache_file desc, path # :nodoc:
|
||||
def remove_cache_file(desc, path)
|
||||
FileUtils.rm_rf path
|
||||
|
||||
if not File.exist?(path) then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue