zabel 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89413297b2ba01b9d67f3bd364566b73ad66164fbcffba18c13f799a35f0b760
-  data.tar.gz: 31e676f429656820d38993ffc31b5a6521bd510dedaab32464f5ab3a69ddf3f8
+  metadata.gz: c252d78baa1f53c925ae86fcd441c044e36240b25d4d9586e27e922901c0cc91
+  data.tar.gz: f3d310882935e4010bdce00b4a0fb248df34639a8af59a35f032491d2b478881
 SHA512:
-  metadata.gz: 8644fe694d350d9799affc0eb50f0cc668380dbbf32361d5fb48a29c02cf330bfe63d2769311e3c64f6f33e351b0d028429022cf0a9d6099c9664e5d3db58cf9
-  data.tar.gz: 56102a92ef122f2cd71c80f6c5e61b561cff1c14021d7dbd77ee4175b708a62f5dc64f2e1150324582f25a02cbbd553782ee9b34517b1b4beeb998e24db457ba
+  metadata.gz: c6adde390bb82e92bbf984530690bf399b062e689696bdff2fcc82e2d4c2cd9109ee54f8ead16308000999577cca6865893580aeaef37228e388c51ab678f62a
+  data.tar.gz: ab08a8ac353e898945f8d7b7866caf890a027e31729af110d89d1bed1b32d71130ab6a0a282d0bb352ff2bed948e82f8000458a2545897651e7de5c499976c31

data/.gitignore

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

data/README.md

@@ -2,6 +2,8 @@
 
 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
 
 - only support Cocoapods targets now
@@ -23,9 +25,13 @@ Zabel, is a build cacher for Xcode, using Xcodeproj and MD5, to detect and cache
 
 ## Installation
 
+Please use Ruby 2.x.
+
 Add this line to your application's Gemfile:
 
 ```ruby
+source "https://rubygems.org"
+
 gem 'zabel'
 ```
 
@@ -33,30 +39,53 @@ 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 custom 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.3 support bundle install
 - 1.0.2 support legacy build system
 - 1.0.1 support xcodebuild archive and fastlane
 - 1.0.0

data/bin/zabel

@@ -24,8 +24,17 @@ elsif ARGV.include?("-configuration") or ARGV.include?("--configuration")
     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}"
+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

@@ -74,10 +74,6 @@ module Zabel
         return 1
     end
 
-    def self.zabel_should_extract_once
-        return false
-    end
-
     def self.zabel_get_projects
         # TODO: to support more project, not only Pods
         pods_project = Xcodeproj::Project.open("Pods/Pods.xcodeproj")
@@ -645,23 +641,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
@@ -674,34 +654,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
     
@@ -728,15 +698,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 = {}
@@ -823,7 +784,7 @@ 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
@@ -844,12 +805,6 @@ 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}"
     

data/lib/zabel/version.rb

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

metadata

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