[rubygems/rubygems] Extract Definition#no_resolved_needed?

rubygems/rubygems@1ff8626571
ruby · Jun 14, 2023 · 21238f3 · 21238f3
1 parent 4f1b181
commit 21238f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
@@ -281,7 +281,7 @@ def resolve
       @resolve ||= if Bundler.frozen_bundle?
         Bundler.ui.debug "Frozen, using resolution from the lockfile"
         @locked_specs
-      elsif !unlocking? && nothing_changed?
+      elsif no_resolve_needed?
         if deleted_deps.any?
           Bundler.ui.debug "Some dependencies were deleted, using a subset of the resolution from the lockfile"
           SpecSet.new(filter_specs(@locked_specs, @dependencies - deleted_deps))
@@ -477,6 +477,10 @@ def nothing_changed?
       !@source_changes && !@dependency_changes && !@new_platform && !@path_changes && !@local_changes && !@incomplete_lockfile
     end
 
+    def no_resolve_needed?
+      !unlocking? && nothing_changed?
+    end
+
     def unlocking?
       @unlocking
     end

diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb
@@ -94,7 +94,7 @@ def self.definition_method(meth)
     definition_method :requires
 
     def lock(opts = {})
-      return if @definition.nothing_changed? && !@definition.unlocking?
+      return if @definition.no_resolve_needed?
       @definition.lock(Bundler.default_lockfile, opts[:preserve_unknown_sections])
     end