akcache 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e111a87e7b115115b7fe107f4973a6860e4932a9fd60bf39a618b1ecef70a71a
-  data.tar.gz: e64335df77ccde462d563a4824d56e8ddb8e121f25b63154fd04447d3d435953
+  metadata.gz: a09a77cf0dd1f6e164eedf0a94b3e2f87009416c2ca271acb24a2823c26dd190
+  data.tar.gz: 636c83770b0dfc9d78219333daf57cb33b548d69c4f58a85eb753a5355f62f6f
 SHA512:
-  metadata.gz: 9ae37bcf39f37c9189f204fde4a90bb38dc0902058cd0c82c83d43dc32ba867e5d250fdc39ccfa9ef177e75fab597e4ad707016ed6b1dab0b54d85ccc26499f2
-  data.tar.gz: 73c4cace947c1c93670f139d568edcb7d8091ddd7a406da832c7c8fa5363c1647843a20a09293ac064cd9b935cb7f205489b5853ee8c960316a990232f7986ca
+  metadata.gz: 8ca2435c52e371036a4465960eb3504ecf587628becff5f3dd1a15ff5f92b745bcf02ad5d77d23dad0aac0614cd196d3f7c1b906b976dc04e8ff5e42b9b976bd
+  data.tar.gz: 8b2185ff6a399a12af7c297c690596d8ac4989d0d3e30bfc41276186fdc98196050773f2a3b0e2aa84a163cfa2e18a81ae6a493011e607c0b9f633bedc2b0346

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/version.rb

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

data/lib/kcache.rb

@@ -40,7 +40,7 @@ $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 @@ $exclude_target = []
         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 @@ $exclude_target = []
             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 @@ $exclude_target = []
             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 @@ $exclude_target = []
                     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
@@ -352,8 +354,6 @@ $exclude_target = []
     
      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,14 +361,9 @@ $exclude_target = []
             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 = "\"#{$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
     
@@ -378,10 +373,10 @@ $exclude_target = []
         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
@@ -412,7 +407,6 @@ $exclude_target = []
     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 |
@@ -521,8 +515,7 @@ $exclude_target = []
     
     
     def project_task_begin
-    
-        clean_temp_files
+
         projects = get_projects
         total_count = 0
         hit_count = 0
@@ -534,11 +527,18 @@ $exclude_target = []
         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)
@@ -568,8 +568,8 @@ $exclude_target = []
                 end
             end
         end
-        
-        while 1
+          
+        while true
             projects.each do |project|
                 project.native_targets.each do |target|
                     target_info = pre_targets_info[target]
@@ -595,14 +595,14 @@ $exclude_target = []
                                 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} dose not hit"
+                                    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} dose not hit"
+                                    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
@@ -640,10 +640,7 @@ $exclude_target = []
                     end
 
                     File.write("#{project.path}/#{target.name}.#{FILE_NAME_TARGET_CONTEXT}", target_info.to_yaml)
-        
                 end
-        
-                backup_project(project)
                 project.save
             end
             if total_count == hit_count + miss_count + error_count
@@ -801,7 +798,6 @@ $exclude_target = []
     
         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.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - yusheng
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 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:
@@ -49,6 +49,7 @@ files:
 - lib/kcache.rb
 - lib/kcache/README.md
 - lib/kcache/version.rb
+- lib/pod_plugin.rb
 homepage: https://github.com/yusheng00
 licenses:
 - MIT
@@ -56,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
@@ -71,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: []