diff --git a/Gemfile b/Gemfile index fd5b0fe05..541c49abf 100644 --- a/Gemfile +++ b/Gemfile @@ -19,10 +19,14 @@ gem "minitest-difftastic", "~> 0.2" gem "rake", "~> 13.4" gem "rake-compiler", "~> 1.3" gem "rake-compiler-dock", "~> 1.12" +gem "rbs", "~> 4.1" gem "rbs-inline", "~> 0.14" gem "reactionview", "~> 0.3.0" gem "reline", "~> 0.6" gem "rubocop", "~> 1.71" gem "sorbet" -gem "steep", "~> 2.0" gem "turbo-rails", "~> 2.0" + +# TODO: remove once https://github.com/soutaro/steep/pull/2255 ships +# gem "steep", "~> 2.0" +gem "steep", github: "marcoroth/steep", branch: "enum-self-type" diff --git a/Gemfile.lock b/Gemfile.lock index dd2ab2a6a..e44ccd8e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,25 @@ +GIT + remote: https://github.com/marcoroth/steep.git + revision: 4f663b53b04c241245fa4e5db9565be0a8665e70 + branch: enum-self-type + specs: + steep (2.1.0.dev) + concurrent-ruby (>= 1.1.10) + csv (>= 3.0.9) + fileutils (>= 1.1.0) + json (>= 2.1.0) + language_server-protocol (>= 3.17.0.4, < 4.0) + listen (~> 3.0) + logger (>= 1.3.0) + parser (>= 3.2) + prism (>= 0.25.0) + rainbow (>= 2.2.2, < 4.0) + rbs (~> 4.0) + securerandom (>= 0.1) + strscan (>= 1.0.0) + terminal-table (>= 2, < 5) + uri (>= 0.12.0) + GIT remote: https://github.com/ruby/prism.git revision: c0e37816e97e23e92524a4070e1b99a4025bc63f @@ -215,7 +237,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rbs (4.0.2) + rbs (4.1.2) logger prism (>= 1.6.0) tsort @@ -253,22 +275,6 @@ GEM sorbet-static (0.6.13367-aarch64-linux) sorbet-static (0.6.13367-universal-darwin) sorbet-static (0.6.13367-x86_64-linux) - steep (2.0.0) - concurrent-ruby (>= 1.1.10) - csv (>= 3.0.9) - fileutils (>= 1.1.0) - json (>= 2.1.0) - language_server-protocol (>= 3.17.0.4, < 4.0) - listen (~> 3.0) - logger (>= 1.3.0) - parser (>= 3.2) - prism (>= 0.25.0) - rainbow (>= 2.2.2, < 4.0) - rbs (~> 4.0) - securerandom (>= 0.1) - strscan (>= 1.0.0) - terminal-table (>= 2, < 5) - uri (>= 0.12.0) stringio (3.2.0) strscan (3.1.7) terminal-table (4.0.0) @@ -314,12 +320,13 @@ DEPENDENCIES rake (~> 13.4) rake-compiler (~> 1.3) rake-compiler-dock (~> 1.12) + rbs (~> 4.1) rbs-inline (~> 0.14) reactionview (~> 0.3.0) reline (~> 0.6) rubocop (~> 1.71) sorbet - steep (~> 2.0) + steep! turbo-rails (~> 2.0) BUNDLED WITH diff --git a/rbs_collection.lock.yaml b/rbs_collection.lock.yaml index f828f4c3e..1938c2475 100644 --- a/rbs_collection.lock.yaml +++ b/rbs_collection.lock.yaml @@ -6,7 +6,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: actionview @@ -14,7 +14,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: activesupport @@ -22,7 +22,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: ast @@ -30,7 +30,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: base64 @@ -58,7 +58,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: charm @@ -70,7 +70,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: connection_pool @@ -78,22 +78,14 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 - remote: https://github.com/ruby/gem_rbs_collection.git - repo_dir: gems -- name: csv - version: '3.3' - source: - type: git - name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: date version: '0' source: type: stdlib -- name: dbm +- name: delegate version: '0' source: type: stdlib @@ -105,18 +97,10 @@ gems: version: '0' source: type: stdlib -- name: ffi - version: 1.17.3 - source: - type: rubygems - name: fileutils version: '0' source: type: stdlib -- name: forwardable - version: '0' - source: - type: stdlib - name: gum version: 0.3.2 source: @@ -130,7 +114,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: io-console @@ -146,27 +130,19 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: lipgloss version: 0.2.2 source: type: rubygems -- name: listen - version: '3.9' - source: - type: git - name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 - remote: https://github.com/ruby/gem_rbs_collection.git - repo_dir: gems - name: logger version: '1.7' source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: minitest @@ -174,7 +150,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: minitest-difftastic @@ -190,7 +166,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: openssl @@ -206,7 +182,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: parser @@ -214,7 +190,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: pp @@ -229,24 +205,12 @@ gems: version: 1.9.0 source: type: rubygems -- name: pstore - version: '0.2' - source: - type: git - name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 - remote: https://github.com/ruby/gem_rbs_collection.git - repo_dir: gems -- name: psych - version: '0' - source: - type: stdlib - name: rack version: '2.2' source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: rails-dom-testing @@ -254,7 +218,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: rails-html-sanitizer @@ -262,7 +226,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: railties @@ -270,7 +234,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: rainbow @@ -278,7 +242,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: rake @@ -286,7 +250,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: random-formatter @@ -294,11 +258,11 @@ gems: source: type: stdlib - name: rbs - version: 4.0.2 + version: 4.1.2 source: type: rubygems - name: rbs-inline - version: 0.13.0 + version: 0.14.0 source: type: rubygems - name: rdoc @@ -314,7 +278,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: rubocop @@ -322,7 +286,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: rubocop-ast @@ -330,7 +294,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: securerandom @@ -362,7 +326,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: time @@ -373,6 +337,10 @@ gems: version: '0' source: type: stdlib +- name: tmpdir + version: '0' + source: + type: stdlib - name: tsort version: '0' source: @@ -382,7 +350,7 @@ gems: source: type: git name: ruby/gem_rbs_collection - revision: 81fa8bd0617286078617a62b6a3229cebfd4af23 + revision: 82762423fc5694b82888ea89a972847cf19838c2 remote: https://github.com/ruby/gem_rbs_collection.git repo_dir: gems - name: uri diff --git a/rbs_collection.yaml b/rbs_collection.yaml index fddd2147b..28439d7fd 100644 --- a/rbs_collection.yaml +++ b/rbs_collection.yaml @@ -1,4 +1,3 @@ -# Download sources sources: - type: git name: ruby/gem_rbs_collection @@ -6,13 +5,13 @@ sources: revision: main repo_dir: gems -# You can specify local directories as sources also. -# - type: local -# path: path/to/your/local/repository - -# A directory to install the downloaded RBSs path: .gem_rbs_collection gems: - name: herb ignore: true + + - name: steep + ignore: true + + - name: strscan