1 files changed, 57 insertions, 26 deletions

diff --git a/lib/bundler/cli/lock.rb b/lib/bundler/cli/lock.rb
index 7dd078b1ef..2f78868936 100644
--- a/lib/bundler/cli/lock.rb
+++ b/lib/bundler/cli/lock.rb
@@ -14,50 +14,81 @@ module Bundler
         exit 1
       end
 
+      check_for_conflicting_options
+
       print = options[:print]
-      ui = Bundler.ui
-      Bundler.ui = UI::Silent.new if print
+      previous_output_stream = Bundler.ui.output_stream
+      Bundler.ui.output_stream = :stderr if print
 
       Bundler::Fetcher.disable_endpoint = options["full-index"]
 
       update = options[:update]
+      conservative = options[:conservative]
+      bundler = options[:bundler]
+
       if update.is_a?(Array) # unlocking specific gems
         Bundler::CLI::Common.ensure_all_gems_in_lockfile!(update)
-        update = { :gems => update, :lock_shared_dependencies => options[:conservative] }
+        update = { gems: update, conservative: conservative }
+      elsif update && conservative
+        update = { conservative: conservative }
+      elsif update && bundler
+        update = { bundler: bundler }
       end
-      definition = Bundler.definition(update)
 
-      Bundler::CLI::Common.configure_gem_version_promoter(Bundler.definition, options) if options[:update]
+      Bundler.settings.temporary(frozen: false) do
+        definition = Bundler.definition(update, Bundler.default_lockfile)
+        definition.add_checksums if options["add-checksums"]
 
-      options["remove-platform"].each do |platform|
-        definition.remove_platform(platform)
-      end
+        Bundler::CLI::Common.configure_gem_version_promoter(definition, options) if options[:update]
 
-      options["add-platform"].each do |platform_string|
-        platform = Gem::Platform.new(platform_string)
-        if platform.to_s == "unknown"
-          Bundler.ui.warn "The platform `#{platform_string}` is unknown to RubyGems " \
-            "and adding it will likely lead to resolution errors"
+        options["remove-platform"].each do |platform_string|
+          platform = Gem::Platform.new(platform_string)
+          definition.remove_platform(platform)
+        end
+
+        options["add-platform"].each do |platform_string|
+          platform = Gem::Platform.new(platform_string)
+          if platform.to_s == "unknown"
+            Bundler.ui.error "The platform `#{platform_string}` is unknown to RubyGems and can't be added to the lockfile."
+            exit 1
+          end
+          definition.add_platform(platform)
+        end
+
+        if definition.platforms.empty?
+          raise InvalidOption, "Removing all platforms from the bundle is not allowed"
         end
-        definition.add_platform(platform)
-      end
 
-      if definition.platforms.empty?
-        raise InvalidOption, "Removing all platforms from the bundle is not allowed"
+        definition.remotely! unless options[:local]
+
+        if options["normalize-platforms"]
+          definition.normalize_platforms
+        end
+
+        if print
+          puts definition.to_lock
+        else
+          file = options[:lockfile]
+          file = file ? Pathname.new(file).expand_path : Bundler.default_lockfile
+
+          puts "Writing lockfile to #{file}"
+          definition.write_lock(file, false)
+        end
       end
 
-      definition.resolve_remotely! unless options[:local]
+      Bundler.ui.output_stream = previous_output_stream
+    end
+
+    private
 
-      if print
-        puts definition.to_lock
-      else
-        file = options[:lockfile]
-        file = file ? File.expand_path(file) : Bundler.default_lockfile
-        puts "Writing lockfile to #{file}"
-        definition.lock(file)
+    def check_for_conflicting_options
+      if options["normalize-platforms"] && options["add-platform"].any?
+        raise InvalidOption, "--normalize-platforms can't be used with --add-platform"
       end
 
-      Bundler.ui = ui
+      if options["normalize-platforms"] && options["remove-platform"].any?
+        raise InvalidOption, "--normalize-platforms can't be used with --remove-platform"
+      end
     end
   end
 end