1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/rubygems/command.rb (Gem::Command#get_all_gem_names_and_versions):

Browse Source 
who assumes that the pathname of a gem never contains ':' ?
  yes, on Unixen pathnames can contain ':', and on Windows they almost
  certainly contain ':'.  see [ruby-core:50388].

* lib/rubygems/requirement.rb (Gem::Requirement::PATTERN_RAW): extract
  the regexp to match the version specifier from PATTERN to use in
  above method.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-11-30 16:27:52 +00:00
parent 4bb1bfa0ed
commit 952beb5ff4
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Sat Dec 1 01:21:07 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/rubygems/command.rb (Gem::Command#get_all_gem_names_and_versions):
who assumes that the pathname of a gem never contains ':' ?
yes, on Unixen pathnames can contain ':', and on Windows they almost
certainly contain ':'. see [ruby-core:50388].
* lib/rubygems/requirement.rb (Gem::Requirement::PATTERN_RAW): extract
the regexp to match the version specifier from PATTERN to use in
above method.
Sat Dec 1 00:48:19 2012 Naohisa Goto <ngotogenome@gmail.com> Sat Dec 1 00:48:19 2012 Naohisa Goto <ngotogenome@gmail.com>
* ext/fiddle/extconf.rb, ext/fiddle/function.c * ext/fiddle/extconf.rb, ext/fiddle/function.c

9
lib/rubygems/command.rb
View File

@ -5,6 +5,7 @@
#++ #++
require 'optparse' require 'optparse'
require 'rubygems/requirement'
require 'rubygems/user_interaction' require 'rubygems/user_interaction'
## ##
@ -186,7 +187,13 @@ class Gem::Command
# An argument in the form gem:ver is pull apart into the gen name and version, # An argument in the form gem:ver is pull apart into the gen name and version,
# respectively. # respectively.
def get_all_gem_names_and_versions def get_all_gem_names_and_versions
get_all_gem_names.map { |name| name.split(":", 2) } get_all_gem_names.map do |name|
if /\A(.*):(#{Gem::Requirement::PATTERN_RAW})\z/ =~ name
[$1, $2]
else
[name]
end
end
end end
## ##

3
lib/rubygems/requirement.rb
View File

@ -27,7 +27,8 @@ class Gem::Requirement
} }
quoted = OPS.keys.map { |k| Regexp.quote k }.join "|" quoted = OPS.keys.map { |k| Regexp.quote k }.join "|"
PATTERN = /\A\s*(#{quoted})?\s*(#{Gem::Version::VERSION_PATTERN})\s*\z/ PATTERN_RAW = "\\s*(#{quoted})?\\s*(#{Gem::Version::VERSION_PATTERN})\\s*"
PATTERN = /\A#{PATTERN_RAW}\z/
DefaultRequirement = [">=", Gem::Version.new(0)] DefaultRequirement = [">=", Gem::Version.new(0)]

2
test/rubygems/test_gem_commands_install_command.rb
View File

@ -664,7 +664,7 @@ ERROR: Possible alternatives: non_existent_with_hint
assert_equal 0, e.exit_code assert_equal 0, e.exit_code
end end
def test_execute_satisify_deps_of_local_from_sources def test_execute_satisfy_deps_of_local_from_sources
r, r_gem = util_gem 'r', '1', 'q' => '= 1' r, r_gem = util_gem 'r', '1', 'q' => '= 1'
q, q_gem = util_gem 'q', '1' q, q_gem = util_gem 'q', '1'