From 536726799d24afb704d420f772a8f9b60150fa32 Mon Sep 17 00:00:00 2001 From: vidusheeamoli Date: Thu, 11 Jun 2020 10:18:54 +0530 Subject: [PATCH 1/2] Gemfile: add sorbet and sorbet-runtime bundler/setup: add sorbet and sorbet-runtime --- .gitignore | 4 +++- Library/Homebrew/Gemfile | 2 ++ Library/Homebrew/Gemfile.lock | 6 ++++++ Library/Homebrew/vendor/bundle/bundler/setup.rb | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 45de01f3f..c10b081c1 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,7 @@ # Ignore dependencies we don't wish to vendor **/vendor/bundle/ruby/*/gems/ast-*/ **/vendor/bundle/ruby/*/gems/bundler-*/ +**/vendor/bundle/ruby/*/gems/byebug-*/ **/vendor/bundle/ruby/*/gems/coderay-*/ **/vendor/bundle/ruby/*/gems/connection_pool-*/ **/vendor/bundle/ruby/*/gems/coveralls-*/ @@ -127,6 +128,8 @@ **/vendor/bundle/ruby/*/gems/simplecov-*/ **/vendor/bundle/ruby/*/gems/simplecov-cobertura-*/ **/vendor/bundle/ruby/*/gems/simplecov-html-*/ +**/vendor/bundle/ruby/*/gems/sorbet-*/ +**/vendor/bundle/ruby/*/gems/sorbet-runtime-*/ **/vendor/bundle/ruby/*/gems/term-ansicolor-*/ **/vendor/bundle/ruby/*/gems/thor-*/ **/vendor/bundle/ruby/*/gems/tins-*/ @@ -134,7 +137,6 @@ **/vendor/bundle/ruby/*/gems/unf-*/ **/vendor/bundle/ruby/*/gems/unicode-display_width-*/ **/vendor/bundle/ruby/*/gems/webrobots-*/ -**/vendor/bundle/ruby/*/gems/byebug-*/ # Ignore `bin` contents (again). /bin diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile index 2c28f3de2..77afd2fa2 100644 --- a/Library/Homebrew/Gemfile +++ b/Library/Homebrew/Gemfile @@ -13,6 +13,8 @@ gem "rspec-retry", require: false gem "rspec-wait", require: false gem "rubocop" gem "simplecov", require: false +gem "sorbet" +gem "sorbet-runtime" # vendored gems gem "activesupport" diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index 420e9940c..ee286d7b5 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -104,6 +104,10 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) + sorbet (0.5.5742) + sorbet-static (= 0.5.5742) + sorbet-runtime (0.5.5742) + sorbet-static (0.5.5742-universal-darwin-14) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) @@ -141,6 +145,8 @@ DEPENDENCIES rubocop-rspec ruby-macho simplecov + sorbet + sorbet-runtime BUNDLED WITH 1.17.2 diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 3c4002ea4..16705b7f7 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -20,6 +20,8 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json-2.3.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.10.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.16.1/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-0.5.5742" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-runtime-0.5.5742/lib" $:.unshift "#{path}/../../../../../../../../Library/Ruby/Gems/2.6.0/gems/sync-0.5.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tins-1.25.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/term-ansicolor-1.7.1/lib" From 5ef55d9637499178f03dbc7604934d2cc95c453d Mon Sep 17 00:00:00 2001 From: vidusheeamoli Date: Thu, 11 Jun 2020 16:46:05 +0530 Subject: [PATCH 2/2] homebrew-sorbet env --- Library/Homebrew/Gemfile | 6 ++++-- Library/Homebrew/Gemfile.lock | 6 ------ Library/Homebrew/vendor/bundle/bundler/setup.rb | 2 -- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile index 77afd2fa2..7335e0ffc 100644 --- a/Library/Homebrew/Gemfile +++ b/Library/Homebrew/Gemfile @@ -13,8 +13,10 @@ gem "rspec-retry", require: false gem "rspec-wait", require: false gem "rubocop" gem "simplecov", require: false -gem "sorbet" -gem "sorbet-runtime" +if ENV["HOMEBREW_SORBET"] + gem "sorbet" + gem "sorbet-runtime" +end # vendored gems gem "activesupport" diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index ee286d7b5..420e9940c 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -104,10 +104,6 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sorbet (0.5.5742) - sorbet-static (= 0.5.5742) - sorbet-runtime (0.5.5742) - sorbet-static (0.5.5742-universal-darwin-14) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) @@ -145,8 +141,6 @@ DEPENDENCIES rubocop-rspec ruby-macho simplecov - sorbet - sorbet-runtime BUNDLED WITH 1.17.2 diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 16705b7f7..3c4002ea4 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -20,8 +20,6 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json-2.3.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.10.2/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.16.1/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-0.5.5742" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-runtime-0.5.5742/lib" $:.unshift "#{path}/../../../../../../../../Library/Ruby/Gems/2.6.0/gems/sync-0.5.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/tins-1.25.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/term-ansicolor-1.7.1/lib"