zabel 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b4bd5a362ce7f4aa9c80a6e1f385f21cdd60b07c7d76bd27aaacb127a5eb037
-  data.tar.gz: 842369d90e5a1f878d51b9d439c62de4c123f3fbfd7bd63bca2735f24ac302d9
+  metadata.gz: 89413297b2ba01b9d67f3bd364566b73ad66164fbcffba18c13f799a35f0b760
+  data.tar.gz: 31e676f429656820d38993ffc31b5a6521bd510dedaab32464f5ab3a69ddf3f8
 SHA512:
-  metadata.gz: e44882f989a91d79be7467f1c81af6625f74509219ea8e761814eba5bafa9413263b9e0708ea9d2d42f637da03ccea990eaecfdaf337d540ee12576750aece13
-  data.tar.gz: 6dbf765804557e693cc30e569ea7cf17ceffaf1c6cfb516eb745e1d972248551bb4490fc14a660c2de55296fedd67f7f3afb585427729623995f5ca479fe97e5
+  metadata.gz: 8644fe694d350d9799affc0eb50f0cc668380dbbf32361d5fb48a29c02cf330bfe63d2769311e3c64f6f33e351b0d028429022cf0a9d6099c9664e5d3db58cf9
+  data.tar.gz: 56102a92ef122f2cd71c80f6c5e61b561cff1c14021d7dbd77ee4175b708a62f5dc64f2e1150324582f25a02cbbd553782ee9b34517b1b4beeb998e24db457ba

data/README.md

@@ -1,6 +1,6 @@
 # Zabel
 
-Zabel, is a build cacher for Xcode, using Xcodeproj and MD5, to detect and cache products for targets. Zabel is not Bazel.
+Zabel, is a build cacher for Xcode, using Xcodeproj and MD5, to detect and cache products for targets. Designed for CI by now. Zabel is not Bazel. 
 
 ## Feature
 
@@ -19,6 +19,7 @@ Zabel, is a build cacher for Xcode, using Xcodeproj and MD5, to detect and cache
 - support dependent files and implicit dependent targets
 - support xcodebuild build or archive
 - support fastlane build or archive
+- support legacy or new build system
 
 ## Installation
 
@@ -54,6 +55,12 @@ xcodebuild/fastlane xxx
 zabel post -configuration Release abc
 ```
 
+## Changelog
+
+- 1.0.2 support legacy build system
+- 1.0.1 support xcodebuild archive and fastlane
+- 1.0.0
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/zabel.rb

@@ -13,6 +13,7 @@ module Zabel
 
     BUILD_KEY_SYMROOT = "SYMROOT"
     BUILD_KEY_CONFIGURATION_BUILD_DIR = "CONFIGURATION_BUILD_DIR"
+    BUILD_KEY_TARGET_BUILD_DIR = "TARGET_BUILD_DIR"
     BUILD_KEY_OBJROOT = "OBJROOT"
     BUILD_KEY_TARGET_TEMP_DIR = "TARGET_TEMP_DIR"
     BUILD_KEY_PODS_XCFRAMEWORKS_BUILD_DIR = "PODS_XCFRAMEWORKS_BUILD_DIR"
@@ -74,15 +75,6 @@ module Zabel
     end
 
     def self.zabel_should_extract_once
-        # By default, to achieve better compatibility, zabel extracts target cache ondemand, 
-        # which means it depends on original dependencies of targets and it is in parallel.
-        # However, extracting once in a shell script build phase rather than multiple shell script build phases, 
-        # is a little bit faster in some cases.
-        # You can enable this by set "export ZABEL_EXTRACT_ONCE=YES"
-        should_extract_once = ENV["ZABEL_EXTRACT_ONCE"]
-        if should_extract_once == "YES"
-            return true
-        end
         return false
     end
 
@@ -866,15 +858,36 @@ module Zabel
     
     def self.zabel_extract
         target_cache_dir = ARGV[1]
-        product_path = ARGV[2]
         
         cache_product_path = target_cache_dir + "/#{FILE_NAME_PRODUCT}"
     
         start_time = Time.now
-        command = "mkdir -p \"#{ENV[BUILD_KEY_SYMROOT]}/#{product_path}\" && cd \"#{ENV[BUILD_KEY_SYMROOT]}/#{product_path}/..\" && tar -xf \"#{cache_product_path}\""
-        puts command
-        raise unless system command
-    
+
+        if ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR] != ENV[BUILD_KEY_TARGET_BUILD_DIR]
+            command = "mkdir -p \"#{ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR]}\" && cd \"#{File.dirname(ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR])}/\" && tar -xf \"#{cache_product_path}\""
+            puts command
+            raise unless system command
+
+            command = "rm -rf \"#{ENV[BUILD_KEY_TARGET_BUILD_DIR]+"/"+ENV[BUILD_KEY_FULL_PRODUCT_NAME]}\""
+            puts command
+            raise unless system command
+
+            command = "mkdir -p \"#{File.dirname(ENV[BUILD_KEY_TARGET_BUILD_DIR]+"/"+ENV[BUILD_KEY_FULL_PRODUCT_NAME])}\""
+            puts command
+            raise unless system command
+
+            command = "mv \"#{ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR]+"/"+ENV[BUILD_KEY_FULL_PRODUCT_NAME]}\" \"#{ENV[BUILD_KEY_TARGET_BUILD_DIR]+"/"+ENV[BUILD_KEY_FULL_PRODUCT_NAME]}\""
+            puts command
+            raise unless system command
+
+            command = "/bin/ln -sfh \"#{ENV[BUILD_KEY_TARGET_BUILD_DIR]+"/"+ENV[BUILD_KEY_FULL_PRODUCT_NAME]}\" \"#{ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR]+"/"+ENV[BUILD_KEY_FULL_PRODUCT_NAME]}\""
+            puts command
+            raise unless system command
+        else
+            command = "mkdir -p \"#{ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR]}\" && cd \"#{File.dirname(ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR])}/\" && tar -xf \"#{cache_product_path}\""
+            puts command
+            raise unless system command
+        end 
     end
     
     def self.zabel_printenv

data/lib/zabel/version.rb

@@ -1,3 +1,3 @@
 module Zabel
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabel
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - dengweijun
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-31 00:00:00.000000000 Z
+date: 2021-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj