spoom 1.1.1 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b209723354af5be10930893accb559ecbb62afc1469d2d8a12f7a7af44d67d6c
-  data.tar.gz: 4bd2e43681783fceb004e5595218127b5838b5e09c47800c6d4d0905566e42f0
+  metadata.gz: 526b44a6bb1b2ec6b8b09a3bec42264f86b2803c561c4862d622c374893d529a
+  data.tar.gz: ac616a998a9800706ca28d805d5e975b35e78fb4c0b725463938b4b925f24728
 SHA512:
-  metadata.gz: 99e8cccc29317edb58b84ba3a5713dfbfcf44c97bea40d2b4f30c256460983da7698847ea6fd9fc5a8c58c1aa6cb716e626a4540ac3e60302822b2d17efb194c
-  data.tar.gz: 055571522e43f963a1ee79a1cbd138d10d8ca685a252e5bfc64fc696abbf1812ae796bef764ab2d95359d1236012fe6cc45cfc48074997273f30df02e018a8b1
+  metadata.gz: c6cf08eb1fe7d880e8dfae54352d554b83c41ff6878546b84d986fdbb17fa95244b1630f31aa0f1ccd14ef843dc71d80bd3236715d16165c7c1a0a6fc7271502
+  data.tar.gz: ea376f188b1a33a83784f4e7923ba4087cd2891f10deacf998b145c724f586f76e2cfda338011f50d7990b8b860720eb832f365c5a6541042453d3381e45c871

data/lib/spoom/cli/bump.rb

@@ -102,6 +102,7 @@ module Spoom
           path = File.expand_path(err.file)
           next unless path.start_with?(directory)
           next unless File.file?(path)
+          next unless files_to_bump.include?(path)
           path
         end.compact.uniq
 
@@ -133,7 +134,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,7 +9,11 @@ module Spoom
   module Cli
     module Helper
       extend T::Sig
-      include Thor::Shell
+      extend T::Helpers
+
+      include Colorize
+
+      requires_ancestor { Thor }
 
       # Print `message` on `$stdout`
       sig { params(message: String).void }
@@ -66,7 +70,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) }
@@ -82,12 +86,12 @@ module Spoom
       # Colors
 
       # Color used to highlight expressions in backticks
-      HIGHLIGHT_COLOR = :blue
+      HIGHLIGHT_COLOR = T.let(Spoom::Color::BLUE, Spoom::Color)
 
       # 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) }
@@ -114,35 +118,35 @@ module Spoom
       end
 
       # Colorize a string if `color?`
-      sig { params(string: String, color: Symbol).returns(String) }
-      def colorize(string, color)
+      sig { params(string: String, color: Color).returns(String) }
+      def colorize(string, *color)
         return string unless color?
-        string.colorize(color)
+        T.unsafe(self).set_color(string, *color)
       end
 
       sig { params(string: String).returns(String) }
       def blue(string)
-        colorize(string, :blue)
+        colorize(string, Color::BLUE)
       end
 
       sig { params(string: String).returns(String) }
       def gray(string)
-        colorize(string, :light_black)
+        colorize(string, Color::LIGHT_BLACK)
       end
 
       sig { params(string: String).returns(String) }
       def green(string)
-        colorize(string, :green)
+        colorize(string, Color::GREEN)
       end
 
       sig { params(string: String).returns(String) }
       def red(string)
-        colorize(string, :red)
+        colorize(string, Color::RED)
       end
 
       sig { params(string: String).returns(String) }
       def yellow(string)
-        colorize(string, :yellow)
+        colorize(string, Color::YELLOW)
       end
     end
   end

data/lib/spoom/colors.rb

@@ -0,0 +1,45 @@
+# typed: strict
+# frozen_string_literal: true
+
+module Spoom
+  class Color < T::Enum
+    extend T::Sig
+
+    enums do
+      CLEAR           = new("\e[0m")
+      BOLD            = new("\e[1m")
+
+      BLACK           = new("\e[30m")
+      RED             = new("\e[31m")
+      GREEN           = new("\e[32m")
+      YELLOW          = new("\e[33m")
+      BLUE            = new("\e[34m")
+      MAGENTA         = new("\e[35m")
+      CYAN            = new("\e[36m")
+      WHITE           = new("\e[37m")
+
+      LIGHT_BLACK     = new("\e[90m")
+      LIGHT_RED       = new("\e[91m")
+      LIGHT_GREEN     = new("\e[92m")
+      LIGHT_YELLOW    = new("\e[93m")
+      LIGHT_BLUE      = new("\e[94m")
+      LIGHT_MAGENTA   = new("\e[95m")
+      LIGHT_CYAN      = new("\e[96m")
+      LIGHT_WHITE     = new("\e[97m")
+    end
+
+    sig { returns(String) }
+    def ansi_code
+      serialize
+    end
+  end
+
+  module Colorize
+    extend T::Sig
+
+    sig { params(string: String, color: Color).returns(String) }
+    def set_color(string, *color)
+      "#{color.map(&:ansi_code).join}#{string}#{Color::CLEAR.ansi_code}"
+    end
+  end
+end

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/file_tree.rb

@@ -156,7 +156,7 @@ module Spoom
           end
           print("\n")
         else
-          print_colored(node.name, :blue)
+          print_colored(node.name, Color::BLUE)
           print("/")
           printn
           indent
@@ -180,15 +180,15 @@ module Spoom
         Spoom::Sorbet::Sigils.file_strictness(path)
       end
 
-      sig { params(strictness: T.nilable(String)).returns(Symbol) }
+      sig { params(strictness: T.nilable(String)).returns(Color) }
       def strictness_color(strictness)
         case strictness
         when "false"
-          :red
+          Color::RED
         when "true", "strict", "strong"
-          :green
+          Color::GREEN
         else
-          :uncolored
+          Color::CLEAR
         end
       end
     end

data/lib/spoom/git.rb

@@ -20,7 +20,7 @@ module Spoom
       err = e.read.to_s
       e.close
       i.close
-      [out, err, T.cast(s.value, Process::Status).success?]
+      [out, err, s.value.success?]
     end
 
     # Git commands
@@ -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/printer.rb

@@ -8,6 +8,8 @@ module Spoom
     extend T::Sig
     extend T::Helpers
 
+    include Colorize
+
     abstract!
 
     sig { returns(T.any(IO, StringIO)) }
@@ -42,11 +44,10 @@ module Spoom
     # Print `string` colored with `color` into `out`
     #
     # Does not use colors unless `@colors`.
-    sig { params(string: T.nilable(String), color: Symbol, colors: Symbol).void }
-    def print_colored(string, color, *colors)
+    sig { params(string: T.nilable(String), color: Color).void }
+    def print_colored(string, *color)
       return unless string
-      string = colorize(string, color)
-      colors.each { |c| string = colorize(string, c) }
+      string = T.unsafe(self).colorize(string, *color)
       @out.print(string)
     end
 
@@ -72,9 +73,10 @@ module Spoom
     end
 
     # Colorize `string` with color if `@colors`
-    sig { params(string: String, color: Symbol).returns(String) }
-    def colorize(string, color)
-      @colors ? string.colorize(color) : string
+    sig { params(string: String, color: Spoom::Color).returns(String) }
+    def colorize(string, *color)
+      return string unless @colors
+      T.unsafe(self).set_color(string, *color)
     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/lsp/structures.rb

@@ -56,7 +56,7 @@ module Spoom
 
       sig { override.params(printer: SymbolPrinter).void }
       def accept_printer(printer)
-        printer.print_colored("#{line}:#{char}", :light_black)
+        printer.print_colored("#{line}:#{char}", Color::LIGHT_BLACK)
       end
 
       def to_s
@@ -81,7 +81,7 @@ module Spoom
       sig { override.params(printer: SymbolPrinter).void }
       def accept_printer(printer)
         printer.print_object(start)
-        printer.print_colored("-", :light_black)
+        printer.print_colored("-", Color::LIGHT_BLACK)
         printer.print_object(self.end)
       end
 
@@ -106,7 +106,7 @@ module Spoom
 
       sig { override.params(printer: SymbolPrinter).void }
       def accept_printer(printer)
-        printer.print_colored("#{printer.clean_uri(uri)}:", :light_black)
+        printer.print_colored("#{printer.clean_uri(uri)}:", Color::LIGHT_BLACK)
         printer.print_object(range)
       end
 
@@ -203,14 +203,14 @@ module Spoom
         printer.printt
         printer.print(kind_string)
         printer.print(' ')
-        printer.print_colored(name, :blue, :bold)
-        printer.print_colored(' (', :light_black)
+        printer.print_colored(name, Color::BLUE, Color::BOLD)
+        printer.print_colored(' (', Color::LIGHT_BLACK)
         if range
           printer.print_object(range)
         elsif location
           printer.print_object(location)
         end
-        printer.print_colored(')', :light_black)
+        printer.print_colored(')', Color::LIGHT_BLACK)
         printer.printn
         unless children.empty?
           printer.indent

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

@@ -82,7 +82,7 @@ module Spoom
         opts = {}
         opts[:chdir] = path
         out, err, status = Open3.capture3("bundle", "install", opts)
-        [out, err, status.success?]
+        [out, err, T.must(status.success?)]
       end
 
       # Run a command with `bundle exec` in this project
@@ -91,7 +91,7 @@ module Spoom
         opts = {}
         opts[:chdir] = path
         out, err, status = Open3.capture3(["bundle", "exec", cmd, *args].join(' '), opts)
-        [out, err, status.success?]
+        [out, err, T.must(status.success?)]
       end
 
       # Delete this project and its content
@@ -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.5"
 end

data/lib/spoom.rb

@@ -1,7 +1,6 @@
 # typed: true
 # frozen_string_literal: true
 
-require "colorize"
 require "sorbet-runtime"
 
 module Spoom
@@ -27,6 +26,7 @@ module Spoom
   end
 end
 
+require "spoom/colors"
 require "spoom/sorbet"
 require "spoom/cli"
 require "spoom/version"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.5
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-10-18 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
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.9204
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.9204
 - !ruby/object:Gem::Dependency
   name: sorbet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.6347
+        version: 0.5.9204
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.6347
+        version: 0.5.9204
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.19.2
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - ruby@shopify.com
@@ -128,6 +114,7 @@ files:
 - lib/spoom/cli/helper.rb
 - lib/spoom/cli/lsp.rb
 - lib/spoom/cli/run.rb
+- lib/spoom/colors.rb
 - lib/spoom/coverage.rb
 - lib/spoom/coverage/d3.rb
 - lib/spoom/coverage/d3/base.rb
@@ -174,7 +161,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.