Refactor some stuff

Author: deivid-rodriguez

bundler/lib/bundler/cli/common.rb

@@ -20,7 +20,7 @@ def self.output_fund_metadata_summary
       current_dependencies = definition.requested_dependencies
       current_specs = definition.specs
 
-      count = current_dependencies.count {|dep| current_specs[dep.name].first.metadata.key?("funding_uri") }
+      count = current_dependencies.count {|dep| current_specs.find_by_name(dep.name).metadata.key?("funding_uri") }
 
       return if count.zero?
 

bundler/lib/bundler/cli/fund.rb

@@ -20,7 +20,7 @@ def run
       end
 
       fund_info = deps.each_with_object([]) do |dep, arr|
-        spec = Bundler.definition.specs[dep.name].first
+        spec = Bundler.definition.specs.find_by_name(dep.name)
         if spec.metadata.key?("funding_uri")
           arr << "* #{spec.name} (#{spec.version})\n  Funding: #{spec.metadata["funding_uri"]}"
         end

bundler/lib/bundler/cli/update.rb

@@ -90,7 +90,7 @@ def run
           next unless locked_info
 
           locked_spec = locked_info[:spec]
-          new_spec = Bundler.definition.specs[name].first
+          new_spec = Bundler.definition.specs.find_by_name(name)
           unless new_spec
             unless locked_spec.match_platform(Bundler.local_platform)
               Bundler.ui.warn "Bundler attempted to update #{name} but it was not considered because it is for a different platform from the current one"

bundler/lib/bundler/definition.rb

@@ -577,7 +577,7 @@ def materialize(dependencies)
     def start_resolution
       result = SpecSet.new(resolver.start)
 
-      @resolved_bundler_version = result.find {|spec| spec.name == "bundler" }&.version
+      @resolved_bundler_version = result.find_version("bundler")
       @platforms = result.complete_platforms!(platforms) if should_complete_platforms?
 
       SpecSet.new(result.for(dependencies, false, @platforms))

bundler/lib/bundler/installer.rb

@@ -99,8 +99,9 @@ def generate_bundler_executable_stubs(spec, options = {})
       if options[:binstubs_cmd] && spec.executables.empty?
         options = {}
         spec.runtime_dependencies.each do |dep|
-          bins = @definition.specs[dep].first.executables
-          options[dep.name] = bins unless bins.empty?
+          name = dep.name
+          bins = @definition.specs.find_by_name(name).executables
+          options[name] = bins unless bins.empty?
         end
         if options.any?
           Bundler.ui.warn "#{spec.name} has no executables, but you may want " \

bundler/lib/bundler/resolver/package.rb

@@ -18,7 +18,7 @@ class Package
       def initialize(name, platforms, locked_specs:, unlock:, prerelease: false, dependency: nil)
         @name = name
         @platforms = platforms
-        @locked_version = locked_specs[name].first&.version
+        @locked_version = locked_specs.find_version(name)
         @unlock = unlock
         @dependency = dependency || Dependency.new(name, @locked_version)
         @top_level = !dependency.nil?

bundler/lib/bundler/spec_set.rb

@@ -90,6 +90,14 @@ def complete_platforms!(platforms)
       platforms
     end
 
+    def find_by_name(name)
+      self[name].first
+    end
+
+    def find_version(name)
+      find_by_name(name)&.version
+    end
+
     def [](key)
       key = key.name if key.respond_to?(:name)
       lookup[key]&.reverse || []

bundler/spec/commands/pristine_spec.rb

@@ -215,7 +215,7 @@
 
   def find_spec(name)
     without_env_side_effects do
-      Bundler.definition.specs[name].first
+      Bundler.definition.specs.find_by_name(name)
     end
   end
 end