zabel 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b4bd5a362ce7f4aa9c80a6e1f385f21cdd60b07c7d76bd27aaacb127a5eb037
-  data.tar.gz: 842369d90e5a1f878d51b9d439c62de4c123f3fbfd7bd63bca2735f24ac302d9
+  metadata.gz: 7bbbbd6d01a9148ff002993ceebe5ed44aba4fd905cb1529689ca40406357aff
+  data.tar.gz: b0ef1fd3e75802bc1ab90f99f3c2910263e84c0fa4352536a7e7515a7e8515c5
 SHA512:
-  metadata.gz: e44882f989a91d79be7467f1c81af6625f74509219ea8e761814eba5bafa9413263b9e0708ea9d2d42f637da03ccea990eaecfdaf337d540ee12576750aece13
-  data.tar.gz: 6dbf765804557e693cc30e569ea7cf17ceffaf1c6cfb516eb745e1d972248551bb4490fc14a660c2de55296fedd67f7f3afb585427729623995f5ca479fe97e5
+  metadata.gz: 842b4eade28085456376de660c8f353108d488caf3f26dcd6308476c2eab2a60cfa67e1c4f5a248cc9a7c4a29d574ecbaa41273d56dd3d323a05a8453698fd11
+  data.tar.gz: 28fdc857de4f92a8c6c806305e858bdd94c5fb2888bc86eaa7fb7f9a3b67ea311ef28bf132ffb4690ab5bea9449f62eb62c5a983fb5f0a9bc1988d38f343cf3b

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 tmp
+bundle
 Pods
 build*
 cache

data/README.md

@@ -1,6 +1,20 @@
-# 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. 
+
+WARNING: BE CAREFUL IN PRODUCTION ENVIRONMENT.
+
+- [Feature](https://github.com/WeijunDeng/Zabel#feature)
+- [Installation](https://github.com/WeijunDeng/Zabel#installation)
+- [Usage](https://github.com/WeijunDeng/Zabel#usage)
+- [Advanced usage](https://github.com/WeijunDeng/Zabel#advanced-usage)
+- [Options](https://github.com/WeijunDeng/Zabel#options)
+- [Changelog](https://github.com/WeijunDeng/Zabel#changelog)
+- [Development](https://github.com/WeijunDeng/Zabel#development)
+- [Test](https://github.com/WeijunDeng/Zabel#test)
+- [Contributing](https://github.com/WeijunDeng/Zabel#contributing)
+- [License](https://github.com/WeijunDeng/Zabel#license)
+- [Code of Conduct](https://github.com/WeijunDeng/Zabel#code-of-conduct)
+- [FAQ](https://github.com/WeijunDeng/Zabel#faq)
+- [TODO](https://github.com/WeijunDeng/Zabel#todo)
 
 ## Feature
 
@@ -19,12 +33,17 @@ 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
 
+Please use Ruby 2.x.
+
 Add this line to your application's Gemfile:
 
 ```ruby
+source "https://rubygems.org"
+
 gem 'zabel'
 ```
 
@@ -32,27 +51,57 @@ And then execute:
 
     $ bundle
 
+Or install in local path:
+
+    $ bundle install --path vendor/bundle
+
 Or install it yourself as:
 
-    $ gem install zabel
+    $ [sudo] gem install zabel
 
 ## Usage
 
-Simply add zabel before your xcodebuild/fastlane command. Please ensure that your command can work without zabel.
+Simply add zabel before your xcodebuild/fastlane command. Please ensure that your command can work without zabel. 
 
-```
-zabel xcodebuild/fastlane xxx 
-```
+    $ [bundle exec] zabel xcodebuild/fastlane ...
 
 ## Advanced usage
 
 You can controll your cache keys, which can be more or less. Please ensure that your arguments are same in pre and post.
 
-```
-zabel pre -configuration Release abc
-xcodebuild/fastlane xxx
-zabel post -configuration Release abc
-```
+    $ [bundle exec] zabel pre -configuration Debug ...
+    $ xcodebuild/fastlane ...
+    $ [bundle exec] zabel post -configuration Debug ...
+
+Importantly, configuration argument must be set with zabel.
+
+## Options
+
+You can customize some options by yourself.
+
+Zabel stores caches in `~/zabel` by default. You can change this path.
+
+    $ export ZABEL_CACHE_ROOT=xxx
+
+Zabel uses LRU to clear unuse old caches, to keep max count with 10000 by default. You can change this number.
+
+    $ export ZABEL_CACHE_COUNT=12345
+
+Zable caches targets which count of source files is greater than or equal 1 by default. You can set this value to 0 or more than 1 to achieve higher total speed. 
+
+    $ export ZABEL_MIN_SOURCE_FILE_COUNT=10
+
+Zabel detects module map dependecy by default. However, there are bugs of xcodebuild or swift-frontend, which emits unnecessary, incorrect and even cycle modulemap dependencies. Cycle dependency targets will be miss every time. To test by run "ruby test/one.rb test/todo/modulemap_file/Podfile". You can disable this feature.
+
+    $ export ZABEL_NOT_DETECT_MODULE_MAP_DEPENDENCY=YES
+
+## Changelog
+
+- 1.0.4 optimize spec checksums; optimize output log; use CACHE_VERSION; should not cache if dependency error
+- 1.0.3 support bundle install
+- 1.0.2 support legacy build system
+- 1.0.1 support xcodebuild archive and fastlane
+- 1.0.0
 
 ## Development
 
@@ -71,14 +120,6 @@ ruby test/one.rb test/case/simple/Podfile
 ruby test/one.rb test/todo/modulemap_file/Podfile
 ```
 
-## TODO
-
-- support more projects and targets, not only Pods
-- support and test more clang arguments
-- support intermediate cache such as .o and .gcno
-- try to support local development
-- try to support remote cache server
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/WeijunDeng/Zabel. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
@@ -113,4 +154,11 @@ Q: What about dependencies ?
 
 A: Simple dependent files (headers) and implicit dependent targets will be detected. If dependent files of a target change, this target will be recompiled. If dependent targets of a target miss cache, this target and dependent targets will be recompiled. 
 
+## TODO
+
+- support more projects and targets, not only Pods
+- support and test more clang arguments
+- support intermediate cache such as .o and .gcno
+- try to support local development
+- try to support remote cache server
 

data/bin/zabel

@@ -19,13 +19,22 @@ elsif ARGV.include?("-configuration") or ARGV.include?("--configuration")
 
     build_start_time = Time.now
     exit 1 unless system(*ARGV)
-    puts "[ZABEL]<INFO> duration = #{(Time.now - build_start_time).to_i} s in stage build"
+    puts "[ZABEL/I] duration = #{(Time.now - build_start_time).to_i} s in stage build"
 
     Zabel::zabel_post(ARGV)
 
-    puts "[ZABEL]<INFO> duration = #{(Time.now - total_start_time).to_i} s in stage all"
-else
-    puts "version: #{Zabel::VERSION}"
-    puts "exec: #{$0}"
+    puts "[ZABEL/I] duration = #{(Time.now - total_start_time).to_i} s in stage all"
+elsif ARGV.size == 0 or (ARGV.size == 1 and ARGV[0].include?("v"))
+    puts "ver: #{Zabel::VERSION}"
+    puts "exe: #{$0}"
     puts "url: https://github.com/WeijunDeng/Zabel"
+else
+    puts "Usage: "
+    puts "IMPORTANT: configuration must be set."
+    puts "For example:"
+    puts "zabel xcodebuild archive -workspace app.xcworkspace -scheme app -configuration Debug ..."
+    puts "zabel fastlane gym --workspace app.xcworkspace --scheme app --configuration Debug ..."
+    puts ""
+    puts "Advanced usage:"
+    puts "zabel pre -configuration Debug && xcodebuild/fastlane ... && zabel post -configuration Debug"
 end

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"
@@ -73,19 +74,6 @@ module Zabel
         return 1
     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
-
     def self.zabel_get_projects
         # TODO: to support more project, not only Pods
         pods_project = Xcodeproj::Project.open("Pods/Pods.xcodeproj")
@@ -111,6 +99,7 @@ module Zabel
     
     def self.zabel_can_cache_target(target)
         if target.name.start_with? "Pods-"
+            puts "[ZABEL/I] skip #{target.name}"
             return false
         end
         if target.class == Xcodeproj::Project::Object::PBXNativeTarget
@@ -119,7 +108,11 @@ module Zabel
                 target.product_type == "com.apple.product-type.library.static" or
                 target.product_type == "com.apple.product-type.framework"
                 return true
+            else
+                puts "[ZABEL/I] skip #{target.name} #{target.class} #{target.product_type}"
             end
+        else
+            puts "[ZABEL/I] skip #{target.name} #{target.class}"
         end
         return false
     end
@@ -137,7 +130,7 @@ module Zabel
                 file = file.gsub("\\ ", " ")
     
                 unless File.exist? file
-                    puts "[ZABEL]<ERROR> #{target.name} #{file} should exist in dependency file #{dependency_file}"
+                    puts "[ZABEL/E] #{target.name} #{file} should exist in dependency file #{dependency_file}"
                     return []
                 end
     
@@ -206,11 +199,11 @@ module Zabel
             file_time_hash[file] = File.mtime(file)
         end
         file_list = file_list.sort_by {|file| - file_time_hash[file].to_f}
-        puts "[ZABEL]<INFO> keep cache " + file_list.size.to_s + " " + Open3.capture3("du -sh #{zabel_get_cache_root}")[0].to_s
+        puts "[ZABEL/I] keep cache " + file_list.size.to_s + " " + Open3.capture3("du -sh #{zabel_get_cache_root}")[0].to_s
     
         if file_list.size > 1
-            puts "[ZABEL]<INFO> keep oldest " + file_time_hash[file_list.last].to_s + " " + file_list.last
-            puts "[ZABEL]<INFO> keep newest " + file_time_hash[file_list.first].to_s + " " + file_list.first
+            puts "[ZABEL/I] keep oldest " + file_time_hash[file_list.last].to_s + " " + file_list.last
+            puts "[ZABEL/I] keep newest " + file_time_hash[file_list.first].to_s + " " + file_list.first
         end
     
         if file_list.size > zabel_get_cache_count
@@ -254,7 +247,7 @@ module Zabel
         project_configuration_content = project_configuration.pretty_print.to_yaml
         project_xcconfig = ""
         if project_configuration.base_configuration_reference
-            config_file_path = project_configuration.base_configuration_reference.real_path
+            config_file_path = project_configuration.base_configuration_reference.real_path.to_s
             if File.exist? config_file_path
                 project_xcconfig = File.read(config_file_path).lines.reject{|line|line.include? "_SEARCH_PATHS"}.sort.join("")
             end
@@ -263,8 +256,10 @@ module Zabel
         target_configuration = target.build_configurations.detect { | config | config.name == configuration_name}
         target_configuration_content = target_configuration.pretty_print.to_yaml
         target_xcconfig = ""
+        target_spec_name = ""
         if target_configuration.base_configuration_reference
-            config_file_path = target_configuration.base_configuration_reference.real_path
+            config_file_path = target_configuration.base_configuration_reference.real_path.to_s
+            target_spec_name = File.basename(File.dirname(config_file_path))
             if File.exist? config_file_path
                 target_xcconfig = File.read(config_file_path).lines.reject{|line|line.include? "_SEARCH_PATHS"}.sort.join("")
             end
@@ -301,22 +296,15 @@ module Zabel
     
         source_md5_list = []
         # zabel built-in verison, which will be changed for incompatibility in the future
-        source_md5_list.push "Zabel version : #{Zabel::VERSION}"
+        source_md5_list.push "Zabel cache version : #{Zabel::CACHE_VERSION}"
         source_md5_list.push "ARGV : #{key_argv.to_s}"
     
-        has_found_checksum = false
-        split_parts = target.name.split("-")
-        split_parts.each_with_index do | part, index |
-            spec_name = split_parts[0..index].join("-")
-            # TODO: to get a explicit spec name from a target. 
-            # Now all potential spec names are push into md5 for safety.
-            if $zabel_podfile_spec_checksums.has_key? spec_name
-                source_md5_list.push "SPEC CHECKSUM : #{spec_name} #{$zabel_podfile_spec_checksums[spec_name]}"
-                has_found_checksum = true
-            end
-        end
-        unless has_found_checksum
-            puts "[ZABEL]<ERROR> #{target.name} SPEC CHECKSUM should be found"
+        # TODO: to get a explicit spec name from a target. 
+        if target_spec_name.size > 0 and $zabel_podfile_spec_checksums.has_key? target_spec_name
+            source_md5_list.push "SPEC CHECKSUM : #{target_spec_name} #{$zabel_podfile_spec_checksums[target_spec_name]}"
+            has_found_checksum = true
+        else
+            puts "[ZABEL/E] #{target.name} #{target_spec_name} SPEC CHECKSUM should be found"
         end
     
         source_md5_list.push "Project : #{File.basename(project.path)}"
@@ -350,10 +338,6 @@ module Zabel
         command = "rm -rf Pods/*.xcodeproj/*.#{FILE_NAME_TARGET_CONTEXT}"
         puts command
         raise unless system command
-    
-        command = "rm -rf Pods/zabel.xcodeproj"
-        puts command
-        raise unless system command
     end
     
     def self.zabel_add_cache(target, target_context, message)
@@ -374,7 +358,7 @@ module Zabel
         end
     
         unless full_product_name and full_product_name.size > 0 and File.exist? "#{product_dir}/#{full_product_name}"
-            puts "[ZABEL]<ERROR> #{target.name} #{product_dir}/#{full_product_name} should exist"
+            puts "[ZABEL/E] #{target.name} #{product_dir}/#{full_product_name} should exist"
             return false
         end
     
@@ -387,12 +371,12 @@ module Zabel
     
         puts command
         unless system command
-            puts "[ZABEL]<ERROR> #{command} should succeed"
+            puts "[ZABEL/E] #{command} should succeed"
             return false
         end
     
         if File.exist? target_cache_dir
-            puts "[ZABEL]<ERROR> #{target_cache_dir} should not exist"
+            puts "[ZABEL/E] #{target_cache_dir} should not exist"
             raise unless system "rm -rf \"#{target_cache_dir}\""
             return false
         end
@@ -400,7 +384,7 @@ module Zabel
         command = "mkdir -p \"#{target_cache_dir}\""
         unless system command
             puts command
-            puts "[ZABEL]<ERROR> #{command} should succeed"
+            puts "[ZABEL/E] #{command} should succeed"
             return false
         end
     
@@ -410,11 +394,11 @@ module Zabel
         puts command
         unless system command
             puts command
-            puts "[ZABEL]<ERROR> #{command} should succeed"
+            puts "[ZABEL/E] #{command} should succeed"
             return false
         end
         unless File.exist? cache_product_path
-            puts "[ZABEL]<ERROR> #{cache_product_path} should exist after mv"
+            puts "[ZABEL/E] #{cache_product_path} should exist after mv"
             return false
         end
         
@@ -430,6 +414,7 @@ module Zabel
         target_context.delete(:target_status)
         target_context.delete(:potential_hit_target_cache_dirs)
         target_context.delete(:target_md5_content)
+        target_context.delete(:miss_dependency_list)
         [BUILD_KEY_SYMROOT, BUILD_KEY_CONFIGURATION_BUILD_DIR, BUILD_KEY_OBJROOT, BUILD_KEY_TARGET_TEMP_DIR, BUILD_KEY_PODS_XCFRAMEWORKS_BUILD_DIR, BUILD_KEY_SRCROOT].each do | key |
             target_context.delete(key)
         end
@@ -450,7 +435,7 @@ module Zabel
             configuration_name = argv[argv.index("--configuration") + 1]
         end
         unless configuration_name and configuration_name.size > 0
-            raise "[ZABEL]<ERROR> -configuration or --configuration should be set"
+            raise "[ZABEL/E] -configuration or --configuration should be set"
         end
 
         start_time = Time.now
@@ -462,14 +447,17 @@ module Zabel
         post_targets_context = {}
     
         projects.each do | project |
+            project_configuration = project.build_configurations.detect { | config | config.name == configuration_name}
+            unless project_configuration
+                puts "[ZABEL/E] #{project.path} should have config #{configuration_name}"
+                next
+            end
             project.native_targets.each do | target |
+                target_context_file = "#{project.path}/#{target.name}.#{FILE_NAME_TARGET_CONTEXT}"
+                unless File.exist? target_context_file
+                    next
+                end
                 if zabel_can_cache_target(target)
-                    
-                    target_context_file = "#{project.path}/#{target.name}.#{FILE_NAME_TARGET_CONTEXT}"
-                    unless File.exist? target_context_file
-                        next
-                    end
-                    
                     target_context = YAML.load(File.read(target_context_file))
                 
                     if target_context[:target_status] == STATUS_MISS
@@ -481,7 +469,7 @@ module Zabel
 
                         dependency_files = zabel_get_dependency_files(target, intermediate_dir, product_dir, xcframeworks_build_dir)
                         if source_files.size > 0 and dependency_files.size == 0 and target.product_type != "com.apple.product-type.bundle"
-                            puts "[ZABEL]<ERROR> #{target.name} should have dependent files"
+                            puts "[ZABEL/E] #{target.name} should have dependent files"
                             next
                         end
                         target_context[:dependency_files] = dependency_files - source_files
@@ -489,7 +477,7 @@ module Zabel
                         target_context[:target_md5_content] = target_md5_content
                         target_md5 = Digest::MD5.hexdigest(target_md5_content)
                         unless target_context[:target_md5] == target_md5
-                            puts "[ZABEL]<ERROR> #{target.name} md5 should not be changed after build"
+                            puts "[ZABEL/E] #{target.name} md5 should not be changed after build"
                             next
                         end
                         if target_context[BUILD_KEY_SRCROOT] and target_context[BUILD_KEY_SRCROOT].size > 0 and 
@@ -497,19 +485,19 @@ module Zabel
                             if File.exist? Dir.pwd + "/" + zabel_get_content_without_pwd("#{target_context[BUILD_KEY_SRCROOT]}/#{target_context[BUILD_KEY_MODULEMAP_FILE]}")
                                 target_context[BUILD_KEY_MODULEMAP_FILE] = zabel_get_content_without_pwd("#{target_context[BUILD_KEY_SRCROOT]}/#{target_context[BUILD_KEY_MODULEMAP_FILE]}")
                             else
-                                puts "[ZABEL]<ERROR> #{target.name} #{target_context[BUILD_KEY_MODULEMAP_FILE]} should be supported"
+                                puts "[ZABEL/E] #{target.name} #{target_context[BUILD_KEY_MODULEMAP_FILE]} should be supported"
                                 next
                             end
                         end
                     elsif target_context[:target_status] == STATUS_HIT
                         if target_context[BUILD_KEY_MODULEMAP_FILE] and target_context[BUILD_KEY_MODULEMAP_FILE].size > 0
                             if not File.exist? Dir.pwd + "/" + target_context[BUILD_KEY_MODULEMAP_FILE]
-                                puts "[ZABEL]<ERROR> #{target.name} #{target_context[BUILD_KEY_MODULEMAP_FILE]} should be supported"
+                                puts "[ZABEL/E] #{target.name} #{target_context[BUILD_KEY_MODULEMAP_FILE]} should be supported"
                                 next
                             end
                         end
                     else
-                        puts "[ZABEL]<ERROR> #{target.name} should be hit or miss"
+                        puts "[ZABEL/E] #{target.name} should be hit or miss"
                         next
                     end
     
@@ -567,9 +555,17 @@ module Zabel
     
                     target_context[:dependency_files] = target_context[:dependency_files] - implicit_dependencies
                     dependency_files_md5 = []
+                    should_not_cache = false
                     target_context[:dependency_files].each do | file |
+                        if file.start_with? target_context[BUILD_KEY_OBJROOT] + "/" or file.start_with? target_context[BUILD_KEY_SYMROOT] + "/"
+                            puts "[ZABEL/W] #{target.name} #{file} dependecy should not include build path"
+                            should_not_cache = true
+                            break
+                        end
                         dependency_files_md5.push [zabel_get_content_without_pwd(file), zabel_get_file_md5(file)]
                     end
+                    next if should_not_cache
+                    
                     target_context[:dependency_files_md5] = dependency_files_md5.sort.uniq
     
                     dependency_targets_md5 = dependency_targets_set.to_a.map { | target |  [target.name, post_targets_context[target][:target_md5]]}
@@ -590,13 +586,13 @@ module Zabel
     
         zabel_keep
     
-        puts "[ZABEL]<INFO> total add #{add_count}"
+        puts "[ZABEL/I] total add #{add_count}"
     
-        puts "[ZABEL]<INFO> duration = #{(Time.now - start_time).to_i} s in stage post"
+        puts "[ZABEL/I] duration = #{(Time.now - start_time).to_i} s in stage post"
     
     end
     
-    def self.zabel_get_potential_hit_target_cache_dirs(target, target_md5)
+    def self.zabel_get_potential_hit_target_cache_dirs(target, target_md5, miss_dependency_list)
         dependency_start_time = Time.now
         target_cache_dirs = Dir.glob(zabel_get_cache_root + "/" + target.name + "-" + target_md5 + "-*")
         file_time_hash = {}
@@ -615,12 +611,12 @@ module Zabel
                 dependency_md5 = item[1]
     
                 unless File.exist? dependency_file
-                    puts "[ZABEL]<WARNING> #{target.name} #{dependency_file} file should exist to be hit"
+                    miss_dependency_list.push "[ZABEL/W] #{target.name} #{dependency_file} file should exist to be hit"
                     dependency_miss = true
                     break
                 end
                 unless zabel_get_file_md5(dependency_file) == dependency_md5
-                    puts "[ZABEL]<WARNING> #{target.name} #{dependency_file} md5 should match to be hit"
+                    miss_dependency_list.push "[ZABEL/W] #{target.name} #{dependency_file} md5 #{zabel_get_file_md5(dependency_file)} should match #{dependency_md5} to be hit"
                     dependency_miss = true
                     break
                 end
@@ -629,14 +625,14 @@ module Zabel
                 if not target_context[:target_md5] == target_md5
                     command = "rm -rf \"#{target_cache_dir}\""
                     raise unless system command
-                    puts "[ZABEL]<ERROR> #{target.name} #{target_cache_dir} target md5 should match to be verified"
+                    puts "[ZABEL/E] #{target.name} #{target_cache_dir} target md5 should match to be verified"
                     dependency_miss = false
                     next
                 end
                 if not target_context[:product_md5] == zabel_get_file_md5(target_cache_dir + "/" + FILE_NAME_PRODUCT)
                     command = "rm -rf \"#{target_cache_dir}\""
                     raise unless system command
-                    puts "[ZABEL]<ERROR> #{target.name} #{target_cache_dir} product md5 should match to be verified"
+                    puts "[ZABEL/E] #{target.name} #{target_cache_dir} product md5 should match to be verified"
                     dependency_miss = false
                     next
                 end
@@ -653,23 +649,7 @@ module Zabel
         return potential_hit_target_cache_dirs
     end
     
-    # see https://github.com/CocoaPods/Xcodeproj/blob/master/lib/xcodeproj/project/object/native_target.rb#L239
-    # and this is faster, without searching deeply. 
-    def self.zabel_fast_add_dependency(project, target_target, target, subproject_reference)
-        container_proxy = project.new(Xcodeproj::Project::PBXContainerItemProxy)
-        container_proxy.container_portal = subproject_reference.uuid
-        container_proxy.proxy_type = Xcodeproj::Constants::PROXY_TYPES[:native_target]
-        container_proxy.remote_global_id_string = target.uuid
-        container_proxy.remote_info = target.name
-    
-        dependency = project.new(Xcodeproj::Project::PBXTargetDependency)
-        dependency.name = target.name
-        dependency.target_proxy = container_proxy
-    
-        target_target.dependencies << dependency
-    end
-    
-    def self.zabel_disable_build_and_inject_extract(project, target, inject_project, inject_target, inject_scripts, target_context)
+    def self.zabel_disable_build_and_inject_extract(project, target, target_context)
         target_cache_dir = target_context[:hit_target_cache_dir]
 
         # touch to update mtime
@@ -682,34 +662,24 @@ module Zabel
             build_phase.class == Xcodeproj::Project::Object::PBXResourcesBuildPhase
         }
 
-        extract_script = "#{$0} #{STAGE_EXTRACT} \"#{target_cache_dir}\" \"#{target_context[:build_product_dir]}\" \"#{target_context[:build_intermediate_dir]}\""
-
-        if zabel_should_extract_once
-            subproject_reference = nil
-            project.main_group.files.each do | file |
-                if file.class == Xcodeproj::Project::Object::PBXFileReference and File.basename(file.path) == File.basename(inject_project.path)
-                    subproject_reference = file
-                    break
-                end
-            end
-        
-            unless subproject_reference
-                subproject_reference = project.main_group.new_reference(inject_project.path, :group)
-            end
-        
-            zabel_fast_add_dependency(project, target, inject_target, subproject_reference)
-            
-            inject_scripts.push extract_script
-        else
-            inject_phase = target.new_shell_script_build_phase("zabel_extract_#{target.name}")
-            inject_phase.shell_script = extract_script
-            inject_phase.show_env_vars_in_log = '1'
+        zabel_exec = "\"#{$0}\""
+        if ENV["BUNDLE_BIN_PATH"] and ENV["BUNDLE_BIN_PATH"].size > 0 and ENV["BUNDLE_GEMFILE"] and ENV["BUNDLE_GEMFILE"].size > 0
+            zabel_exec = "cd \"#{File.dirname(ENV["BUNDLE_GEMFILE"])}\" && \"#{ENV["BUNDLE_BIN_PATH"]}\" exe zabel"
         end
+        extract_script = "#{zabel_exec} #{STAGE_EXTRACT} \"#{target_cache_dir}\" \"#{target_context[:build_product_dir]}\" \"#{target_context[:build_intermediate_dir]}\""
+
+        inject_phase = target.new_shell_script_build_phase("zabel_extract_#{target.name}")
+        inject_phase.shell_script = extract_script
+        inject_phase.show_env_vars_in_log = '1'
     end
     
     def self.zabel_inject_printenv(project, target)
+        zabel_exec = "\"#{$0}\""
+        if ENV["BUNDLE_BIN_PATH"] and ENV["BUNDLE_BIN_PATH"].size > 0 and ENV["BUNDLE_GEMFILE"] and ENV["BUNDLE_GEMFILE"].size > 0
+            zabel_exec = "cd \"#{File.dirname(ENV["BUNDLE_GEMFILE"])}\" && \"#{ENV["BUNDLE_BIN_PATH"]}\" exe zabel"
+        end
         inject_phase = target.new_shell_script_build_phase("zabel_printenv_#{target.name}")
-        inject_phase.shell_script = "#{$0} #{STAGE_PRINTENV} #{target.name} \"#{project.path}\""
+        inject_phase.shell_script = "#{zabel_exec} #{STAGE_PRINTENV} #{target.name} \"#{project.path}\""
         inject_phase.show_env_vars_in_log = '1'
     end
     
@@ -723,7 +693,7 @@ module Zabel
             configuration_name = argv[argv.index("--configuration") + 1]
         end
         unless configuration_name and configuration_name.size > 0
-            raise "[ZABEL]<ERROR> -configuration or --configuration should be set"
+            raise "[ZABEL/E] -configuration or --configuration should be set"
         end
 
         start_time = Time.now
@@ -736,15 +706,6 @@ module Zabel
     
         zabel_clean_temp_files
     
-        if zabel_should_extract_once
-            inject_project = Xcodeproj::Project.new("Pods/zabel.xcodeproj")
-            inject_target = inject_project.new_aggregate_target("zabel")
-            inject_phase = inject_target.new_shell_script_build_phase("zabel_extract")
-            inject_phase.show_env_vars_in_log = '1'
-            inject_project.save
-            inject_scripts = []
-        end
-    
         projects = zabel_get_projects
     
         pre_targets_context = {}
@@ -755,19 +716,32 @@ module Zabel
         iteration_count = 0
     
         projects.each do | project |
+            project_configuration = project.build_configurations.detect { | config | config.name == configuration_name}
+            unless project_configuration
+                puts "[ZABEL/E] #{project.path} should have config #{configuration_name}"
+                next
+            end
             project.native_targets.each do | target |
                 if zabel_can_cache_target(target)
                     source_files = zabel_get_target_source_files(target)
-                    next unless source_files.size >= zabel_get_min_source_file_count
+                    unless source_files.size >= zabel_get_min_source_file_count
+                        puts "[ZABEL/I] skip #{target.name} #{source_files.size} >= #{zabel_get_min_source_file_count}"
+                        next
+                    end
                     target_md5_content = zabel_get_target_md5_content(project, target, configuration_name, argv, source_files)
                     target_md5 = Digest::MD5.hexdigest(target_md5_content)
-                    potential_hit_target_cache_dirs = zabel_get_potential_hit_target_cache_dirs(target, target_md5) 
+                    miss_dependency_list = []
+                    potential_hit_target_cache_dirs = zabel_get_potential_hit_target_cache_dirs(target, target_md5, miss_dependency_list) 
     
                     target_context = {}
                     target_context[:target_md5] = target_md5
                     target_context[:potential_hit_target_cache_dirs] = potential_hit_target_cache_dirs
+                    target_context[:miss_dependency_list] = miss_dependency_list
                     if potential_hit_target_cache_dirs.size == 0
-                        puts "[ZABEL]<INFO> miss #{target.name} #{target_md5} in iteration #{iteration_count}"
+                        if miss_dependency_list.size > 0
+                            puts miss_dependency_list.uniq.join("\n")
+                        end
+                        puts "[ZABEL/I] miss #{target.name} #{target_md5} in iteration #{iteration_count}"
                         target_context[:target_status] = STATUS_MISS
                         miss_count = miss_count + 1
                     end
@@ -811,7 +785,7 @@ module Zabel
                         end
                     end
                     if hit_target_cache_dir
-                        puts "[ZABEL]<INFO> hit #{target.name} #{target_context[:target_md5]} in iteration #{iteration_count} potential #{potential_hit_target_cache_dirs.size}"
+                        puts "[ZABEL/I] hit #{target.name} #{target_context[:target_md5]} in iteration #{iteration_count} potential #{potential_hit_target_cache_dirs.size}"
                         target_context[:target_status] = STATUS_HIT
                         target_context[:hit_target_cache_dir] = hit_target_cache_dir
                         hit_count = hit_count + 1
@@ -831,11 +805,15 @@ module Zabel
                 target_context = pre_targets_context[target]
     
                 if target_context[:target_status] == STATUS_HIT
-                    zabel_disable_build_and_inject_extract(project, target, inject_project, inject_target, inject_scripts, target_context)
+                    zabel_disable_build_and_inject_extract(project, target, target_context)
                 else
                     unless target_context[:target_status] == STATUS_MISS
                         target_context[:target_status] = STATUS_MISS
-                        puts "[ZABEL]<INFO> miss #{target.name} #{target_context[:target_md5]} in iteration #{iteration_count}"
+                        miss_dependency_list = target_context[:miss_dependency_list]
+                        if miss_dependency_list.size > 0
+                            puts miss_dependency_list.uniq.join("\n")
+                        end
+                        puts "[ZABEL/I] miss #{target.name} #{target_context[:target_md5]} in iteration #{iteration_count}"
                         miss_count = miss_count + 1
                     end
                     zabel_inject_printenv(project, target)
@@ -852,29 +830,50 @@ module Zabel
                 zabel_clean_backup_project(project)
             end
         end
-    
-        if zabel_should_extract_once and inject_scripts.size > 0
-            inject_scripts = (["startTime_s=`date +%s`"] + inject_scripts + ["echo \"[ZABEL]<INFO> duration = $[ `date +%s` - $startTime_s ] s in stage #{STAGE_EXTRACT}\""]).flatten
-            inject_phase.shell_script = inject_scripts.join("\n")
-            inject_project.save
-        end
 
-        puts "[ZABEL]<INFO> total #{hit_count + miss_count} hit #{hit_count} miss #{miss_count} iteration #{iteration_count}"
+        puts "[ZABEL/I] total #{hit_count + miss_count} hit #{hit_count} miss #{miss_count} iteration #{iteration_count}"
     
-        puts "[ZABEL]<INFO> duration = #{(Time.now - start_time).to_i} s in stage pre"
+        puts "[ZABEL/I] duration = #{(Time.now - start_time).to_i} s in stage pre"
     end
     
     def self.zabel_extract
+        puts "[ZABEL/D] #{Time.now.to_f.to_s}"
+        start_time = Time.now
+
         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 
+
+        puts "[ZABEL/I] duration = #{(Time.now - start_time).to_i} s in stage extract"
+        puts "[ZABEL/D] #{Time.now.to_f.to_s}"
     end
     
     def self.zabel_printenv
@@ -893,11 +892,6 @@ module Zabel
     end
     
     def self.zabel_clean
-        if File.exist? "Pods/zabel.xcodeproj"
-            command = "rm -rf Pods/*.xcodeproj"
-            puts command
-            raise unless system command
-        end
         zabel_clean_temp_files
     end
 

data/lib/zabel/version.rb

@@ -1,3 +1,4 @@
 module Zabel
-  VERSION = "1.0.1"
+  VERSION = "1.0.4"
+  CACHE_VERSION = "1"
 end

metadata

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