cocoapods-bb-PodAssistant 0.3.6.1 → 0.3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f2d52face2f3ba304d2b966d140c60c4d78615b4fd58957cfe92031b232e91e
-  data.tar.gz: 49ddb7ef3bccd266c636cc0ca6455816f3e6b5937289a081771d5a02ba20ed0d
+  metadata.gz: a8516c7300704a3a2ba1e9ee67133ef82364f6187be79ea886565055e9791748
+  data.tar.gz: 22475a3cbb929a84f32528dca10c1acdccaed5cc6417e98a406d23c1a54a152e
 SHA512:
-  metadata.gz: a9f9becb8300d55c029dc7f7f12555a8dc4186bb6d8b2032c8a7018b38c983f1b28eca3da230e249b92d1f23bdc01f0effdf70fe198718e8d50bdd3049b22ef9
-  data.tar.gz: 48a1887b14defa100f3ead511e969aa8ebf66158cfdb3c0c919b41ae77a4a4c16e551a01e1e4138d055c3e7409211d0ed0f3faad0b7ab028863f9493bc532dbf
+  metadata.gz: 88f91d179f3303d77930e8d6b9f5fa33845676b59c54672190cc151cb324644615b116e331fbf95293f542157f6065138d02f6ef8303d6b5051e7aa5ce5101ce
+  data.tar.gz: f0bb1a78c6f5bee58db590fa6634fecc534ed110fdb44ecd18f259a81a1581d8b2abcdb36c63047243233d9f497e034a63683ddcd9ef3d37a08267295d47b356

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

@@ -0,0 +1,19 @@
+module BB
+    class DataConfig
+        def self.config
+            @config ||= DataConfig.new
+        end
+
+        # 需要过滤忽略组件
+        def ignore_dependencies_pod_names
+            puts "<===获取业务方配置过滤组件数据:#{@ignore_pods_list}".yellow
+            return @ignore_pods_list
+        end
+
+        # 配置过滤忽略组件
+        def set_ignore_dependencies_pod_names(pods=[])
+            puts "==>业务方配置需要过滤组件数据:#{pods} cls:#{pods.class}".yellow
+            @ignore_pods_list=pods
+        end
+    end
+end

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

@@ -3,6 +3,7 @@ require 'cocoapods-bb-PodAssistant/config/stable_specs'
 require 'cocoapods-bb-PodAssistant/helpers/stable_manager_helper'
 require 'cocoapods-core'
 require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
+require 'cocoapods-bb-PodAssistant/config/data_config'
 
 # 数据源管理
 module BB
@@ -392,7 +393,9 @@ module BB
         end
         # 矩阵产品需要过滤组件
         def matrix_filter_pod_names(pods, ignore_dependencies_pod_names=[])
-            ignore_dependencies_pod_names=['BBSAdvert'] unless ignore_dependencies_pod_names.nil? # 如果业务方配置，以业务方为主，默认处理广告业务
+            if ignore_dependencies_pod_names.nil? || ignore_dependencies_pod_names.length == 0
+                ignore_dependencies_pod_names=['BBSAdvert','BBSAdvertCompany'] # 如果业务方配置，以业务方为主，默认处理广告业务
+            end
             find_ok_dependencies_pod_names=[]
             filter_pod_names=[]
             whitelist_pods={}
@@ -401,8 +404,14 @@ module BB
             if ignore_dependencies_pod_names.length > 0
                 puts "业务方配置需要过滤数据:#{ignore_dependencies_pod_names} cls:#{ignore_dependencies_pod_names.class}".yellow
                 pods.each do |pod|
-                    if pod.is_a?(Hash) # 存在依赖关系
+                    if pod.is_a?(Hash) # 存在字典依赖关系
                         pod_name = pod.keys.first
+                    elsif pod.is_a?(String) # 存在字符串依赖关系
+                        pod_name = pod
+                    else
+                        pod_name = nil
+                    end
+                    if !pod_name.empty?
                         name, version = name_and_version_from_string(pod_name)
                         podCoreName = subspec_podname(name)
                         if ignore_dependencies_pod_names.include?(podCoreName) || find_ok_dependencies_pod_names.include?(name)
@@ -411,23 +420,30 @@ module BB
                             end
                             sub_pods=[]
                             data = pod[pod_name]
-                            data.each do | pod |
-                                dependencies_pod_name = name_from_string(pod)
-                                if dependencies_pod_name.include?(name) #subspecs
-                                    if !find_ok_dependencies_pod_names.include?(dependencies_pod_name)
-                                        find_ok_dependencies_pod_names.push(dependencies_pod_name)
+                            # puts "podCoreName:#{podCoreName} type:#{data.class} data:#{data}"
+                            if data.is_a?(Array) # 存在数组依赖关系
+                                data.each do | pod |
+                                    dependencies_pod_name = name_from_string(pod)
+                                    if dependencies_pod_name.include?(name) #subspecs
+                                        if !find_ok_dependencies_pod_names.include?(dependencies_pod_name)
+                                            find_ok_dependencies_pod_names.push(dependencies_pod_name)
+                                        end
                                     end
-                                end
-                                if !sub_pods.include?(dependencies_pod_name)
-                                    sub_pods.push(dependencies_pod_name)
-                                end
-                                tmp_whitelist_pod_names = whitelist_pods[podCoreName]
-                                if (podCoreName != name) && !tmp_whitelist_pod_names.include?(dependencies_pod_name)
-                                    dependencies_core_pod_name = subspec_podname(dependencies_pod_name)
-                                    if (podCoreName != dependencies_core_pod_name) && !whitelist.include?(dependencies_core_pod_name) && !filter_pod_names.include?(dependencies_core_pod_name)
-                                        filter_pod_names.push(dependencies_core_pod_name)
+                                    if !sub_pods.include?(dependencies_pod_name)
+                                        sub_pods.push(dependencies_pod_name)
+                                    end
+                                    tmp_whitelist_pod_names = whitelist_pods[podCoreName]
+                                    if (podCoreName != name) && !tmp_whitelist_pod_names.include?(dependencies_pod_name)
+                                        dependencies_core_pod_name = subspec_podname(dependencies_pod_name)
+                                        if (podCoreName != dependencies_core_pod_name) && !whitelist.include?(dependencies_core_pod_name) && !filter_pod_names.include?(dependencies_core_pod_name)
+                                            filter_pod_names.push(dependencies_core_pod_name)
+                                        end
                                     end
                                 end
+                            elsif data.is_a?(String) # 存在字符串依赖关系
+                                if !whitelist.include?(podCoreName) && !filter_pod_names.include?(podCoreName)
+                                    filter_pod_names.push(podCoreName)
+                                end
                             end
                             if podCoreName == name
                                 whitelist_pods[podCoreName]=sub_pods
@@ -459,7 +475,8 @@ module BB
         end
         # 生成项目stable配置文件
         # 策略：根据podfile.lock dependencies依赖记录pod core标签/分支数据，不存储subspec数据
-        def generate_localStable(ignore_dependencies_pod_names=[])
+        def generate_localStable()
+            ignore_dependencies_pod_names = BB::DataConfig.config.ignore_dependencies_pod_names
             lockfile = podfile_lock
             local_specs = {}
             internal_data = lockfile.internal_data

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.3.6.1"
+  VERSION = "0.3.7.0"
 end

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

@@ -21,17 +21,19 @@ module BB
         # member_configs 项目成员工程配置
         # ignore_local_stable 是否忽略本地stable配置，true 适合pod子组件
         # skip_stable_check 是否跳过stable检测，true 采用标准pod合并操作
-        def initialize(all_modules, member_modules = {}, member_configs = [], ignore_local_stable = false, skip_stable_check = false)
+        # 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()
             #加载远程稳定仓库 和本地podfile 指定的仓库进行合并
             if skip_stable_check == true
                 # 过滤带:remove数据
                 @@all_modules = filter_origin_pod_modules(all_modules)
             else
-                @@all_modules = load_stable_specs_to_podfile(all_modules, ignore_local_stable)
+                @@all_modules = load_stable_specs_to_podfile(all_modules, ignore_local_stable, ignore_dependencies_pod_names)
             end
             @@member_modules = member_modules
             @@member_configs = member_configs
+            @@ignore_dependencies_pod_names = ignore_dependencies_pod_names
         end
         private def filter_origin_pod_modules(all_modules)
             result_modules = []
@@ -100,8 +102,9 @@ module BB
         
         # 合并stable和podfile 中的specs！ ⚠️podfile 中的组件会覆盖stable 中的！
         # 比如stable 中AFNetworking 指向标签1.1，而 podfile中AFNetworking 指向develop，那么最终AFNetworking 会指向develop
-        def load_stable_specs_to_podfile(podfile_specs, ignore_local_stable = false)
+        def load_stable_specs_to_podfile(podfile_specs, ignore_local_stable = false, ignore_dependencies_pod_names=[])
             puts "[PodAssistant] start process pod module...".yellow
+            BB::DataConfig.config.set_ignore_dependencies_pod_names(ignore_dependencies_pod_names)
             local_stable_data = @source_manager.fetch_local_stable_datas # 本地stable配置
             if (local_stable_data.is_a? Hash) && !local_stable_data.empty?
                 return merge_module_data(podfile_specs, local_stable_data)

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

@@ -54,11 +54,17 @@ module Pod
             source_manager.generate_pod_module_dependency(pod_names)
         end
         # pod组件合并操作（项目）
-        def project_pod_module_run(pod_modules, member_modules = {}, member_configs = [], skip_stable_check = false)
+        # 参数说明
+        # all_modules 业务使用组件
+        # member_modules 项目成员模块，一般用于切本地开发使用
+        # member_configs 项目成员工程配置
+        # skip_stable_check 是否跳过stable检测，true 采用标准pod合并操作
+        # ignore_dependencies_pod_names 过滤组件,不受stable版本控制
+        def project_pod_module_run(pod_modules, member_modules = {}, member_configs = [], skip_stable_check = false, ignore_dependencies_pod_names=[])
             # Pod::UI.puts "Pod Module:#{pod_modules}"
             time1 = Time.new
             puts "[PodAssistant]项目pod组件组装开始操作时间:#{time1}".green
-            source = BB::PodModule.new(pod_modules, member_modules, member_configs, false, skip_stable_check)
+            source = BB::PodModule.new(pod_modules, member_modules, member_configs, false, skip_stable_check, ignore_dependencies_pod_names)
             pod_box_module_run(source)
             time2 = Time.new
             puts "[PodAssistant]项目pod组件组装结束时间:#{time2}".green
@@ -67,11 +73,16 @@ module Pod
             puts "项目pod组件组装操作耗时:#{time.to_s.send(:red)}秒".green
         end
         # pod组件合并操作（单组件）
-        def pod_module_run(pod_modules, member_modules = {}, member_configs = [])
+        # 参数说明
+        # all_modules 业务使用组件
+        # member_modules 项目成员模块，一般用于切本地开发使用
+        # member_configs 项目成员工程配置
+        # ignore_dependencies_pod_names 过滤组件,不受stable版本控制
+        def pod_module_run(pod_modules, member_modules = {}, member_configs = [], ignore_dependencies_pod_names=[])
             # Pod::UI.puts "Pod Module:#{pod_modules}"
             time1 = Time.new
             puts "[PodAssistant]pod组件组装开始操作时间:#{time1}".green
-            source = BB::PodModule.new(pod_modules, member_modules, member_configs, true, true)
+            source = BB::PodModule.new(pod_modules, member_modules, member_configs, true, true, ignore_dependencies_pod_names)
             pod_box_module_run(source)
             time2 = Time.new
             puts "[PodAssistant]pod组件组装结束时间:#{time2}".green

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.3.6.1
+  version: 0.3.7.0
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-30 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8.1
+        version: 0.2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.8.1
+        version: 0.2.9.0
 - !ruby/object:Gem::Dependency
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,6 +125,7 @@ files:
 - lib/cocoapods-bb-PodAssistant/command/stable/sync.rb
 - 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/source_manager.rb
 - lib/cocoapods-bb-PodAssistant/config/stable_source.rb
 - lib/cocoapods-bb-PodAssistant/config/stable_specs.rb
@@ -161,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.20
 signing_key:
 specification_version: 4
 summary: A longer description of cocoapods-bb-PodAssistant.