cocoapods-bb-PodAssistant 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d20d9d58e270471cf2c4f2c67680ac357bfe3a9bc98bfff584365aa7c7880ccc
-  data.tar.gz: b9ae69a6fe68492eb9e60a9fd8f18bd128a983c05f2652f5bd4e256434965b2a
+  metadata.gz: 97479d53d22f4894ba793463fbb3aa6cc0affdb87959c19640398527e63a1bdd
+  data.tar.gz: e9d2bbe17b2e17c47688c02d5a6cba2e44bef6f500ee8b70fa90e5d27332ee58
 SHA512:
-  metadata.gz: fdb0cbecbf00a7e12b86a39f912516361edf310c261508a494b6126c9122ab79e737c6ee5c821b3ae2fd871bbbc2309c0aa664b0c8a94fa489588e13e0cea645
-  data.tar.gz: 6d2727972ff6356bca684ff3e7a9b6339d43e9e2fcf2952daada97c668712a9308cb37eb08e55bc38f7ad769aaeb7d4150241c12df3bc363c053839129ce58c9
+  metadata.gz: ad79dceeb9b07d81250ff78dda40620203c4ad74b40e3596d6544beb4a6ffad7d6d2b61a2fad0aaacf66a317438662992e6580ec62f9fc0a49cceb2d677fb5db
+  data.tar.gz: e0a2bf40bd535d3ab06edba17a6b49a7b5e8dbff2df1b5563d59b8cb117b06d2f9f466a88d51e6a89972e2b1db93b0de3abf444b2ce33e1f1523305fa6f6c5a7

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

@@ -1,4 +1,5 @@
 require 'cocoapods-bb-PodAssistant/config/source_manager'
+require 'cocoapods-bb-bin/native'
 
 module Pod
   class Command

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

@@ -1,4 +1,5 @@
 require 'cocoapods-bb-PodAssistant/config/source_manager'
+require 'cocoapods-bb-bin/native'
 
 module Pod
   class Command
@@ -21,13 +22,14 @@ module Pod
 
         def self.options
           [
-            ['--sync', '立即同步远端yml配置，更新组件信息'],
+            ['--force', '强制更新组件，突破stable版本限制'],
           ].concat(super)
         end
 
         def initialize(argv)
           @pods = argv.arguments!
           @sync = argv.flag?('sync', true)
+          @force = argv.flag?('force', true)
           super
         end
 
@@ -38,7 +40,7 @@ module Pod
           # verify_podfile_exists! # 系统提供api验证podfile是否ok
           if @sync
             puts "[PodAssistant] 需要同步组件信息#{@pods}".green
-            source_manager.merge_stable_data(@pods)
+            source_manager.merge_stable_data(@pods, @force)
           end
           podStartTime = Time.new
           update_spec

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

@@ -121,9 +121,9 @@ module BB
         end
 
         # 合并stable数据，参数，支持传入更新某几个数据
-        def merge_stable_data(update_pods=[])
+        def merge_stable_data(update_pods=[], is_force = false)
             #4、show origin_stable_lock diff with local_stable_lock
-            new_stable_spec = compare_specs(fetch_local_stable_datas, fetch_origin_stable_datas, update_pods)
+            new_stable_spec = compare_specs(fetch_local_stable_datas, fetch_origin_stable_datas, update_pods, is_force)
 
             #5、rewirte local_stable_lock with origin_stable_lock
             update_localstable_datas(new_stable_spec)    
@@ -191,7 +191,7 @@ module BB
             update_dependencies_and_remove_data(business_stable_yaml, business_stable_datas, dependencies_pods, remove_pods)
         end
         # compare specs 参数1:本地，参数2:远端，参数3:指定更新pod库
-        def compare_specs(local_specs, common_specs, update_pods=[])
+        def compare_specs(local_specs, common_specs, update_pods=[], is_force = false)
             added_projects = []
             updated_projects = []
             rollbacked_projects = []
@@ -218,10 +218,11 @@ module BB
                     if (update_pods.length == 0) || (update_pods.include?(podCoreName))
                         if versionGreat(version, local_version)
                             updated_projects << "【#{name}】 (#{local_version}) -> (#{version.to_s.send(:yellow)})"
+                            need_update_pod_lists[podCoreName] = version
                         else
+                            # 本地指向分支，以本地为主
                             rollbacked_projects << "【#{name}】 (#{version.to_s.send(:red)}) <- (#{local_version})"
                         end
-                        need_update_pod_lists[podCoreName] = version
                     end
                 end
             end
@@ -271,6 +272,17 @@ module BB
                 new_specs.delete(name)
             end
             showMergeLog(added_projects, updated_projects, rollbacked_projects, deleted_projects)
+            # step.4 强制更新组件
+            if is_force == true
+                puts "强制升级组件#{update_pods}".red
+                update_pods.each do |pod_name|
+                    pod = new_specs[pod_name]
+                    if (pod.is_a? String) && !pod.include?('>=')
+                        puts "强制升级name:#{pod_name} (>= #{pod})".red
+                        new_specs[pod_name] = ">= #{pod}"
+                    end
+                end
+            end
             # puts "new_specs:#{new_specs}".send(:red)
             return new_specs
         end
@@ -309,13 +321,137 @@ module BB
             return lockfile
         end
 
+        def name_and_version_from_string(string_representation)
+            match_data = string_representation.match(/\A((?:\s?[^\s(])+)(?: \((.+)\))?\Z/)
+            unless match_data
+                raise Informative, 'Invalid string representation for a ' \
+                "specification: `#{string_representation}`. " \
+                'The string representation should include the name and ' \
+                'optionally the version of the Pod.'
+            end
+            name = match_data[1]
+            vers = Pod::Version.new(match_data[2])
+            [name, vers]
+        end
+        def name_from_string(string_representation)
+            match_data = string_representation.match(/\A((?:\s?[^\s(])+)(?: \((.+)\))?\Z/)
+            unless match_data
+                raise Informative, 'Invalid string representation for a ' \
+                "specification: `#{string_representation}`. " \
+                'The string representation should include the name and ' \
+                'optionally the version of the Pod.'
+            end
+            name = match_data[1]
+            return name
+        end
+        def podfile_lock_pods
+            lockfile = podfile_lock
+            internal_data = lockfile.internal_data
+            pods = internal_data['PODS']
+            list={}
+            pods.each do |pod|
+                if pod.is_a?(Hash) # 存在依赖关系
+                    pod_name = pod.keys.first
+                    name, version = name_and_version_from_string(pod_name)
+                    data = pod[pod_name]
+                    data.each do | pod |
+                        dependencies_pod_name = name_from_string(pod)
+                        data = list[name]
+                        if data.nil?
+                            sub_data=[]
+                            sub_data.push(dependencies_pod_name)
+                            list[name]=sub_data
+                        else
+                            data.push(dependencies_pod_name)
+                            list[name]=data
+                        end
+                    end
+                end
+            end
+            return list
+        end
+        def whitelist_podnames
+            return ['BBPostion', 'FMDB', 'Masonry', 'lottie-ios', 'SDWebImage', 'SSZipArchive', 'YYModel']
+        end
+        # 矩阵产品需要过滤组件
+        def matrix_filter_pod_names(pods, ignore_dependencies_pod_names=[])
+            ignore_dependencies_pod_names=['BBSAdvert'] unless ignore_dependencies_pod_names.nil? # 如果业务方配置，以业务方为主，默认处理广告业务
+            find_ok_dependencies_pod_names=[]
+            filter_pod_names=[]
+            whitelist_pods={}
+            whitelist = whitelist_podnames
+            # 查找需要进行过滤数据，解决多场景下组件动态更新，以广告为例
+            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) # 存在依赖关系
+                        pod_name = pod.keys.first
+                        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)
+                            if !find_ok_dependencies_pod_names.include?(name)
+                                find_ok_dependencies_pod_names.push(name)
+                            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)
+                                    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)
+                                    end
+                                end
+                            end
+                            if podCoreName == name
+                                whitelist_pods[podCoreName]=sub_pods
+                            end
+                        end
+                    end
+                end
+                puts "过滤组件数据依赖:#{find_ok_dependencies_pod_names} cls:#{find_ok_dependencies_pod_names.class}"
+                # puts "==whitelist_pods:#{whitelist_pods} cls:#{whitelist_pods.class}".red
+                puts "需要过滤一级黑名单数据:#{filter_pod_names} cls:#{filter_pod_names.class}".yellow
+                if filter_pod_names.length > 0
+                    pods_list = podfile_lock_pods
+                    pods_list.keys.each do | pod_name |
+                        podCoreName = subspec_podname(pod_name)
+                        if filter_pod_names.include?(podCoreName)
+                            data = pods_list[pod_name]
+                            data.each do | sub_pod_name |
+                                sub_podCoreName = subspec_podname(sub_pod_name)
+                                if !sub_podCoreName.include?('BB') && !whitelist.include?(sub_podCoreName) && !filter_pod_names.include?(sub_podCoreName)
+                                    filter_pod_names.push(sub_podCoreName)
+                                end
+                            end
+                        end
+                    end
+                    puts "需要过滤all黑名单数据:#{filter_pod_names} cls:#{filter_pod_names.class}".yellow
+                end
+            end
+            return filter_pod_names
+        end
         # 生成项目stable配置文件
         # 策略：根据podfile.lock dependencies依赖记录pod core标签/分支数据，不存储subspec数据
-        def generate_localStable
+        def generate_localStable(ignore_dependencies_pod_names=[])
             lockfile = podfile_lock
             local_specs = {}
+            internal_data = lockfile.internal_data
+            pods = internal_data['PODS']
             dependencies = lockfile.dependencies
             pod_names = lockfile.pod_names
+            # puts "dependencies:#{dependencies}".red
+            # puts "pod_names:#{pod_names}".green
+            filter_pod_names = matrix_filter_pod_names(pods, ignore_dependencies_pod_names)
             # dependencies依赖数据
             dependencies.each do | dependency |
                 pod_name = dependency.name
@@ -366,10 +502,17 @@ module BB
                 end
             end
 
-            # Pod::UI.puts "yml配置数据:#{local_specs}"
+            # 删除过滤数据
+            filter_pod_names.each do | pod_name |
+                if local_specs.include?(pod_name)
+                    # puts "删除过滤数据pod_name:#{pod_name} #{local_specs[pod_name]}"
+                    local_specs.delete(pod_name)
+                end
+            end
+            # puts "yml配置数据:#{local_specs}"
             if local_specs.length > 0
                 update_localstable_datas(local_specs)
-                Pod::UI.puts "Generating yml配置文件=> #{local_stable_yaml} 更新成功".green
+                puts "Generating yml配置文件=> #{local_stable_yaml} 更新成功".green
             end
         end
         # pod库是否包含core subspec

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

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

@@ -25,13 +25,29 @@ module BB
             @source_manager = BB::SourceManager.new()
             #加载远程稳定仓库 和本地podfile 指定的仓库进行合并
             if skip_stable_check == true
-                @@all_modules = all_modules
+                # 过滤带:remove数据
+                @@all_modules = filter_origin_pod_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
         end
+        private def filter_origin_pod_modules(all_modules)
+            result_modules = []
+            all_modules.each do |pod|
+                if pod.is_a?(Hash)
+                    remove = pod[:remove]
+                    if remove
+                        pod_name = pod.first
+                        puts "###业务方配置需要移除插件####names:[#{pod_name}] pod:#{pod}".red
+                    else
+                        result_modules.push(pod)
+                    end
+                end
+            end
+            return result_modules
+        end
 
         def current_member
             if @@member_configs
@@ -272,7 +288,7 @@ module BB
                         end
                     end
                     stable_hash[podName] = pod
-                    puts "[PodAssistant] merge pod #{podName} #{pod}"
+                    # puts "[PodAssistant] merge pod #{podName} #{pod}"
                 end
             else
                 puts "[PodAssistant] 本地stable数据无变化<===完成".yellow
@@ -315,15 +331,17 @@ module BB
                         data[:linkage] = linkage
                     end
                     if !data.empty?
-                        # puts "name:#{name} stable_specs: #{data}".green
+                        # puts "===git===分支==> #{data}".green
                         stable_specs.push(data)
                     end
                 elsif pod.is_a? String
+                    # puts "===git===标签==> { names: [\"#{name}\"], version: #{pod}, method: REMOTE_TAG }".green
                     stable_specs.push({ names: [name], version: pod, method: REMOTE_TAG })
                 else
                     puts "unknow type [#{name}] data:#{pod}".red
                 end
             end
+            # puts "[PodAssistant] stable_specs:#{stable_specs}".green
             return stable_specs
         end
         ################################# linkline stable ����� #################################

data/lib/cocoapods-bb-PodAssistant/native/installer.rb

@@ -0,0 +1,48 @@
+require 'active_support/core_ext/string/inflections'
+require 'fileutils'
+require 'cocoapods/podfile'
+require 'cocoapods-bb-bin/native'
+
+module Pod
+  class Installer
+    autoload :Analyzer,                     'cocoapods/installer/analyzer'
+    autoload :InstallationOptions,          'cocoapods/installer/installation_options'
+    autoload :PostInstallHooksContext,      'cocoapods/installer/post_install_hooks_context'
+    autoload :PreInstallHooksContext,       'cocoapods/installer/pre_install_hooks_context'
+    autoload :BaseInstallHooksContext,      'cocoapods/installer/base_install_hooks_context'
+    autoload :PostIntegrateHooksContext,    'cocoapods/installer/post_integrate_hooks_context'
+    autoload :PreIntegrateHooksContext,     'cocoapods/installer/pre_integrate_hooks_context'
+    autoload :SourceProviderHooksContext,   'cocoapods/installer/source_provider_hooks_context'
+    autoload :PodfileValidator,             'cocoapods/installer/podfile_validator'
+    autoload :PodSourceDownloader,          'cocoapods/installer/pod_source_downloader'
+    autoload :PodSourceInstaller,           'cocoapods/installer/pod_source_installer'
+    autoload :PodSourcePreparer,            'cocoapods/installer/pod_source_preparer'
+    autoload :UserProjectIntegrator,        'cocoapods/installer/user_project_integrator'
+    autoload :Xcode,                        'cocoapods/installer/xcode'
+    autoload :SandboxHeaderPathsInstaller,  'cocoapods/installer/sandbox_header_paths_installer'
+    autoload :SandboxDirCleaner,            'cocoapods/installer/sandbox_dir_cleaner'
+    autoload :ProjectCache,                 'cocoapods/installer/project_cache/project_cache'
+    autoload :TargetUUIDGenerator,          'cocoapods/installer/target_uuid_generator'
+
+    include Config::Mixin
+
+    # alias_method :origin_resolve_dependencies, :resolve_dependencies
+    # def resolve_dependencies
+    #   puts "[PodAssistant] 开始执行 Installer resolve_dependencies".red
+    #   puts "[PodAssistant] 开始执行 Installer resolve_dependencies [#{$*}] [#{$*.first}]".green
+    #   analyzer = origin_resolve_dependencies
+    #   puts "analyzer:#{analyzer}".green
+    #   if ($*.first == "update" || $*.first == "install")
+    #     puts 'Analyzing dependencies virtual'.red
+    #     # UI.section 'Analyzing dependencies virtual' do
+    #       $virtual_dependencies_names = @analysis_result.specifications.map(&:name)
+    #       $virtual_dependencies_flag = true
+    #       analyzer = origin_resolve_dependencies
+    #     # end
+    #   end
+    #   puts "analyzer:#{analyzer}".red
+    #   analyzer
+    # end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: cocoapods-bb-bin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.7.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +117,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/yaml_files_helper.rb
+- lib/cocoapods-bb-PodAssistant/native/installer.rb
 - lib/cocoapods-bb-PodAssistant/podfile.rb
 - lib/cocoapods-bb-PodAssistant/source_provider_hook.rb
 - lib/cocoapods_plugin.rb