From 4995fcf3954858ec1c37d03e74e67463126f4a57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Oct 2021 18:53:41 +0000 Subject: [PATCH 1/3] build(deps): bump spoom from 1.1.4 to 1.1.5 in /Library/Homebrew Bumps [spoom](https://github.com/Shopify/spoom) from 1.1.4 to 1.1.5. - [Release notes](https://github.com/Shopify/spoom/releases) - [Commits](https://github.com/Shopify/spoom/compare/v1.1.4...v1.1.5) --- updated-dependencies: - dependency-name: spoom dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Library/Homebrew/Gemfile.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index 0b2f63eddd..1d19792f20 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -15,7 +15,6 @@ GEM msgpack (~> 1.0) byebug (11.1.3) coderay (1.1.3) - colorize (0.8.1) commander (4.6.0) highline (~> 2.0.0) concurrent-ruby (1.1.9) @@ -163,8 +162,7 @@ GEM sorbet-runtime (0.5.9242) sorbet-runtime-stub (0.2.0) sorbet-static (0.5.9242-universal-darwin-14) - spoom (1.1.4) - colorize + spoom (1.1.5) sorbet (>= 0.5.9204) sorbet-runtime (>= 0.5.9204) thor (>= 0.19.2) From 79e51531b1fb1a3badf7e4f8911eadeb14a81c96 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Mon, 18 Oct 2021 19:00:17 +0000 Subject: [PATCH 2/3] brew vendor-gems: commit updates. --- Library/Homebrew/vendor/bundle/bundler/setup.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 4ced7f2ae2..2c9e930c46 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -21,7 +21,6 @@ $:.unshift "#{path}/" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/byebug-11.1.3" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/byebug-11.1.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coderay-1.1.3/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/colorize-0.8.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/highline-2.0.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/commander-4.6.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.2.5/lib" @@ -99,6 +98,6 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.21.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-cobertura-1.4.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-runtime-stub-0.2.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thor-1.1.0/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/spoom-1.1.4/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/spoom-1.1.5/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tapioca-0.5.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/warning-1.2.1/lib" From 12a9ec9fd7e1616538bffd5c0460e97c0f7823b9 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Mon, 18 Oct 2021 19:04:07 +0000 Subject: [PATCH 3/3] Update RBI files for spoom. --- .../sorbet/rbi/gems/colorize@0.8.1.rbi | 39 --------- .../gems/{spoom@1.1.4.rbi => spoom@1.1.5.rbi} | 57 +++++++++--- .../sorbet/rbi/hidden-definitions/hidden.rbi | 86 +++---------------- Library/Homebrew/sorbet/rbi/todo.rbi | 2 + 4 files changed, 59 insertions(+), 125 deletions(-) delete mode 100644 Library/Homebrew/sorbet/rbi/gems/colorize@0.8.1.rbi rename Library/Homebrew/sorbet/rbi/gems/{spoom@1.1.4.rbi => spoom@1.1.5.rbi} (96%) diff --git a/Library/Homebrew/sorbet/rbi/gems/colorize@0.8.1.rbi b/Library/Homebrew/sorbet/rbi/gems/colorize@0.8.1.rbi deleted file mode 100644 index 5c71a5afb5..0000000000 --- a/Library/Homebrew/sorbet/rbi/gems/colorize@0.8.1.rbi +++ /dev/null @@ -1,39 +0,0 @@ -# DO NOT EDIT MANUALLY -# This is an autogenerated file for types exported from the `colorize` gem. -# Please instead update this file by running `bin/tapioca gem colorize`. - -# typed: true - -module Colorize; end - -module Colorize::ClassMethods - def color_codes; end - def color_matrix(_ = T.unsafe(nil)); end - def color_methods; end - def color_samples; end - def colors; end - def disable_colorization(value = T.unsafe(nil)); end - def disable_colorization=(value); end - def mode_codes; end - def modes; end - def modes_methods; end -end - -module Colorize::InstanceMethods - def colorize(params); end - def colorized?; end - def uncolorize; end - - private - - def background_color(color); end - def color(color); end - def color_from_symbol(match, symbol); end - def colors_from_hash(match, hash); end - def colors_from_params(match, params); end - def defaults_colors(match); end - def mode(mode); end - def require_windows_libs; end - def scan_for_colors; end - def split_colors(match); end -end diff --git a/Library/Homebrew/sorbet/rbi/gems/spoom@1.1.4.rbi b/Library/Homebrew/sorbet/rbi/gems/spoom@1.1.5.rbi similarity index 96% rename from Library/Homebrew/sorbet/rbi/gems/spoom@1.1.4.rbi rename to Library/Homebrew/sorbet/rbi/gems/spoom@1.1.5.rbi index bff08fb1f2..0f4d9d98ce 100644 --- a/Library/Homebrew/sorbet/rbi/gems/spoom@1.1.4.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/spoom@1.1.5.rbi @@ -14,6 +14,7 @@ end module Spoom::Cli; end class Spoom::Cli::Bump < ::Thor + include ::Spoom::Colorize include ::Spoom::Cli::Helper sig { params(directory: String).void } @@ -26,6 +27,7 @@ class Spoom::Cli::Bump < ::Thor end class Spoom::Cli::Config < ::Thor + include ::Spoom::Colorize include ::Spoom::Cli::Helper def help(command = T.unsafe(nil), subcommand = T.unsafe(nil)); end @@ -33,6 +35,7 @@ class Spoom::Cli::Config < ::Thor end class Spoom::Cli::Coverage < ::Thor + include ::Spoom::Colorize include ::Spoom::Cli::Helper def bundle_install(path, sha); end @@ -48,7 +51,7 @@ end Spoom::Cli::Coverage::DATA_DIR = T.let(T.unsafe(nil), String) module Spoom::Cli::Helper - include ::Thor::Shell + include ::Spoom::Colorize sig { params(string: String).returns(String) } def blue(string); end @@ -56,8 +59,8 @@ module Spoom::Cli::Helper sig { returns(T::Boolean) } def color?; end - sig { params(string: String, color: Symbol).returns(String) } - def colorize(string, color); end + sig { params(string: String, color: Spoom::Color).returns(String) } + def colorize(string, *color); end sig { returns(String) } def exec_path; end @@ -96,9 +99,8 @@ module Spoom::Cli::Helper def yellow(string); end end -Spoom::Cli::Helper::HIGHLIGHT_COLOR = T.let(T.unsafe(nil), Symbol) - class Spoom::Cli::LSP < ::Thor + include ::Spoom::Colorize include ::Spoom::Cli::Helper def defs(file, line, col); end @@ -118,6 +120,7 @@ class Spoom::Cli::LSP < ::Thor end class Spoom::Cli::Main < ::Thor + include ::Spoom::Colorize include ::Spoom::Cli::Helper def __print_version; end @@ -134,6 +137,7 @@ class Spoom::Cli::Main < ::Thor end class Spoom::Cli::Run < ::Thor + include ::Spoom::Colorize include ::Spoom::Cli::Helper def colorize_message(message); end @@ -147,6 +151,37 @@ Spoom::Cli::Run::SORT_CODE = T.let(T.unsafe(nil), String) Spoom::Cli::Run::SORT_ENUM = T.let(T.unsafe(nil), Array) Spoom::Cli::Run::SORT_LOC = T.let(T.unsafe(nil), String) +class Spoom::Color < ::T::Enum + enums do + CLEAR = new + BOLD = new + BLACK = new + RED = new + GREEN = new + YELLOW = new + BLUE = new + MAGENTA = new + CYAN = new + WHITE = new + LIGHT_BLACK = new + LIGHT_RED = new + LIGHT_GREEN = new + LIGHT_YELLOW = new + LIGHT_BLUE = new + LIGHT_MAGENTA = new + LIGHT_CYAN = new + LIGHT_WHITE = new + end + + sig { returns(String) } + def ansi_code; end +end + +module Spoom::Colorize + sig { params(string: String, color: Spoom::Color).returns(String) } + def set_color(string, *color); end +end + module Spoom::Coverage class << self sig { params(snapshots: T::Array[Spoom::Coverage::Snapshot], palette: Spoom::Coverage::D3::ColorPalette, path: String).returns(Spoom::Coverage::Report) } @@ -693,7 +728,7 @@ class Spoom::FileTree::TreePrinter < ::Spoom::Printer sig { params(node: Spoom::FileTree::Node).returns(T.nilable(String)) } def node_strictness(node); end - sig { params(strictness: T.nilable(String)).returns(Symbol) } + sig { params(strictness: T.nilable(String)).returns(Spoom::Color) } def strictness_color(strictness); end end @@ -973,13 +1008,15 @@ class Spoom::LSP::SymbolPrinter < ::Spoom::Printer end class Spoom::Printer + include ::Spoom::Colorize + abstract! sig { params(out: T.any(IO, StringIO), colors: T::Boolean, indent_level: Integer).void } def initialize(out: T.unsafe(nil), colors: T.unsafe(nil), indent_level: T.unsafe(nil)); end - sig { params(string: String, color: Symbol).returns(String) } - def colorize(string, color); end + sig { params(string: String, color: Spoom::Color).returns(String) } + def colorize(string, *color); end sig { void } def dedent; end @@ -995,8 +1032,8 @@ class Spoom::Printer sig { params(string: T.nilable(String)).void } def print(string); end - sig { params(string: T.nilable(String), color: Symbol, colors: Symbol).void } - def print_colored(string, color, *colors); end + sig { params(string: T.nilable(String), color: Spoom::Color).void } + def print_colored(string, *color); end sig { params(string: T.nilable(String)).void } def printl(string); end diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index 76896d10e6..8d54ef24ec 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -9027,6 +9027,10 @@ class Spoom::Cli::Bump extend ::T::Private::Methods::SingletonMethodHooks end +module Spoom::Cli::Helper + HIGHLIGHT_COLOR = ::T.let(nil, ::T.untyped) +end + module Spoom::Cli::Helper extend ::T::Sig extend ::T::Helpers @@ -9038,6 +9042,12 @@ class Spoom::Cli::Main extend ::T::Sig end +module Spoom::Colorize + extend ::T::Sig + extend ::T::Private::Methods::MethodHooks + extend ::T::Private::Methods::SingletonMethodHooks +end + class Spoom::Coverage::D3::Base extend ::T::Sig extend ::T::Helpers @@ -9205,88 +9215,18 @@ module Spoom end class String - def black(); end - - def blink(); end - - def blue(); end - - def bold(); end - - def cyan(); end - def exclude?(string); end def fast_xs(); end - def green(); end - - def hide(); end - def indent(amount, indent_string=T.unsafe(nil), indent_empty_lines=T.unsafe(nil)); end def indent!(amount, indent_string=T.unsafe(nil), indent_empty_lines=T.unsafe(nil)); end - def italic(); end - - def light_black(); end - - def light_blue(); end - - def light_cyan(); end - - def light_green(); end - - def light_magenta(); end - - def light_red(); end - - def light_white(); end - - def light_yellow(); end - - def magenta(); end - - def on_black(); end - - def on_blue(); end - - def on_cyan(); end - - def on_green(); end - - def on_light_black(); end - - def on_light_blue(); end - - def on_light_cyan(); end - - def on_light_green(); end - - def on_light_magenta(); end - - def on_light_red(); end - - def on_light_white(); end - - def on_light_yellow(); end - - def on_magenta(); end - - def on_red(); end - - def on_white(); end - - def on_yellow(); end - - def red(); end - def shellescape(); end def shellsplit(); end - def swap(); end - def to_nfc(); end def to_nfd(); end @@ -9294,12 +9234,6 @@ class String def to_nfkc(); end def to_nfkd(); end - - def underline(); end - - def white(); end - - def yellow(); end end class String diff --git a/Library/Homebrew/sorbet/rbi/todo.rbi b/Library/Homebrew/sorbet/rbi/todo.rbi index 405a1f33e4..f00672bc02 100644 --- a/Library/Homebrew/sorbet/rbi/todo.rbi +++ b/Library/Homebrew/sorbet/rbi/todo.rbi @@ -2,6 +2,8 @@ # srb rbi todo # typed: strong +module ::Colorize::ClassMethods; end +module ::Colorize::InstanceMethods; end module ::StackProf; end module T::InterfaceWrapper::Helpers; end module T::Private::Abstract::Hooks; end