carthage_remote_cache 0.0.7 → 0.0.8
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.
- checksums.yaml +4 -4
- data/Gemfile.lock +3 -3
- data/lib/api.rb +6 -2
- data/lib/carthage_archive.rb +3 -7
- data/lib/carthage_dependency.rb +0 -13
- data/lib/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b0378eb00151bc4e33a1ffc537c7cbb6bca23d24
|
4
|
+
data.tar.gz: 3c8e29aea0bb379b562053fdcf5fb5a707451bae
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ea26a9202429da4c8a49b1a9080db44b60fb3f27baaa45c71821ef674cac4fbc5caea59a5ae19c728abbd256d26aa69a04de49e0a088708d90e5f58f3d2fffc3
|
7
|
+
data.tar.gz: 42e74e05ac76e0836be06e92ade5d3aa91935a5315c877e2ba541ba3f1b1a7404d42a6aa9d1161a9d74aa034b4488e0f9561394800201a468694d29790aa01c3
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
carthage_remote_cache (0.0.
|
4
|
+
carthage_remote_cache (0.0.8)
|
5
5
|
concurrent-ruby (~> 1.0.5)
|
6
6
|
rack (~> 2.0.4)
|
7
7
|
rest-client (~> 2.0.2)
|
@@ -12,7 +12,7 @@ GEM
|
|
12
12
|
specs:
|
13
13
|
coderay (1.1.2)
|
14
14
|
concurrent-ruby (1.0.5)
|
15
|
-
domain_name (0.5.
|
15
|
+
domain_name (0.5.20180417)
|
16
16
|
unf (>= 0.0.5, < 1.0.0)
|
17
17
|
ffi (1.9.21)
|
18
18
|
formatador (0.2.5)
|
@@ -53,7 +53,7 @@ GEM
|
|
53
53
|
pry (0.11.3)
|
54
54
|
coderay (~> 1.1.0)
|
55
55
|
method_source (~> 0.9.0)
|
56
|
-
rack (2.0.
|
56
|
+
rack (2.0.5)
|
57
57
|
rack-protection (2.0.1)
|
58
58
|
rack
|
59
59
|
rake (10.5.0)
|
data/lib/api.rb
CHANGED
@@ -4,6 +4,7 @@ class API
|
|
4
4
|
@config = config
|
5
5
|
@networking = networking
|
6
6
|
@options = options
|
7
|
+
@unpack_mutex = Mutex.new
|
7
8
|
end
|
8
9
|
|
9
10
|
def verify_server_version
|
@@ -48,7 +49,7 @@ class API
|
|
48
49
|
# @return zip archive size in Bytes
|
49
50
|
def create_and_upload_archive(carthage_dependency, framework_name, platform)
|
50
51
|
archive = CarthageArchive.new(framework_name, platform)
|
51
|
-
archive.create_archive(@shell
|
52
|
+
archive.create_archive(@shell)
|
52
53
|
archive_size = archive.archive_size
|
53
54
|
begin
|
54
55
|
checksum = crc32(archive.archive_path)
|
@@ -78,7 +79,10 @@ class API
|
|
78
79
|
archive_size = archive.archive_size
|
79
80
|
begin
|
80
81
|
$LOG.debug("Downloaded #{archive.archive_path}")
|
81
|
-
|
82
|
+
# Can't unpack multiple archives concurrently.
|
83
|
+
@unpack_mutex.synchronize do
|
84
|
+
archive.unpack_archive(@shell)
|
85
|
+
end
|
82
86
|
ensure
|
83
87
|
archive.delete_archive
|
84
88
|
end
|
data/lib/carthage_archive.rb
CHANGED
@@ -15,7 +15,7 @@ class CarthageArchive
|
|
15
15
|
# - Carthage/Build/iOS/Alamofire.framework/Alamofire
|
16
16
|
# - Carthage/Build/iOS/618BEB79-4C7F-3692-B140-131FB983AC5E.bcsymbolmap
|
17
17
|
# into Alamofire-iOS.zip
|
18
|
-
def create_archive(shell,
|
18
|
+
def create_archive(shell, carthage_build_dir = CARTHAGE_BUILD_DIR)
|
19
19
|
$LOG.debug("Archiving #{@framework_name} for #{@platform}")
|
20
20
|
|
21
21
|
platform_path = File.join(carthage_build_dir, platform_to_carthage_dir_string(@platform))
|
@@ -25,12 +25,8 @@ class CarthageArchive
|
|
25
25
|
# It's very likely, that binary releases don't contain DSYMs.
|
26
26
|
dsym_path = File.join(platform_path, "#{@framework_name}.framework.dSYM")
|
27
27
|
unless File.exist?(dsym_path)
|
28
|
-
|
29
|
-
|
30
|
-
else
|
31
|
-
$LOG.error("DSYM File #{dsym_path} not found, continuing")
|
32
|
-
dsym_path = nil
|
33
|
-
end
|
28
|
+
$LOG.error("DSYM File #{dsym_path} not found, continuing")
|
29
|
+
dsym_path = nil
|
34
30
|
end
|
35
31
|
|
36
32
|
binary_path = File.join(framework_path, @framework_name)
|
data/lib/carthage_dependency.rb
CHANGED
@@ -56,19 +56,6 @@ class CarthageDependency
|
|
56
56
|
File.join(CARTHAGE_BUILD_DIR, version_filename)
|
57
57
|
end
|
58
58
|
|
59
|
-
def should_include_dsym
|
60
|
-
case @origin
|
61
|
-
when :github
|
62
|
-
true
|
63
|
-
when :git
|
64
|
-
true
|
65
|
-
when :binary
|
66
|
-
false
|
67
|
-
else
|
68
|
-
raise AppError.new, "Unrecognized origin '#{@origin}'"
|
69
|
-
end
|
70
|
-
end
|
71
|
-
|
72
59
|
def verify_version_in_version_file(version_file)
|
73
60
|
if @version != version_file.version
|
74
61
|
raise OutdatedFrameworkBuildError.new(guessed_framework_basename, version_file.version, @version)
|
data/lib/version.rb
CHANGED
@@ -1 +1 @@
|
|
1
|
-
VERSION = '0.0.
|
1
|
+
VERSION = '0.0.8'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: carthage_remote_cache
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Juraj Blahunka
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-
|
11
|
+
date: 2018-06-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|