Fix bundle lock --add-checksums

Due to a typo in the spec, the issue was not caught initially. If
Bundler does not need to re-resolve, `bundle lock` is a noop so Bundler
cannot add checksums. We need to make sure to force a re-resolve when
`--add-checksums` flag is given.

Author: deivid-rodriguez

bundler/lib/bundler/cli/lock.rb

@@ -25,6 +25,7 @@ def run
       update = options[:update]
       conservative = options[:conservative]
       bundler = options[:bundler]
+      add_checksums = options["add-checksums"]
 
       if update.is_a?(Array) # unlocking specific gems
         Bundler::CLI::Common.ensure_all_gems_in_lockfile!(update)
@@ -33,14 +34,16 @@ def run
         update = { conservative: conservative }
       elsif update && bundler
         update = { bundler: bundler }
+      elsif add_checksums
+        update = { checksums: add_checksums }
       end
 
       file = options[:lockfile]
       file = file ? Pathname.new(file).expand_path : Bundler.default_lockfile
 
       Bundler.settings.temporary(frozen: false) do
         definition = Bundler.definition(update, file)
-        definition.locked_checksums = true if options["add-checksums"]
+        definition.locked_checksums = true if add_checksums
 
         Bundler::CLI::Common.configure_gem_version_promoter(definition, options) if options[:update]
 

bundler/lib/bundler/definition.rb

@@ -61,9 +61,11 @@ def self.build(gemfile, lockfile, unlock)
     def initialize(lockfile, dependencies, sources, unlock, ruby_version = nil, optional_groups = [], gemfiles = [])
       if [true, false].include?(unlock)
         @unlocking_bundler = false
+        @adding_checksums = false
         @unlocking = unlock
       else
         @unlocking_bundler = unlock.delete(:bundler)
+        @adding_checksums = unlock.delete(:checksums)
         @unlocking = unlock.any? {|_k, v| !Array(v).empty? }
       end
 
@@ -499,6 +501,7 @@ def nothing_changed?
         !@local_changes &&
         !@missing_lockfile_dep &&
         !@unlocking_bundler &&
+        !@adding_checksums &&
         !@locked_spec_with_missing_deps &&
         !@locked_spec_with_invalid_deps
     end
@@ -744,6 +747,7 @@ def change_reason
         [@local_changes, "the gemspecs for git local gems changed"],
         [@missing_lockfile_dep, "your lock file is missing \"#{@missing_lockfile_dep}\""],
         [@unlocking_bundler, "an update to the version of Bundler itself was requested"],
+        [@adding_checksums, "bundler is adding checksums to the lockfile"],
         [@locked_spec_with_missing_deps, "your lock file includes \"#{@locked_spec_with_missing_deps}\" but not some of its dependencies"],
         [@locked_spec_with_invalid_deps, "your lockfile does not satisfy dependencies of \"#{@locked_spec_with_invalid_deps}\""],
       ].select(&:first).map(&:last).join(", ")

bundler/spec/commands/lock_spec.rb

@@ -1798,16 +1798,18 @@
         x86_64-linux
 
       DEPENDENCIES
-        nogokiri
+        nokogiri
 
       BUNDLED WITH
          #{Bundler::VERSION}
     L
 
     simulate_platform "x86_64-linux" do
-      bundle "lock --add-checksums"
+      bundle "lock --add-checksums --verbose"
     end
 
+    expect(out).to include("bundler is adding checksums to the lockfile")
+
     checksums = checksums_section do |c|
       c.checksum gem_repo4, "nokogiri", "1.14.2"
       c.checksum gem_repo4, "nokogiri", "1.14.2", "x86_64-linux"