spoom 1.0.6 → 1.1.1

data/lib/spoom/sorbet/config.rb

@@ -36,6 +36,36 @@ module Spoom
         @allowed_extensions = T.let([], T::Array[String])
       end
 
+      sig { returns(Config) }
+      def copy
+        new_config = Sorbet::Config.new
+        new_config.paths.concat(@paths)
+        new_config.ignore.concat(@ignore)
+        new_config.allowed_extensions.concat(@allowed_extensions)
+        new_config
+      end
+
+      # Returns self as a string of options that can be passed to Sorbet
+      #
+      # Example:
+      # ~~~rb
+      # config = Sorbet::Config.new
+      # config.paths << "/foo"
+      # config.paths << "/bar"
+      # config.ignore << "/baz"
+      # config.allowed_extensions << ".rb"
+      #
+      # puts config.options_string # "/foo /bar --ignore /baz --allowed-extension .rb"
+      # ~~~
+      sig { returns(String) }
+      def options_string
+        opts = []
+        opts.concat(paths)
+        opts.concat(ignore.map { |p| "--ignore #{p}" })
+        opts.concat(allowed_extensions.map { |ext| "--allowed-extension #{ext}" })
+        opts.join(" ")
+      end
+
       class << self
         extend T::Sig
 

data/lib/spoom/sorbet/errors.rb

@@ -4,6 +4,8 @@
 module Spoom
   module Sorbet
     module Errors
+      extend T::Sig
+
       # Parse errors from Sorbet output
       class Parser
         extend T::Sig
@@ -123,6 +125,7 @@ module Spoom
           @more = more
         end
 
+        # By default errors are sorted by location
         sig { params(other: T.untyped).returns(Integer) }
         def <=>(other)
           return 0 unless other.is_a?(Error)
@@ -134,6 +137,11 @@ module Spoom
           "#{file}:#{line}: #{message} (#{code})"
         end
       end
+
+      sig { params(errors: T::Array[Error]).returns(T::Array[Error]) }
+      def self.sort_errors_by_code(errors)
+        errors.sort_by { |e| [e.code, e.file, e.line, e.message] }
+      end
     end
   end
 end

data/lib/spoom/sorbet/lsp.rb

@@ -11,13 +11,9 @@ require_relative 'lsp/errors'
 module Spoom
   module LSP
     class Client
-      def initialize(sorbet_cmd, *sorbet_args, path: ".")
+      def initialize(sorbet_bin, *sorbet_args, path: ".")
         @id = 0
-        Bundler.with_clean_env do
-          opts = {}
-          opts[:chdir] = path
-          @in, @out, @err, @status = Open3.popen3([sorbet_cmd, *sorbet_args].join(" "), opts)
-        end
+        @in, @out, @err, @status = T.unsafe(Open3).popen3(sorbet_bin, *sorbet_args, chdir: path)
       end
 
       def next_id

data/lib/spoom/sorbet/sigils.rb

@@ -56,14 +56,14 @@ module Spoom
       sig { params(path: T.any(String, Pathname)).returns(T.nilable(String)) }
       def self.file_strictness(path)
         return nil unless File.exist?(path)
-        content = File.read(path)
+        content = File.read(path, encoding: Encoding::ASCII_8BIT)
         strictness_in_content(content)
       end
 
       # changes the sigil in the file at the passed path to the specified new strictness
       sig { params(path: T.any(String, Pathname), new_strictness: String).returns(T::Boolean) }
       def self.change_sigil_in_file(path, new_strictness)
-        content = File.read(path)
+        content = File.read(path, encoding: Encoding::ASCII_8BIT)
         new_content = update_sigil(content, new_strictness)
 
         File.write(path, new_content)
@@ -87,7 +87,7 @@ module Spoom
           extension: String
         ).returns(T::Array[String])
       end
-      def self.files_with_sigil_strictness(directory, strictness, extension = ".rb")
+      def self.files_with_sigil_strictness(directory, strictness, extension: ".rb")
         paths = Dir.glob("#{File.expand_path(directory)}/**/*#{extension}").sort.uniq
         paths.filter do |path|
           file_strictness(path) == strictness

data/lib/spoom/test_helpers/project.rb

@@ -76,6 +76,15 @@ module Spoom
         Spoom::Git.exec("GIT_COMMITTER_DATE=\"#{date}\" git commit -m '#{message}' --date '#{date}'", path: path)
       end
 
+      # Run `bundle install` in this project
+      sig { returns([T.nilable(String), T.nilable(String), T::Boolean]) }
+      def bundle_install
+        opts = {}
+        opts[:chdir] = path
+        out, err, status = Open3.capture3("bundle", "install", opts)
+        [out, err, status.success?]
+      end
+
       # Run a command with `bundle exec` in this project
       sig { params(cmd: String, args: String).returns([T.nilable(String), T.nilable(String), T::Boolean]) }
       def bundle_exec(cmd, *args)

data/lib/spoom/version.rb

@@ -1,6 +1,6 @@
-# typed: true
+# typed: strict
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.0.6"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: sorbet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.6347
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.6347
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +128,6 @@ files:
 - lib/spoom/cli/helper.rb
 - lib/spoom/cli/lsp.rb
 - lib/spoom/cli/run.rb
-- lib/spoom/config.rb
 - lib/spoom/coverage.rb
 - lib/spoom/coverage/d3.rb
 - lib/spoom/coverage/d3/base.rb

data/lib/spoom/config.rb

@@ -1,11 +0,0 @@
-# typed: true
-# frozen_string_literal: true
-
-module Spoom
-  module Config
-    SORBET_CONFIG = "sorbet/config"
-    SORBET_GEM_PATH = Gem::Specification.find_by_name("sorbet-static").full_gem_path
-    SORBET_PATH = (Pathname.new(SORBET_GEM_PATH) / "libexec" / "sorbet").to_s
-    SPOOM_PATH = (Pathname.new(__FILE__) / ".." / ".." / "..").to_s
-  end
-end