spoom 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b209723354af5be10930893accb559ecbb62afc1469d2d8a12f7a7af44d67d6c
-  data.tar.gz: 4bd2e43681783fceb004e5595218127b5838b5e09c47800c6d4d0905566e42f0
+  metadata.gz: b9b05f4a851903017a55999c9ba093a08e690af7294145dbe6e4401e1cb919f1
+  data.tar.gz: 24db18c1f5f061a275576c5a863ec1c190da06eb1f76c1b420266c5c85818641
 SHA512:
-  metadata.gz: 99e8cccc29317edb58b84ba3a5713dfbfcf44c97bea40d2b4f30c256460983da7698847ea6fd9fc5a8c58c1aa6cb716e626a4540ac3e60302822b2d17efb194c
-  data.tar.gz: 055571522e43f963a1ee79a1cbd138d10d8ca685a252e5bfc64fc696abbf1812ae796bef764ab2d95359d1236012fe6cc45cfc48074997273f30df02e018a8b1
+  metadata.gz: 85f76b4b4ece46d92484dee9063ca001114a5231f6371cdac09d403ce8e23120ccd4bbd8c9e51e6ed8de43b4a0f9db0f0453c21e2bf20ab71cc25108745201e1
+  data.tar.gz: fb41d83d4dee426c81fb2d2d0786ea0ebe21c42c3fda3ed907b522f6ee0f9745cc860ba86f01e97a224c334ae6d837e97af94f45bfd4cb4e1eba45c5640dfde2

data/lib/spoom/cli/bump.rb

@@ -133,7 +133,7 @@ module Spoom
           if dry && command
             say("\nRun `#{command}` to bump them")
           elsif dry
-            say("\nRun `spoom bump --from #{from} --to #{to}` to bump them")
+            say("\nRun `spoom bump --from #{from} --to #{to}` locally then `commit the changes` and `push them`")
           end
         end
 

data/lib/spoom/cli/coverage.rb

@@ -44,8 +44,9 @@ module Spoom
         path = exec_path
         sorbet = options[:sorbet]
 
-        sha_before = Spoom::Git.last_commit(path: path)
-        unless sha_before
+        ref_before = Spoom::Git.current_branch
+        ref_before = Spoom::Git.last_commit(path: path) unless ref_before
+        unless ref_before
           say_error("Not in a git repository")
           say_error("\nSpoom needs to checkout into your previous commits to build the timeline.", status: nil)
           exit(1)
@@ -90,7 +91,7 @@ module Spoom
 
           snapshot = T.let(nil, T.nilable(Spoom::Coverage::Snapshot))
           if options[:bundle_install]
-            Bundler.with_clean_env do
+            Bundler.with_unbundled_env do
               next unless bundle_install(path, sha)
               snapshot = Spoom::Coverage.snapshot(path: path, sorbet_bin: sorbet)
             end
@@ -107,7 +108,7 @@ module Spoom
           File.write(file, snapshot.to_json)
           say("  Snapshot data saved under `#{file}`\n\n")
         end
-        Spoom::Git.checkout(sha_before, path: path)
+        Spoom::Git.checkout(ref_before, path: path)
       end
 
       desc "report", "Produce a typing coverage report"

data/lib/spoom/cli/helper.rb

@@ -9,8 +9,11 @@ module Spoom
   module Cli
     module Helper
       extend T::Sig
+      extend T::Helpers
       include Thor::Shell
 
+      requires_ancestor Thor
+
       # Print `message` on `$stdout`
       sig { params(message: String).void }
       def say(message)
@@ -66,7 +69,7 @@ module Spoom
       # Return the path specified through `--path`
       sig { returns(String) }
       def exec_path
-        T.unsafe(self).options[:path] # TODO: requires_ancestor
+        options[:path]
       end
 
       sig { returns(String) }
@@ -87,7 +90,7 @@ module Spoom
       # Is the `--color` option true?
       sig { returns(T::Boolean) }
       def color?
-        T.unsafe(self).options[:color] # TODO: requires_ancestor
+        options[:color]
       end
 
       sig { params(string: String).returns(String) }

data/lib/spoom/coverage.rb

@@ -21,6 +21,9 @@ module Spoom
 
       metrics = Spoom::Sorbet.srb_metrics(
         "--no-config",
+        "--no-error-sections",
+        "--no-error-count",
+        "--isolate-error-code=0",
         new_config.options_string,
         path: path,
         capture_err: true,

data/lib/spoom/git.rb

@@ -50,6 +50,13 @@ module Spoom
       exec("git show #{arg.join(' ')}", path: path)
     end
 
+    sig { params(path: String).returns(T.nilable(String)) }
+    def self.current_branch(path: ".")
+      out, _, status = exec("git branch --show-current", path: path)
+      return nil unless status
+      out.strip
+    end
+
     # Utils
 
     # Get the commit epoch timestamp for a `sha`
@@ -93,7 +100,19 @@ module Spoom
     def self.sorbet_intro_commit(path: ".")
       res, _, status = Spoom::Git.log("--diff-filter=A --format='%h' -1 -- sorbet/config", path: path)
       return nil unless status
-      res.strip
+      res.strip!
+      return nil if res.empty?
+      res
+    end
+
+    # Get the hash of the commit removing the `sorbet/config` file
+    sig { params(path: String).returns(T.nilable(String)) }
+    def self.sorbet_removal_commit(path: ".")
+      res, _, status = Spoom::Git.log("--diff-filter=D --format='%h' -1 -- sorbet/config", path: path)
+      return nil unless status
+      res.strip!
+      return nil if res.empty?
+      res
     end
   end
 end

data/lib/spoom/sorbet/config.rb

@@ -29,11 +29,15 @@ module Spoom
       sig { returns(T::Array[String]) }
       attr_reader :paths, :ignore, :allowed_extensions
 
+      sig { returns(T::Boolean) }
+      attr_accessor :no_stdlib
+
       sig { void }
       def initialize
         @paths = T.let([], T::Array[String])
         @ignore = T.let([], T::Array[String])
         @allowed_extensions = T.let([], T::Array[String])
+        @no_stdlib = T.let(false, T::Boolean)
       end
 
       sig { returns(Config) }
@@ -42,6 +46,7 @@ module Spoom
         new_config.paths.concat(@paths)
         new_config.ignore.concat(@ignore)
         new_config.allowed_extensions.concat(@allowed_extensions)
+        new_config.no_stdlib = @no_stdlib
         new_config
       end
 
@@ -63,6 +68,7 @@ module Spoom
         opts.concat(paths)
         opts.concat(ignore.map { |p| "--ignore #{p}" })
         opts.concat(allowed_extensions.map { |ext| "--allowed-extension #{ext}" })
+        opts << "--no-stdlib" if @no_stdlib
         opts.join(" ")
       end
 
@@ -106,12 +112,19 @@ module Spoom
             when /^--dir=/
               config.paths << parse_option(line)
               next
+            when /^--no-stdlib$/
+              config.no_stdlib = true
+              next
             when /^--.*=/
               next
             when /^--/
               state = :skip
             when /^-.*=?/
               next
+            when /^#/
+              next
+            when /^$/
+              next
             else
               case state
               when :ignore

data/lib/spoom/sorbet/sigils.rb

@@ -55,7 +55,7 @@ module Spoom
       # * returns nil if no sigil
       sig { params(path: T.any(String, Pathname)).returns(T.nilable(String)) }
       def self.file_strictness(path)
-        return nil unless File.exist?(path)
+        return nil unless File.file?(path)
         content = File.read(path, encoding: Encoding::ASCII_8BIT)
         strictness_in_content(content)
       end

data/lib/spoom/test_helpers/project.rb

@@ -100,6 +100,16 @@ module Spoom
         FileUtils.rm_rf(path)
       end
 
+      sig { params(name: String).void }
+      def create_and_checkout_branch(name)
+        Spoom::Git.exec("git checkout -b #{name}", path: path)
+      end
+
+      sig { returns(T.nilable(String)) }
+      def current_branch
+        Spoom::Git.current_branch(path: path)
+      end
+
       private
 
       # Create an absolute path from `self.path` and `rel_path`

data/lib/spoom/version.rb

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

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Useful tools for Sorbet enthusiasts.