akcache 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f40c3531c36cdfba8d66f1a6a25fcb516ed15a30efe06583b3d223e46798bca
-  data.tar.gz: 42fe053a9c1e6e1eed2780870d19770065cf916435796750a40239f6a7829030
+  metadata.gz: a09a77cf0dd1f6e164eedf0a94b3e2f87009416c2ca271acb24a2823c26dd190
+  data.tar.gz: 636c83770b0dfc9d78219333daf57cb33b548d69c4f58a85eb753a5355f62f6f
 SHA512:
-  metadata.gz: bc2fbd4f27fd460612ccece726184cb9e5e1e71a4e616fbbf229728ab97ed0761f6a93c492ff0e617bf3bddf0bf38bd2793595ac945060c151bc6ffd35df699b
-  data.tar.gz: 5a8b8c3bc42ee52c60671106a8845551f04f1eb753a2b558065abccfa5041ffabaf00780029c705c46d278ff041fbda47a2d88e397b2b06c33582331f9bf5790
+  metadata.gz: 8ca2435c52e371036a4465960eb3504ecf587628becff5f3dd1a15ff5f92b745bcf02ad5d77d23dad0aac0614cd196d3f7c1b906b976dc04e8ff5e42b9b976bd
+  data.tar.gz: 8b2185ff6a399a12af7c297c690596d8ac4989d0d3e30bfc41276186fdc98196050773f2a3b0e2aa84a163cfa2e18a81ae6a493011e607c0b9f633bedc2b0346

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kcache (1.0.0)
+    akcache (1.0.2)
       xcodeproj (~> 1.0)
 
 GEM
@@ -47,7 +47,7 @@ PLATFORMS
   universal-darwin-21
 
 DEPENDENCIES
-  kcache!
+  akcache!
   rake (~> 13.0)
   rubocop (~> 1.7)
 

data/README.md

@@ -1,4 +1,5 @@
-# Kcache
+# AKCache
+
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/kcache`. To experiment with that code, run `bin/console` for an interactive prompt.
 

data/kcache.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["1433233832@qq.com"]
 
   spec.summary       = "a cache tool"
-  spec.description   = "a cache tool that can promote xcode build time"
+  spec.description   = "a cache tool that can reduce xcode archive time"
   spec.homepage      = "https://github.com/yusheng00"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")

data/lib/kcache/README.md

@@ -0,0 +1,29 @@
+# AKMall
+
+[![CI Status](https://img.shields.io/travis/pangyulei/AKMall.svg?style=flat)](https://travis-ci.org/pangyulei/AKMall)
+[![Version](https://img.shields.io/cocoapods/v/AKMall.svg?style=flat)](https://cocoapods.org/pods/AKMall)
+[![License](https://img.shields.io/cocoapods/l/AKMall.svg?style=flat)](https://cocoapods.org/pods/AKMall)
+[![Platform](https://img.shields.io/cocoapods/p/AKMall.svg?style=flat)](https://cocoapods.org/pods/AKMall)
+
+## Example
+
+To run the example project, clone the repo, and run `pod install` from the Example directory first.
+
+## Requirements
+
+## Installation
+
+AKMall is available through [CocoaPods](https://cocoapods.org). To install
+it, simply add the following line to your Podfile:
+
+```ruby
+pod 'AKMall'
+```
+
+## Author
+
+pangyulei, pangyulei@gmail.com
+
+## License
+
+AKMall is available under the MIT license. See the LICENSE file for more info.

data/lib/kcache/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kcache
-  VERSION = "1.0.0"
+  VERSION = "1.1.1"
 end

data/lib/kcache.rb

@@ -38,9 +38,9 @@ OBJROOT = "OBJROOT"
 #变量
 $podfile_spec_checksums = nil
 $file_md5_hash = {}
+$exclude_target = []
 
-
-  class CacheManager
+class CacheManager
 
     def get_cache_root
         return Dir.home + "/ysCache"
@@ -82,23 +82,24 @@ $file_md5_hash = {}
         end
         return wrapper_project_paths.uniq
     end
+
     
     def backup_project(project)
-        command = "cp \"#{project.path}/project.pbxproj\" \"#{project.path}/project.ysTest_backup_pbxproj\""
+        command = "cp \"#{project.path}/project.pbxproj\" \"#{project.path}/ysTest_backup.pbxproj\""
         raise unless system command
     end
     
     def clean_temp_files
-        command = "rm -rf Pods/*.xcodeproj/project.ysTest_backup_pbxproj"
-        raise unless system command
+        # command = "rm -rf Pods/*.xcodeproj/ysTest_backup.pbxproj"
+        # raise unless system command
     
         command = "rm -rf Pods/*.xcodeproj/*.#{FILE_NAME_TARGET_CONTEXT}"
         raise unless system command
     end
     
     def restore_project(project)
-        if File.exist? "#{project.path}/project.ysTest_backup_pbxproj"
-            command = "mv \"#{project.path}/project.ysTest_backup_pbxproj\" \"#{project.path}/project.pbxproj\""
+        if File.exist? "#{project.path}/ysTest_backup.pbxproj"
+            command = "mv \"#{project.path}/ysTest_backup.pbxproj\" \"#{project.path}/project.pbxproj\""
             raise unless system command
         end
     end
@@ -152,6 +153,7 @@ $file_md5_hash = {}
             file_path = file.file_ref.real_path.to_s
             files.push file_path
         end
+
         #获取所有头文件（.h）
         target.headers_build_phase.files.each do | file |
             file_path = file.file_ref.real_path.to_s
@@ -296,7 +298,7 @@ $file_md5_hash = {}
             if target_context[:target_md5] != target_md5 or target_context[:product_md5] != get_file_md5(target_cache_dir + "/" + FILE_NAME_PRODUCT)
                 command = "rm -rf \"#{target_cache_dir}\""
                 raise unless system command
-                puts "<ERROR> #{target.name} target md5 dose not match:  #{target_cache_dir}"
+                puts "<ERROR> #{target.name} target md5 does not match:  #{target_cache_dir}"
             end
     
             dependency_exit = true
@@ -306,12 +308,12 @@ $file_md5_hash = {}
                     dependency_file = item[0]
                     dependency_md5 = item[1]
                     unless File.exist? dependency_file
-                        # puts "<WARNING> #{target.name} dependency file miss: #{dependency_file}"
+                        puts "<WARNING> #{target.name} dependency file miss: #{dependency_file}"
                         dependency_exit = false
                         break
                     end
                     unless get_file_md5(dependency_file) == dependency_md5
-                        # puts "<WARNING> #{target.name} dependency file md5 dose not match: #{dependency_file}"
+                        puts "<WARNING> #{target.name} dependency file md5 does not match: #{dependency_file}"
                         dependency_exit = false
                         break
                     end
@@ -344,7 +346,7 @@ $file_md5_hash = {}
     end
     
     def inject_flag_action(project, target)
-        command_exec = "kcache"
+        command_exec = "\"#{$0}\""        
         inject_phase = target.new_shell_script_build_phase("ys_inject_#{target.name}")
         inject_phase.shell_script = "#{command_exec} #{"inject"} #{target.name} \"#{project.path}\""
         inject_phase.show_env_vars_in_log = '1'
@@ -352,8 +354,6 @@ $file_md5_hash = {}
     
      def inject_copy_action(project, target, target_context)
         target_cache_dir = target_context[:hit_target_cache_dir]
-        target_product_dir = target_context[:build_product_dir]
-        build_intermediate_dir = target_context[:build_intermediate_dir]
     
         target.build_phases.delete_if { | build_phase | 
             build_phase.class == Xcodeproj::Project::Object::PBXHeadersBuildPhase or 
@@ -361,15 +361,9 @@ $file_md5_hash = {}
             build_phase.class == Xcodeproj::Project::Object::PBXResourcesBuildPhase
         }
     
-    #    if target.name == "EURLocalizedStrings"
-    #        target.build_phases.delete_if { |phase| 
-    #            phase.class == Xcodeproj::Project::Object::PBXShellScriptBuildPhase
-    #        }
-    #    end
-    
-        command_exec = "kcache"
+        command_exec = "\"#{$0}\""        
         inject_phase = target.new_shell_script_build_phase("ys_copy_#{target.name}")
-        inject_phase.shell_script = "#{command_exec} #{"copy"} \"#{target_cache_dir}\" \"#{target_product_dir}\" \"#{build_intermediate_dir}\""
+        inject_phase.shell_script = "#{command_exec} #{"copy"} \"#{target_cache_dir}\""
         inject_phase.show_env_vars_in_log = '1'
     end
     
@@ -379,10 +373,10 @@ $file_md5_hash = {}
         start_time = Time.now
         target_cache_dir = ARGV[1]
         cache_product_path = target_cache_dir + "/#{FILE_NAME_PRODUCT}"
-    
+
         [SYMROOT, CONFIGURATION_BUILD_DIR, CONFIGURATION_TEMP_DIR, OBJROOT, TARGET_BUILD_DIR, TARGET_TEMP_DIR, SRCROOT, FULL_PRODUCT_NAME].sort.each do | key |
             unless ENV.has_key? key and ENV[key] and ENV[key].size > 0
-                raise "<INFO> #{target.name} should have #{key}"
+                raise "<INFO> #{$0} should have #{key}"
                 break
             end
         end
@@ -413,7 +407,6 @@ $file_md5_hash = {}
     def add_cache(target, target_info)
         target_md5 = target_info[:target_md5]
         product_dir = target_info[CONFIGURATION_BUILD_DIR]
-        # intermediate_dir = target_info[TARGET_TEMP_DIR]
         full_product_name = target_info[FULL_PRODUCT_NAME]
     
         Dir.glob("#{product_dir}/**/*.modulemap").each do | modulemap |
@@ -440,7 +433,14 @@ $file_md5_hash = {}
             puts "<INFO> #{command} should succeed"
             return false
         end
-    
+
+        already_target_cache_dirs = Dir.glob(get_cache_root + "/" + target.name + "-" + target_md5 + "-*")
+        already_target_cache_dirs.each do |path|
+            if File.exist? path
+                raise unless system "rm -rf \"#{path}\""
+            end
+        end
+        
         target_cache_dir = get_cache_root + "/" + target.name + "-" + target_md5 + "-" + (Time.now.to_f * 1000).to_i.to_s
         if File.exist? target_cache_dir
             puts "<INFO> #{target_cache_dir} should not exist"
@@ -486,23 +486,59 @@ $file_md5_hash = {}
         return true
     
     end
+
+    def get_custom_config_information
+        if File.exist? "project_cache_config.yml"
+            custom_config = YAML.load (File.read("project_cache_config.yml"))
+            $exclude_target = custom_config[:exclude_targets]
+        else
+            source = {
+                :description => nil,
+                :dependency_check => true,
+                :exclude_targets => ["target1", "target2"],
+            }.to_yaml
+    
+            substitution_list = {
+                /:description:/ => "# You can assign values to these parameters to achieve some custom functions\n",
+                /:dependency_check:/ => "\n\n# Whether to check the dependencies of the target. For exzample: target A depends on target B. Under normal circumstances, target B is recompiled, then target A will be recompiled, but if the dependencies are not checked, target A will not be recompiled at this time\n:dependency_check:",
+                /:exclude_targets:/ => "\n\n# the targets that will not participate in cache dependency detection\n:exclude_targets:",
+            }
+    
+            substitution_list.each do |pattern, replacement|
+              source.gsub!(pattern, replacement)
+            end
+            puts source
+            File.write("project_cache_config.yml", source)
+        end
     
-    def project_task_begin
+    end
     
-        clean_temp_files
+    
+    def project_task_begin
+
         projects = get_projects
         total_count = 0
         hit_count = 0
         miss_count = 0
         error_count = 0
         hit_target_md5_cache_set = Set.new
+        miss_target_cache_set = Set.new
+
+        get_custom_config_information
     
         pre_targets_info = {}
+
+        projects.each do |project|
+            restore_project(project)
+            backup_project(project)
+        end
+
+        clean_temp_files 
+        
+        projects = get_projects
+
         projects.each do |project|
             project.native_targets.each do |target|
-                target.build_phases.delete_if { |phase|
-                    phase.class == Xcodeproj::Project::Object::PBXShellScriptBuildPhase and phase.name.include? "ys_"
-                }
                 if can_cache_target(target)
                     total_count = total_count + 1
                     source_files = get_target_source_files(target)
@@ -532,58 +568,86 @@ $file_md5_hash = {}
                 end
             end
         end
-    
-        projects.each do |project|
-            project.native_targets.each do |target|
-                target_info = pre_targets_info[target]
-                next unless target_info and target_info[:target_status] != CACHE_STATUS_MISS
-                hit_target_cache_dirs = target_info[:hit_target_cache_dir]
-                next unless hit_target_cache_dirs and hit_target_cache_dirs.count > 0
-                target_md5 = target_info[:target_md5]
-                
-                really_hit_dir = ""
-                hit_target_cache_dirs.each do |hit_target_cache_dir|
-                    all_dependency_target_exist = true
-                    hit_targets_info = YAML.load(File.read(hit_target_cache_dir + "/" + FILE_NAME_CONTEXT))
-                    if hit_targets_info[:dependency_targets_md5]
-                        hit_targets_info[:dependency_targets_md5].each do | item |
-                            dependency_target = item[0]
-                            dependency_target_md5 = item[1]
-                            unless hit_target_md5_cache_set.include? "#{dependency_target}-#{dependency_target_md5}"
-                                puts "<INFO> #{target.name} #{target_md5} hit cache, but dependency target #{dependency_target}-#{dependency_target_md5} dose not hit"
-                                all_dependency_target_exist = false
+          
+        while true
+            projects.each do |project|
+                project.native_targets.each do |target|
+                    target_info = pre_targets_info[target]
+                    next unless target_info and target_info[:target_status] != CACHE_STATUS_MISS
+                    next unless target_info and target_info[:target_status] != CACHE_STATUS_HIT
+                    hit_target_cache_dirs = target_info[:hit_target_cache_dir]
+                    next unless hit_target_cache_dirs and hit_target_cache_dirs.count > 0
+                    target_md5 = target_info[:target_md5]
+                    
+                    target_really_hit_dir = ""
+                    target_really_miss = false
+                    hit_target_cache_dirs.each do |hit_target_cache_dir|
+                        all_dependency_target_exist = true
+                        target_really_miss = false
+                        hit_targets_info = YAML.load(File.read(hit_target_cache_dir + "/" + FILE_NAME_CONTEXT))
+                        if hit_targets_info[:dependency_targets_md5]
+                            hit_targets_info[:dependency_targets_md5].each do | item |
+                                dependency_target = item[0]
+                                dependency_target_md5 = item[1]
+                                if $exclude_target.include? dependency_target 
+                                    puts "<INFO> #{target.name} #{target_md5} hit cache, dependency target #{dependency_target}-#{dependency_target_md5} skip check"
+                                    next
+                                end
+                                
+                                if miss_target_cache_set.include? "#{dependency_target}"
+                                    puts "<INFO> #{target.name} #{target_md5} hit cache, but dependency target #{dependency_target}-#{dependency_target_md5} does not hit"
+                                    target_really_miss = true
+                                    all_dependency_target_exist = false
+                                    break
+                                end
+
+                                unless hit_target_md5_cache_set.include? "#{dependency_target}-#{dependency_target_md5}"
+                                    puts "<INFO> #{target.name} #{target_md5} hit cache, but dependency target #{dependency_target}-#{dependency_target_md5} does not hit"
+                                    all_dependency_target_exist = false
+                                    target_really_miss = true
+                                    break
+                                end
+                            end
+                            
+                            if all_dependency_target_exist
+                                target_really_hit_dir = hit_target_cache_dir
+                                break
+                            end
+
+                            if target_really_miss
                                 break
                             end
-                        end
-                        
-                        if all_dependency_target_exist
-                            really_hit_dir = hit_target_cache_dir
-                            break
                         end
                     end
+        
+                    if target_really_hit_dir.length > 0
+                        puts "<INFO> #{target.name} #{target_md5} hit cache"
+                        hit_count = hit_count + 1
+                        hit_target_info = YAML.load(File.read(target_really_hit_dir + "/" + FILE_NAME_CONTEXT))
+                        target_info = target_info.merge!(hit_target_info)
+                        target_info[:target_status] = CACHE_STATUS_HIT
+                        target_info[:hit_target_cache_dir] = target_really_hit_dir
+                        inject_copy_action(project, target, target_info)
+                    end
+
+                    if target_really_miss 
+                        miss_count = miss_count + 1
+                        miss_target_cache_set.add "#{target.name}"
+                        hit_target_md5_cache_set.delete "#{target.name}-#{target_info[:target_md5]}"
+                        target_info[:target_status] = CACHE_STATUS_MISS
+                        target_info.delete(:hit_target_cache_dir)
+                        inject_flag_action(project, target)
+                    end
+
+                    File.write("#{project.path}/#{target.name}.#{FILE_NAME_TARGET_CONTEXT}", target_info.to_yaml)
                 end
-    
-                if really_hit_dir.length > 0
-                    puts "<INFO> #{target.name} #{target_md5} hit cache"
-                    hit_count = hit_count + 1
-                    hit_target_info = YAML.load(File.read(really_hit_dir + "/" + FILE_NAME_CONTEXT))
-                    target_info = target_info.merge!(hit_target_info)
-                    target_info[:target_status] = CACHE_STATUS_HIT
-                    target_info[:hit_target_cache_dir] = really_hit_dir
-                    inject_copy_action(project, target, target_info)
-                else
-                    puts "<INFO> #{target.name} #{target_md5} miss cache for reason dependency miss"
-                    target_info[:target_status] = CACHE_STATUS_MISS
-                    target_info.delete(:hit_target_cache_dir)
-                    inject_flag_action(project, target)
-                    miss_count = miss_count + 1
-                end
-                File.write("#{project.path}/#{target.name}.#{FILE_NAME_TARGET_CONTEXT}", target_info.to_yaml)
-    
+                project.save
+            end
+            if total_count == hit_count + miss_count + error_count
+                break
+            else
+                puts "<INFO> continue to find hit cache"
             end
-    
-            backup_project(project)
-            project.save
         end
         puts "<INFO> total count: #{total_count}, hit count: #{hit_count}, miss_count: #{miss_count}, error_count: #{error_count}"
     end
@@ -734,7 +798,6 @@ $file_md5_hash = {}
     
         puts "<INFO> total add cache count: #{total_add_count}"
     end
-    
 
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akcache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - yusheng
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: a cache tool that can promote xcode build time
+description: a cache tool that can reduce xcode archive time
 email:
 - 1433233832@qq.com
 executables:
@@ -47,7 +47,9 @@ files:
 - bin/setup
 - kcache.gemspec
 - lib/kcache.rb
+- lib/kcache/README.md
 - lib/kcache/version.rb
+- lib/pod_plugin.rb
 homepage: https://github.com/yusheng00
 licenses:
 - MIT
@@ -55,7 +57,7 @@ metadata:
   homepage_uri: https://github.com/yusheng00
   source_code_uri: https://github.com/yusheng00
   changelog_uri: https://github.com/yusheng00
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -70,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: a cache tool
 test_files: []