spoom 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 526b44a6bb1b2ec6b8b09a3bec42264f86b2803c561c4862d622c374893d529a
-  data.tar.gz: ac616a998a9800706ca28d805d5e975b35e78fb4c0b725463938b4b925f24728
+  metadata.gz: e58e5584ba33b3b678ddedb06972121af9dd4b9a8b7f1b6941f6bb939086107a
+  data.tar.gz: c1cc668af1f42ace8318a47ac0b813815e4e6a9ee1d942593b1ff37b9b41cbc2
 SHA512:
-  metadata.gz: c6cf08eb1fe7d880e8dfae54352d554b83c41ff6878546b84d986fdbb17fa95244b1630f31aa0f1ccd14ef843dc71d80bd3236715d16165c7c1a0a6fc7271502
-  data.tar.gz: ea376f188b1a33a83784f4e7923ba4087cd2891f10deacf998b145c724f586f76e2cfda338011f50d7990b8b860720eb832f365c5a6541042453d3381e45c871
+  metadata.gz: f389c4b463b7bd1c4a275e844ed68d0d9e7279fefe4b1e9ed29a1c9238c25ad941aa494dee63c4f15dab288602a22efce3da6e7b08c795b1cb99fb236e2edf39
+  data.tar.gz: 7071bc29a1d13087d0e0527832b7619af180b20375c006122d059c640a606a55edd68234e098cf2360f06c00aa165a7a673a4d009275707be830bebef947936a

data/Gemfile

@@ -5,8 +5,9 @@ source "https://rubygems.org"
 
 gemspec
 
-group(:development) do
-  gem('rubocop-shopify', require: false)
-  gem('rubocop-sorbet', require: false)
-  gem('pry-byebug')
+group :development do
+  gem "pry-byebug"
+  gem "rubocop-shopify", require: false
+  gem "rubocop-sorbet", require: false
+  gem "tapioca", require: false
 end

data/README.md

@@ -358,4 +358,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Spoom project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Shopify/spoom/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Spoom project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Shopify/spoom/blob/main/CODE_OF_CONDUCT.md).

data/lib/spoom/cli/bump.rb

@@ -83,14 +83,22 @@ module Spoom
           exit(files_to_bump.empty?)
         end
 
-        output, no_errors = Sorbet.srb_tc(
+        output, status, exit_code = Sorbet.srb_tc(
           "--no-error-sections",
           path: exec_path,
           capture_err: true,
           sorbet_bin: options[:sorbet]
         )
 
-        if no_errors
+        check_sorbet_segfault(exit_code) do
+          say_error(<<~ERR, status: nil)
+            It means one of the file bumped to `typed: #{to}` made Sorbet crash.
+            Run `spoom bump -f` locally followed by `bundle exec srb tc` to investigate the problem.
+          ERR
+          undo_changes(files_to_bump, from)
+        end
+
+        if status
           print_changes(files_to_bump, command: cmd, from: from, to: to, dry: dry, path: exec_path)
           undo_changes(files_to_bump, from) if dry
           exit(files_to_bump.empty?)

data/lib/spoom/cli/helper.rb

@@ -83,6 +83,20 @@ module Spoom
         Sorbet::Config.parse_file(sorbet_config_file)
       end
 
+      sig { params(exit_code: Integer, block: T.nilable(T.proc.void)).void }
+      def check_sorbet_segfault(exit_code, &block)
+        return unless exit_code == Spoom::Sorbet::SEGFAULT_CODE
+
+        say_error(<<~ERR, status: nil)
+          #{red("!!! Sorbet exited with code #{exit_code} - SEGFAULT !!!")}
+
+          This is most likely related to a bug in Sorbet.
+        ERR
+
+        block&.call
+        exit(exit_code)
+      end
+
       # Colors
 
       # Color used to highlight expressions in backticks
@@ -129,6 +143,11 @@ module Spoom
         colorize(string, Color::BLUE)
       end
 
+      sig { params(string: String).returns(String) }
+      def cyan(string)
+        colorize(string, Color::CYAN)
+      end
+
       sig { params(string: String).returns(String) }
       def gray(string)
         colorize(string, Color::LIGHT_BLACK)

data/lib/spoom/cli/run.rb

@@ -35,12 +35,27 @@ module Spoom
         sorbet = options[:sorbet]
 
         unless limit || code || sort
-          output, status = T.unsafe(Spoom::Sorbet).srb_tc(*arg, path: path, capture_err: false, sorbet_bin: sorbet)
+          output, status, exit_code = T.unsafe(Spoom::Sorbet).srb_tc(
+            *arg,
+            path: path,
+            capture_err: false,
+            sorbet_bin: sorbet
+          )
+
+          check_sorbet_segfault(exit_code)
           say_error(output, status: nil, nl: false)
           exit(status)
         end
 
-        output, status = T.unsafe(Spoom::Sorbet).srb_tc(*arg, path: path, capture_err: true, sorbet_bin: sorbet)
+        output, status, exit_code = T.unsafe(Spoom::Sorbet).srb_tc(
+          *arg,
+          path: path,
+          capture_err: true,
+          sorbet_bin: sorbet
+        )
+
+        check_sorbet_segfault(exit_code)
+
         if status
           say_error(output, status: nil, nl: false)
           exit(0)
@@ -99,7 +114,7 @@ module Spoom
               cyan = !cyan
               next
             end
-            word << (cyan ? c.cyan : c.red)
+            word << (cyan ? cyan(c) : red(c))
           end
           word.string
         end

data/lib/spoom/sorbet/lsp/structures.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require_relative "../../printer"
+require "set"
 
 module Spoom
   module LSP

data/lib/spoom/sorbet.rb

@@ -15,6 +15,8 @@ module Spoom
     GEM_PATH = Gem::Specification.find_by_name("sorbet-static").full_gem_path
     BIN_PATH = (Pathname.new(GEM_PATH) / "libexec" / "sorbet").to_s
 
+    SEGFAULT_CODE = 139
+
     class << self
       extend T::Sig
 
@@ -24,7 +26,7 @@ module Spoom
           path: String,
           capture_err: T::Boolean,
           sorbet_bin: T.nilable(String)
-        ).returns([String, T::Boolean])
+        ).returns([String, T::Boolean, Integer])
       end
       def srb(*arg, path: '.', capture_err: false, sorbet_bin: nil)
         if sorbet_bin
@@ -41,7 +43,7 @@ module Spoom
           path: String,
           capture_err: T::Boolean,
           sorbet_bin: T.nilable(String)
-        ).returns([String, T::Boolean])
+        ).returns([String, T::Boolean, Integer])
       end
       def srb_tc(*arg, path: '.', capture_err: false, sorbet_bin: nil)
         arg.prepend("tc") unless sorbet_bin

data/lib/spoom/version.rb

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

data/lib/spoom.rb

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 
 require "sorbet-runtime"
+require "pathname"
 
 module Spoom
   extend T::Sig
@@ -16,12 +17,14 @@ module Spoom
       arg: String,
       path: String,
       capture_err: T::Boolean
-    ).returns([String, T::Boolean])
+    ).returns([String, T::Boolean, Integer])
   end
   def self.exec(cmd, *arg, path: '.', capture_err: false)
     method = capture_err ? "popen2e" : "popen2"
-    Open3.send(method, [cmd, *arg].join(" "), chdir: path) do |_, o, t|
-      [o.read, T.cast(t.value, Process::Status).success?]
+    Open3.send(method, [cmd, *arg].join(" "), chdir: path) do |_, stdout, thread|
+      out = stdout.read
+      status = T.cast(thread.value, Process::Status)
+      [out, status.success?, status.exitstatus]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement