rubygems-update 1.4.1 → 1.4.2

data/History.txt

@@ -1,4 +1,12 @@
-=== 1.4.1 / 2010-12-31
+=== 1.4.2 / 2011-01-06
+
+Bug fixes:
+
+* Gem::Versions: "1.b1" != "1.b.1", but "1.b1" eql? "1.b.1". Fixes gem indexing.
+* Fixed Gem.find_files.
+* Removed otherwise unused #find_all_dot_rb. Only 6 days old and hella buggy.
+
+=== 1.4.1 / 2010-12-31
 
 Since apparently nobody reads my emails, blog posts or the README:
 

data/lib/rubygems.rb

@@ -100,7 +100,7 @@ require 'thread' # HACK: remove me for 1.5 - this is here just for rails
 # -The RubyGems Team
 
 module Gem
-  RubyGemsVersion = VERSION = '1.4.1'
+  RubyGemsVersion = VERSION = '1.4.2'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -468,7 +468,7 @@ module Gem
   end
 
   ##
-  # Returns a list of paths matching +file+ that can be used by a gem to pick
+  # Returns a list of paths matching +glob+ that can be used by a gem to pick
   # up features from other gems.  For example:
   #
   #   Gem.find_files('rdoc/discover').each do |path| load path end
@@ -479,12 +479,12 @@ module Gem
   # Note that find_files will return all files even if they are from different
   # versions of the same gem.
 
-  def self.find_files(path, check_load_path=true)
+  def self.find_files(glob, check_load_path=true)
     files = []
 
     if check_load_path
       $LOAD_PATH.each do |load_path|
-        globbed = Dir["#{File.expand_path path, load_path}#{Gem.suffix_pattern}"]
+        globbed = Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"]
 
         globbed.each do |load_path_file|
           files << load_path_file if File.file?(load_path_file.untaint)
@@ -492,10 +492,10 @@ module Gem
       end
     end
 
-    specs = searcher.find_all_dot_rb path
+    specs = searcher.find_all glob
 
     specs.each do |spec|
-      files.concat searcher.matching_files(spec, path)
+      files.concat searcher.matching_files(spec, glob)
     end
 
     # $LOAD_PATH might contain duplicate entries or reference

data/lib/rubygems/gem_path_searcher.rb

@@ -22,7 +22,7 @@ class Gem::GemPathSearcher
   end
 
   ##
-  # Look in all the installed gems until a matching _path_ is found.
+  # Look in all the installed gems until a matching +glob+ is found.
   # Return the _gemspec_ of the gem where it was found.  If no match
   # is found, return nil.
   #
@@ -41,33 +41,18 @@ class Gem::GemPathSearcher
   # This method doesn't care about the full filename that matches;
   # only that there is a match.
 
-  def find(path)
-    @gemspecs.find do |spec| matching_file? spec, path end
-  end
-
-  ##
-  # Works like #find, but finds all gemspecs matching +path+.
-
-  def find_all(path)
-    @gemspecs.select do |spec|
-      matching_file? spec, path
+  def find(glob)
+    @gemspecs.find do |spec|
+      matching_file? spec, glob
     end
   end
 
   ##
-  # Find all files +path+ .rb advertised by all gemspecs.
-  # Only files in the gemspec's require paths are considered.
-
-  def find_all_dot_rb(path)
-    rb_path = "#{path}.rb"
+  # Works like #find, but finds all gemspecs matching +glob+.
 
+  def find_all(glob)
     @gemspecs.select do |spec|
-      rp = spec.require_paths
-      next false unless rp
-
-      rp.find do |lib|
-        spec.files.include? File.join(lib, rb_path)
-      end
+      matching_file? spec, glob
     end
   end
 

data/lib/rubygems/version.rb

@@ -211,7 +211,7 @@ class Gem::Version
   # same precision. Version "1.0" is not the same as version "1".
 
   def eql? other
-    self.class === other and segments == other.segments
+    self.class === other and @version == other.version
   end
 
   def hash # :nodoc:

data/test/test_gem_version.rb

@@ -36,14 +36,16 @@ class TestGemVersion < RubyGemTestCase
   end
 
   def test_eql_eh
-    assert_version_eql "1.2", "1.2"
-    refute_version_eql "1.2", "1.2.0"
-    refute_version_eql "1.2", "1.3"
+    assert_version_eql "1.2",    "1.2"
+    refute_version_eql "1.2",    "1.2.0"
+    refute_version_eql "1.2",    "1.3"
+    refute_version_eql "1.2.b1", "1.2.b.1"
   end
 
-  def test_equals
-    assert_version_equal "1.2", "1.2"
-    refute_version_equal "1.2", "1.3"
+  def test_equals2
+    assert_version_equal "1.2",    "1.2"
+    refute_version_equal "1.2",    "1.3"
+    assert_version_equal "1.2.b1", "1.2.b.1"
   end
 
   # REVISIT: consider removing as too impl-bound

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Jim Weirich
@@ -38,7 +38,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-12-31 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -289,7 +289,7 @@ post_install_message:
 rdoc_options: 
 - --main
 - README.rdoc
-- --title=RubyGems 1.4.1 Documentation
+- --title=RubyGems 1.4.2 Documentation
 require_paths: 
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement