carthage_remote_cache 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b0378eb00151bc4e33a1ffc537c7cbb6bca23d24
-  data.tar.gz: 3c8e29aea0bb379b562053fdcf5fb5a707451bae
+SHA256:
+  metadata.gz: 668d359528b6d3f6abf8c281b7ec00b2de532ffcab2d592dfbf7ab95cb191ccd
+  data.tar.gz: 74bf2f1193d16661a9df78b198371fc265c83d0a7c42bd4a6a885c07d7197043
 SHA512:
-  metadata.gz: ea26a9202429da4c8a49b1a9080db44b60fb3f27baaa45c71821ef674cac4fbc5caea59a5ae19c728abbd256d26aa69a04de49e0a088708d90e5f58f3d2fffc3
-  data.tar.gz: 42e74e05ac76e0836be06e92ade5d3aa91935a5315c877e2ba541ba3f1b1a7404d42a6aa9d1161a9d74aa034b4488e0f9561394800201a468694d29790aa01c3
+  metadata.gz: b9b56271263ff4cd50107f54d4faeab89f4ae15a17cb3468672af1a262c0c67e885ce5ddceb6c19966d27fe8545008062878f8984cf70689e5218b85a6e23d95
+  data.tar.gz: d4fcc47328b5f228d3c1b2d9eac42b4066eeefd3415c9f8415613fa38986fd79d016a30577c642e630d81bf9b43cf8f2ae2ed07eb1e11f6211a437b3dc2fe8e6

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    carthage_remote_cache (0.0.8)
+    carthage_remote_cache (0.0.9)
       concurrent-ruby (~> 1.0.5)
-      rack (~> 2.0.4)
+      rack (~> 2.0.6)
       rest-client (~> 2.0.2)
-      sinatra (~> 2.0.1)
+      sinatra (~> 2.0.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
     concurrent-ruby (1.0.5)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.9.21)
+    ffi (1.11.1)
     formatador (0.2.5)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -35,31 +35,31 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
+    lumberjack (1.0.13)
     metaclass (0.0.4)
-    method_source (0.9.0)
-    mime-types (3.1)
+    method_source (0.9.2)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2019.0331)
     mocha (1.3.0)
       metaclass (~> 0.0.1)
-    mustermann (1.0.2)
+    mustermann (1.0.3)
     nenv (0.3.0)
     netrc (0.11.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    power_assert (1.1.1)
-    pry (0.11.3)
+    power_assert (1.1.4)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rack (2.0.5)
-    rack-protection (2.0.1)
+    rack (2.0.7)
+    rack-protection (2.0.5)
       rack
     rake (10.5.0)
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rerun (0.13.0)
       listen (~> 3.0)
     rest-client (2.0.2)
@@ -67,20 +67,20 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     ruby_dep (1.5.0)
-    rufo (0.2.0)
+    rufo (0.5.1)
     shellany (0.0.1)
-    sinatra (2.0.1)
+    sinatra (2.0.5)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.1)
+      rack-protection (= 2.0.5)
       tilt (~> 2.0)
-    test-unit (3.2.7)
+    test-unit (3.2.9)
       power_assert
-    thor (0.20.0)
-    tilt (2.0.8)
+    thor (0.20.3)
+    tilt (2.0.9)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
 
 PLATFORMS
   ruby
@@ -97,4 +97,4 @@ DEPENDENCIES
   test-unit (~> 3.2.7)
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/carthage_remote_cache.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "test-unit", "~> 3.2.7"
 
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0.5"
-  spec.add_runtime_dependency "rack", "~> 2.0.4"
+  spec.add_runtime_dependency "rack", "~> 2.0.6"
   spec.add_runtime_dependency "rest-client", "~> 2.0.2"
-  spec.add_runtime_dependency "sinatra", "~> 2.0.1"
+  spec.add_runtime_dependency "sinatra", "~> 2.0.4"
 end

data/lib/carthage_archive.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 class CarthageArchive
   attr_reader :archive_filename, :archive_path
 
@@ -46,8 +48,11 @@ class CarthageArchive
     $LOG.debug("Created #{@archive_path} archive, file size: #{formatted_archive_size}")
   end
 
-  def unpack_archive(shell)
+  def unpack_archive(shell, carthage_build_dir = CARTHAGE_BUILD_DIR)
     raise AppError.new, "Archive #{@archive_path} is missing" unless File.exist?(@archive_path)
+
+    delete_existing_build_framework_if_exists(carthage_build_dir)
+
     $LOG.debug("Unpacking #{@archive_path}, file size: #{formatted_archive_size}")
     shell.unpack(@archive_path)
   end
@@ -81,4 +86,13 @@ class CarthageArchive
   def formatted_archive_size
     format_file_size(archive_size)
   end
+
+  def delete_existing_build_framework_if_exists(carthage_build_dir)
+    platform_path = File.join(carthage_build_dir, platform_to_carthage_dir_string(@platform))
+    framework_path = File.join(platform_path, "#{@framework_name}.framework")
+    if File.exist?(framework_path)
+      $LOG.debug("Deleting #{framework_path}")
+      FileUtils.rm_rf(framework_path)
+    end
+  end
 end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carthage_remote_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Juraj Blahunka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.4
 description: Centralized cache to serve carthage frameworks. Useful for distributed
   CI setup with several build machines.
 email:
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Centralized cache to serve carthage frameworks. Useful for distributed CI