sorbet 0.5.5891 → 0.5.6155

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e4ad8feb3606e17dd5c9930903c6c309f30ef00
-  data.tar.gz: 109a75e52d1cad3da37bb982100c20d359f2b705
+  metadata.gz: 2d8017b91ec772c5cf373f5e24f8678618776244
+  data.tar.gz: 95f6fb01dd5933ff242d3870f3d9a6caccdd0ccf
 SHA512:
-  metadata.gz: e0b00bd68efd79c8fef57aacea598d97654a3f52d91a2005b63c251c118ef65bea432a42c44e02a93cee229f810040de0606394b1913f5f515a363fe2e23c406
-  data.tar.gz: 8ac1306c9c550402327d13f92e242f8200d5f810d9cdd99409aa4410db47a8881d0d36d0ddad4ae3173e02c6059a3c8706729179828cbaa2672ae72af0c85f70
+  metadata.gz: b88a32fb3b7a60167b7ecee54e63d5f2cab95502382883fce40cfb4d6ca925abae241c7b3788b0058240c2125f2ca9493a759bff6c68990b16df11967b7b6f73
+  data.tar.gz: e26392ddec65da02eafcd2e37c5a76ccc4e045c0430313450db6b41a5568f0493306e7e42dab74d0e6286cd5253bd84dc130fb490d2d46cd304c6772bc2ef293

data/lib/fetch-rbis.rb

@@ -19,7 +19,7 @@ class Sorbet::Private::FetchRBIs
   XDG_CACHE_HOME = ENV['XDG_CACHE_HOME'] || "#{ENV['HOME']}/.cache"
   RBI_CACHE_DIR = "#{XDG_CACHE_HOME}/sorbet/sorbet-typed"
 
-  SORBET_TYPED_REPO = 'https://github.com/sorbet/sorbet-typed.git'
+  SORBET_TYPED_REPO = ENV['SRB_SORBET_TYPED_REPO'] || 'https://github.com/sorbet/sorbet-typed.git'
   SORBET_TYPED_REVISION = ENV['SRB_SORBET_TYPED_REVISION'] || 'origin/master'
 
   HEADER = Sorbet::Private::Serialize.header(false, 'sorbet-typed')
@@ -29,7 +29,17 @@ class Sorbet::Private::FetchRBIs
   # Ensure our cache is up-to-date
   T::Sig::WithoutRuntime.sig {void}
   def self.fetch_sorbet_typed
-    if !File.directory?(RBI_CACHE_DIR)
+    if File.directory?(RBI_CACHE_DIR)
+      cached_remote = IO.popen(["git", "-C", RBI_CACHE_DIR, "config", "--get", "remote.origin.url"]) {|pipe| pipe.read}.strip
+
+      # Compare the <owner>/<repo>.git to be agnostic of https vs ssh urls
+      cached_remote_repo = cached_remote.split(%r{github.com[:/]}).last
+      requested_remote_repo = SORBET_TYPED_REPO.split(%r{github.com[:/]}).last
+
+      if cached_remote_repo != requested_remote_repo
+        raise "Cached remote #{cached_remote_repo} does not match requested remote #{requested_remote_repo}. Delete #{RBI_CACHE_DIR} and try again."
+      end
+    else
       IO.popen(["git", "clone", SORBET_TYPED_REPO, RBI_CACHE_DIR]) {|pipe| pipe.read}
       raise "Failed to git pull" if $?.exitstatus != 0
     end

data/lib/serialize.rb

@@ -337,6 +337,19 @@ class Sorbet::Private::Serialize
           uniq += 1
         end
       end
+
+      # Sanitize parameter names that are not valid.
+      # Ruby 2.7+ argument forwarding works by expanding `foo(...)`
+      # to `foo(**, ****, &&)`, in other words, to a rest parameter named
+      # `*`, a keyword rest parameter named `**` and a block argument named
+      # `&`. Those are all illegal parameter names which we should NOT
+      # generate. (Coincidentally, that is why Ruby 2.7+ uses those names,
+      # so that user code cannot mess with the forwarded arguments)
+      if ["*", "**", "&"].include?(name.to_s)
+        name = '_' + (uniq == 0 ? '' : uniq.to_s)
+        uniq += 1
+      end
+
       [kind, name]
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sorbet
 version: !ruby/object:Gem::Version
-  version: 0.5.5891
+  version: 0.5.6155
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-05 00:00:00.000000000 Z
+date: 2020-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sorbet-static
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.5891
+        version: 0.5.6155
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.5891
+        version: 0.5.6155
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement