sorbet 0.5.6014 → 0.5.6022
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/fetch-rbis.rb +12 -2
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: faac776895707fa740f5e14d419b5df6809a7b97
|
4
|
+
data.tar.gz: 3d0b1cc7a6a66c03c3144b813be5c85e0dd17004
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2ff86f42ddf76e6a36b58bdc57f7cf0934069b71b12902334335dc609cfae88a2c16cd97e369f463b2d5f3925f2ccdb492ced5fca1774024a7e35799ee36d7fd
|
7
|
+
data.tar.gz: 22a9a10fdf4d3953d2dfdcccb904e37ac742f66d598ce5545f8053c4330aba220a62f16e4a5b2aa5acdf8ed1cc960ba4378a57606755a26e4a22ad8bb867c760
|
data/lib/fetch-rbis.rb
CHANGED
@@ -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
|
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.
|
4
|
+
version: 0.5.6022
|
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-
|
11
|
+
date: 2020-10-30 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.
|
19
|
+
version: 0.5.6022
|
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.
|
26
|
+
version: 0.5.6022
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: minitest
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|