zabel 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bbbbd6d01a9148ff002993ceebe5ed44aba4fd905cb1529689ca40406357aff
-  data.tar.gz: b0ef1fd3e75802bc1ab90f99f3c2910263e84c0fa4352536a7e7515a7e8515c5
+  metadata.gz: cc4cbbc3f7bbd44aab6c8956a5bf28ebb5eee811d4d83f1682770ea4ce878627
+  data.tar.gz: 034b407ef6ccd3c063d1455be9eab00cc43cbbfa1d59a8412558e320046cb4ba
 SHA512:
-  metadata.gz: 842b4eade28085456376de660c8f353108d488caf3f26dcd6308476c2eab2a60cfa67e1c4f5a248cc9a7c4a29d574ecbaa41273d56dd3d323a05a8453698fd11
-  data.tar.gz: 28fdc857de4f92a8c6c806305e858bdd94c5fb2888bc86eaa7fb7f9a3b67ea311ef28bf132ffb4690ab5bea9449f62eb62c5a983fb5f0a9bc1988d38f343cf3b
+  metadata.gz: 66249457f3f78f39421c1d84f7a5ba00cb108e30251dc5fbb7c2b243be1d218b2b1e4a21e62d6714f942638737c11c9773fdbc27c05b9a8a14c07e07fed0ca69
+  data.tar.gz: ecc774715a35089f5f9686a24aba6982ad034f4dd7542b4ac1180e298557f3accca60b10ec51669a9f9c9b952c747e214f7e8cc6fc35f39e3965aa0699a0a775

data/bin/zabel

@@ -15,6 +15,8 @@ elsif ARGV[0] == Zabel::STAGE_POST
 elsif ARGV.include?("-configuration") or ARGV.include?("--configuration")
     total_start_time = Time.now
 
+    puts ARGV.to_s
+    
     Zabel::zabel_pre(ARGV)
 
     build_start_time = Time.now

data/lib/zabel/version.rb

@@ -1,4 +1,4 @@
 module Zabel
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
   CACHE_VERSION = "1"
 end

data/lib/zabel.rb

@@ -23,6 +23,7 @@ module Zabel
 
     STATUS_HIT = "hit"
     STATUS_MISS = "miss"
+    STATUS_MISS_AND_READY = "miss_ready"
 
     STAGE_CLEAN = "clean"
     STAGE_EXTRACT = "extract"
@@ -130,15 +131,19 @@ module Zabel
                 file = file.gsub("\\ ", " ")
     
                 unless File.exist? file
-                    puts "[ZABEL/E] #{target.name} #{file} should exist in dependency file #{dependency_file}"
+                    puts "[ZABEL/E] #{target.name} #{file} should exist in dependency file #{dependency_file} in #{intermediate_dir}/**/*.d"
                     return []
                 end
     
                 if file.start_with? intermediate_dir + "/" or 
-                    file.start_with? product_dir + "/" or
-                    file.start_with? xcframeworks_build_dir + "/"
+                    file.start_with? product_dir + "/"
                     next
                 end
+
+                if xcframeworks_build_dir and xcframeworks_build_dir.size > 0 and file.start_with? xcframeworks_build_dir + "/"
+                    next
+                end
+
     
                 dependency_files.push file
             end
@@ -256,15 +261,13 @@ module Zabel
         target_configuration = target.build_configurations.detect { | config | config.name == configuration_name}
         target_configuration_content = target_configuration.pretty_print.to_yaml
         target_xcconfig = ""
-        target_spec_name = ""
         if target_configuration.base_configuration_reference
             config_file_path = target_configuration.base_configuration_reference.real_path.to_s
-            target_spec_name = File.basename(File.dirname(config_file_path))
             if File.exist? config_file_path
                 target_xcconfig = File.read(config_file_path).lines.reject{|line|line.include? "_SEARCH_PATHS"}.sort.join("")
             end
         end
-    
+
         first_configuration = []
         build_phases = []
         build_phases.push target.source_build_phase if target.methods.include? :source_build_phase
@@ -300,11 +303,29 @@ module Zabel
         source_md5_list.push "ARGV : #{key_argv.to_s}"
     
         # TODO: to get a explicit spec name from a target. 
-        if target_spec_name.size > 0 and $zabel_podfile_spec_checksums.has_key? target_spec_name
-            source_md5_list.push "SPEC CHECKSUM : #{target_spec_name} #{$zabel_podfile_spec_checksums[target_spec_name]}"
-            has_found_checksum = true
-        else
-            puts "[ZABEL/E] #{target.name} #{target_spec_name} SPEC CHECKSUM should be found"
+        target_possible_spec_names = []
+        target_possible_spec_names.push target_configuration.build_settings["PRODUCT_NAME"] if target_configuration.build_settings["PRODUCT_NAME"]
+        target_possible_spec_names.push target_configuration.build_settings["IBSC_MODULE"] if target_configuration.build_settings["IBSC_MODULE"]
+        target_possible_spec_names.push File.basename(target_configuration.build_settings["CONFIGURATION_BUILD_DIR"]) if target_configuration.build_settings["CONFIGURATION_BUILD_DIR"]
+        if target_xcconfig.lines.detect { | line | line.start_with? "CONFIGURATION_BUILD_DIR = "}
+            target_possible_spec_names.push File.basename(target_xcconfig.lines.detect { | line | line.start_with? "CONFIGURATION_BUILD_DIR = "}.strip)
+        end
+        if target_xcconfig.lines.detect { | line | line.start_with? "PODS_TARGET_SRCROOT = "}
+            target_possible_spec_names.push File.basename(target_xcconfig.lines.detect { | line | line.start_with? "PODS_TARGET_SRCROOT = "}.strip)
+        end
+
+        target_match_spec_names = []
+        target_possible_spec_names.uniq.sort.each do | spec_name |
+            if spec_name.size > 0 and $zabel_podfile_spec_checksums.has_key? spec_name
+                source_md5_list.push "SPEC CHECKSUM : #{spec_name} #{$zabel_podfile_spec_checksums[spec_name]}"
+                target_match_spec_names.push spec_name
+            end
+        end
+        
+        unless target_match_spec_names.size == 1
+            puts "[ZABEL/E] #{target.name} #{target_possible_spec_names.to_s} #{target_match_spec_names.to_s} SPEC CHECKSUM should be found"
+            puts target_configuration.build_settings.to_s
+            puts target_xcconfig
         end
     
         source_md5_list.push "Project : #{File.basename(project.path)}"
@@ -459,8 +480,18 @@ module Zabel
                 end
                 if zabel_can_cache_target(target)
                     target_context = YAML.load(File.read(target_context_file))
-                
-                    if target_context[:target_status] == STATUS_MISS
+
+                    if target_context[:target_status] == STATUS_MISS_AND_READY
+                        environment_valid = true
+                        [BUILD_KEY_SYMROOT, BUILD_KEY_CONFIGURATION_BUILD_DIR, BUILD_KEY_OBJROOT, BUILD_KEY_TARGET_TEMP_DIR, BUILD_KEY_SRCROOT, BUILD_KEY_FULL_PRODUCT_NAME].sort.each do | key |
+                            unless target_context.has_key? key and target_context[key] and target_context[key].size > 0
+                                puts "[ZABEL/E] #{target.name} should have #{key} in #{target_context.to_s}"
+                                environment_valid = false
+                                break
+                            end
+                        end
+                        next unless environment_valid
+
                         source_files = zabel_get_target_source_files(target)
     
                         product_dir = target_context[BUILD_KEY_CONFIGURATION_BUILD_DIR]
@@ -510,7 +541,7 @@ module Zabel
             project.native_targets.each do | target |
                 if post_targets_context.has_key? target
                     target_context = post_targets_context[target]
-                    next unless target_context[:target_status] == STATUS_MISS
+                    next unless target_context[:target_status] == STATUS_MISS_AND_READY
     
                     dependency_targets_set = Set.new
                     implicit_dependencies = []
@@ -725,7 +756,7 @@ module Zabel
                 if zabel_can_cache_target(target)
                     source_files = zabel_get_target_source_files(target)
                     unless source_files.size >= zabel_get_min_source_file_count
-                        puts "[ZABEL/I] skip #{target.name} #{source_files.size} >= #{zabel_get_min_source_file_count}"
+                        puts "[ZABEL/I] skip #{target.name} #{source_files.size} < #{zabel_get_min_source_file_count}"
                         next
                     end
                     target_md5_content = zabel_get_target_md5_content(project, target, configuration_name, argv, source_files)
@@ -846,6 +877,13 @@ module Zabel
     
         start_time = Time.now
 
+        [BUILD_KEY_SYMROOT, BUILD_KEY_CONFIGURATION_BUILD_DIR, BUILD_KEY_OBJROOT, BUILD_KEY_TARGET_TEMP_DIR, BUILD_KEY_SRCROOT, BUILD_KEY_FULL_PRODUCT_NAME].sort.each do | key |
+            unless ENV.has_key? key and ENV[key] and ENV[key].size > 0
+                raise "[ZABEL/E] #{target.name} should have #{key}"
+                break
+            end
+        end
+
         if ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR] != ENV[BUILD_KEY_TARGET_BUILD_DIR]
             command = "mkdir -p \"#{ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR]}\" && cd \"#{File.dirname(ENV[BUILD_KEY_CONFIGURATION_BUILD_DIR])}/\" && tar -xf \"#{cache_product_path}\""
             puts command
@@ -877,6 +915,7 @@ module Zabel
     end
     
     def self.zabel_printenv
+        puts ARGV.to_s
         target_name = ARGV[1]
         project_path = ARGV[2]
         
@@ -888,6 +927,7 @@ module Zabel
                 target_context[key] = ENV[key]
             end
         end
+        target_context[:target_status] = STATUS_MISS_AND_READY
         File.write("#{project_path}/#{target_name}.#{FILE_NAME_TARGET_CONTEXT}", target_context.to_yaml)
     end
     

metadata

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