cocoapods-bb-PodAssistant 0.1.9.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32ae7a754051168b335839ef24e3241e10ae8c1ce9772b65ae1add131a591744
-  data.tar.gz: fabd94ec00e74cd9b40dcbbf176baca21d88e54d640ddaf82b3c085520649807
+  metadata.gz: 46f2909212dda4283465cfe1db2a4b2311ed002e97f5c64290129b75a3f96c85
+  data.tar.gz: b11851246802d6000005ebbc23cbdf19687de70805896ccae2915963aa8aca49
 SHA512:
-  metadata.gz: 3945a8e16d272daa2b8a13e6fa412127bd055b1f85f97b6dbee51c56df0465dce8a8403d913139bb669239e1c7926341e6f8e5a7a60f619b49f614983cb1f387
-  data.tar.gz: 1d27d7075c0fae3e206182a07b2c061f2d1f67907083ff938084ed34d4bc4d872d19d6a55a1e09abfaaf3879b99ec47ec3fd2c101ff10e1eb617c9598ff23509
+  metadata.gz: aa134b6cc558192b7b864c4872592299dc70efd9a1c58786e53048fbd0e6a7967e8d167467353002b700808249c1d390fbcba938b73dc9215ac7b9d45e28d5e2
+  data.tar.gz: 3bff44bfca25a276653939eb3575b6872221a8412a3d3b717c9f1acfb3f566a5a65758226c04f992aae1f1dcef60390e39015e4770237457d3aa7282b9d7b650

data/lib/cocoapods-bb-PodAssistant/babybus/helpers/babybus_info_plist_helper.rb

@@ -91,9 +91,35 @@ def isPinyinAppp
     return bundleId === "com.sinyee.babybus.voicerecognition" || bundleId === "com.sinyee.babybus.read.ios" || bundleId === "com.sinyee.babybus.stroke"
 end
 
+# 是否科学产品
+def isCourseApp
+    bundleId = getProjectBundleIdentifier()
+    return bundleId === "com.ailiyong.world.course"
+end
+
+# 是否思维产品
+def isMathApp
+    bundleId = getProjectBundleIdentifier()
+    return bundleId === "com.sinyee.babybus.mathIII"
+end
+
+# 是否abc产品
+def isABCApp
+    bundleId = getProjectBundleIdentifier()
+    return bundleId === "com.sinyee.babybus.abc"
+end
+
+# 是否城市产品
+def isCityApp
+    bundleId = getProjectBundleIdentifier()
+    return bundleId === "com.sinyee.babybus.city"
+end
+
 # 是否矩阵产品
 def isMatrixApp
-    if (isHanZiApp || isQMWApp || isPinyinAppp) then
+    bundleId = getProjectBundleIdentifier()
+    puts "###bundleId:#{bundleId}###".red
+    if (isHanZiApp || isQMWApp || isPinyinAppp || isCourseApp || isMathApp || isABCApp || isCityApp) then
         return false
     end
     return true

data/lib/cocoapods-bb-PodAssistant/babybus/installer/post_install_hooks.rb

@@ -9,9 +9,8 @@ require 'cocoapods-bb-PodAssistant/helpers/pod_utils'
 class PodPostInstaller
     def initialize(lib, deployment_target=nil)
         @lib = lib
-        puts "====isUnity3DApp:#{isUnity3DApp}".red
         if deployment_target.nil?
-            @deployment_target = isUnity3DApp ? "12.0" : "11.0" # Unity2022引擎最低支持iOS12.0
+            @deployment_target = isUnity3DApp ? "12.0" : "11.0" # Unity2022引擎最低支持iOS12.0、unity2d iOS11 、cocos iOS10、超A产品 iOS11 （968广告厂商升级最低支持iOS11）
         else
             @deployment_target = deployment_target
         end
@@ -26,7 +25,7 @@ class PodPostInstaller
             env.createCocosResource
         end
         ios_deployment_target = @deployment_target
-        puts "当前工程最低支持iOS系统 ===> #{ios_deployment_target.to_s.send(:red)}".green
+        puts "pod组件配置工程最低支持iOS系统 ===> #{ios_deployment_target.to_s.send(:red)}".green
         @lib.aggregate_targets.first.user_project.save # 解决Xcode13 pod update操作出现failed to save pods.xcodeproj问题 by hm 21/11/8
         project = Xcodeproj::Project.open(BB::PodUtils.getXcodeprojPath)
         project.targets.each do |target|
@@ -64,51 +63,50 @@ class PodPostInstaller
         # project.targets.config
         @lib.pod_target_subprojects.flat_map { |p| p.targets }.each do |target|
             target.build_configurations.each do |config|
-            # pod 1.13.0兼容故去除，避免
-            # 适配xcode 15 动态库报错： Error 'DT_TOOLCHAIN_DIR cannot be used to evaluate LIBRARY_SEARCH_PATHS, use TOOLCHAIN_DIR instead'
-            # if (is_xcode15 == true) then
-            #     xcconfig_path = config.base_configuration_reference.real_path
-            #     xcconfig = File.read(xcconfig_path)
-            #     xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
-            #     File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
-            # end
-            
-            config.build_settings['DEAD_CODE_STRIPPING'] = 'YES'
-            config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target
-            if (isUnityProject) then
-                config.build_settings['ARCHS'] = 'arm64'
-            else
-                config.build_settings['ARCHS'] = '$(ARCHS_STANDARD)'
-            end
-            # fix xcode14手动签名问题 https://github.com/CocoaPods/CocoaPods/issues/11402
-        #      config.build_settings["DEVELOPMENT_TEAM"] = "#{teamid}"
-            # Fix Xcode14 bundle need sign
-            # https://github.com/CocoaPods/CocoaPods/issues/11402#issuecomment-1201464693
-            if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
-                config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
-            end
-            # 编译器优化
-            config.build_settings['WARNING_CFLAGS'] = '-Wno-documentation -Wno-nullability-completeness -Wno-macro-redefined -Wno-property-attribute-mismatch -Wno-strict-prototypes -Wno-incompatible-pointer-types'
-            config.build_settings['ASSETCATALOG_COMPILER_OPTIMIZATION'] = 'space'
-            config.build_settings['ENABLE_BITCODE'] = 'NO'
-            config.build_settings['DEAD_CODE_STRIPPING'] = 'YES'
-            if config.name.include? 'Debug'
-                config.build_settings['SWIFT_COMPILATION_MODE'] = 'Incremental'
-                config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Onone'
-                config.build_settings['GCC_OPTIMIZATION_LEVEL'] = '0'
-            else
-                config.build_settings['SWIFT_COMPILATION_MODE'] = 'wholemodule'
-                config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Osize'
-                config.build_settings['GCC_OPTIMIZATION_LEVEL'] = 'z'
-            end
-            # C++支持@import (工程中带mm类需要进行控制)
-            if (target.name.include? 'matrix-wechat') || (target.name.include? 'Sentry')
-                # 三方库不支持modulemap
-                config.build_settings['OTHER_CPLUSPLUSFLAGS'] = "$(inherited) $(OTHER_CFLAGS)"
-            else
-                 config.build_settings['OTHER_CPLUSPLUSFLAGS'] = "$(inherited) $(OTHER_CFLAGS) -fmodules -fcxx-modules"
-            end
-
+                # pod 1.13.0兼容故去除，避免
+                # 适配xcode 15 动态库报错： Error 'DT_TOOLCHAIN_DIR cannot be used to evaluate LIBRARY_SEARCH_PATHS, use TOOLCHAIN_DIR instead'
+                # if (is_xcode15 == true) then
+                #     xcconfig_path = config.base_configuration_reference.real_path
+                #     xcconfig = File.read(xcconfig_path)
+                #     xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+                #     File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
+                # end
+                
+                config.build_settings['DEAD_CODE_STRIPPING'] = 'YES'
+                config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_target
+                if (isUnityProject) then
+                    config.build_settings['ARCHS'] = 'arm64'
+                else
+                    config.build_settings['ARCHS'] = '$(ARCHS_STANDARD)'
+                end
+                # fix xcode14手动签名问题 https://github.com/CocoaPods/CocoaPods/issues/11402
+                # config.build_settings["DEVELOPMENT_TEAM"] = "#{teamid}"
+                # Fix Xcode14 bundle need sign
+                # https://github.com/CocoaPods/CocoaPods/issues/11402#issuecomment-1201464693
+                if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+                    config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+                end
+                # 编译器优化
+                config.build_settings['WARNING_CFLAGS'] = '-Wno-documentation -Wno-nullability-completeness -Wno-macro-redefined -Wno-property-attribute-mismatch -Wno-strict-prototypes -Wno-incompatible-pointer-types'
+                config.build_settings['ASSETCATALOG_COMPILER_OPTIMIZATION'] = 'space'
+                config.build_settings['ENABLE_BITCODE'] = 'NO'
+                config.build_settings['DEAD_CODE_STRIPPING'] = 'YES'
+                if config.name.include? 'Debug'
+                    config.build_settings['SWIFT_COMPILATION_MODE'] = 'Incremental'
+                    config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Onone'
+                    config.build_settings['GCC_OPTIMIZATION_LEVEL'] = '0'
+                else
+                    config.build_settings['SWIFT_COMPILATION_MODE'] = 'wholemodule'
+                    config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Osize'
+                    config.build_settings['GCC_OPTIMIZATION_LEVEL'] = 'z'
+                end
+                # C++支持@import (工程中带mm类需要进行控制)
+                if (target.name.include? 'matrix-wechat') || (target.name.include? 'Sentry')
+                    # 三方库不支持modulemap
+                    config.build_settings['OTHER_CPLUSPLUSFLAGS'] = "$(inherited) $(OTHER_CFLAGS)"
+                else
+                    config.build_settings['OTHER_CPLUSPLUSFLAGS'] = "$(inherited) $(OTHER_CFLAGS) -fmodules -fcxx-modules"
+                end
             end
             # 修复警告 Run script build phase '[CP] Copy Pods Resources' will be run during every build because it does not specify any outputs
             fix_phases = target.shell_script_build_phases.find { |x| x.name == '[CP] Copy XCFrameworks' || 'Create Symlinks to Header Folders' }

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

@@ -0,0 +1,93 @@
+require 'cocoapods-bb-PodAssistant/config/source_manager'
+
+module Pod
+  class Command
+    class Stable < Command
+      class Push < Stable
+        self.summary = '[更新stable组件稳定版本] Update outdated project dependencies and create new ' \
+        'Podfile.lock'
+
+        self.description = <<-DESC
+          常用命令如下：\n
+          更新所有公共组件: `pod stable push`\n
+          更新指定公共组件: `pod stable push 组件名称`\n
+          更新指定公共组件/移除组件: `pod stable push 组件名称 --remove=组件名称` #多个移除名称带`,`\n
+          更新指定公共组件/带依赖关系: `pod stable push 组件名称 --dependencies=组件名称` #多个依赖名称带`,`\n
+          更新指定公共组件/带依赖关系/移除组件: `pod stable push 组件名称 --dependencies=组件名称 --remove=组件名称` #多个依赖名称带`,`\n
+          参数说明:--dependencies 依赖组件 --remove 需要移除组件 --update-matrix 更新矩阵产品公共业务线
+        DESC
+
+        self.arguments = [
+            CLAide::Argument.new('POD_NAMES', false, true),
+        ]
+
+        def self.options
+            [
+                ['--dependencies', '依赖组件名称，多个使用`,`隔开'],
+                ['--remove', '移除公共组件名称，多个使用`,`隔开'],
+                ['--update-matrix', '更新矩阵产品公共业务线'],
+            ].concat(super)
+        end
+
+        def initialize(argv)
+            @pods = argv.arguments!
+            @dependencies = argv.option('dependencies', nil)&.split(',')
+            @remove = argv.option('remove', nil)&.split(',')
+            @is_matrix = argv.flag?('update-matrix', false)
+            super
+        end
+
+        def run
+            puts "[PodAssistant] 开始执行 $ pod stable push".yellow
+            source_manager = BB::SourceManager.new(false)
+            cachePath = source_manager.cache_path
+            puts "stable cache git=>#{cachePath}"
+            Dir.chdir(File.join(cachePath)) { 
+                # puts "pwd:#{`pwd`}".green
+                path = @is_matrix ? matrix_stable_path : common_stable_path
+                Dir.chdir(File.join(path)) {
+                    if @pods.any?
+                        if (@pods.length > 1) && (@dependencies)
+                            puts "❌ 无效指令，不能处理多个组件#{@pods}依赖，更新组件仅支持单组件".red
+                            puts "举例：pod stable push <单组件> --dependencies=<多组件>".green
+                            puts "详见 pod stable push --help".green
+                            system "pod stable push --help"
+                            exit
+                        elsif (@pods.length == 1) && (@dependencies || @remove)
+                            pod_name=@pods.first
+                            dependencies_hash = {}
+                            if @dependencies
+                                dependencies_hash[pod_name] = @dependencies
+                            end
+                            if @is_matrix
+                                source_manager.update_business_dependencies_and_remove_data(dependencies_hash, @remove)
+                            else
+                                source_manager.update_common_dependencies_and_remove_data(dependencies_hash, @remove)
+                            end
+                        end
+                        pods_str = @pods.join(" ")
+                        system "pod stable update #{pods_str}"
+                    else
+                        if (@dependencies) || (@remove)
+                            puts "❌ 无效指令，没有制定组件名称 详见 pod stable push --help".red
+                            system "pod stable push --help"
+                            exit
+                        end
+                        system "pod stable update"
+                    end
+                }
+            }
+        end
+
+        # 公共stable目录
+        private def common_stable_path
+            return File.join(Dir.pwd, 'Common_Stable')
+        end
+        # 全线矩阵产品公共stable目录
+        private def matrix_stable_path
+            return File.join(Dir.pwd, 'Matrix_Common_Stable')
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Pod
     class Stable < Command
       class Sync < Stable
 
-        self.summary = '[同步远端yml配置] sync a Stable yml config file'
+        self.summary = '[同步远端yml配置，更新所有公共组件标签库版本] sync a Stable yml config file'
 
         self.description = <<-DESC
           同步远端stable yml配置文件，并对本地文件进行合并操作

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

@@ -4,7 +4,7 @@ module Pod
   class Command
     class Stable < Command
       class Update < Stable
-        self.summary = '[命令同执行`pod update操作`] Update outdated project dependencies and create new ' \
+        self.summary = '[命令同执行`pod update操作`,同步更新stable组件标签版本到最新] Update outdated project dependencies and create new ' \
         'Podfile.lock'
 
         self.description = <<-DESC
@@ -21,13 +21,14 @@ module Pod
 
         def self.options
           [
-            ['--sync', '立即同步远端yml配置，更新组件信息'],
+            ['--force', '强制更新组件，突破stable版本限制'],
           ].concat(super)
         end
 
         def initialize(argv)
           @pods = argv.arguments!
-          @sync = argv.flag?('sync')
+          @sync = argv.flag?('sync', true)
+          @force = argv.flag?('force', true)
           super
         end
 
@@ -38,9 +39,10 @@ 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
           if @pods.any?
             pods_str = @pods.join(" ")
             system "pod update #{pods_str}"
@@ -55,6 +57,11 @@ module Pod
           source_manager.update_local_stable_from_podmodules(@pods)
           puts "[PodAssistant] `pod stable update` complete!".green
         end
+        def update_spec
+          system "pod repo update babybus-babybus-ios-specs-babybus-specs"
+          system "pod repo update babybus-babybus-ios-specs-sourcev2-specs"
+          system "pod repo update babybus-babybus-ios-specs-dylib-specs"
+        end
       end
     end
   end

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

@@ -6,6 +6,7 @@ require 'cocoapods-bb-PodAssistant/command/stable/init'
 require 'cocoapods-bb-PodAssistant/command/stable/install'
 require 'cocoapods-bb-PodAssistant/command/stable/update'
 require 'cocoapods-bb-PodAssistant/command/stable/sync'
+require 'cocoapods-bb-PodAssistant/command/stable/push'
 
 module Pod
 
@@ -29,21 +30,16 @@ module Pod
           拉取稳定lock配置插件。利用版本比对进行更新配置实现对组件版本控制管理。
         DESC
 
-        self.default_subcommand = 'init'
+        # self.default_subcommand = 'init'
 
         #-----------------------------------------------------------------------#
 
         extend Executable
         executable :git
 
-        def validate!
+        def initialize(argv)
           super
-          banner! if @help
-        end
-
-        def run
-          puts "[PodAssistant] `pod stable` 帮助文档请查看�".yellow
-          # banner! 
+          puts "cocoapods-bb-PodAssistant (#{CocoapodsBbPodassistant::VERSION})"
         end
 
       end

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

@@ -3,12 +3,12 @@ require 'cocoapods-bb-PodAssistant/helpers/pod_utils'
 
 module BB
     class Cache
-        def initialize(stable_source = nil)
+        def initialize(stable_source = nil, verify_stable_env=true)
             if stable_source.nil?
                 stable_source = StableSource.stable_default_source
             end
             @stable_source = stable_source
-            if File.exist?(File.join(Pathname.pwd, "Podfile"))
+            if verify_stable_env && File.exist?(File.join(Pathname.pwd, "Podfile"))
                 @bundleId = BB::PodUtils.getProjectBundleIdentifier
             end
             if @bundleId.nil?

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

@@ -7,13 +7,16 @@ require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
 # 数据源管理
 module BB
     class SourceManager
-        def initialize()
-            env = BB::StableEnv.new()
-            # puts "SourceManager env:#{env}".red
-            @businessSpecName = env.business_stable
-            @stableMgr = BB::StableManager.new(env)
+        def initialize(verify_stable_env=true)
+            @env = BB::StableEnv.new(verify_stable_env)
+            @businessSpecName = @env.business_stable
+            @stableMgr = BB::StableManager.new(@env, verify_stable_env)
         end
 
+        def cache_path
+            return @env.cache_path
+          end
+
         # 公共源路径(远端)
         def public_stable_yaml
             return @stableMgr.public_stable_yaml
@@ -29,6 +32,18 @@ module BB
             return @stableMgr.local_stable_yaml
         end
 
+        def get_stable_datas(yml)
+            spec = BB::StableSpecs.new()
+            return spec.readData(yml)
+        end
+        # 通用-公共lock数据
+        def common_stable_datas
+            return get_stable_datas(public_stable_yaml)
+        end
+        # 业务线-公共lock数据
+        def business_stable_datas
+            return get_stable_datas(business_stable_yaml)
+        end
         # 产品线本地lock数据
         def fetch_local_stable_datas
             localSpec = BB::StableSpecs.new()
@@ -37,7 +52,7 @@ module BB
                 puts "yml配置文件不存在，执行自动初始化项目yml配置文件".green
                 generate_localStable
             end
-            return localSpec.readData(yml)
+            return get_stable_datas(yml)
         end
 
         # 远端公共lock数据
@@ -90,14 +105,25 @@ module BB
 
         # 更新本地lock数据
         def update_localstable_datas(stable_lock)
-            localSpec = BB::StableSpecs.new()
-            localSpec.writeData(local_stable_yaml, stable_lock)  
+            update_stable_lock(local_stable_yaml, stable_lock)
+        end
+        # podfile 更新配置文件使用(通用)
+        def update_common_stable_lock(stable_lock)
+            update_stable_lock(public_stable_yaml, stable_lock)
+        end
+        # podfile 更新配置文件使用(业务线)
+        def update_business_stable_lock(stable_lock)
+            update_stable_lock(business_stable_yaml, stable_lock)
+        end
+        def update_stable_lock(stable_yaml, stable_lock)
+            stableSpec = BB::StableSpecs.new()
+            stableSpec.writeData(stable_yaml, stable_lock)
         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)    
@@ -122,9 +148,50 @@ module BB
             end
             return result
         end
-
+        # 更新依赖/移除数据
+        def update_dependencies_and_remove_data(stable_yaml, stable_specs, dependencies_pods, remove_pods)
+            if dependencies_pods || remove_pods
+                listdata = stable_specs[YAML_CONFIG_LIST_KEY]
+                removedata = stable_specs[YAML_CONFIG_REMOVE_KEY]
+                dependenciesdata = stable_specs[YAML_CONFIG_DEPENDENCIES_KEY]
+                if remove_pods
+                    remove_pods.each do |name|
+                        name = name.to_s
+                        if listdata[name].nil?
+                            puts "❌ 移除未知公共组件【#{name}】，请确认名称是否正确!!! 传入参数list:#{remove_pods}".red
+                            exit
+                        end
+                        if !removedata.include?(name)
+                            removedata.push(name)
+                        end
+                    end
+                end
+                if dependencies_pods
+                    dependencies_pods.each do |name, array|
+                        if array.length > 0
+                            array.each do |pod_name|
+                                if listdata[pod_name].nil?
+                                    puts "❌ 依赖未知公共组件【#{name}】，请确认名称是否正确!!! 传入参数list:#{array}".red
+                                    exit
+                                end
+                            end
+                            dependenciesdata[name] = array
+                        end
+                    end
+                end
+                stable_specs[YAML_CONFIG_REMOVE_KEY] = removedata
+                stable_specs[YAML_CONFIG_DEPENDENCIES_KEY] = dependenciesdata
+                update_stable_lock(stable_yaml, stable_specs)
+            end
+        end
+        def update_common_dependencies_and_remove_data(dependencies_pods, remove_pods)
+            update_dependencies_and_remove_data(public_stable_yaml, common_stable_datas, dependencies_pods, remove_pods)
+        end
+        def update_business_dependencies_and_remove_data(dependencies_pods, remove_pods)
+            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 = []
@@ -204,6 +271,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

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

@@ -1,3 +1,3 @@
 module CocoapodsBbPodassistant
-  VERSION = "0.1.9.2"
+  VERSION = "0.2.1"
 end

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

@@ -111,6 +111,7 @@ module BB
                 commit = pod[:commit]
                 linkages = pod[:linkages]
                 linkage = pod[:linkage]
+                remove = pod[:remove]
                 if (names.is_a? Array) && !names.empty?
                     data = {}
                     if version
@@ -141,6 +142,10 @@ module BB
                     if linkage
                         data[:linkage] = linkage
                     end
+                    if remove
+                        data[:remove] = remove
+                        puts "###业务方配置需要移除插件####names:[#{names}] pod:#{pod}".red
+                    end
                     names.each do |pod_name|
                         podfile_hash[pod_name] = data
                     end
@@ -159,7 +164,7 @@ module BB
             stable_hash = local_stable_data
             podfile_hash.each do |podName,podfile_pod|
                 if podfile_pod.count == 0
-                    puts "❌ podfile组件配置异常，请确认:method => REMOTE_VERSION是否配置\n组件信息如下:\n#{podName} => #{podfile_pod}".red
+                    puts "❌ podfile组件[#{podName}]配置异常，请确认:method => REMOTE_VERSION是否配置\n组件信息如下:\n#{podName} => #{podfile_pod}".red
                     exit
                 end
                 podCoreName = @source_manager.subspec_podname(podName)
@@ -168,10 +173,6 @@ module BB
                     if pod.nil? # stbale没有受版本控制
                         need_update_pod_data[podName] = podfile_pod
                     else
-                        # if podCoreName == 'BBGameModule'
-                        #     succ = (pod == podfile_pod) ? true : false
-                        #     puts "[stable]podCoreName:#{podCoreName}(#{pod}) VS [podfile] podName:#{podName}(#{podfile_pod}) succ:#{succ}".green
-                        # end
                         if pod == podfile_pod
                             if podName != podCoreName
                                 need_update_pod_data[podName] = podfile_pod
@@ -183,6 +184,12 @@ module BB
                                 git = podfile_pod[:git_format]
                             end
                             version = podfile_pod[:version]
+                            remove = podfile_pod[:remove]
+                            if remove
+                                puts "[PodAssistant] 过滤组件数据 #{podName} #{podfile_pod}".red
+                                stable_hash.delete(podCoreName)
+                                next
+                            end
                             if (branch && !branch.empty?) || (git && !git.empty?)
                                 # 项目配置指向分支数据，以本项目为主
                                 puts "[PodAssistant] #{podName} 指向分支数据 => #{podfile_pod}"
@@ -256,8 +263,16 @@ module BB
                 # puts "need_update_pod_data:#{need_update_pod_data}".green
                 # 规避指向分支/远端版本替换yml配置所有组件，避免pod指向指向多个源
                 need_update_pod_data.each do |podName,pod|
+                    if pod.is_a? Hash
+                        remove = pod[:remove]
+                        if remove
+                            puts "[PodAssistant] 过滤组件数据 #{podName} #{pod} remove:#{remove}".red
+                            stable_hash.delete(podName)
+                            next
+                        end
+                    end
                     stable_hash[podName] = pod
-                    puts "[PodAssistant] merge pod #{podName} #{pod}"
+                    # puts "[PodAssistant] merge pod #{podName} #{pod}"
                 end
             else
                 puts "[PodAssistant] 本地stable数据无变化<===完成".yellow

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

@@ -2,16 +2,17 @@ require 'cocoapods-bb-PodAssistant/config/stable_source'
 
 module BB
     class StableEnv  
-        def initialize()
-            @cache = BB::Cache.new()
+        def initialize(verify_stable_env=true)
+            @cache = BB::Cache.new(nil, verify_stable_env)
             configGitPath(@cache.cachePath)
-            # 自动加载stable环境
-            loadStaleEnv
-            if verify_stable_env_exists == false
-              puts "[PodAssistant] ❌工程没有配置stable环境".red
-            else
-              fetch_stale_git # 自动拉取远端git仓库数据
+            if verify_stable_env
+              # 自动加载stable环境
+              loadStaleEnv
+              if verify_stable_env_exists == false
+                puts "[PodAssistant] ❌工程没有配置stable环境".red
+              end
             end
+            fetch_stale_git # 自动拉取远端git仓库数据
         end
 
         # stable 环境,执行pod stable
@@ -40,27 +41,28 @@ module BB
         # 拉取stable仓库代码  hook开发环境,执行pod install/update
         def system_clone_stable_git
             cachePath = @cache.cachePath
-            puts "hook [pod install/update] fetch stable git=>#{cachePath}"
+            puts "fetch stable git=>#{cachePath}"
             if !Dir.exist?(File.join(cachePath))
+              puts "git clone=>#{stable_source}"
               clonePath = File.dirname(cachePath)
               FileUtils.mkdir_p clonePath
-              system "git clone #{@stable_source} #{cachePath}"
+              system "git clone #{stable_source} #{cachePath}"
             end
             if verify_branch_exists
               if stable_tag || stable_branch
                 if stable_branch
-                  system "cd #{cachePath}; git checkout #{stable_branch}; git reset --hard origin/#{stable_branch}; git pull --all"
+                  system "cd #{cachePath}; git pull --all; git checkout #{stable_branch}; git reset --hard origin/#{stable_branch}"
                 end
                 if stable_tag
-                  system "cd #{cachePath}; git checkout #{stable_tag};"
+                  system "cd #{cachePath}; git pull --all; git checkout #{stable_tag};"
                 end
               else
                 result =`git symbolic-ref refs/remotes/origin/HEAD`
                 protechBranch = result.split("/").last.strip || default_branch
-                system "cd #{cachePath}; git checkout #{protechBranch}; git reset --hard origin/#{protechBranch}; git pull --all"
+                system "cd #{cachePath}; git pull --all; git checkout #{protechBranch}; git reset --hard origin/#{protechBranch}"
               end
             else
-              puts "❌ stable配置无效分支信息source:#{@stable_source} branch:#{stable_branch}".red
+              puts "❌ stable配置无效分支信息source:#{stable_source} branch:#{stable_branch}".red
               exit
             end
         end
@@ -81,6 +83,9 @@ module BB
         end
 
         def stable_source
+          if @stable_source.nil?
+            @stable_source = StableSource.stable_default_source
+          end
           return @stable_source
         end
         def default_branch
@@ -129,5 +134,8 @@ module BB
           end
           return false
         end
+        def cache_path
+          return @cache.cachePath
+        end
     end
 end

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

@@ -4,8 +4,9 @@ require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
 
 module BB
     class StableManager
-        def initialize(env = nil)
+        def initialize(env = nil, verify_stable_env=true)
             @env = env
+            @verify_stable_env = verify_stable_env
         end
         
         # podfile 更新配置文件使用(通用)
@@ -32,7 +33,7 @@ module BB
         # 仓库缓存目录
         def cachePath
             if @cache.nil? 
-                @cache = BB::Cache.new()
+                @cache = BB::Cache.new(nil, @verify_stable_env)
             end
             return @cache.cachePath
         end
@@ -61,7 +62,8 @@ module BB
             stableSpec.update_stable_lock(yml_path, pod_targets)
             # step.2 提交修改后代码
             yml_name = File.basename(yml_path)
-            `cd #{cachePath}; git pull --all; git add #{yml_name}; git commit -m "[update] 更新stable配置文件#{yml_name}"; git push; git pull --all;`
+            # `cd #{cachePath}; git pull --all; git add #{yml_name}; git commit -m "[update] 更新stable配置文件#{yml_name}"; git push; git pull --all;`
+            `cd #{cachePath}; git pull --all; git add * ; git commit -m "[update] 更新stable配置文件#{yml_name}"; git push; git pull --all;`
         end
         private def update_local_stable_lock(yml_path, pod_targets)
             # step.1 更新yaml配置文件

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-bb-PodAssistant
 version: !ruby/object:Gem::Version
-  version: 0.1.9.2
+  version: 0.2.1
 platform: ruby
 authors:
 - humin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-17 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -88,6 +88,7 @@ files:
 - lib/cocoapods-bb-PodAssistant/command/stable.rb
 - lib/cocoapods-bb-PodAssistant/command/stable/init.rb
 - lib/cocoapods-bb-PodAssistant/command/stable/install.rb
+- lib/cocoapods-bb-PodAssistant/command/stable/push.rb
 - lib/cocoapods-bb-PodAssistant/command/stable/sync.rb
 - lib/cocoapods-bb-PodAssistant/command/stable/update.rb
 - lib/cocoapods-bb-PodAssistant/config/cache_path.rb