cocoapods-kz 0.0.17 → 0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d054c8e5514bb6136c627613b061ced1961f9f069d0c6160718f060d8394b4d
-  data.tar.gz: cced90a605f5652c04c46f39d4f44ef3ab21da9131842b3cbbe22fe0bb8eb58c
+  metadata.gz: d2ef6bc4b485373616f4d2c175e90b817e9b01653f6ed6ecc178600f4b221bce
+  data.tar.gz: 373e1539e8f34f93465875386d11a57d265678987ac6f37513697b6ae1fdaffc
 SHA512:
-  metadata.gz: 5b83c0a3b25538cf2d6dfff81c419de10062a93ec78480fc3022df7c751e7bb920d130f6d2f93740bfed80fd4c80b335979606d5d649cc75c6e3bbca4297020a
-  data.tar.gz: 6deb0853f199c345a66bfef9e0f10da7d1493bc20a6bc1b05c14ef4bae455f3187658b14c42d90bca096085557ab1aee3153d2feee22621c360cbc5a2dd4cbac
+  metadata.gz: 285e197ed1015865f273880da25d8c036289fdce81c87a982da2add77ecc8e2310bc2503c85c22a4c4fc9f8cda4903779b565b10bef465dc5b28b30aa21faa9c
+  data.tar.gz: 8a0329bc6cdd2a0088f26d395694c642935988c2632f44891adb87841bc04a33750645c83ed5195e46bd70e64121962f5148d89c53ad3d637c528982c0bd0915

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.17"
+  VERSION = "0.1"
 end
 
 module Pod

data/lib/cocoapods-kz/helpers/kz_analyzer.rb

@@ -83,7 +83,14 @@ module KZ
       if @all_kz_pod_targets.has_key?(native_pod_target_name)
         kz_pod_target = @all_kz_pod_targets[native_pod_target_name]
         if !kz_pod_target.is_dev_pod && config_pod_mode != :kz_pod_origin_mode
-          kz_pod_target.config_pod_mode = config_pod_mode
+          # 如果没有走任何模式，则保持pod本身模式不变
+          if KZGlobalHelper.instance.specify_pod_mode == :kz_pod_framework_mode
+            # framework模式优先
+            kz_pod_target.config_pod_mode = config_pod_mode unless kz_pod_target.config_pod_mode == :kz_pod_framework_mode
+          elsif KZGlobalHelper.instance.specify_pod_mode == :kz_pod_code_mode
+            # code模式优先
+            kz_pod_target.config_pod_mode = config_pod_mode unless kz_pod_target.config_pod_mode == :kz_pod_code_mode
+          end
         end
       else
         kz_pod_target = KZPodTarget.new(native_pod_target)
@@ -96,10 +103,16 @@ module KZ
           end
         end
         kz_pod_target.force_config_pod_mode = get_force_config_pod_mode(kz_pod_target)
-        if config_pod_mode != :kz_pod_origin_mode && !is_dev_pod
-          kz_pod_target.config_pod_mode = config_pod_mode
+        if KZGlobalHelper.instance.specify_pod_mode == :kz_pod_origin_mode
+          # 没有指定任何模式，优先使用上次记录
+          kz_pod_target.config_pod_mode = use_framework_mode_from_lock_file?(kz_pod_target)
         else
-          kz_pod_target.config_pod_mode = get_use_config_pod_mode(kz_pod_target)
+          # 指定了模式，则走配置
+          if config_pod_mode != :kz_pod_origin_mode && !is_dev_pod
+            kz_pod_target.config_pod_mode = config_pod_mode
+          else
+            kz_pod_target.config_pod_mode = get_use_config_pod_mode(kz_pod_target)
+          end
         end
         @all_kz_pod_targets[native_pod_target_name] = kz_pod_target
 
@@ -159,8 +172,6 @@ module KZ
         specify_pod_names_contain(kz_pod_target.name) ? :kz_pod_framework_mode : :kz_pod_code_mode
       elsif KZGlobalHelper.instance.specify_pod_mode == :kz_pod_code_mode
         specify_pod_names_contain(kz_pod_target.name) ? :kz_pod_code_mode : :kz_pod_framework_mode
-      elsif KZGlobalHelper.instance.specify_pod_mode == :kz_pod_origin_mode
-        use_framework_mode_from_lock_file?(kz_pod_target)
       end
     end
 
@@ -183,7 +194,7 @@ module KZ
     def use_framework_mode_from_lock_file?(kz_pod_target)
       olde_lock_file_content = KZGlobalHelper.instance.olde_lock_file_content
       if olde_lock_file_content
-        pod_lock_config = olde_lock_file_content[kz_pod_target.name]
+        pod_lock_config = olde_lock_file_content["pod_targets"][kz_pod_target.name]
         return :kz_pod_framework_mode if pod_lock_config && pod_lock_config['use_framework']
       end
       :kz_pod_code_mode

data/lib/cocoapods-kz/helpers/kz_log.rb

@@ -12,8 +12,10 @@ module KZ
       normal:   ""
     }
 
-    def self.log(log_string, type = :normal)
+    def self.log(log_string, type = :normal, skip_count = 1)
       if KZGlobalHelper.instance.debug || type == :error || type == :warning
+        loc = caller_locations(skip_count, 1).first
+        puts "#{loc.path}:#{loc.lineno} ⬇️"
         puts "\e[36m【Cocoapods-kz】\e[0m#{@log_types[type]}【#{type}】#{@log_types[:reset]}#{log_string}"
       end
     end
@@ -21,8 +23,8 @@ module KZ
     def self.run_shell(cmd)
       stdout, stderr, status = Open3.capture3(cmd)
 
-      self.log(stdout) unless stdout.empty?
-      self.log(stderr, :error) unless stderr.empty?
+      self.log(stdout, :normal, 2) unless stdout.empty?
+      self.log(stderr, :error, 2) unless stderr.empty?
 
       return status.success?
     end

data/lib/cocoapods-kz/resources/kz_generate_xcode_env.sh

@@ -10,6 +10,9 @@ VARS=(
   LANG
   LC_ALL
 )
+# 清空之前变量
+echo "" > "$OUTPUT_FILE"
+
 for var in "${VARS[@]}"; do
   val="${!var}"
   if [ -n "$val" ]; then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: '0.1'
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-12 00:00:00.000000000 Z
+date: 2025-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler