[rubygems/rubygems] Refactor Path vs Gemspec source comparison

ruby/rubygems@58e9bd9962

Author: deivid-rodriguez

lib/bundler/definition.rb

@@ -906,7 +906,7 @@ def converge_paths
 
     def converge_path_source_to_gemspec_source(source)
       return source unless source.instance_of?(Source::Path)
-      gemspec_source = sources.path_sources.find {|s| s.is_a?(Source::Gemspec) && s.as_path_source == source }
+      gemspec_source = sources.path_sources.find {|s| s == source }
       gemspec_source || source
     end
 

lib/bundler/plugin/installer/path.rb

@@ -8,6 +8,14 @@ def root
           SharedHelpers.in_bundle? ? Bundler.root : Plugin.root
         end
 
+        def eql?(other)
+          return unless other.class == self.class
+          expanded_original_path == other.expanded_original_path &&
+            version == other.version
+        end
+
+        alias_method :==, :eql?
+
         def generate_bin(spec, disable_extensions = false)
           # Need to find a way without code duplication
           # For now, we can ignore this

lib/bundler/source/gemspec.rb

@@ -9,10 +9,6 @@ def initialize(options)
         super
         @gemspec = options["gemspec"]
       end
-
-      def as_path_source
-        Path.new(options)
-      end
     end
   end
 end

lib/bundler/source/path.rb

@@ -60,8 +60,8 @@ def hash
       end
 
       def eql?(other)
-        return unless other.class == self.class
-        expanded_original_path == other.expanded_original_path &&
+        [Gemspec, Path].include?(other.class) &&
+          expanded_original_path == other.expanded_original_path &&
           version == other.version
       end
 

lib/bundler/source_list.rb

@@ -183,7 +183,7 @@ def map_sources(replacement_sources)
       end
 
       path = @path_sources.map do |source|
-        replacement_sources.find {|s| s == (source.is_a?(Source::Gemspec) ? source.as_path_source : source) } || source
+        replace_source(replacement_sources, source)
       end
 
       [rubygems, path, git, plugin]