cocoapods-bb-PodAssistant 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b51e74ff613bc48453d0b937997988c53f5afb9d510ff03a9d749c574f5400e5
-  data.tar.gz: 4473eeab305c9d52b40fe3964c2ab2e00daced64a6f67189b257b9ebf5f25a3e
+  metadata.gz: a4d73bccc2529481814cc586c3d0cb46b863c986741859ac8d399f1a8962ed1c
+  data.tar.gz: d96718876d58008ffa7e846cae38e68d46358fe3e88effd7477b669b514ede12
 SHA512:
-  metadata.gz: 5f8dfd78e3ed158208d41d15ec6258c58e0679c39e4132ff6d93cba459984de7f6b2ecf200c8db80042176b8559616388de18d62266ae5d6b630867655937846
-  data.tar.gz: c48dd116047320c6d2ab0ad045aa138682a00fa31752cedff4b48f02889cd65560d8cb71b8363792b1d93d2c5e3b88bf9a60fa7f14946d0d6ee67eab9b90cee0
+  metadata.gz: 979d7c8365b57c364e953ebe616d55be2c40c5547a72d42089db504123d9188bfe8920ede679ec412128e41cca44feaec052d32d1163c60b7434d022be2dfba4
+  data.tar.gz: c86d930fdd7cc595ea411b235ce98b18e8c105665b178a05938f9f4e942a20530bb83a5ac2dabb6a530022d0f82f2373adf6951d55984d2473b15d52d93e2a0f

data/lib/cocoapods-bb-PodAssistant/command/stable/stable.rb

@@ -114,7 +114,7 @@ module Pod
               ll_fetch_stale_git
               # 数据合并
               source_manager.merge_stable_data
-              puts "[PodAssistant] `pod stable` complete!".green
+              puts "[PodAssistant] `pod stable` complete! Please execute the [pod install/ pod update] command".green
             else
               puts "[PodAssistant] `pod stable` 帮助文档请查看👇".yellow
               banner! 

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

@@ -29,7 +29,12 @@ module BB
         # 产品线本地lock数据
         def fetch_local_stable_datas
             localSpec = BB::StableSpecs.new()
-            return localSpec.readData(local_stable_yaml)
+            yml = local_stable_yaml
+            if !File.file?(yml)
+                puts "yml配置文件不存在，执行自动初始化项目yml配置文件".green
+                generate_localStable
+            end
+            return localSpec.readData(yml)
         end
 
         # 远端公共lock数据
@@ -231,51 +236,38 @@ module BB
             return lockfile
         end
 
+        # 生成项目stable配置文件
+        # 策略：根据podfile.lock dependencies依赖记录pod core标签/分支数据，不存储subspec数据
         def generate_localStable
             lockfile = podfile_lock
             local_specs = {}
-            # step.1 获取分支指向信息
             dependencies = lockfile.dependencies
             dependencies.each do | dependency |
+                pod_name = dependency.name
+                if has_include_subspec(pod_name)
+                    podCoreName = subspec_podname(pod_name)
+                else
+                    podCoreName = pod_name
+                end
                 if dependency.external_source.is_a? Hash
-                    name = dependency.name
+                    # 指向分支
                     external_source = dependency.external_source
-                    podCoreName = subspec_podname(name)
                     # checkout_options = lockfile.checkout_options_for_pod_named(podCoreName)
                     # if checkout_options.is_a? Hash
                     #     commit = checkout_options[:commit]
                     #     external_source[:commit] = commit
                     #     puts "name:#{podCoreName} checkout_options:#{checkout_options} commit:#{commit}"
                     # end
-                    if podCoreName != name
-                        # local_specs.delete(podCoreName)
+                    if !local_specs.has_key?(podCoreName)
                         local_specs[podCoreName] = external_source
-                        if (!has_include_core_subspec(name)) # 过滤core数据
-                            local_specs[name] = external_source
-                            Pod::UI.puts "[分支] #{name} => (#{external_source})"
-                        end
-                    else
-                        local_specs[name] = external_source
-                        Pod::UI.puts "[分支] #{name} => (#{external_source})"
-                    end
-                end
-            end
-            # step.2 获取pods标签信息,如果存在分支优先使用分支信息
-            lockfile.pod_names.each do |pod_name|
-                version = lockfile.version(pod_name)
-                podCoreName = subspec_podname(pod_name)
-                if local_specs.has_key?(podCoreName)
-                    if podCoreName != pod_name
-                        if (!has_include_core_subspec(pod_name)) # 过滤core数据
-                            # Pod::UI.puts "step.2 #{pod_name} => (#{local_specs[podCoreName]})"
-                            local_specs[pod_name] = local_specs[podCoreName]
-                        end
+                        # puts "[分支] #{podCoreName} => (#{external_source})".yellow
                     end
                 else
-                    if (!has_include_core_subspec(pod_name)) # 过滤core数据
-                        ver = version.to_s
-                        local_specs[pod_name] = ver
-                        Pod::UI.puts "[标签] #{pod_name} => (#{ver})"
+                    # 指向标签版本
+                    version = lockfile.version(pod_name).to_s
+                    if !version.empty? && !local_specs.has_key?(podCoreName)
+                        local_specs[podCoreName] = version
+                        # puts "[标签] #{podCoreName} => (#{version})".yellow
                     end
                 end
             end

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

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

@@ -14,13 +14,23 @@ module BB
         @@member_configs = [
         ]
 
-        def initialize(all_modules, member_modules, member_configs, ignore_local_stable = false)
+        # pod组件合并
+        # 参数说明
+        # all_modules 业务使用组件
+        # member_modules 项目成员模块，一般用于切本地开发使用
+        # 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)
             @source_manager = BB::SourceManager.new()
             #加载远程稳定仓库 和本地podfile 指定的仓库进行合并
-            @@all_modules = load_stable_specs_to_podfile(all_modules, ignore_local_stable)
+            if skip_stable_check == true
+                @@all_modules = all_modules
+            else
+                @@all_modules = load_stable_specs_to_podfile(all_modules, ignore_local_stable)
+            end
             @@member_modules = member_modules
             @@member_configs = member_configs
-            # puts "member_modules:#{member_modules}"
         end
 
         def current_member
@@ -138,39 +148,69 @@ module BB
             }
             return podfile_hash
         end
+        # 合并组建数据
+        # 策略:本地stable作为基础数据，遍历podfile组件进行替换，变化以本地为主，标签以stable为主
         def merge_module_data(podfile_specs, local_stable_data)
             # puts "podfile_specs: #{podfile_specs}".green
             podfile_hash = convert_podfile_specs_data(podfile_specs)
             # puts "podfile_hash: #{podfile_hash}".red
             # puts "local_stable_data: #{local_stable_data}".red
             need_update_pod_data={}
-            podfile_hash.each do |podName,pod|
-                local_pod_data = local_stable_data[podName]
-                if pod != local_pod_data
-                    branch = pod[:branch]
-                    git_format = pod[:git_format]
-                    version = pod[:version]
-                    podCoreName = @source_manager.subspec_podname(podName)
-                    # puts "podName:#{podName} pod:#{pod} branch:#{branch} git_format:#{git_format} version:#{version} local_pod_data:#{local_pod_data}".green
-                    if (branch && !branch.empty?) || (git_format && !git_format.empty?)
-                        # 项目配置指向分支数据，以本项目为主
-                        puts "[PodAssistant] #{podName} 指向分支数据 => #{pod}"
-                        need_update_pod_data[podCoreName] = pod
-                    end
-                    # succ = (version && !version.empty? && (local_pod_data.is_a? String) && (version != local_pod_data) && !version.include?(local_pod_data))
-                    # puts "podName:#{podName} version:#{version} succ=#{succ}".red
-                    if (version && !version.empty? && (local_pod_data.is_a? String) && (version != local_pod_data) && !version.include?(local_pod_data))
-                        version = version.lstrip # 去除首字母空格
-                        initial_str = version[0..0] # 第一个字母
-                        # 项目配置固定版本，以本项目为主
-                        is_fixed_version = initial_str.include?('=') ? true : false # 固定版本 pod 'A','= x.x.x'
-                        is_lessthan_version = version.include?('<') ? true : false # 限制《最高》组件版本 pod 'A','< x.x.x' 或者 pod 'A','<= x.x.x'
-                        is_greaterthan_version = version.include?('>') ? true : false # 限制《最低》组件版本 pod 'A','> x.x.x' 或者 pod 'A','>= x.x.x'
-                        is_fuzzy_version = version.include?('~>') ? true : false # 固定版本 pod 'A','~> x.x.x'
-                        is_fuzzy_versionV2 = (!is_fixed_version && !is_lessthan_version && !is_greaterthan_version && !is_fuzzy_version) ? true : false # 固定版本 pod 'A','x.x.x'
-                        if (is_fixed_version == true) || (is_lessthan_version == true) || (is_fuzzy_version == true) || (is_fuzzy_versionV2 == true)
-                            puts "[PodAssistant] ⚠️ 限制组件版本 '#{podName}', '#{version}' 以项目配置为主. (最新版本=> #{local_pod_data.send(:red)})"
-                            need_update_pod_data[podCoreName] = version
+            stable_hash = local_stable_data
+            podfile_hash.each do |podName,podfile_pod|
+                podCoreName = @source_manager.subspec_podname(podName)
+                if (podName == podCoreName) || @source_manager.has_pod_subspec(podName, podCoreName)
+                    pod = stable_hash[podCoreName]
+                    if pod.nil? # stbale没有受版本控制
+                        need_update_pod_data[podName] = podfile_pod
+                    else
+                        # puts "[stable]podCoreName:#{podCoreName}(#{pod}) VS [podfile] podName:#{podName}(#{podfile_pod})".yellow
+                        if podName == "BBWriteReview/World"
+                            puts "[stable]podCoreName:#{podCoreName}(#{pod}) VS [podfile] podName:#{podName}(#{podfile_pod})".yellow
+                        end
+                        if pod == podfile_pod
+                            if podName != podCoreName
+                                need_update_pod_data[podName] = podfile_pod
+                            end
+                        else
+                            branch = podfile_pod[:branch]
+                            git = podfile_pod[:git]
+                            if git.nil?
+                                git = podfile_pod[:git_format]
+                            end
+                            version = podfile_pod[:version]
+                            if (branch && !branch.empty?) || (git && !git.empty?)
+                                # 项目配置指向分支数据，以本项目为主
+                                puts "[PodAssistant] #{podName} 指向分支数据 => #{podfile_pod}"
+                                stable_hash[podCoreName] = podfile_pod
+                                if podName != podCoreName
+                                    need_update_pod_data[podName] = podfile_pod
+                                end
+                            elsif (version && !version.empty? && (pod.is_a? String) && (version != pod))
+                                version = version.lstrip # 去除首字母空格
+                                initial_str = version[0..0] # 第一个字母
+                                # 项目配置固定版本，以本项目为主
+                                is_fixed_version = initial_str.include?('=') ? true : false # 固定版本 pod 'A','= x.x.x'
+                                is_lessthan_version = version.include?('<') ? true : false # 限制《最高》组件版本 pod 'A','< x.x.x' 或者 pod 'A','<= x.x.x'
+                                is_greaterthan_version = version.include?('>') ? true : false # 限制《最低》组件版本 pod 'A','> x.x.x' 或者 pod 'A','>= x.x.x'
+                                is_fuzzy_version = version.include?('~>') ? true : false # 固定版本 pod 'A','~> x.x.x'
+                                is_fuzzy_versionV2 = (!is_fixed_version && !is_lessthan_version && !is_greaterthan_version && !is_fuzzy_version) ? true : false # 固定版本 pod 'A','x.x.x'
+                                if (is_fixed_version == true) || (is_lessthan_version == true) || (is_fuzzy_versionV2 == true)
+                                    puts "[PodAssistant] ⚠️ 限制组件版本 '#{podName}', '#{version}' 以项目配置为主. (最新版本=> #{pod.send(:red)})"
+                                    stable_hash[podCoreName] = version
+                                    if podName != podCoreName
+                                        need_update_pod_data[podName] = version
+                                    end
+                                elsif (is_greaterthan_version == true) || (is_fuzzy_version == true)
+                                    # puts "[PodAssistant] '#{podName}', '#{pod.send(:red)}' 以stable配置为主."
+                                    need_update_pod_data[podName] = pod
+                                end
+                            else
+                                if podName != podCoreName
+                                    # puts "[PodAssistant] '#{podName}', '#{pod.send(:red)}' 以stable配置为主."
+                                    need_update_pod_data[podName] = pod
+                                end
+                            end
                         end
                     end
                 end
@@ -178,22 +218,16 @@ module BB
             if need_update_pod_data.count > 0
                 # puts "need_update_pod_data:#{need_update_pod_data}".green
                 # 规避指向分支/远端版本替换yml配置所有组件，避免pod指向指向多个源
-                need_update_pod_data.each do |podCoreName,pod|
-                    local_stable_data.keys.each do |podName|
-                        if (podName == podCoreName) || @source_manager.has_pod_subspec(podName, podCoreName)
-                            local_stable_data[podName] = pod
-                            puts "[PodAssistant] 合并组件 #{podName} #{pod} 以项目为主".yellow
-                        end
-                    end
+                need_update_pod_data.each do |podName,pod|
+                    stable_hash[podName] = pod
+                    puts "[PodAssistant] merge pod #{podName} #{pod}"
                 end
-                puts "[PodAssistant] 重新保存本地stable数据".yellow
-                @source_manager.update_localstable_datas(local_stable_data) 
             else
                 puts "[PodAssistant] 本地stable数据无变化<===完成".yellow
             end
-            # puts "local_stable_data: #{local_stable_data}".red
+            # puts "[PodAssistant] stable_hash:#{stable_hash}".red
             stable_specs = []
-            local_stable_data.each do |name,pod|
+            stable_hash.each do |name,pod|
                 if pod.is_a? Hash
                     branch = pod[:branch]
                     git = pod[:git]
@@ -235,7 +269,7 @@ module BB
                 elsif pod.is_a? String
                     stable_specs.push({ names: [name], version: pod, method: REMOTE_TAG })
                 else
-                    puts "unknow type data:#{pod}".red
+                    puts "unknow type [#{name}] data:#{pod}".red
                 end
             end
             return stable_specs

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

@@ -47,13 +47,25 @@ module Pod
     class Podfile
         # @!group DSL support
         include Pod::Podfile::DSL
-
-        # pod组件合并操作
-        def pod_module_run(pod_modules, member_modules = {}, member_configs = [], ignore_local_stable = false)
+        # pod组件合并操作（项目）
+        def project_pod_module_run(pod_modules, member_modules = {}, member_configs = [], skip_stable_check = false)
+            # 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)
+            pod_box_module_run(source)
+            time2 = Time.new
+            puts "[PodAssistant]项目pod组件组装结束时间:#{time2}".green
+             # 获取时间差
+            time = time2 - time1
+            puts "项目pod组件组装操作耗时:#{time.to_s.send(:red)}秒".green
+        end
+        # pod组件合并操作（单组件）
+        def pod_module_run(pod_modules, member_modules = {}, member_configs = [])
             # 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, ignore_local_stable)
+            source = BB::PodModule.new(pod_modules, member_modules, member_configs, true, true)
             pod_box_module_run(source)
             time2 = Time.new
             puts "[PodAssistant]pod组件组装结束时间:#{time2}".green

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

@@ -1,6 +1,7 @@
 require 'cocoapods-bb-PodAssistant/command'
 require 'csv'
 require 'xcodeproj'
+require 'cocoapods-bb-PodAssistant/config/source_manager'
 
 class Dir
   def self.size(dir)
@@ -67,6 +68,9 @@ module BB
   end
   Pod::HooksManager.register("cocoapods-bb-PodAssistant", :post_install) do |installer|
     begin
+        source_manager = BB::SourceManager.new(@businessSpec)
+        # 生成本地yml配置
+        source_manager.generate_localStable
         $podEndTime = Time.new
         puts "[PodAssistant] plugin hook post_install".yellow
         puts "[PodAssistant] pod库下载耗时 GitCloneAllSize: #{$gitAllSize} M GitCloneAllTime: #{$cloneAllTime} S CDNDownloadAllSize: #{$pluginCurrentZipAllSize} M CDNAllTime: #{$downloadAllTime} S CDNDownloadAllTime: #{$cdnDownloadAllTime} S CDNUnzipAllTime: #{$cdnUnZipAllTime} S"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core