akcache 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a09a77cf0dd1f6e164eedf0a94b3e2f87009416c2ca271acb24a2823c26dd190
-  data.tar.gz: 636c83770b0dfc9d78219333daf57cb33b548d69c4f58a85eb753a5355f62f6f
+  metadata.gz: 4f1e7c5b3e86764ec008d18297ddd6046bef0bba071131cb071f547216f98643
+  data.tar.gz: e40db2fb5988f4d10979fee186b9c2edaccbefb01ba15689727ce6940bdd86a4
 SHA512:
-  metadata.gz: 8ca2435c52e371036a4465960eb3504ecf587628becff5f3dd1a15ff5f92b745bcf02ad5d77d23dad0aac0614cd196d3f7c1b906b976dc04e8ff5e42b9b976bd
-  data.tar.gz: 8b2185ff6a399a12af7c297c690596d8ac4989d0d3e30bfc41276186fdc98196050773f2a3b0e2aa84a163cfa2e18a81ae6a493011e607c0b9f633bedc2b0346
+  metadata.gz: 55e5fde66337bd885753e702737b5e063b4af05ce2825bf4071ff1dbbde1c1476a0195db9a9b686bac07224757d33b0c71b459cd6e25aec00fc53c2f43cfa1aa
+  data.tar.gz: dd9221c730af1b32c8525479bc36b3417949f01fa3c923f343f92fc738d8e2bcaeb9b696ff9109f24bbd76552bcfff38b0b4c98b0041ba8dc546cd5487d0ebd4

data/bin/kcache

@@ -5,20 +5,18 @@ require 'kcache'
 manager = CacheManager.new
 
 if ARGV[0] == "xcodebuild" or ARGV[0] == "fastlane"
-    manager.project_task_begin
+    manager.project_task_begin(ARGV)
     raise unless system(*ARGV)
     manager.project_task_end
   
 elsif ARGV[0] == "inject"
-
     manager.set_prama_to_yaml
 
 elsif ARGV[0] == "copy"
-
     manager.copy_cache
 
 elsif ARGV[0] == "begin"
-    manager.project_task_begin
+    manager.project_task_begin(ARGV)
 
 elsif ARGV[0] == "end"
     manager.project_task_end

data/lib/kcache/version.rb

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

data/lib/kcache.rb

@@ -9,7 +9,6 @@ require "find"
 require 'set'
 
 #配置
-Target_Build_Configuration = "Release"
 
 TARGET_CACHE_CONFIG = "target_cache_config.yml"
 
@@ -36,6 +35,8 @@ OBJROOT = "OBJROOT"
 
 
 #变量
+$target_build_configuration = "Release"
+$project_build_branch = "master"
 $podfile_spec_checksums = nil
 $file_md5_hash = {}
 $exclude_target = []
@@ -43,9 +44,21 @@ $exclude_target = []
 class CacheManager
 
     def get_cache_root
-        return Dir.home + "/ysCache"
+        return Dir.home + "/ysCache" +"/#{$project_build_branch}"
+    end
+
+    def get_default_cache_root
+        return Dir.home + "/ysCache/master"
     end
     
+    def is_private_target(target)
+        if target.name.start_with? "AK" or target.name.start_with? "EUR" or target.name.start_with? "A4K"
+            return true
+        else
+            return false
+        end
+    end
+
     def get_content_without_pwd(content)
         content = content.gsub("#{Dir.pwd}/", "").gsub(/#{Dir.pwd}(\W|$)/, '\1')
         return content
@@ -188,7 +201,7 @@ class CacheManager
             $podfile_spec_checksums = podfile_lock["SPEC CHECKSUMS"]
         end
     
-        project_configuration = project.build_configurations.detect { | config | config.name == Target_Build_Configuration}
+        project_configuration = project.build_configurations.detect { | config | config.name == $target_build_configuration}
         project_configuration_content = project_configuration.pretty_print.to_yaml
     
         project_xcconfig = ""
@@ -199,7 +212,7 @@ class CacheManager
             end
         end
     
-        target_configuration = target.build_configurations.detect { | config | config.name == Target_Build_Configuration}
+        target_configuration = target.build_configurations.detect { | config | config.name == $target_build_configuration}
         target_configuration_content = target_configuration.pretty_print.to_yaml
     
         target_xcconfig = ""
@@ -266,7 +279,10 @@ class CacheManager
                         source_md5_list.push path + " : " + get_file_md5(path)
                     end
                 end
+            else
+                source_md5_list.push "Target configuration: #{$target_build_configuration}"    
             end
+
             source_md5_content = source_md5_list.join("\n")
             return source_md5_content
     
@@ -279,7 +295,11 @@ class CacheManager
 
         dependency_start_time = Time.now
     
-        target_cache_dirs = Dir.glob(get_cache_root + "/" + target.name + "-" + target_md5 + "-*")
+        if is_private_target(target) 
+            target_cache_dirs = Dir.glob(get_cache_root + "/" + target.name + "-" + target_md5 + "-*")
+        else
+            target_cache_dirs = Dir.glob(get_default_cache_root + "/" + target.name + "-" + target_md5 + "-*")
+        end
     
         hit_results = []
     
@@ -434,14 +454,25 @@ class CacheManager
             return false
         end
 
-        already_target_cache_dirs = Dir.glob(get_cache_root + "/" + target.name + "-" + target_md5 + "-*")
+
+        if is_private_target(target) 
+            already_target_cache_dirs = Dir.glob(get_cache_root + "/" + target.name + "-" + target_md5 + "-*")
+        else
+            already_target_cache_dirs = Dir.glob(get_default_cache_root + "/" + target.name + "-" + target_md5 + "-*")
+        end
+
         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 is_private_target(target) 
+            target_cache_dir = get_cache_root + "/" + target.name + "-" + target_md5 + "-" + (Time.now.to_f * 1000).to_i.to_s
+        else
+            target_cache_dir = get_default_cache_root + "/" + target.name + "-" + target_md5 + "-" + (Time.now.to_f * 1000).to_i.to_s
+        end
+
         if File.exist? target_cache_dir
             puts "<INFO> #{target_cache_dir} should not exist"
             raise unless system "rm -rf \"#{target_cache_dir}\""
@@ -514,7 +545,19 @@ class CacheManager
     end
     
     
-    def project_task_begin
+    def project_task_begin(argv)
+
+        argv.each do |prama|
+            if prama.include? "configuration" 
+                if prama.include? "Debug"
+                    $target_build_configuration = "Debug"
+                elsif prama.include? "Release"
+                    $target_build_configuration = "Release"
+                end
+            elsif prama.include? "branch:"
+                $project_build_branch = prama.dup.gsub!("branch:", "")
+            end
+        end
 
         projects = get_projects
         total_count = 0
@@ -539,6 +582,9 @@ class CacheManager
 
         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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akcache
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - yusheng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-31 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj