cocoapods-kz 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18e1dd57432a470374b85e1794cf69de70759adb36f68c49c7728938ee14a4be
-  data.tar.gz: a3817262cf67e2e65481738f5cd9ea4f8f4af4ea70a8b763a1ea4260edcc7b0e
+  metadata.gz: 8f85aeb7b3f3ec7afa4fec40b6509b2f1fa599970068a00532874ba299c96a3c
+  data.tar.gz: eac71cb74fad8e788604563a5c10d087523fdaeee86dcd5e4b9edff9b0b645a6
 SHA512:
-  metadata.gz: f34e514bf9be6dfc1932d3d6c636150a168613a0576070d606d22fc750c11065a8a4ba7545a4b807d80490a174d0977703a7cd639cb36aa0ae5670fe8f9eea43
-  data.tar.gz: e59798c2da8fd42bed9ec76532799256a304d611ea0a94a7e9c38db515d9a0cea69a25e222b13f5f2c8d186eebc720c8b734c7e24c1efb2be8160adc5c895815
+  metadata.gz: d78c400c79c139d5beb99b5c84e349869abec6507ad4d4b720c3ffd956542e207d34ec55e72273496b074a031fb01299ec79f26959e0611a33fd2a2e7c8d1521
+  data.tar.gz: d5d61fdecfb237ba596539559f560747c3fdd3145324f2f069ad0e9f1c418b70786f19656405a3906992d1decea96718201f15c1103149967bea85b242e1dfc9

data/lib/cocoapods-kz/command/install.rb

@@ -22,19 +22,21 @@ module Pod
             ['--framework', "后面需要跟上pod名(多个pod，使用英文逗号隔开)"],
             ['--code', "后面需要跟上pod名(多个pod，使用英文逗号隔开)"],
             ['--debug', "debug模式，会打印调试日志或生成调试文件"],
+            ['--no-framework-update', "不再生成frameowrk"]
           ].concat(super).reject { |(name, _)| name == '--no-repo-update' }
         end
 
         def initialize(argv)
-          @use_code_tag = argv.flag?('code')
-          @use_framework_tag = argv.flag?('framework')
-          @debug = argv.flag?('debug')
-          help! if @use_code_tag && @use_framework_tag
-          KZ::KZGlobalHelper.instance.analyze_special_parameters(@use_code_tag, @use_framework_tag, argv.arguments!)
+          use_code_tag = argv.flag?('code')
+          use_framework_tag = argv.flag?('framework')
+          help! if use_code_tag && use_framework_tag
+          KZ::KZGlobalHelper.instance.analyze_special_parameters(use_code_tag, use_framework_tag, argv.arguments!)
           if Pod.match_version?('~> 1.4')
             KZ::KZGlobalHelper.instance.kz_pod_enable = true
+            KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end
-          KZ::KZGlobalHelper.instance.debug = true if @debug
+          KZ::KZGlobalHelper.instance.debug = true if argv.flag?('debug')
+          KZ::KZGlobalHelper.instance.disable_generate_framework = true if argv.flag?('no-framework-update')
 
           super
           @additional_args = argv.remainder!

data/lib/cocoapods-kz/command/kz.rb

@@ -1,5 +1,6 @@
 require_relative 'install'
 require_relative 'update'
+require_relative 'repair'
 
 module Pod
   class Command

data/lib/cocoapods-kz/command/repair.rb

@@ -0,0 +1,47 @@
+require 'cocoapods-kz/helpers/repair_dynamic_swift'
+require 'cocoapods-kz/helpers/repair_module_import'
+
+module Pod
+  class Command
+    class Kz < Command
+      class Repair < Kz
+        self.summary = 'pod kz repair，用于修复各种不符合规范的场景'
+
+        self.description = <<-DESC
+        结合可选子命令用于执行各种修补脚本
+        DESC
+
+        def self.options
+          [
+            ['--module-import', "修复所有头文件import方式，使其支持module导入，如果后面追加指定Pod名，将只修改该Pod"],
+            ['--dynamic-swift', "将项目中所有swift添加上OC动态属性，如果后面追加指定Pod名，将只修改该Pod"]
+          ]
+        end
+
+        def initialize(argv)
+          help! if argv.arguments == 0
+          @repair_module_import = argv.flag?('module-import')
+          @repair_dynamic_swift = argv.flag?('dynamic-swift')
+          help! if !@repair_module_import && !@repair_dynamic_swift
+
+          KZ::KZGlobalHelper.instance.analyze_special_parameters(true, false, argv.arguments!)
+          KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
+
+          super
+        end
+
+        def run
+          installer = installer_for_config
+          installer.prepare
+          installer.resolve_dependencies.analyze
+
+          if @repair_dynamic_swift
+            KZ::KZSwiftAttachOCFeature.new.repair
+          else @repair_module_import
+            KZ::KZRepairModuleImport.new(installer.aggregate_targets.first.user_project).repair
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-kz/command/update.rb

@@ -22,18 +22,21 @@ module Pod
             ['--framework', "后面需要跟上pod名(多个pod，使用英文逗号隔开)"],
             ['--code', "后面需要跟上pod名(多个pod，使用英文逗号隔开)"],
             ['--debug', "debug模式，会打印调试日志或生成调试文件"],
+            ['--no-framework-update', "不再生成frameowrk"]
           ].concat(super)
         end
 
         def initialize(argv)
-          @use_code_tag = argv.flag?('code')
-          @use_framework_tag = argv.flag?('framework')
-          help! if @use_code_tag && @use_framework_tag
-          KZ::KZGlobalHelper.instance.analyze_special_parameters(@use_code_tag, @use_framework_tag, argv.arguments!)
+          use_code_tag = argv.flag?('code')
+          use_framework_tag = argv.flag?('framework')
+          help! if use_code_tag && use_framework_tag
+          KZ::KZGlobalHelper.instance.analyze_special_parameters(use_code_tag, use_framework_tag, argv.arguments!)
           if Pod.match_version?('~> 1.4')
             KZ::KZGlobalHelper.instance.kz_pod_enable = true
+            KZ::KZGlobalHelper.instance.generate_kz_pod_targets = true
           end
-          KZ::KZGlobalHelper.instance.debug = true if @debug
+          KZ::KZGlobalHelper.instance.debug = true if argv.flag?('debug')
+          KZ::KZGlobalHelper.instance.disable_generate_framework = true if argv.flag?('no-framework-update')
 
           super
           @additional_args = argv.remainder!

data/lib/cocoapods-kz/gem_version.rb

@@ -1,5 +1,5 @@
 module CocoapodsKz
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end
 
 module Pod

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

@@ -23,6 +23,11 @@ fi
 PRODUCT_DIR=${PODS_BUILD_DIR}/Debug-iphoneos/${TARGET_NAME}/${FULL_PRODUCT_NAME}
 PRODUCT_SIMULATOR_DIR=${PODS_BUILD_DIR}/Debug-iphonesimulator/${TARGET_NAME}/${FULL_PRODUCT_NAME}
 CURRENT_PRODUCT_DIR=${PODS_CONFIGURATION_BUILD_DIR}/${TARGET_NAME}
+
+if [ -d "${KZ_FRAMEWORK_CACHE_PATH}" ]; then
+    rm -r "${KZ_FRAMEWORK_CACHE_PATH}"
+fi
+mkdir -p "${KZ_FRAMEWORK_CACHE_PATH}"
                     
 if [ -d "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}" ]; then
     rm -r "${KZ_FRAMEWORK_CACHE_PATH}/${FULL_PRODUCT_NAME}"

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

@@ -22,8 +22,8 @@ module KZ
         if File.file?(file_path)
           yield(file_path) if file_name.end_with?('.h')
         elsif File.directory?(file_path)
-          traverse_folder(file_path) do |file_path|
-            yield(file_path)
+          traverse_folder(file_path) do |path|
+            yield(path)
           end
         end
       end
@@ -60,14 +60,14 @@ module KZ
         private_hmap_hash[header_pathname_basename] = header_hmap_value
       end
 
-      if !private_hmap_hash.empty?
+      unless private_hmap_hash.empty?
         save_hmap_file(private_hmap_hash, KZ_POD_CONFIG_ROOT, @main_project.root_object.display_name)
       end
 
       @main_project.targets.each do |target|
         if target.isa == "PBXNativeTarget" and target.product_type == "com.apple.product-type.application"
           target.build_configurations.each do |config|
-            config.build_settings['HEADER_SEARCH_PATHS'] = "${PODS_ROOT}/#{@main_project.root_object.display_name }.hmap"
+            config.build_settings['HEADER_SEARCH_PATHS'] = "${PODS_ROOT}/KZPodConfigure/#{@main_project.root_object.display_name }.hmap"
             config.build_settings['USE_HEADERMAP'] = 'NO'
           end
         end
@@ -85,11 +85,22 @@ module KZ
       all_native_target
     end
 
-    def get_all_handle_target_from(project)
+    def get_all_test_target_from(project)
+      all_native_target = {}
+
+      project.targets.each do |target|
+        if target.isa == "PBXNativeTarget" and target.product_type == "com.apple.product-type.bundle.unit-test"
+          all_native_target[target.name] = target
+        end
+      end
+      all_native_target
+    end
+
+    def get_all_aggregate_target_from(project)
       all_handle_target = {}
 
       project.targets.each do |target|
-        if !(target.isa == "PBXNativeTarget" and target.product_type == "com.apple.product-type.bundle") and !target.name.start_with?('Pods-')
+        if target.isa == "PBXAggregateTarget"
           all_handle_target[target.name] = target
         end
       end
@@ -132,7 +143,15 @@ module KZ
         elsif hmap_content_style == HmapContentStyle::QUOTES_REPAIR
           header_hmap_value_slash = {}
           header_hmap_value_slash['suffix'] = header_pathname_basename
-          header_hmap_value_slash['prefix'] = kz_pod_target.name + '/'
+          prefix_name = kz_pod_target.name
+          if header_pathname.dirname.to_s.include?('.framework')
+            header_pathname.dirname.to_s.split('/').each do |name|
+              if name.include?('.framework')
+                prefix_name = name.split('.').first
+              end
+            end
+          end
+          header_hmap_value_slash['prefix'] = prefix_name + '/'
           hmap_info[header_pathname_basename] = header_hmap_value_slash
         end
       end
@@ -140,7 +159,8 @@ module KZ
     end
 
     def create_pod_hamp(all_kz_pod_targets)
-      all_handle_targets = get_all_handle_target_from(@pod_project)
+      all_native_targets = get_all_native_target_from(@pod_project)
+      all_handle_targets = all_native_targets.merge(get_all_aggregate_target_from(@pod_project))
       all_handle_targets.each do |target_name, target|
         kz_pod_target = all_kz_pod_targets[target_name]
         next unless kz_pod_target
@@ -161,17 +181,17 @@ module KZ
         end
       end
 
-      all_native_targets = get_all_native_target_from(@pod_project)
       all_native_targets.each do |target_name, target|
-        kz_pod_target = all_kz_pod_targets[target_name]
+        target_real_name = target_name.split("-").first
+        kz_pod_target = all_kz_pod_targets[target_real_name]
         next unless kz_pod_target
 
         # 添加私有头文件引用
         private_hamp_info = get_hmap_info_from(kz_pod_target, HmapContentStyle::QUOTES_PRIVATE)
         if private_hamp_info.count > 0
           hmap_cache_path = kz_pod_target.pod_config_cache_path(false)
-          save_hmap_file(private_hamp_info, kz_pod_target.pod_config_cache_path(false), target_name)
-          kz_pod_target.private_header_search_path = hmap_cache_path + "#{target_name}.hmap"
+          save_hmap_file(private_hamp_info, kz_pod_target.pod_config_cache_path(false), target_real_name)
+          kz_pod_target.private_header_search_path = hmap_cache_path + "#{target_real_name}.hmap"
         end
 
         # 修复缺失的依赖
@@ -191,8 +211,10 @@ module KZ
         kz_pod_target.framwork_search_paths = framework_search_paths
       end
 
-      all_native_targets.each do |target_name, target|
-        kz_pod_target = all_kz_pod_targets[target_name]
+      all_config_target = all_native_targets.merge(get_all_test_target_from(@pod_project))
+      all_config_target.each do |target_name, target|
+        target_real_name = target_name.split("-").first
+        kz_pod_target = all_kz_pod_targets[target_real_name]
         next unless kz_pod_target
 
         # 添加配置

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

@@ -1,15 +1,19 @@
 require 'cocoapods'
 require 'fileutils'
+require 'json'
 require_relative 'kz_analyzer'
 require_relative 'kz_framework_manager'
 require_relative 'kz_config_result'
 require_relative 'kz_pod_target'
 
 module KZ
-  KZ_POD_CONFIG_ROOT = Pod::Config.instance.sandbox_root + 'KZPodConfigure'
+  KZ_POD_CONFIG_ROOT = Pod::Config.instance.installation_root + 'Pods/KZPodConfigure'
+  # 修复pod lib报错问题
+  Pod::Config.instance.installation_root = nil
 
   HMAP_EXECUTE_PATH = File.dirname(__FILE__) + '/../resources/hmap'
   FLEX_COMPLIER_PATH = KZ_POD_CONFIG_ROOT + 'FlexCompiler'
+  KZ_LOCK_FILE_PATH = KZ_POD_CONFIG_ROOT + 'KZConfigLock'
 
   class KZGlobalHelper
     attr_accessor :kz_pod_enable
@@ -18,6 +22,9 @@ module KZ
     attr_accessor :specify_pod_names
     attr_accessor :specify_pod_mode
     attr_accessor :debug
+    attr_accessor :kz_config_lock
+    attr_accessor :disable_generate_framework
+    attr_accessor :generate_kz_pod_targets
 
     private_class_method :new
 
@@ -26,9 +33,9 @@ module KZ
       @specify_pod_mode = :kz_pod_origin_mode
       @pods_config_cache = {}
       @debug = false
-
-      FileUtils.mkdir_p(KZ_POD_CONFIG_ROOT)
-      FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', KZ_POD_CONFIG_ROOT)
+      @kz_config_lock = {}
+      @disable_generate_framework = false
+      @generate_kz_pod_targets = false
     end
 
     @@instance = nil
@@ -36,6 +43,20 @@ module KZ
       @@instance ||= new
     end
 
+    def kz_pod_enable=(value)
+      @kz_pod_enable = value
+      FileUtils.rm(KZ_LOCK_FILE_PATH) if File.exist?(KZ_LOCK_FILE_PATH)
+
+      if value
+        FileUtils.mkdir_p(KZ_POD_CONFIG_ROOT) unless File.exist?(KZ_POD_CONFIG_ROOT)
+
+        flex_compiler_de_path = KZ_POD_CONFIG_ROOT + 'FlexCompiler'
+        FileUtils.rm(flex_compiler_de_path) if File.exist?(flex_compiler_de_path)
+        FileUtils.cp_r(File.dirname(__FILE__) + '/../resources/FlexCompiler', KZ_POD_CONFIG_ROOT)
+        system("chmod +x #{flex_compiler_de_path}")
+      end
+    end
+
     def analyze_special_parameters(use_code_tag, use_framework_tag, pod_names)
       specify_pod_names = []
       if pod_names.count > 0
@@ -67,5 +88,27 @@ module KZ
       result
     end
 
+    def have_flexLib_pod_target
+      @kz_analyzer.kz_pod_targets_with("FlexLib").count > 0
+    end
+
+    def write_lock_file
+      self.kz_analyzer.all_kz_pod_targets.values.each do |kz_pod_target|
+        result = pod_config_result_with_target(kz_pod_target)
+
+        @kz_config_lock[kz_pod_target.name] ||= {}
+        @kz_config_lock[kz_pod_target.name]["dev_pod"] = kz_pod_target.is_dev_pod
+        @kz_config_lock[kz_pod_target.name]["use_framework"] = (result != nil)
+        @kz_config_lock[kz_pod_target.name]["version"] = kz_pod_target.version
+      end
+
+      if @kz_config_lock.count > 0
+        lock_file_content = JSON.pretty_generate(@kz_config_lock)
+        File.open(KZ_LOCK_FILE_PATH, 'w') do |file|
+          file.write(lock_file_content)
+        end
+      end
+    end
+
   end
 end

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

@@ -33,6 +33,14 @@ module KZ
         end
         @all_kz_pod_targets[native_pod_target_name] = kz_pod_target
 
+        if is_dev_pod && native_pod_target.test_dependent_targets_by_spec_name.count > 0
+          test_pod_targets = native_pod_target.test_dependent_targets_by_spec_name.values.flatten
+          test_pod_targets.each do |test_pod_target|
+            kz_test_pod_target = create_kz_pod_target_from(test_pod_target, :kz_pod_framework_mode)
+            @all_kz_pod_targets[test_pod_target.name] = kz_test_pod_target
+          end
+        end
+
         kz_dependent_target_info = {}
         native_pod_target.dependent_targets.each do |native_dependent_target|
           kz_dependent_pod_target = create_kz_pod_target_from(native_dependent_target, kz_pod_target.config_pod_mode)

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

@@ -30,7 +30,7 @@ module KZ
       @dependent_target_info = {}
       @repair_dependent_target_info = {}
       @repair_import = []
-      @isDevPod = false
+      @is_dev_pod = false
       @config_pod_mode = :kz_pod_origin_mode
 
       native_pod_target.file_accessors.each do |file_accessor|
@@ -47,6 +47,8 @@ module KZ
 
       all_headers = []
       native_pod_target.file_accessors.each do |file_accessor|
+        next if file_accessor.spec.test_specification
+
         all_headers.concat(file_accessor.headers)
       end
 
@@ -59,8 +61,9 @@ module KZ
 
       public_headers = []
       native_pod_target.file_accessors.each do |file_accessor|
+        next if file_accessor.spec.test_specification
+
         public_headers.concat(file_accessor.origin_public_headers)
-        public_headers.concat(file_accessor.vendored_frameworks_headers)
       end
 
       @_public_headers = public_headers
@@ -166,9 +169,23 @@ module KZ
     def pod_config_cache_path(concat_version)
       kz_target_framework_folder = KZ_POD_CONFIG_ROOT + @name
       kz_target_framework_folder += @version if concat_version
-      FileUtils.mkdir_p(kz_target_framework_folder) unless File.exist?(kz_target_framework_folder)
+      FileUtils.mkdir_p(kz_target_framework_folder) unless File.exist?(kz_target_framework_folder) || concat_version
       Pathname(kz_target_framework_folder)
     end
 
+    def kz_module_name
+      return @native_pod_target.product_module_name  unless all_headers.count > 0
+
+      one_header_path = all_headers.first.to_s
+      if one_header_path.include?('.framework')
+        one_header_path.split('/').each do |name|
+          if name.include?('.framework')
+            return name.split('.').first
+          end
+        end
+      end
+      return @native_pod_target.product_module_name
+    end
+
   end
 end

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

@@ -0,0 +1,373 @@
+require_relative 'global_helper'
+
+module KZ
+  class KZSwiftContext
+    def initialize(type_contexts)
+      @type_contexts = type_contexts
+      @type_ornament = []
+      @type_header = []
+      @type_str = ""
+      @type_body = []
+
+      if @type_contexts.length == 1
+        element = @type_contexts[0]
+        puts @type_contexts
+        @type_ornament = element.scan(/@\w+[()\w\n]*/)
+        element_info = element.split("{")
+        @type_str = element_info[0] + "{"
+        @type_body << element_info[1].sub("}", "")
+      else
+        # 1 从未扫描到class 2 扫描到class 3 class扫描完毕
+        type_line_tag = 1
+        type_lines = []
+        for type_line in @type_contexts
+          if type_line_tag == 1
+            ornaments = type_line.scan(/@\w+[()\w\n]*/)
+            @type_ornament.concat(ornaments) if ornaments.length > 0
+
+            result = yield(type_line)
+            if result
+              type_line_tag = 2
+            else
+              @type_header << type_line
+              next
+            end
+          end
+
+          if type_line_tag == 2
+            type_lines << type_line
+            if type_line.include?("{")
+              type_line_tag = 3
+              @type_str = type_lines.join("")
+            end
+            next
+          end
+
+          @type_body << type_line
+        end
+
+        last_element = @type_body[-1]
+        @type_body.pop()
+        @type_body << last_element.sub("}", "")
+      end
+    end
+
+    def get_oc_feature_contexts
+      @type_contexts
+    end
+
+  end
+
+  class KZSwiftParagraph < KZSwiftContext
+
+    def initialize(type_contexts, need_handle_func)
+      @type_contexts = type_contexts
+      @need_handle_func = need_handle_func
+    end
+
+    def get_oc_feature_contexts
+      if @need_handle_func
+        new_class_context = []
+
+        for context in @type_contexts
+          if context.include?("init()") && !context.include?("override")
+            context = context.sub("init()", "override init()")
+            context = context.sub("{", "{\nsuper.init()")
+          end
+          new_class_context << context
+        end
+        return new_class_context
+      else
+        return @type_contexts
+      end
+    end
+  end
+
+  class KZSwiftClass < KZSwiftContext
+
+    def initialize(type_contexts)
+      @system_nsobject_class = [
+        "NSObject"
+      ]
+
+      super(type_contexts) do |line|
+        KZSwiftClass.check_line_have_class_tag(line)
+      end
+    end
+
+    def self.check_line_have_class_tag(line)
+      if line =~ /^(?:.*\s)?class\s/ && !line.include?("func") && !line.include?("var") && !line.include?("let")
+        return true
+      else
+        return false
+      end
+    end
+
+    def get_oc_feature_contexts
+      new_class_context = []
+
+      # 获取类、父类、协议信息
+      class_name = ""
+      superClass_and_protocol = []
+
+      class_line = @type_str.gsub(/\s+/, "")
+      class_line = class_line.split("class")[1]
+      if class_line.include?(":")
+        colon_infos = class_line.split(":")
+        class_name = colon_infos[0]
+
+        colon_right = colon_infos[1]
+        colon_right = colon_right.sub("{", "")
+        superClass_and_protocol = colon_right.split(",")
+      else
+        class_name = class_line.sub("{", "")
+      end
+
+      return @type_contexts if class_name == ""
+
+      # 获取oc特性标识
+      have_super_class = false
+      if superClass_and_protocol.length > 0
+        have_super_class = !superClass_and_protocol[0].end_with?("Protocol")
+      end
+
+      have_objc_class = false
+      have_objc_members = false
+      for ornament in @type_ornament
+        if ornament.start_with?("@objc ") || ornament.start_with?("@objc(") || ornament == "@objc" || ornament == "@objc\n"
+          have_objc_class = true
+        end
+        have_objc_members = true if ornament.start_with?("@objcMembers")
+      end
+
+      # 添加class ornament
+      new_class_context.concat(@type_header)
+
+      if !have_objc_members
+        new_class_context.insert(0, "@objcMembers\n")
+      end
+
+      if !have_objc_class && !have_super_class
+        new_class_context.insert(0, "@objc\n")
+      end
+
+      # 添加class header
+      if !have_objc_class && !have_super_class
+        if superClass_and_protocol.length > 0
+          if !@system_nsobject_class.include?(superClass_and_protocol[0])
+            @type_str = @type_str.sub(":", ": NSObject,")
+          end
+        else
+          @type_str = @type_str.sub("{", ": NSObject {")
+        end
+      end
+      new_class_context << @type_str
+
+      # 添加class body
+      new_swift_types = KZSwiftFileAnalyse.analyse_swift_file(@type_body, !have_super_class)
+      new_swift_types.each do |swift_type|
+        new_class_context.concat(swift_type.get_oc_feature_contexts())
+      end
+      new_class_context << "}\n"
+
+      new_class_context
+    end
+  end
+
+  class KZSwiftEnum < KZSwiftContext
+
+    def initialize(type_contexts)
+      super(type_contexts) do |line|
+        return KZSwiftEnum.check_line_have_enum_tag(line)
+      end
+    end
+
+    def self.check_line_have_enum_tag(line)
+      if line =~ /^(?:.*\s)?enum\s/
+        return true
+      else
+        return false
+      end
+    end
+
+    def get_oc_feature_contexts
+      new_enum_context = []
+
+      have_objc_tag = false
+      for ornament in @type_ornament
+        if ornament.start_with?("@objc ") || ornament.start_with?("@objc(") || ornament == "@objc"
+          have_objc_tag = true
+        end
+      end
+
+      return @type_contexts if have_objc_tag
+
+      for enum_line in @type_contexts
+        if KZSwiftEnum.check_line_have_enum_tag(enum_line)
+          raw_value_type = ""
+          raw_value_type = $1 if enum_line =~ /^.*:\s*(\w+)\s*{/
+
+          if raw_value_type == "Int"
+            new_enum_context.insert(0, "@objc\n")
+          else
+            return @type_contexts
+          end
+        end
+        new_enum_context << enum_line
+      end
+
+      new_enum_context
+    end
+  end
+
+  class KZSwiftFileAnalyse
+    def self.analyse_swift_file(swift_files, need_handle_func)
+      swift_types = []
+
+      cursor_index = 0
+      swift_files.each_with_index do |line, index|
+        next if line.start_with?("//")
+        next if index < cursor_index
+
+        if KZSwiftClass.check_line_have_class_tag(line)
+          class_begin_line = find_type_begin_index(index, cursor_index, swift_files)
+          class_end_line = find_type_end_index(index, swift_files)
+
+          # 封装无关代码
+          if class_begin_line > cursor_index
+            contexts = swift_files[cursor_index...class_begin_line]
+            swift_types << KZSwiftParagraph.new(contexts, need_handle_func)
+          end
+
+          # 封装类代码
+          contexts = swift_files[class_begin_line..class_end_line]
+          swift_types << KZSwiftClass.new(contexts)
+
+          # 更新游标
+          cursor_index = class_end_line + 1
+        elsif KZSwiftEnum.check_line_have_enum_tag(line)
+          enum_begin_line = find_type_begin_index(index, cursor_index, swift_files)
+          enum_end_line = find_type_end_index(index, swift_files)
+
+          # 封装无关代码
+          if enum_begin_line > cursor_index
+            contexts = swift_files[cursor_index...enum_begin_line]
+            swift_types << KZSwiftParagraph.new(contexts, need_handle_func)
+          end
+
+          # 封装枚举代码
+          contexts = swift_files[enum_begin_line..enum_end_line]
+          swift_types << KZSwiftEnum.new(contexts)
+
+          # 更新游标
+          cursor_index = enum_end_line + 1
+        end
+      end
+
+      # 封装无关代码
+      if cursor_index < swift_files.length
+        contexts = swift_files[cursor_index...swift_files.length]
+        swift_types << KZSwiftParagraph.new(contexts, need_handle_func)
+      end
+
+      swift_types
+    end
+
+    def self.find_type_begin_index(current_index, cursor_index, swift_files)
+      class_begin_line = current_index
+      if current_index > 0
+        (cursor_index...current_index).reverse_each do |_index|
+          previous_line = swift_files[_index].lstrip
+
+          next if previous_line == ""
+
+          if previous_line.start_with?("@")
+            class_begin_line = _index
+          else
+            break
+          end
+        end
+      end
+      class_begin_line
+    end
+
+    def self.find_type_end_index(current_index, swift_files)
+      class_end_line = current_index
+      if current_index < swift_files.length
+        left_bracket_count = -1
+        (current_index...swift_files.length).each do |_index|
+          next_line = swift_files[_index]
+
+          left_brackets = next_line.scan(/{/)
+          right_brackets = next_line.scan(/}/)
+
+          if left_brackets.length > 0
+            left_bracket_count = 0 if left_bracket_count == -1
+            left_bracket_count += left_brackets.length
+          end
+
+          if right_brackets.length > 0
+            left_bracket_count -= right_brackets.length
+
+            if left_bracket_count == 0
+              class_end_line = _index
+              break
+            end
+          end
+        end
+      end
+      class_end_line
+    end
+  end
+
+  class KZSwiftAttachOCFeature
+
+    def initialize
+      @all_kz_pod_targets = KZ::KZGlobalHelper.instance.kz_analyzer.all_kz_pod_targets
+      @specify_pod_names = KZ::KZGlobalHelper.instance.specify_pod_names
+    end
+
+    def repair
+      @all_kz_pod_targets.values.each do |kz_pod_target|
+        next unless kz_pod_target.is_dev_pod
+        next if @specify_pod_names.count > 0 && !@specify_pod_names.include?(kz_pod_target.name)
+
+        need_repair_files = []
+        kz_pod_target.native_pod_target.file_accessors.each do |file_accessor|
+          next if file_accessor.spec.test_specification
+
+          file_accessor.source_files.each do |source_file|
+            if source_file.extname == ".swift"
+              need_repair_files << source_file
+            end
+          end
+        end
+
+        puts "Start reair '#{kz_pod_target.name}' swfit files..."
+        need_repair_files.each do |swift_file_path|
+          swift_file = File.open(swift_file_path, 'r')
+          swift_files = swift_file.readlines
+          swift_file.close
+          swift_types = KZSwiftFileAnalyse.analyse_swift_file(swift_files, false)
+
+          new_swift_contexts = []
+          swift_types.each do |swift_type|
+            new_swift_contexts.concat(swift_type.get_oc_feature_contexts())
+          end
+          # puts new_swift_contexts
+          write_swift_file(swift_file_path, new_swift_contexts)
+        end
+      end
+
+    end
+
+    def write_swift_file(file_path, contexts)
+      swift_file = File.open(file_path, 'w')
+      contexts.each do |new_line|
+        swift_file.write(new_line)
+      end
+      swift_file.close
+    end
+
+  end
+end

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

@@ -0,0 +1,122 @@
+require_relative 'global_helper'
+
+module KZ
+  class KZRepairModuleImport
+    def initialize(main_project)
+      @main_project = main_project
+      @all_kz_pod_targets = KZ::KZGlobalHelper.instance.kz_analyzer.all_kz_pod_targets
+      @specify_pod_names = KZ::KZGlobalHelper.instance.specify_pod_names
+    end
+
+    def repair
+      if @specify_pod_names.count == 0
+        main_project_file_folder = @main_project.project_dir + @main_project.root_object.display_name
+        main_project_files = []
+        main_project_headers = []
+        Dir.glob(File.join(main_project_file_folder, '**', '*')).each do |file|
+          if File.file?(file) and (file.end_with?(".h") or file.end_with?(".m"))
+            if file.end_with?(".h")
+              main_project_headers << Pathname.new(file)
+              main_project_files << Pathname.new(file)
+            elsif file.end_with?(".m")
+              main_project_files << Pathname.new(file)
+            end
+          end
+        end
+        puts "Start reair main project..."
+        main_project_files.each do |file_path|
+          repair_file(file_path, main_project_headers)
+        end
+
+        @all_kz_pod_targets.values.each do |kz_pod_target|
+          next unless kz_pod_target.is_dev_pod
+
+          puts "Start reair '#{kz_pod_target.name}' header files..."
+          kz_pod_target.all_headers.each do |header_path|
+            repair_file(header_path, kz_pod_target.all_headers, kz_pod_target.recursive_dependent_targets)
+          end
+        end
+      else
+        @all_kz_pod_targets.values.each do |kz_pod_target|
+          next unless kz_pod_target.is_dev_pod
+          next unless @specify_pod_names.include?(kz_pod_target.name)
+
+          need_repair_files = []
+          kz_pod_target.native_pod_target.file_accessors.each do |file_accessor|
+            next if file_accessor.spec.test_specification
+
+            file_accessor.source_files.each do |source_file|
+              if [".h", ".m", ".mm"].include?(source_file.extname)
+                need_repair_files << source_file
+              end
+            end
+          end
+
+          puts "Start reair '#{kz_pod_target.name}' files..."
+          need_repair_files.each do |file_path|
+            repair_file(file_path, kz_pod_target.all_headers, kz_pod_target.recursive_dependent_targets)
+          end
+        end
+      end
+    end
+
+    def repair_file(file_path, current_module_headers, sub_pods = nil)
+      new_header_content = []
+
+      file = File.open(file_path)
+      contents = file.readlines
+      file.close
+
+      contents.each do |line|
+        if line =~ /#import\s*["<]([a-zA-Z\+]+\.h)[">]/
+          heaer_name = $1
+          other_module_name = find_other_module_name(heaer_name, current_module_headers, sub_pods)
+          if other_module_name
+            if other_module_name == ""
+              new_header_content << line
+            else
+              new_header_content << "#import <#{other_module_name}/#{heaer_name}>\n"
+            end
+          else
+            new_header_content << "#warning '#{heaer_name}' is not included in the current pod or its subpods\n"
+            new_header_content << line
+          end
+        else
+          new_header_content << line
+        end
+      end
+      write_swift_file(file_path, new_header_content)
+    end
+
+    def write_swift_file(file_path, contexts)
+      swift_file = File.open(file_path, 'w')
+      contexts.each do |new_line|
+        swift_file.write(new_line)
+      end
+      swift_file.close
+    end
+
+    def find_other_module_name(header_name, current_module_headers, sub_pods)
+      current_module_headers.each do |header_path|
+        if header_path.basename.to_s == header_name
+          return ""
+        end
+      end
+
+      if sub_pods == nil
+        sub_pods = @all_kz_pod_targets.values
+      end
+      sub_pods.each do |sub_kz_pod_target|
+        sub_headers = sub_kz_pod_target.all_headers
+        sub_headers.each do |header_path|
+          if header_path.basename.to_s == header_name
+            return sub_kz_pod_target.kz_module_name
+          end
+        end
+      end
+
+      return nil
+    end
+
+  end
+end

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

@@ -39,7 +39,11 @@ fi}
 
     def config_project
       @pod_project.targets.each do |target|
-        if target.isa == "PBXNativeTarget" && target.product_type == "com.apple.product-type.framework" && target.name.start_with?("SP")
+        if target.isa == "PBXNativeTarget" && target.product_type == "com.apple.product-type.framework"
+          kz_pod_target = KZGlobalHelper.instance.kz_analyzer.all_kz_pod_targets[target.name]
+          next unless kz_pod_target
+          next unless kz_pod_target.is_dev_pod
+
           target.build_configurations.each do |config|
             config.build_settings["KZ_XML_FLEX_COMPILER"] = FLEX_COMPLIER_PATH.to_s
             config.build_settings["KZ_XML_FLEX_DIR"] = "${TARGET_TEMP_DIR}/XmlFlexs"

data/lib/cocoapods-kz/native/acknowledgements.rb

@@ -3,23 +3,16 @@ require 'cocoapods-kz/native/acknowledgements'
 module Pod
   module  Generator
     class Acknowledgements
+
+      alias_method :origin_license_text, :license_text
       def license_text(spec)
-        return nil unless spec.license
-        text = spec.license[:text]
-        unless text
-          if license_file = spec.license[:file]
-            license_path = file_accessor(spec).root + license_file
-            if File.exist?(license_path)
-              text = IO.read(license_path)
-            else
-              # UI.warn "Unable to read the license file `#{license_file}` " \
-              # "for the spec `#{spec}`"
-            end
-          elsif license_file = file_accessor(spec).license
-            text = IO.read(license_file)
-          end
+        if KZ::KZGlobalHelper.instance.kz_pod_enable
+          return nil unless spec.license
+          text = spec.license[:text]
+          text
+        else
+          origin_license_text(spec)
         end
-        text
       end
     end
   end

data/lib/cocoapods-kz/native/analyzer.rb

@@ -7,13 +7,11 @@ module Pod
 
       def generate_targets(resolver_specs_by_target, target_inspections)
         aggregate_targets, pod_targets = original_generate_targets(resolver_specs_by_target, target_inspections)
-
-        if KZ::KZGlobalHelper.instance.kz_pod_enable
+        if KZ::KZGlobalHelper.instance.generate_kz_pod_targets
           kz_analyer = KZ::KZAnalyzer.new(pod_targets, self.sandbox.development_pods)
           kz_analyer.analyer
           KZ::KZGlobalHelper.instance.kz_analyzer = kz_analyer
         end
-
         [aggregate_targets, pod_targets]
       end
 

data/lib/cocoapods-kz/native/file_accessor.rb

@@ -8,7 +8,7 @@ module Pod
 
       alias_method :origin_public_headers, :public_headers
       def public_headers(include_frameworks = false)
-        if KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
+        if !self.spec.test_specification && KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
           []
         else
           origin_public_headers(include_frameworks)
@@ -16,7 +16,7 @@ module Pod
       end
 
       def project_headers
-        if KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
+        if !self.spec.test_specification && KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
           []
         else
           project_header_files
@@ -24,7 +24,7 @@ module Pod
       end
 
       def private_headers
-        if KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
+        if !self.spec.test_specification && KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
           []
         else
           private_header_files
@@ -33,7 +33,7 @@ module Pod
 
       alias_method :origin_source_files, :source_files
       def source_files
-        if KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
+        if !self.spec.test_specification && KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
           []
         else
           origin_source_files
@@ -42,7 +42,7 @@ module Pod
 
       alias_method :origin_arc_source_files, :arc_source_files
       def arc_source_files
-        if KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
+        if !self.spec.test_specification && KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
           []
         else
           origin_arc_source_files
@@ -51,7 +51,7 @@ module Pod
 
       alias_method :origin_resource_bundles, :resource_bundles
       def resource_bundles
-        if KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
+        if !self.spec.test_specification && KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
           {}
         else
           origin_resource_bundles
@@ -61,7 +61,7 @@ module Pod
       alias_method :origin_resources, :resources
       def resources
         result = KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
-        if result
+        if !self.spec.test_specification && result
           resources = origin_resources
           resources.concat(result.get_bundle_paths)
           resources
@@ -73,7 +73,7 @@ module Pod
       alias_method :origin_vendored_frameworks, :vendored_frameworks
       def vendored_frameworks
         result = KZ::KZGlobalHelper.instance.pod_config_result_with_target(self.kz_pod_target)
-        if result
+        if !self.spec.test_specification && result
           frameworks = origin_vendored_frameworks
           frameworks.concat(result.get_framework_paths)
           frameworks

data/lib/cocoapods-kz/native/installer.rb

@@ -14,21 +14,23 @@ module Pod
         main_project = self.aggregate_targets.first.user_project
         pods_project = self.pods_project
 
-        puts 'Config Xml Build Rules'
-        KZ::XmlBuildConfig.new(main_project, pods_project).config_project
+        puts 'Start KZPlugin Config'
+        if KZ::KZGlobalHelper.instance.have_flexLib_pod_target
+          KZ::XmlBuildConfig.new(main_project, pods_project).config_project
+        end
 
-        puts 'Config Framework Strip'
         KZ::StripFrameworkConfig.new(main_project, pods_project).config_project
 
-        puts 'Config Framework Build'
-        KZ::BuildFrameworkConfig.new(main_project, pods_project).config_project
+        unless KZ::KZGlobalHelper.instance.disable_generate_framework
+          KZ::BuildFrameworkConfig.new(main_project, pods_project).config_project
+        end
 
-        puts 'Config Hmap'
         KZ::CreateHmap.new(main_project, pods_project).config_project
 
         main_project.save
         pods_project.save
-        puts 'Config Done'
+
+        KZ::KZGlobalHelper.instance.write_lock_file
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-kz
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - yixiong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A short description of cocoapods-kz.
+description: Kanzhun's cocoapods manage tools.
 email:
 - yixiong@kanzhun.com
 executables: []
@@ -49,6 +49,7 @@ files:
 - lib/cocoapods-kz/command.rb
 - lib/cocoapods-kz/command/install.rb
 - lib/cocoapods-kz/command/kz.rb
+- lib/cocoapods-kz/command/repair.rb
 - lib/cocoapods-kz/command/update.rb
 - lib/cocoapods-kz/gem_version.rb
 - lib/cocoapods-kz/helpers/build_framework_config.rb
@@ -58,6 +59,8 @@ files:
 - lib/cocoapods-kz/helpers/kz_config_result.rb
 - lib/cocoapods-kz/helpers/kz_framework_manager.rb
 - lib/cocoapods-kz/helpers/kz_pod_target.rb
+- lib/cocoapods-kz/helpers/repair_dynamic_swift.rb
+- lib/cocoapods-kz/helpers/repair_module_import.rb
 - lib/cocoapods-kz/helpers/strip_framework_config.rb
 - lib/cocoapods-kz/helpers/xml_build_config.rb
 - lib/cocoapods-kz/native.rb
@@ -92,5 +95,5 @@ requirements: []
 rubygems_version: 3.4.13
 signing_key:
 specification_version: 4
-summary: A longer description of cocoapods-kz.
+summary: Kanzhun's cocoapods manage tools.
 test_files: []