diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-01 11:40:46 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-01 11:40:46 +0000 |
| commit | 708a10d35bf7d34da574ca3f2ae6be4bfffd5267 (patch) | |
| tree | d2c623b0217bdd93ce8d3b9471b2235b36588bf2 /lib/rubygems/commands | |
| parent | abb8b330114e9079eca14b6f73e4c6109e4308b4 (diff) | |
Merge rubygems-2.6.12 from rubygems/rubygems.
* Details of changes:
https://github.com/rubygems/rubygems/blob/009080040279282d7b8ddd09acab41719cb4ba00/History.txt#L3
* I kept ko1's commmit related thread issue. It's not merged 2.6 branch on rubygems.
https://github.com/ruby/ruby/commit/1721dfa0ea963a85d4ac1e3415eb18ef427d4d36
* I removed test_realworld_default_gem from rubygems-2.6.12. It fails on
Ruby trunk. Because it's differences of test suite and environment.
https://github.com/rubygems/rubygems/pull/1899
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/commands')
| -rw-r--r-- | lib/rubygems/commands/open_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/commands/query_command.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/commands/sources_command.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/rubygems/commands/open_command.rb b/lib/rubygems/commands/open_command.rb index a89b7421e3..059635e835 100644 --- a/lib/rubygems/commands/open_command.rb +++ b/lib/rubygems/commands/open_command.rb @@ -72,7 +72,7 @@ class Gem::Commands::OpenCommand < Gem::Command 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 diff --git a/lib/rubygems/commands/query_command.rb b/lib/rubygems/commands/query_command.rb index f25d120b88..70f8127292 100644 --- a/lib/rubygems/commands/query_command.rb +++ b/lib/rubygems/commands/query_command.rb @@ -86,7 +86,7 @@ is too hard to use. 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] diff --git a/lib/rubygems/commands/sources_command.rb b/lib/rubygems/commands/sources_command.rb index 9832afd214..7e46963a4c 100644 --- a/lib/rubygems/commands/sources_command.rb +++ b/lib/rubygems/commands/sources_command.rb @@ -44,7 +44,7 @@ class Gem::Commands::SourcesCommand < Gem::Command 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 |