From 48b12a3aa0f46cabe4bf7cce5e44cdbad20dda8c Mon Sep 17 00:00:00 2001 From: Kaan Ozkan Date: Mon, 30 Sep 2024 16:08:25 -0400 Subject: [PATCH 1/4] bundle update spoom --- gem/Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gem/Gemfile.lock b/gem/Gemfile.lock index 1d7c0485..26f7a48c 100644 --- a/gem/Gemfile.lock +++ b/gem/Gemfile.lock @@ -77,15 +77,15 @@ GEM rubocop-sorbet (0.8.5) rubocop (>= 1) ruby-progressbar (1.13.0) - sorbet (0.5.11553) - sorbet-static (= 0.5.11553) - sorbet-runtime (0.5.11553) - sorbet-static (0.5.11553-universal-darwin) - sorbet-static (0.5.11553-x86_64-linux) - sorbet-static-and-runtime (0.5.11553) - sorbet (= 0.5.11553) - sorbet-runtime (= 0.5.11553) - spoom (1.4.2) + sorbet (0.5.11589) + sorbet-static (= 0.5.11589) + sorbet-runtime (0.5.11589) + sorbet-static (0.5.11589-universal-darwin) + sorbet-static (0.5.11589-x86_64-linux) + sorbet-static-and-runtime (0.5.11589) + sorbet (= 0.5.11589) + sorbet-runtime (= 0.5.11589) + spoom (1.5.0) erubi (>= 1.10.0) prism (>= 0.28.0) sorbet-static-and-runtime (>= 0.5.10187) From 05a6cc1a09bf7059b638fb204a882f1f8cfc6a44 Mon Sep 17 00:00:00 2001 From: Kaan Ozkan Date: Mon, 30 Sep 2024 16:08:46 -0400 Subject: [PATCH 2/4] bundle exec tapioca gem --- .../gems/{spoom@1.4.2.rbi => spoom@1.5.0.rbi} | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) rename gem/sorbet/rbi/gems/{spoom@1.4.2.rbi => spoom@1.5.0.rbi} (99%) diff --git a/gem/sorbet/rbi/gems/spoom@1.4.2.rbi b/gem/sorbet/rbi/gems/spoom@1.5.0.rbi similarity index 99% rename from gem/sorbet/rbi/gems/spoom@1.4.2.rbi rename to gem/sorbet/rbi/gems/spoom@1.5.0.rbi index e76aac5f..d36d8c43 100644 --- a/gem/sorbet/rbi/gems/spoom@1.4.2.rbi +++ b/gem/sorbet/rbi/gems/spoom@1.5.0.rbi @@ -426,7 +426,7 @@ module Spoom::Context::Bundle # Returns `nil` if `gem` cannot be found in the Gemfile. # # source://spoom//lib/spoom/context/bundle.rb#62 - sig { params(gem: ::String).returns(T.nilable(::String)) } + sig { params(gem: ::String).returns(T.nilable(::Gem::Version)) } def gem_version_from_gemfile_lock(gem); end # source://spoom//lib/spoom/context/bundle.rb#51 @@ -1004,7 +1004,7 @@ class Spoom::Coverage::D3::ColorPalette < ::T::Struct prop :strong, ::String class << self - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -1344,7 +1344,7 @@ class Spoom::Coverage::Snapshot < ::T::Struct sig { params(obj: T::Hash[::String, T.untyped]).returns(::Spoom::Coverage::Snapshot) } def from_obj(obj); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -1480,7 +1480,7 @@ class Spoom::Deadcode::Definition < ::T::Struct def to_json(*args); end class << self - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2102,7 +2102,7 @@ class Spoom::Deadcode::Plugins::Ruby < ::Spoom::Deadcode::Plugins::Base private - # source://spoom//lib/spoom/deadcode/plugins/ruby.rb#43 + # source://spoom//lib/spoom/deadcode/plugins/ruby.rb#46 sig { params(send: ::Spoom::Deadcode::Send, node: ::Prism::Node).void } def reference_symbol_as_constant(send, node); end end @@ -2368,7 +2368,7 @@ class Spoom::Deadcode::Send < ::T::Struct def each_arg_assoc(&block); end class << self - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2388,7 +2388,7 @@ class Spoom::ExecResult < ::T::Struct def to_s; end class << self - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2586,7 +2586,7 @@ class Spoom::FileTree::Node < ::T::Struct def path; end class << self - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2652,7 +2652,7 @@ class Spoom::Git::Commit < ::T::Struct def timestamp; end class << self - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end # Parse a line formatted as `%h %at` into a `Commit` @@ -2764,7 +2764,7 @@ class Spoom::LSP::Diagnostic < ::T::Struct sig { params(json: T::Hash[T.untyped, T.untyped]).returns(::Spoom::LSP::Diagnostic) } def from_json(json); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2797,7 +2797,7 @@ class Spoom::LSP::DocumentSymbol < ::T::Struct sig { params(json: T::Hash[T.untyped, T.untyped]).returns(::Spoom::LSP::DocumentSymbol) } def from_json(json); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2855,7 +2855,7 @@ class Spoom::LSP::Hover < ::T::Struct sig { params(json: T::Hash[T.untyped, T.untyped]).returns(::Spoom::LSP::Hover) } def from_json(json); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2880,7 +2880,7 @@ class Spoom::LSP::Location < ::T::Struct sig { params(json: T::Hash[T.untyped, T.untyped]).returns(::Spoom::LSP::Location) } def from_json(json); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2943,7 +2943,7 @@ class Spoom::LSP::Position < ::T::Struct sig { params(json: T::Hash[T.untyped, T.untyped]).returns(::Spoom::LSP::Position) } def from_json(json); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -2981,7 +2981,7 @@ class Spoom::LSP::Range < ::T::Struct sig { params(json: T::Hash[T.untyped, T.untyped]).returns(::Spoom::LSP::Range) } def from_json(json); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -3047,7 +3047,7 @@ class Spoom::LSP::SignatureHelp < ::T::Struct sig { params(json: T::Hash[T.untyped, T.untyped]).returns(::Spoom::LSP::SignatureHelp) } def from_json(json); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end end end @@ -3473,7 +3473,7 @@ class Spoom::Model::Reference < ::T::Struct sig { params(name: ::String, location: ::Spoom::Location).returns(::Spoom::Model::Reference) } def constant(name, location); end - # source://sorbet-runtime/0.5.11553/lib/types/struct.rb#13 + # source://sorbet-runtime/0.5.11589/lib/types/struct.rb#13 def inherited(s); end # source://spoom//lib/spoom/model/reference.rb#29 From 95755aad6587ce1ab738cb20d66c7e1055f4de9c Mon Sep 17 00:00:00 2001 From: Kaan Ozkan Date: Mon, 30 Sep 2024 16:11:15 -0400 Subject: [PATCH 3/4] Remove redundant `::Gem::Version` construction --- gem/lib/rbi-central/context.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gem/lib/rbi-central/context.rb b/gem/lib/rbi-central/context.rb index cafde88d..e813ec2e 100644 --- a/gem/lib/rbi-central/context.rb +++ b/gem/lib/rbi-central/context.rb @@ -84,7 +84,9 @@ def add_gem_dependency(name, version: nil, github: nil, branch: nil, ref: nil, p sig { params(gem_name: String, annotations_file: String).returns(String) } def filter_versions_from_annotation(gem_name, annotations_file) - gem_version = ::Gem::Version.new(gem_version_from_gemfile_lock(gem_name)) + gem_version = gem_version_from_gemfile_lock(gem_name) + raise Error, "Can't find version for gem `#{gem_name}`" unless gem_version + rbi = RBI::Parser.parse_file(annotations_file) rbi.filter_versions!(gem_version) From 1dd97c6abb27bfb1453e84c8c205c888384d0b73 Mon Sep 17 00:00:00 2001 From: Kaan Ozkan Date: Mon, 30 Sep 2024 16:30:26 -0400 Subject: [PATCH 4/4] Bump spoom in root --- Gemfile.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 52dc9836..72406901 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,15 +55,15 @@ GEM rubocop-sorbet (0.8.5) rubocop (>= 1) ruby-progressbar (1.13.0) - sorbet (0.5.11585) - sorbet-static (= 0.5.11585) - sorbet-runtime (0.5.11585) - sorbet-static (0.5.11585-universal-darwin) - sorbet-static (0.5.11585-x86_64-linux) - sorbet-static-and-runtime (0.5.11585) - sorbet (= 0.5.11585) - sorbet-runtime (= 0.5.11585) - spoom (1.4.2) + sorbet (0.5.11589) + sorbet-static (= 0.5.11589) + sorbet-runtime (0.5.11589) + sorbet-static (0.5.11589-universal-darwin) + sorbet-static (0.5.11589-x86_64-linux) + sorbet-static-and-runtime (0.5.11589) + sorbet (= 0.5.11589) + sorbet-runtime (= 0.5.11589) + spoom (1.5.0) erubi (>= 1.10.0) prism (>= 0.28.0) sorbet-static-and-runtime (>= 0.5.10187)