lib/spoom/cli/bump.rb in spoom-1.0.7 vs lib/spoom/cli/bump.rb in spoom-1.0.8

@@ -1,6 +1,6 @@
-# typed: strict
+# typed: true
 # frozen_string_literal: true
 
 require 'find'
 require 'open3'
 
@@ -10,21 +10,32 @@
       extend T::Sig
       include Helper
 
       default_task :bump
 
-      desc "bump DIRECTORY", "change Sorbet sigils from one strictness to another when no errors"
-      option :from, type: :string, default: Spoom::Sorbet::Sigils::STRICTNESS_FALSE
-      option :to, type: :string, default: Spoom::Sorbet::Sigils::STRICTNESS_TRUE
-      option :force, desc: "change strictness without type checking", type: :boolean, default: false, aliases: :f
+      desc "bump DIRECTORY", "Change Sorbet sigils from one strictness to another when no errors"
+      option :from, type: :string, default: Spoom::Sorbet::Sigils::STRICTNESS_FALSE,
+        desc: "Change only files from this strictness"
+      option :to, type: :string, default: Spoom::Sorbet::Sigils::STRICTNESS_TRUE,
+        desc: "Change files to this strictness"
+      option :force, type: :boolean, default: false, aliases: :f,
+        desc: "Change strictness without type checking"
+      option :sorbet, type: :string, desc: "Path to custom Sorbet bin"
+      option :dry, type: :boolean, default: false, aliases: :d,
+        desc: "Only display what would happen, do not actually change sigils"
+      option :only, type: :string, default: nil, aliases: :o,
+        desc: "Only change specified list (one file by line)"
       sig { params(directory: String).void }
       def bump(directory = ".")
         in_sorbet_project!
 
         from = options[:from]
         to = options[:to]
         force = options[:force]
+        dry = options[:dry]
+        only = options[:only]
+        exec_path = File.expand_path(self.exec_path)
 
         unless Sorbet::Sigils.valid_strictness?(from)
           say_error("Invalid strictness #{from} for option --from")
           exit(1)
         end
@@ -34,27 +45,74 @@
           exit(1)
         end
 
         directory = File.expand_path(directory)
         files_to_bump = Sorbet::Sigils.files_with_sigil_strictness(directory, from)
+
+        if only
+          list = File.read(only).lines.map { |file| File.expand_path(file.strip) }
+          files_to_bump.select! { |file| list.include?(File.expand_path(file)) }
+        end
+
+        if files_to_bump.empty?
+          $stderr.puts("No file to bump from #{from} to #{to}")
+          exit(0)
+        end
+
         Sorbet::Sigils.change_sigil_in_files(files_to_bump, to)
 
-        return if force
+        if force
+          print_changes(files_to_bump, from: from, to: to, dry: dry, path: exec_path)
+          undo_changes(files_to_bump, from) if dry
+          exit(files_to_bump.empty?)
+        end
 
-        output, no_errors = Sorbet.srb_tc(path: exec_path, capture_err: true)
+        output, no_errors = Sorbet.srb_tc(path: exec_path, capture_err: true, sorbet_bin: options[:sorbet])
 
-        return if no_errors
+        if no_errors
+          print_changes(files_to_bump, from: from, to: to, dry: dry, path: exec_path)
+          undo_changes(files_to_bump, from) if dry
+          exit(files_to_bump.empty?)
+        end
 
         errors = Sorbet::Errors::Parser.parse_string(output)
 
         files_with_errors = errors.map do |err|
           path = File.expand_path(err.file)
           next unless path.start_with?(directory)
           next unless File.file?(path)
           path
         end.compact.uniq
 
-        Sorbet::Sigils.change_sigil_in_files(files_with_errors, from)
+        undo_changes(files_with_errors, from)
+
+        files_changed = files_to_bump - files_with_errors
+        print_changes(files_changed, from: from, to: to, dry: dry, path: exec_path)
+        undo_changes(files_to_bump, from) if dry
+        exit(files_changed.empty?)
+      end
+
+      no_commands do
+        def print_changes(files, from: "false", to: "true", dry: false, path: File.expand_path("."))
+          if files.empty?
+            $stderr.puts("No file to bump from #{from} to #{to}")
+            return
+          end
+          $stderr.write(dry ? "Can bump" : "Bumped")
+          $stderr.write(" #{files.size} file#{'s' if files.size > 1}")
+          $stderr.puts(" from #{from} to #{to}:")
+          files.each do |file|
+            file_path = Pathname.new(file).relative_path_from(path)
+            $stderr.puts(" + #{file_path}")
+          end
+          if dry
+            $stderr.puts("\nRun `spoom bump --from #{from} --to #{to}` to bump them")
+          end
+        end
+
+        def undo_changes(files, from_strictness)
+          Sorbet::Sigils.change_sigil_in_files(files, from_strictness)
+        end
       end
     end
   end
 end