cocoapods-bb-PodAssistant 0.3.10.0 → 0.3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69481b486b0df554df985240cca0dcd6215a487c3fe900c28b9b7414299a48c
-  data.tar.gz: c24fa5ab6855c6175c5fd457180e3be1c4fe00e04bb62012e643855d4713f499
+  metadata.gz: c64174155b43b25df889bb156ee02467411ce11c89cf2ddb2e9471f8aa675fe2
+  data.tar.gz: fcd75f2accb25d16a75ed2ea6d91fbbc2683632a528048b3a73c1aec8e94cb39
 SHA512:
-  metadata.gz: '098cb75784f415fdf27654d686f37284a1739452f64eab225c93742aa480fcd3538631acce9c7763bd9cb3a4c17df656dc4d753fb9b83c9a4d5c9489f019956a'
-  data.tar.gz: 78b051ba39cddd6893104db53e745193e5c5d9dfa4567bd9ac2394cc364eb8fced1afb1f0163b240af076cfff938dedaecea86591dd190d351c7d6f035fbe48c
+  metadata.gz: 1d15a10db7b21dae333ff26d0358633ab7bf92032c44188857d9c4db6adc358602fc5a32a82a5158809f3033ee2a75c8a0c3356de28f1e1666f77eac747e14fa
+  data.tar.gz: 7be09e5bf0ad8a9a2489699a4c3be1c1009aaf0bf807fa30acc67f07e0b2fc4105ea2b3b03cac5e76e7caf3cc8b65ceca77d0a26a28499f04d322c599fc07a07

data/lib/cocoapods-bb-PodAssistant/config/data_config.rb

@@ -1,19 +1,61 @@
+require 'cocoapods-bb-PodAssistant/config/json_parser'
+
 module BB
     class DataConfig
         def self.config
             @config ||= DataConfig.new
         end
 
+        def initialize()
+            file_path = customConfigPath
+            if file_exists?(customConfigPath)
+                puts "开始解析打包机自定义配置 json:#{file_path}".yellow
+                json_parser = BB::JsonParser.new(file_path)
+                @json_data = json_parser.get_json_data
+                puts "json数据:#{@json_data}"
+            end
+        end
+
+        #与打包机约定自定义配置文件
+        def customConfigPath
+            return "#{Dir.pwd}/bbCustomConfig.json" # 存放工程目录下
+        end
+
+        # 提供给业务方的获取 JSON 数据方法
+        def get_custom_json_data
+            return {} unless @json_data
+            @json_data
+        end
+
+        # 检查文件是否存在
+        def file_exists?(file_path)
+            File.exist?(file_path)
+        end
+
         # 需要过滤忽略组件
         def ignore_dependencies_pod_names
-            puts "<===获取业务方配置过滤组件数据:#{@ignore_pods_list}".yellow
+            puts "<===获取业务方配置过滤组件数据:#{@ignore_pods_list} 打包机自定义配置数据:#{@json_data}".yellow
             return @ignore_pods_list
         end
-
+ 
         # 配置过滤忽略组件
         def set_ignore_dependencies_pod_names(pods=[])
-            puts "==>业务方配置需要过滤组件数据:#{pods} cls:#{pods.class}".yellow
-            @ignore_pods_list=pods
+            @ignore_pods_list = pods
+            # puts "==>业务方配置需要过滤组件数据:#{pods} cls:#{pods.class}".yellow
+            # json_data = get_custom_json_data
+            # if json_data.nil? || json_data.empty?
+            #     @ignore_pods_list = pods
+            # else
+            #     whitelist_pods=[]
+            #     pods.each do |pod_name|
+            #         data = json_data[pod_name]
+            #         if data.nil? || data.empty?
+            #             whitelist_pods.push(pod_name)
+            #         end
+            #     end
+            #     puts "==>修正后需要过滤组件数据:#{whitelist_pods} cls:#{whitelist_pods.class}".green
+            #     @ignore_pods_list = whitelist_pods
+            # end
         end
     end
 end

data/lib/cocoapods-bb-PodAssistant/config/json_parser.rb

@@ -0,0 +1,53 @@
+require 'json'
+
+module BB
+    class JsonParser
+        attr_reader :json_data
+      
+        # 初始化，读取并解析 JSON 文件
+        def initialize(file_path)
+            @file_path = file_path
+            @json_data = read_json
+        end
+      
+        # 读取并解析 JSON 文件
+        def read_json
+            begin
+                file_content = File.read(@file_path)
+                JSON.parse(file_content)
+            rescue Errno::ENOENT
+                puts "错误：找不到文件 #{@file_path}"
+                nil
+            rescue JSON::ParserError
+                puts "错误：JSON 解析失败，请检查文件格式"
+                nil
+            end
+        end
+      
+        # 遍历 JSON 并返回 key-value 结构
+        def traverse_json(data = @json_data, prefix = "", result = {})
+            return result unless data
+
+            case data
+            when Hash
+            data.each do |key, value|
+                traverse_json(value, "#{prefix}#{key}.", result)
+            end
+            when Array
+            data.each_with_index do |value, index|
+                traverse_json(value, "#{prefix}[#{index}].", result)
+            end
+            else
+            result[prefix.chomp('.')] = data
+            end
+
+            result
+        end
+
+        # 提供给业务方的获取 JSON 数据方法
+        def get_json_data
+            return {} unless @json_data
+            traverse_json
+        end
+    end
+end

data/lib/cocoapods-bb-PodAssistant/config/source_manager.rb

@@ -576,6 +576,22 @@ module BB
             return (has_include_subspec(podName) && podName.include?("#{podCoreName}/"))
         end
 
+        # 更新自定义pod组件数据
+        def update_custom_podmodules(json_data)
+            if json_data.nil? || json_data.empty?
+                puts ""
+            else
+                puts "动态更新本地组件:#{json_data}".yellow
+                if json_data.is_a?(Hash)
+                    local_stable_data = fetch_local_stable_datas # 本地stable配置
+                    json_data.each do |key, value|
+                        local_stable_data[key] = value
+                    end
+                    puts "[PodAssistant] 更新本地stable数据".yellow
+                    update_localstable_datas(local_stable_data)
+                end
+            end
+        end
         # 更新单个pod组件
         def update_podmodules(pod_lists)
             local_stable_data = fetch_local_stable_datas # 本地stable配置

data/lib/cocoapods-bb-PodAssistant/gem_version.rb

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.3.10.0"
+  VERSION = "0.3.11.0"
 end

data/lib/cocoapods-bb-PodAssistant/helpers/pod_module_helper.rb

@@ -24,7 +24,10 @@ module BB
         # ignore_dependencies_pod_names 过滤组件,不受stable版本控制
         def initialize(all_modules, member_modules = {}, member_configs = [], ignore_local_stable = false, skip_stable_check = false, ignore_dependencies_pod_names=[])
             @source_manager = BB::SourceManager.new()
-            BB::DataConfig.config.set_ignore_dependencies_pod_names(ignore_dependencies_pod_names)
+            config = BB::DataConfig.config
+            config.set_ignore_dependencies_pod_names(ignore_dependencies_pod_names)
+            # # 打包机支持自定义配置，解决开发环境组件动态更新问题
+            # @source_manager.update_custom_podmodules(config.get_custom_json_data)
             #加载远程稳定仓库 和本地podfile 指定的仓库进行合并
             if skip_stable_check == true
                 # 过滤带:remove数据
@@ -314,6 +317,19 @@ module BB
             else
                 puts "[PodAssistant] 本地stable数据无变化<===完成".yellow
             end
+            config = BB::DataConfig.config
+            json_data = config.get_custom_json_data
+            if json_data.nil? || json_data.empty?
+                puts ""
+            else
+                puts "打包后台配置更新自定义组件配置数据:#{json_data}".yellow
+                if json_data.is_a?(Hash)
+                    json_data.each do |key, value|
+                        stable_hash[key] = value
+                        puts "=====动态更新组件-#{key}:#{value} 替换版本完成====="
+                    end
+                end
+            end
             # puts "[PodAssistant] stable_hash:#{stable_hash}".red
             stable_specs = []
             stable_hash.each do |name,pod|

data/lib/cocoapods-bb-PodAssistant/helpers/swiftlint_manager_helper.rb

@@ -1,20 +1,40 @@
 require 'cocoapods/podfile'
 require 'cocoapods-core/podfile/dsl'
+require 'cocoapods-bb-PodAssistant/helpers/swiftlint_path_helper'
 require 'uri'
 require 'yaml'
 require 'fileutils'
 
 module BB
   class SwiftlintManager
+
+    @update_config = false
+
     def initialize()
-      update_swiftlint_file()
-      update_swiftlint_script()
-      update_swiftlint_gitignore()
+      remove_swiftlint_path()
+      # 已安装过run swiftlint脚本将强制更新
+      update_swiftlint_script(true)
+    end
+
+    def update_swiftlint_config()
+      # 单次运行过程中只安装或更新一次
+      if !@update_config
+        @update_config = true
+        update_swiftlint_file()
+        update_swiftlint_script()
+        update_swiftlint_gitignore()
+      end
     end
 
     # 写入路径到swiftlint文件
-    def swiftlint_from_module(path)
-      write_swiftlint_included(path)
+    def swiftlint_from_module(name, lib_path)
+      # 查询真实路径
+      path_list = SwiftlintFilesHelper.query_file_path(name, lib_path)
+      unless path_list.empty?
+        path_list.each do | path |
+          write_swiftlint_included(path)
+        end
+      end
     end
 
     private def swiftlint_tag()
@@ -79,6 +99,32 @@ module BB
       end
     end
 
+    # 删除路临时路径文件
+    private def remove_swiftlint_path()
+      file_path = getSwiftlintFilepath()
+      if File.exist?(file_path)
+          begin
+            # 检查文件是否存在
+            if File.exist?(file_path)
+              # 尝试删除文件
+              File.delete(file_path)
+              # puts "文件已成功删除: #{file_path}"
+            else
+              # puts "文件不存在: #{file_path}"
+            end
+          rescue Errno::EACCES => e
+            # 处理权限错误
+            puts "权限不足，无法删除文件: #{e.message}"
+          rescue Errno::ENOENT => e
+            # 文件不存在错误已经被上面的 if File.exist? 处理了，这里可以省略或用于其他未预见的情况
+            puts "尝试删除不存在的文件: #{e.message}"
+          rescue => e
+            # 处理所有其他类型的异常
+            puts "删除文件时发生错误: #{e.message}"
+          end
+      end
+    end
+
     # 写入swiftlint临时文件gitignore过滤规则
     private def update_swiftlint_gitignore()
       files_to_ignore = [
@@ -293,7 +339,7 @@ module BB
     end
 
     # 更新script脚本
-    def update_swiftlint_script()
+    def update_swiftlint_script(force = false)
 
       project_path = find_xcodeproj_file()
       if project_path.nil?
@@ -316,7 +362,7 @@ module BB
       existing_script = mainTarget.shell_script_build_phases.find do |phase|
         phase.name == xcode_script_name
       end
-    
+
       if existing_script
         script_content = existing_script.shell_script
         local_script_version = get_script_version(script_content)
@@ -330,7 +376,7 @@ module BB
           existing_script.shell_script = File.read(cache_script_path)
           project.save
         end
-      else
+      elsif !force
         puts "#{swiftlint_tag} Xcode工程配置中的不存在#{xcode_script_name}脚本，更新脚本".green
         new_script = mainTarget.new_shell_script_build_phase(xcode_script_name)
         new_script.shell_script = File.read(cache_script_path)

data/lib/cocoapods-bb-PodAssistant/helpers/swiftlint_path_helper.rb

@@ -0,0 +1,175 @@
+require 'xcodeproj'
+require 'cocoapods' # 加载 CocoaPods 核心库
+
+module BB
+  class SwiftlintFilesHelper
+    # 类变量存储所有subspecs信息
+    @@subspecs_info = {}
+
+    # 获取组件subspecs路径
+    def self.extract_subspecs(spec, parent_name = nil, lib_name = nil)
+      subspecs_info = {}
+    
+      full_name = parent_name ? "#{parent_name}/#{spec.name.split('/').last}" : spec.name
+      source_files = spec.attributes_hash['source_files']
+    
+      info_list = subspecs_info[full_name]
+      if info_list.nil?
+        info_list = []
+      end
+    
+      # 处理source_files路径
+      if source_files.is_a?(String)
+        info_list << source_files
+      elsif source_files.is_a?(Array)
+        info_list = info_list | source_files
+      end
+    
+      # 处理dependency内部引用路径
+      spec.dependencies.each do | dependency |
+        dep_str = dependency.to_s
+        # 检查依赖项是否匹配指定的库名
+        if dep_str.start_with?(lib_name)
+          info_list << dep_str
+        end
+      end
+    
+      unless info_list.empty?
+        subspecs_info[full_name] = info_list if info_list
+      end
+    
+      spec.subspecs.each do |subspec|
+        subspecs_info.merge!(extract_subspecs(subspec, full_name, lib_name))
+      end
+    
+      return subspecs_info
+    end
+
+    def self.parse_podspec(file_path)
+      # Load the podspec file
+      spec = Pod::Specification.from_file(file_path)
+      spec_name = spec.attributes_hash['name']
+    
+      # Extract subspecs information
+      subspecs_info = extract_subspecs(spec, nil, spec_name)
+    
+      default_subspecs = spec.attributes_hash['default_subspecs']
+    
+      # 处理默认引用
+      if default_subspecs.is_a?(String)
+        default_name = File.join(spec_name, default_subspecs)
+        info_list = subspecs_info[default_name]
+        subspecs_info[spec_name] = info_list if info_list
+      elsif default_subspecs.is_a?(Array)
+        default_list = []
+        default_subspecs.each do | name |
+          default_name = File.join(spec_name, name)
+          info_list = subspecs_info[default_name]
+          if info_list.is_a?(Array) && !info_list.empty
+            default_list = default_list | info_list
+          end
+        end
+        unless default_list.empty
+          subspecs_info[spec_name] = default_list if default_list
+        end
+      end
+    
+      return subspecs_info
+    end
+    
+    # 获取真正路径
+    def self.sanitize_path(path, lib_path)
+    
+      return nil if path.nil? || lib_path.nil?
+    
+      real_path = path.dup # 创建副本以避免修改原始数据
+      # 去除 *.{...} 或 **/*.{...} 等文件匹配模式
+      real_path.gsub!(%r{\*\.(\{\w+(,\w+)*\}|)}, "") # 匹配 *.{ext} 或 *.{}
+      real_path.gsub!(%r{/\*\*/}, "")                # 匹配 /**/
+      real_path.gsub!(%r{\*}, "")                    # 匹配单独的 *
+    
+      # 如果路径不以斜杠结尾，则添加斜杠
+      real_path += '/' unless real_path.end_with?('/')
+    
+      # 去除多余的斜杠（如果有）
+      real_path.squeeze!('/')
+    
+      # 去除末尾的多余斜杠
+      real_path.chomp!('/') if real_path != '/'
+    
+      file_path = File.join(lib_path, real_path)
+      if File.exist?(file_path)
+        return file_path
+      end
+    
+      return nil
+    end
+    
+    def self.extract_subspec_real_paths(name, lib_path)
+
+      return nil if @@subspecs_info.nil?
+
+      path_list = @@subspecs_info[name]
+      realPaths = []
+      unless path_list.nil?
+        path_list.each do | path |
+          realPath = sanitize_path(path, lib_path)
+          if realPath.nil? && path != nil && path.to_s.length > 0
+            paths = extract_subspec_real_paths(path, lib_path)
+            realPaths = realPaths | paths
+          else
+            # 不存在则添加
+            unless realPaths.include?(realPath)
+              realPaths << realPath
+            end
+          end
+        end
+      end
+      return realPaths
+    end
+
+    # 查询路径
+    def self.query_file_path(name, lib_path)
+
+      return nil if name.nil? || lib_path.nil?
+
+      if @@subspecs_info[name].nil?
+        podspec_path = find_first_with_suffix(lib_path, ".podspec")
+        unless podspec_path.nil?
+          info = parse_podspec(podspec_path)
+          if @@subspecs_info.nil?
+            @@subspecs_info = info
+          else
+            @@subspecs_info.merge!(info) { |key, oldval, newval| 
+              # 如果键对应的值也是哈希，则可以递归合并
+              oldval.is_a?(Hash) && newval.is_a?(Hash) ? oldval.merge(newval) : newval 
+            }
+          end
+        end
+      end
+
+      return extract_subspec_real_paths(name, lib_path)
+    end
+
+    # 类方法：根据后缀递归查找文件或目录
+    def self.find_first_with_suffix(directory, suffix)
+      # 检查目录是否存在
+      unless Dir.exist?(directory)
+        puts "目录 #{directory} 不存在"
+        return nil
+      end
+  
+      # 遍历目录下的所有文件和子目录
+      Find.find(directory) do |path|
+        # 如果是文件或目录且以给定后缀结尾，则返回其完整路径
+        if (File.file?(path) || File.directory?(path)) && File.basename(path).end_with?(suffix)
+          return path
+        end
+      end
+  
+      # 如果没有找到匹配项
+      puts "未找到以 '#{suffix}' 结尾的文件或目录"
+      nil
+    end
+  end
+end

data/lib/cocoapods-bb-PodAssistant/podfile.rb

@@ -175,10 +175,10 @@ module Pod
             swiftlint = source_module[:swiftlint]
             swiftlintKey = :swiftlint if swiftlint.to_s.length > 0
             if swiftlint != nil && swiftlintKey.length > 0
-                if @swiftlint.nil?
-                    @swiftlint = BB::SwiftlintManager.new()
+                unless @swiftlint.nil?
+                    @swiftlint.update_swiftlint_config()
+                    @swiftlint.swiftlint_from_module(source_module[:name], path)
                 end
-                @swiftlint.swiftlint_from_module(path)
             end
         end
 
@@ -295,6 +295,11 @@ module Pod
             linkageKey = :linkage if linkage.to_s.length > 0
             linkagesKey = :linkages if linkages.to_s.length > 0
 
+            # 初始化swiftlint，清空上次podin路径且强制更新script脚本
+            if @swiftlint.nil?
+                @swiftlint = BB::SwiftlintManager.new()
+            end
+
             case method
             when DEFAULT
                 # 根据参数判断method

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.3.10.0
+  version: 0.3.11.0
 platform: ruby
 authors:
 - humin
 bindir: bin
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -169,6 +169,7 @@ files:
 - lib/cocoapods-bb-PodAssistant/command/stable/update.rb
 - lib/cocoapods-bb-PodAssistant/config/cache_path.rb
 - lib/cocoapods-bb-PodAssistant/config/data_config.rb
+- lib/cocoapods-bb-PodAssistant/config/json_parser.rb
 - lib/cocoapods-bb-PodAssistant/config/source_manager.rb
 - lib/cocoapods-bb-PodAssistant/config/stable_source.rb
 - lib/cocoapods-bb-PodAssistant/config/stable_specs.rb
@@ -180,6 +181,7 @@ files:
 - lib/cocoapods-bb-PodAssistant/helpers/stable_env_helper.rb
 - lib/cocoapods-bb-PodAssistant/helpers/stable_manager_helper.rb
 - lib/cocoapods-bb-PodAssistant/helpers/swiftlint_manager_helper.rb
+- lib/cocoapods-bb-PodAssistant/helpers/swiftlint_path_helper.rb
 - lib/cocoapods-bb-PodAssistant/helpers/yaml_files_helper.rb
 - lib/cocoapods-bb-PodAssistant/native/installer.rb
 - lib/cocoapods-bb-PodAssistant/podfile.rb