sorbet 0.5.5994 → 0.5.6024

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/fetch-rbis.rb +12 -2
  3. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: e3b01417a27dcea05a744e9f429a920ef6b87ec8
4
- data.tar.gz: 97a451c293ab3f7e2999049172fdc5fc6f786f23
3
+ metadata.gz: cf526e041e7db01d6490706bfe91345d36288652
4
+ data.tar.gz: 43143c9d72835b1fc820c61a6faa821d40c54749
5
5
  SHA512:
6
- metadata.gz: f76f182205f977c2af4a3139a0b6435f7016ac6f257550523941ef67f218d9add8fb227daa34352e3bc5db11e51094d8f68dfc4b5b0c6a3a9ec40251542777ab
7
- data.tar.gz: 7a13bd4b91d5eb8defae40c391ffd6af867e440ee8c09d58ebd1744468a3b8de84fbc0644d6411acbf1080bc7332836e3048eff054faedb5d7a589d537db659e
6
+ metadata.gz: de6183dde74fa5a5b25985dabf17ce55886b4d7dfd2fb4cacf67fef342f28c207c265dc430b411614aa620cfe18f5f19a339c7519d77221c8857e47ee17dc055
7
+ data.tar.gz: 5d8f7e6cbec5079b84482c83d3cbf0b28a6214217c50f9a15528af4082f7f4b76d512c3ab87839dd8cff64c1ebc0332875b7130687348f4784909add4e1f7083
@@ -19,7 +19,7 @@ class Sorbet::Private::FetchRBIs
19
19
  XDG_CACHE_HOME = ENV['XDG_CACHE_HOME'] || "#{ENV['HOME']}/.cache"
20
20
  RBI_CACHE_DIR = "#{XDG_CACHE_HOME}/sorbet/sorbet-typed"
21
21
 
22
- SORBET_TYPED_REPO = 'https://github.com/sorbet/sorbet-typed.git'
22
+ SORBET_TYPED_REPO = ENV['SRB_SORBET_TYPED_REPO'] || 'https://github.com/sorbet/sorbet-typed.git'
23
23
  SORBET_TYPED_REVISION = ENV['SRB_SORBET_TYPED_REVISION'] || 'origin/master'
24
24
 
25
25
  HEADER = Sorbet::Private::Serialize.header(false, 'sorbet-typed')
@@ -29,7 +29,17 @@ class Sorbet::Private::FetchRBIs
29
29
  # Ensure our cache is up-to-date
30
30
  T::Sig::WithoutRuntime.sig {void}
31
31
  def self.fetch_sorbet_typed
32
- if !File.directory?(RBI_CACHE_DIR)
32
+ if File.directory?(RBI_CACHE_DIR)
33
+ cached_remote = IO.popen(["git", "-C", RBI_CACHE_DIR, "config", "--get", "remote.origin.url"]) {|pipe| pipe.read}.strip
34
+
35
+ # Compare the <owner>/<repo>.git to be agnostic of https vs ssh urls
36
+ cached_remote_repo = cached_remote.split(%r{github.com[:/]}).last
37
+ requested_remote_repo = SORBET_TYPED_REPO.split(%r{github.com[:/]}).last
38
+
39
+ if cached_remote_repo != requested_remote_repo
40
+ raise "Cached remote #{cached_remote_repo} does not match requested remote #{requested_remote_repo}. Delete #{RBI_CACHE_DIR} and try again."
41
+ end
42
+ else
33
43
  IO.popen(["git", "clone", SORBET_TYPED_REPO, RBI_CACHE_DIR]) {|pipe| pipe.read}
34
44
  raise "Failed to git pull" if $?.exitstatus != 0
35
45
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sorbet
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.5994
4
+ version: 0.5.6024
5
5
  platform: ruby
6
6
  authors:
7
7
  - Stripe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-10-23 00:00:00.000000000 Z
11
+ date: 2020-10-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sorbet-static
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 0.5.5994
19
+ version: 0.5.6024
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 0.5.5994
26
+ version: 0.5.6024
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: minitest
29
29
  requirement: !ruby/object:Gem::Requirement