spoom 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c138290b530402f788fd25c8238340609f68e370cdfce7166f82f910f6352125
-  data.tar.gz: '08595ccc6f1485d1b935c98a318daf9de6475d2fbcc742efafd955679e372cd3'
+  metadata.gz: 526b44a6bb1b2ec6b8b09a3bec42264f86b2803c561c4862d622c374893d529a
+  data.tar.gz: ac616a998a9800706ca28d805d5e975b35e78fb4c0b725463938b4b925f24728
 SHA512:
-  metadata.gz: 8617496b57ade807623ef5cad109d20ff1024c8b6125c6286092859c69aab3e34f2a367fcb3ed531f425425af41cbc04492c0fd098f6e42170a9edf4bb41d120
-  data.tar.gz: b8040df444748a8769739caf0699d784ffcc4518e1a55c152d72f2073ae5a62d08ef02085aaa8808eb48c078baba7655e3880700ca8fb0b79830a52d66f95c7d
+  metadata.gz: c6cf08eb1fe7d880e8dfae54352d554b83c41ff6878546b84d986fdbb17fa95244b1630f31aa0f1ccd14ef843dc71d80bd3236715d16165c7c1a0a6fc7271502
+  data.tar.gz: ea376f188b1a33a83784f4e7923ba4087cd2891f10deacf998b145c724f586f76e2cfda338011f50d7990b8b860720eb832f365c5a6541042453d3381e45c871

data/lib/spoom/cli/helper.rb

@@ -10,7 +10,8 @@ module Spoom
     module Helper
       extend T::Sig
       extend T::Helpers
-      include Thor::Shell
+
+      include Colorize
 
       requires_ancestor { Thor }
 
@@ -85,7 +86,7 @@ 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) }
@@ -117,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/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/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/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/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.1.4"
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2021-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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