spoom 1.1.13 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cad6017cf76302bc359d170fce6c2e33c4ff5923a564b26e2f270b42c102e3d
-  data.tar.gz: 734654483394f8520346d0ddab7872e1c7f42de4eed7523e503264f8045bf2c9
+  metadata.gz: 2a61ae83fa56b7a78027c8954c5680d4784c5a3f8b2d717ed3ba49b36409ede2
+  data.tar.gz: b339a398e57f92f71b797dd8d427e18749d1afd6246be42fe549baf96563706e
 SHA512:
-  metadata.gz: a67da9fa2811e15d5bfc5f554a2b1cb23bed4a0744617d1168b3d3d4c08f4f6828b207142996fb8cebc57ca8732d901e3e390c43939eaa504a2ed1cc1fe611b4
-  data.tar.gz: 1b98af8f37acd554f908fdde1257f9c53eaab0a37b21847e619caee5cdda44e9f06e248545ec247cb43c6ac434d5e00bce4b6731eb434c62bd3a60a72c67313f
+  metadata.gz: 981c7b625e31b732ce731c600fd1291afb9635818918d77424750ba152633f06e8f4515037c5044badcc951ded1dd9fd768ae135ff2305359005a2cb7ad47a38
+  data.tar.gz: 123baadb32b3341271b323eab29a1ddb4561c74b9afbe6cfa71af61ff1547783a24a1d439406f482b3c40920b960e4b04fc19ca7c0423c18407af00bc35fa692

data/lib/spoom/cli/bump.rb

@@ -28,6 +28,7 @@ module Spoom
         desc: "Command to suggest if files can be bumped"
       option :count_errors, type: :boolean, default: false,
         desc: "Count the number of errors if all files were bumped"
+      option :sorbet_options, type: :string, default: "", desc: "Pass options to Sorbet"
       sig { params(directory: String).void }
       def bump(directory = ".")
         in_sorbet_project!
@@ -85,6 +86,7 @@ module Spoom
 
         error_url_base = Spoom::Sorbet::Errors::DEFAULT_ERROR_URL_BASE
         result = Sorbet.srb_tc(
+          *options[:sorbet_options].split(" "),
           "--error-url-base=#{error_url_base}",
           path: exec_path,
           capture_err: true,
@@ -105,6 +107,14 @@ module Spoom
           exit(files_to_bump.empty?)
         end
 
+        unless result.exit_code == 100
+          # Sorbet will return exit code 100 if there are type checking errors.
+          # If Sorbet returned something else, it means it didn't terminate normally.
+          say_error(result.err, status: nil, nl: false)
+          undo_changes(files_to_bump, from)
+          exit(1)
+        end
+
         errors = Sorbet::Errors::Parser.parse_string(result.err, error_url_base: error_url_base)
 
         all_files = errors.flat_map do |err|

data/lib/spoom/cli/run.rb

@@ -64,6 +64,13 @@ module Spoom
           exit(0)
         end
 
+        unless result.exit_code == 100
+          # Sorbet will return exit code 100 if there are type checking errors.
+          # If Sorbet returned something else, it means it didn't terminate normally.
+          say_error(result.err, status: nil, nl: false)
+          exit(1)
+        end
+
         errors = Spoom::Sorbet::Errors::Parser.parse_string(result.err, error_url_base: error_url_base)
         errors_count = errors.size
 

data/lib/spoom/context.rb

@@ -46,6 +46,12 @@ module Spoom
 
     # File System
 
+    # Does the context directory at `absolute_path` exist and is a directory?
+    sig { returns(T::Boolean) }
+    def exist?
+      File.directory?(@absolute_path)
+    end
+
     # Create the context directory at `absolute_path`
     sig { void }
     def mkdir!
@@ -190,6 +196,12 @@ module Spoom
       Spoom::Git.current_branch(path: @absolute_path)
     end
 
+    # Get the last commit in the currently checked out branch
+    sig { params(short_sha: T::Boolean).returns(T.nilable(Git::Commit)) }
+    def git_last_commit(short_sha: true)
+      Spoom::Git.last_commit(path: @absolute_path, short_sha: short_sha)
+    end
+
     # Sorbet
 
     # Run `bundle exec srb` in this context directory

data/lib/spoom/git.rb

@@ -75,9 +75,9 @@ module Spoom
       # Utils
 
       # Get the last commit in the currently checked out branch
-      sig { params(path: String).returns(T.nilable(Commit)) }
-      def last_commit(path: ".")
-        result = log("HEAD --format='%h %at' -1", path: path)
+      sig { params(path: String, short_sha: T::Boolean).returns(T.nilable(Commit)) }
+      def last_commit(path: ".", short_sha: true)
+        result = log("HEAD --format='%#{short_sha ? "h" : "H"} %at' -1", path: path)
         return nil unless result.status
 
         out = result.out.strip

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.1.13"
+  VERSION = "1.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.15
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.9204
+        version: 0.5.10187
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.9204
+        version: 0.5.10187
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement