carthage_remote_cache 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d72fcf3c6a1bd8bed3bf28731cb8be97eef6447
-  data.tar.gz: 99bf505f952e7cc72198b20d8a80c24900f77ebb
+  metadata.gz: b0378eb00151bc4e33a1ffc537c7cbb6bca23d24
+  data.tar.gz: 3c8e29aea0bb379b562053fdcf5fb5a707451bae
 SHA512:
-  metadata.gz: 9a68a8da37a77f7f7b7a374a927d75869f4b2970e3896ba2f02e43d4ad9b693ed4d635aa4fc2dc6df664309ed7ef9688f42ae3dc1e2bdf68a73e96fd61509ae8
-  data.tar.gz: e8fbdcb7ff274a4eeb05c869c467ca213a1aba0d9c667284049a58573e1c45bcdabfeeddcdbdb406785a9a525fe7ae9b39513e35d0c1baf75651b8f60413a036
+  metadata.gz: ea26a9202429da4c8a49b1a9080db44b60fb3f27baaa45c71821ef674cac4fbc5caea59a5ae19c728abbd256d26aa69a04de49e0a088708d90e5f58f3d2fffc3
+  data.tar.gz: 42e74e05ac76e0836be06e92ade5d3aa91935a5315c877e2ba541ba3f1b1a7404d42a6aa9d1161a9d74aa034b4488e0f9561394800201a468694d29790aa01c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    carthage_remote_cache (0.0.7)
+    carthage_remote_cache (0.0.8)
       concurrent-ruby (~> 1.0.5)
       rack (~> 2.0.4)
       rest-client (~> 2.0.2)
@@ -12,7 +12,7 @@ GEM
   specs:
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     ffi (1.9.21)
     formatador (0.2.5)
@@ -53,7 +53,7 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-protection (2.0.1)
       rack
     rake (10.5.0)

data/lib/api.rb

@@ -4,6 +4,7 @@ class API
     @config = config
     @networking = networking
     @options = options
+    @unpack_mutex = Mutex.new
   end
 
   def verify_server_version
@@ -48,7 +49,7 @@ class API
   # @return zip archive size in Bytes
   def create_and_upload_archive(carthage_dependency, framework_name, platform)
     archive = CarthageArchive.new(framework_name, platform)
-    archive.create_archive(@shell, carthage_dependency.should_include_dsym)
+    archive.create_archive(@shell)
     archive_size = archive.archive_size
     begin
       checksum = crc32(archive.archive_path)
@@ -78,7 +79,10 @@ class API
     archive_size = archive.archive_size
     begin
       $LOG.debug("Downloaded #{archive.archive_path}")
-      archive.unpack_archive(@shell)
+      # Can't unpack multiple archives concurrently.
+      @unpack_mutex.synchronize do
+        archive.unpack_archive(@shell)
+      end
     ensure
       archive.delete_archive
     end

data/lib/carthage_archive.rb

@@ -15,7 +15,7 @@ class CarthageArchive
   # - Carthage/Build/iOS/Alamofire.framework/Alamofire
   # - Carthage/Build/iOS/618BEB79-4C7F-3692-B140-131FB983AC5E.bcsymbolmap
   # into Alamofire-iOS.zip
-  def create_archive(shell, should_include_dsym, carthage_build_dir = CARTHAGE_BUILD_DIR)
+  def create_archive(shell, carthage_build_dir = CARTHAGE_BUILD_DIR)
     $LOG.debug("Archiving #{@framework_name} for #{@platform}")
 
     platform_path = File.join(carthage_build_dir, platform_to_carthage_dir_string(@platform))
@@ -25,12 +25,8 @@ class CarthageArchive
     # It's very likely, that binary releases don't contain DSYMs.
     dsym_path = File.join(platform_path, "#{@framework_name}.framework.dSYM")
     unless File.exist?(dsym_path)
-      if should_include_dsym
-        raise AppError.new, "DSYM File #{dsym_path} not found"
-      else
-        $LOG.error("DSYM File #{dsym_path} not found, continuing")
-        dsym_path = nil
-      end
+      $LOG.error("DSYM File #{dsym_path} not found, continuing")
+      dsym_path = nil
     end
 
     binary_path = File.join(framework_path, @framework_name)

data/lib/carthage_dependency.rb

@@ -56,19 +56,6 @@ class CarthageDependency
     File.join(CARTHAGE_BUILD_DIR, version_filename)
   end
 
-  def should_include_dsym
-    case @origin
-    when :github
-      true
-    when :git
-      true
-    when :binary
-      false
-    else
-      raise AppError.new, "Unrecognized origin '#{@origin}'"
-    end
-  end
-
   def verify_version_in_version_file(version_file)
     if @version != version_file.version
       raise OutdatedFrameworkBuildError.new(guessed_framework_basename, version_file.version, @version)

data/lib/version.rb

@@ -1 +1 @@
-VERSION = '0.0.7'
+VERSION = '0.0.8'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_remote_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Juraj Blahunka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler