spoom 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b9a6d7f3818e0af29439ba291b6c05fa29a821de374ee5c8181c64a05f3f7a3
-  data.tar.gz: 6d60e6fc252e6aebcfff2860778b1e2ac596740823a279aec1788ccaefa2fc4b
+  metadata.gz: f16907e7c4ce2a3d368bcac828ae7cfb43f0dde8f857bbfa364c4a3a16e0e433
+  data.tar.gz: b6d2a532d34b0cd5e8e4964d2edc5e279e5481de511a4e61ea764e120e4bae33
 SHA512:
-  metadata.gz: d156b4d9c8f2edb2f68e1b5fc21b659d8bec0bc60fd9110f565889a620febce064cc3ee176228cd659f1b21ca0ab000a9790407537eb9bd18edbc41d601b963b
-  data.tar.gz: a7e1bf03e8bd942bc0f2ac6379739bfd795d1642025e00ef33e198b6422c61598b23c753248a698568b7c1edde23d232604b76ccdfd9d1b7ef98139c74cc583a
+  metadata.gz: ad2f822b0c34fdb51ae8002bdc2c3f35202e219e334723716b141afe9ab00b18c65f74c3129cff6e4a9cb992d3c673ccb8afa522114cf2759af5cdd888df5100
+  data.tar.gz: f077abc8f9be4b2768776214601dd1c8d8c5709649536202a0ab9765058de9dc8590712b9a6fb96c30a0ac5ed46e7c21d84ab9bff190e48d99d5e0bddab1d44e

data/lib/spoom/cli/bump.rb

@@ -18,6 +18,8 @@ module Spoom
       option :force, desc: "change strictness without type checking", type: :boolean, default: false, aliases: :f
       sig { params(directory: String).void }
       def bump(directory = ".")
+        in_sorbet_project!
+
         from = options[:from]
         to = options[:to]
         force = options[:force]
@@ -32,28 +34,27 @@ module Spoom
           exit(1)
         end
 
+        directory = File.expand_path(directory)
         files_to_bump = Sorbet::Sigils.files_with_sigil_strictness(directory, from)
-
         Sorbet::Sigils.change_sigil_in_files(files_to_bump, to)
 
-        return [] if force
+        return if force
 
-        output, no_errors = Sorbet.srb_tc(path: File.expand_path(directory), capture_err: true)
+        output, no_errors = Sorbet.srb_tc(path: exec_path, capture_err: true)
 
-        return [] if no_errors
+        return if no_errors
 
         errors = Sorbet::Errors::Parser.parse_string(output)
 
         files_with_errors = errors.map do |err|
-          path = err.file
-          File.join(directory, path) if path && File.file?(path)
+          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)
       end
-
-      no_commands do
-      end
     end
   end
 end

data/lib/spoom/cli/helper.rb

@@ -37,7 +37,11 @@ module Spoom
       sig { void }
       def in_sorbet_project!
         unless in_sorbet_project?
-          say_error("not in a Sorbet project (no sorbet/config)")
+          say_error(
+            "not in a Sorbet project (#{colorize(sorbet_config, :yellow)} not found)\n\n" \
+            "When running spoom from another path than the project's root, " \
+            "use #{colorize('--path PATH', :blue)} to specify the path to the root."
+          )
           Kernel.exit(1)
         end
       end

data/lib/spoom/config.rb

@@ -1,6 +1,8 @@
 # typed: true
 # frozen_string_literal: true
 
+require 'pathname'
+
 module Spoom
   module Config
     SORBET_CONFIG = "sorbet/config"

data/lib/spoom/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler