akcache 1.1.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61606c56e5669af26ac45d1570d7c03b9f7162fada8fa21f81b7d6e31cfd73c9
-  data.tar.gz: 1a4f8d700c08f5f3a4c76b98859587a39fbf84a6a3f4e9d0f726c14b78506238
+  metadata.gz: 4f1e7c5b3e86764ec008d18297ddd6046bef0bba071131cb071f547216f98643
+  data.tar.gz: e40db2fb5988f4d10979fee186b9c2edaccbefb01ba15689727ce6940bdd86a4
 SHA512:
-  metadata.gz: c1bcf43339041a467e95482b9ed716d1422075aa1dd71340119df6f7aaf84046497de93501ca4740703887cf3e5d90f4f107d8860bdeb783a3aa422b077fc91e
-  data.tar.gz: 75be160670313f6ed6f1add935ac70f1851e69ed0597e9ac3a69817c4b4bda6d3bf959d10bf80c5c8b52abd90990dadc850e2c8246d9532726bbe1a647a60f50
+  metadata.gz: 55e5fde66337bd885753e702737b5e063b4af05ce2825bf4071ff1dbbde1c1476a0195db9a9b686bac07224757d33b0c71b459cd6e25aec00fc53c2f43cfa1aa
+  data.tar.gz: dd9221c730af1b32c8525479bc36b3417949f01fa3c923f343f92fc738d8e2bcaeb9b696ff9109f24bbd76552bcfff38b0b4c98b0041ba8dc546cd5487d0ebd4

data/bin/kcache

@@ -10,11 +10,9 @@ if ARGV[0] == "xcodebuild" or ARGV[0] == "fastlane"
     manager.project_task_end
   
 elsif ARGV[0] == "inject"
-
     manager.set_prama_to_yaml
 
 elsif ARGV[0] == "copy"
-
     manager.copy_cache
 
 elsif ARGV[0] == "begin"

data/lib/kcache/version.rb

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

data/lib/kcache.rb

@@ -36,6 +36,7 @@ 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
@@ -269,7 +282,7 @@ class CacheManager
             else
                 source_md5_list.push "Target configuration: #{$target_build_configuration}"    
             end
-            
+
             source_md5_content = source_md5_list.join("\n")
             return source_md5_content
     
@@ -282,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 = []
     
@@ -437,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}\""
@@ -526,6 +554,8 @@ class CacheManager
                 elsif prama.include? "Release"
                     $target_build_configuration = "Release"
                 end
+            elsif prama.include? "branch:"
+                $project_build_branch = prama.dup.gsub!("branch:", "")
             end
         end
 
@@ -552,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.3
+  version: 2.0.0
 platform: ruby
 authors:
 - yusheng
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj