diff options
Diffstat (limited to 'lib/rubygems/version.rb')
| -rw-r--r-- | lib/rubygems/version.rb | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lib/rubygems/version.rb b/lib/rubygems/version.rb index 17dd7b0795..ff5c1c1e72 100644 --- a/lib/rubygems/version.rb +++ b/lib/rubygems/version.rb @@ -170,7 +170,7 @@ class Gem::Version # True if the +version+ string matches RubyGems' requirements. def self.correct? version - version.to_s =~ ANCHORED_VERSION_PATTERN + !!(version.to_s =~ ANCHORED_VERSION_PATTERN) end ## @@ -241,7 +241,7 @@ class Gem::Version end def hash # :nodoc: - @version.hash + canonical_segments.hash end def init_with coder # :nodoc: @@ -335,7 +335,7 @@ class Gem::Version def <=> other return unless Gem::Version === other - return 0 if @version == other._version + return 0 if @version == other._version || canonical_segments == other.canonical_segments lhsegments = _segments rhsegments = other._segments @@ -360,6 +360,13 @@ class Gem::Version return 0 end + def canonical_segments + @canonical_segments ||= + _split_segments.map! do |segments| + segments.reverse_each.drop_while {|s| s == 0 }.reverse + end.reduce(&:concat) + end + protected def _version @@ -375,4 +382,11 @@ class Gem::Version /^\d+$/ =~ s ? s.to_i : s end.freeze end + + def _split_segments + string_start = _segments.index {|s| s.is_a?(String) } + string_segments = segments + numeric_segments = string_segments.slice!(0, string_start || string_segments.size) + return numeric_segments, string_segments + end end |