cocoapods-bb-PodAssistant 0.1.8 → 0.1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c6d433814654744108bb1b8d1051ac00b37dff52e8d0c73fbb03bbb7d67d52
-  data.tar.gz: d804e3f603a8ed9e8612fb4edf6c5ed19ae543d2328dfaf92bf335664f0da421
+  metadata.gz: 32ae7a754051168b335839ef24e3241e10ae8c1ce9772b65ae1add131a591744
+  data.tar.gz: fabd94ec00e74cd9b40dcbbf176baca21d88e54d640ddaf82b3c085520649807
 SHA512:
-  metadata.gz: 75858bf2163338409042d5e4be54e38d6c08a8ea93df77341870af4a0425bd1dc9a1b8a905376775b958318b554b537d4a0b9ad0f822f92d67ed53b82d0ccf04
-  data.tar.gz: 8216d2c5d5df66e7ff8526ae9394ba0a11c1391ac3f6c835e997458417aacab84d3372b346f9caaa565f087679448d094719c5b80ad48c29aeb04de1ed4691d6
+  metadata.gz: 3945a8e16d272daa2b8a13e6fa412127bd055b1f85f97b6dbee51c56df0465dce8a8403d913139bb669239e1c7926341e6f8e5a7a60f619b49f614983cb1f387
+  data.tar.gz: 1d27d7075c0fae3e206182a07b2c061f2d1f67907083ff938084ed34d4bc4d872d19d6a55a1e09abfaaf3879b99ec47ec3fd2c101ff10e1eb617c9598ff23509

data/README.md

@@ -15,14 +15,26 @@ pod stable --help
 
 * 初始化本地lock文件
 ```
-pod stable --init
+pod stable init
 ```
 
 * 同步lock文件
 ```
-pod stable
+pod stable sync
 ```
 
+* pod install
+```
+pod stable install
+```
+
+* pod update
+```
+pod stable update [组件名称] --sync
+```
+> `--sync`选项可选，会自动同步远端标签，不带默认不更新远端版本
+更多用法，参照：pod stable update --help
+
 ## linkline使用
 支持动态/静态库
 

data/lib/cocoapods-bb-PodAssistant/babybus/business/babybus_install_environment.rb

@@ -13,12 +13,16 @@ class BabybusInstallEnv
         rootPath = getProjectRootPath
         bundleIdentifier = getProjectBundleIdentifier
         path = File.join(rootPath, "Configs", "#{bundleIdentifier}/BBPlistMacro.h")
+        puts "查找PlistMacro文件1:#{path}"
         if !File.file?(path)
             path = File.join(rootPath, "Configs/PlistMacro", "#{bundleIdentifier}/BBPlistMacro.h")
+            puts "查找PlistMacro文件2:#{path}"
             if !File.file?(path)
                 path = File.join(rootPath, "Configs/PlistMacro", "#{bundleIdentifier}_BBPlistMacro.h")
+                puts "查找PlistMacro文件3:#{path}"
                 if !File.file?(path)
                     path = File.join(rootPath, "Configs/PlistMacro", "BBPlistMacro.h")
+                    puts "查找PlistMacro文件4:#{path}"
                 end
             end
         end
@@ -51,12 +55,16 @@ class BabybusInstallEnv
         rootPath = getProjectRootPath
         bundleIdentifier = getProjectBundleIdentifier
         path = File.join(rootPath, "Configs", "#{bundleIdentifier}/UnityFramework.framework")
+        puts "查找UnityFramework产物1:#{path}"
         if !File.file?(path)
             path = File.join(rootPath, "Configs/UnityFramework", "#{bundleIdentifier}/UnityFramework.framework")
+            puts "查找UnityFramework产物2:#{path}"
             if !File.directory?(path)
                 path = File.join(rootPath, "Configs/UnityFramework", "#{bundleIdentifier}_UnityFramework.framework")
+                puts "查找UnityFramework产物3:#{path}"
                 if !File.directory?(path)
                     path = File.join(rootPath, "Configs/UnityFramework", "UnityFramework.framework")
+                    puts "查找UnityFramework产物4:#{path}"
                 end
             end
         end
@@ -78,7 +86,7 @@ class BabybusInstallEnv
             system "rm -rf #{replaceFilePath}; cp -af #{path} #{replaceFilePath}"
             puts "替换UnityFramework文件成功".yellow
         else
-            puts "找不到UnityFramework配置文件，替换失败path:#{path}".red
+            puts "找不到UnityFramework产物文件，替换失败".red
         end
     end
     # 2D母包替换

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

@@ -24,12 +24,20 @@ def forceAddDebugTool
     forceAddDebugTool = BB::PodUtils.getValueFromInfoPlist("ForceAddDebugTool")
     return forceAddDebugTool === "true"
 end
-# 是否3d产品
+# 是否3d产品(968开始切新版unity2022引擎)
 def isUnity3DApp
-    isU3dValue = BB::PodUtils.getValueFromInfoPlist("Unity3D")
-    return isU3dValue === "true"
+    if isUnityApp
+        # 1=>Cocos2D; 2=>Unity2D; 3=>普通 Unity3D; 4=>新版 Unity 3D; 5=>2D融合 打包机负责写入
+        value = BB::PodUtils.getValueFromInfoPlist("packer_engines_id")
+        return value === "4"
+    end
+    return false
+end
+# 是否unity产品，包含2d/3d
+def isUnityApp
+    value = BB::PodUtils.getValueFromInfoPlist("Unity3D")
+    return value === "true"
 end
-
 # 是否需要第三方支付sdk
 def isThirdPaySdk
     value = BB::PodUtils.getValueFromInfoPlist("Third_Purcharse")

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

@@ -7,36 +7,46 @@ require 'cocoapods-bb-PodAssistant/babybus/business/babybus_install_environment'
 require 'cocoapods-bb-PodAssistant/helpers/pod_utils'
 
 class PodPostInstaller
-    def initialize(lib, deployment_target="11.0", unity_deployment_target="11.0")
-      @lib = lib
-      @deployment_target = deployment_target
-      @unity_deployment_target = unity_deployment_target
+    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
+        else
+            @deployment_target = deployment_target
+        end
     end
     def run
         env = BabybusInstallEnv.new()
         is_xcode15 = BB::PodUtils.compare_xcode_15_version
         # 是否Untify项目
-        isUnityProject = isUnity3DApp
-        
+        isUnityProject = isUnityApp
         # Untify项目需要移除cocos项目res/src目录
         if (isUnityProject) then
             env.createCocosResource
         end
-        ios_deployment_target = isUnityProject ? @unity_deployment_target : @deployment_target
-        puts "当前工程最低支持iOS系统===>#{ios_deployment_target.to_s.send(:red)}".green
+        ios_deployment_target = @deployment_target
+        puts "当前工程最低支持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|
             target.build_configurations.each do |config|
-                if config.name.include? 'Debug' # 只有debug环境才进行替换操作，其它环境交由打包机处理
-                    puts "[#{target.name}/#{config.name}] 环境替换PlistMacro文件操作!!!开发者debug环境自行打开👇替换操作，禁止提交版本控制，谢谢🙏"
-                    env.copyPlistMacro # 开发自行打开不能提交到版本控制，避免test包出现配置不正确情况 by hm 22/5/17
-                end
-                # iOS17适配添加ld64
-                if (is_xcode15 == true) then
-                    config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -ld64"
-                else
-                    config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++"
+                if !target.name.include? '_test' # 过滤target test 工程
+                    if config.name.include? 'Debug' # 只有debug环境才进行替换操作，其它环境交由打包机处理
+                        puts "[#{target.name}/#{config.name}] 开发者debug环境环境替换[PlistMacro/cocos/unity]文件操作，其它环境交由打包机处理".red
+                        env.copyPlistMacro # 开发自行打开不能提交到版本控制，避免test包出现配置不正确情况 by hm 22/5/17
+                        if (isUnityProject) then
+                            env.copyUnityFramework
+                        else
+                            env.copyCocosPackage
+                        end
+                    end
+                    # iOS17适配添加ld64
+                    if (is_xcode15 == true) then
+                        config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++ -ld64"
+                    else
+                        config.build_settings['OTHER_LDFLAGS'] = "$(inherited) -lxml2 -lz -ObjC -lstdc++"
+                    end
                 end
             end
         end

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

@@ -8,7 +8,9 @@ module BB
                 stable_source = StableSource.stable_default_source
             end
             @stable_source = stable_source
-            @bundleId = BB::PodUtils.getProjectBundleIdentifier
+            if File.exist?(File.join(Pathname.pwd, "Podfile"))
+                @bundleId = BB::PodUtils.getProjectBundleIdentifier
+            end
             if @bundleId.nil?
                 @bundleId = 'stable'
             end

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

@@ -11,7 +11,7 @@ module BB
             env = BB::StableEnv.new()
             # puts "SourceManager env:#{env}".red
             @businessSpecName = env.business_stable
-            @stableMgr = BB::StableManager.new()
+            @stableMgr = BB::StableManager.new(env)
         end
 
         # 公共源路径(远端)

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

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

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

@@ -73,17 +73,24 @@ module BB
         # 获取info配置文件路径
         def self.getInfoPlistPath
             path = File.join(getProjectPath, "bbframework/Resources/Info.plist")
-            # puts "InfoPlist:#{path}"
-            raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
-            return path
+            if File.exist?(path)
+                return path
+            end
+            puts "无法找打工程Info.plist配置文件，工程目录:#{getProjectPath}".yellow
+            return nil
+            # raise Informative,  "#{path} File no exist, please check" unless File.exist?(path)
+            # return path
         end
         # 获取info配置key对应的值
         def self.getValueFromInfoPlist(key)
             plistPath = getInfoPlistPath
-            value = `/usr/libexec/PlistBuddy -c "Print #{key}" #{plistPath}`
-            value = value.rstrip()
-            puts "#{key} => #{value}"
-            return value
+            if !plistPath.nil?
+                value = `/usr/libexec/PlistBuddy -c "Print #{key}" #{plistPath}`
+                value = value.rstrip()
+                puts "#{key} => #{value}"
+                return value
+            end
+            return ""
         end
         # 获取Xcode版本
         def self.xcode_version

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

@@ -49,7 +49,7 @@ module BB
             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}"
+                  system "cd #{cachePath}; git checkout #{stable_branch}; git reset --hard origin/#{stable_branch}; git pull --all"
                 end
                 if stable_tag
                   system "cd #{cachePath}; git checkout #{stable_tag};"
@@ -57,7 +57,7 @@ module BB
               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}"
+                system "cd #{cachePath}; git checkout #{protechBranch}; git reset --hard origin/#{protechBranch}; git pull --all"
               end
             else
               puts "❌ stable配置无效分支信息source:#{@stable_source} branch:#{stable_branch}".red

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

@@ -1,9 +1,11 @@
 require 'cocoapods-bb-PodAssistant/config/stable_specs'
 require 'cocoapods-bb-PodAssistant/helpers'
+require 'cocoapods-bb-PodAssistant/helpers/stable_env_helper'
 
 module BB
     class StableManager
-        def initialize()
+        def initialize(env = nil)
+            @env = env
         end
         
         # podfile 更新配置文件使用(通用)
@@ -11,8 +13,16 @@ module BB
             update_stable_lock(public_stable_yaml, pod_targets)
         end
         # podfile 更新配置文件使用(业务线)
-        def update_business_stable_lock(businessSpecName, pod_targets)
-            update_stable_lock(business_stable_yaml(businessSpecName), pod_targets)
+        def update_business_stable_lock(pod_targets)
+            if @env.nil?
+                @env = BB::StableEnv.new()
+            end
+            businessSpecName = @env.business_stable
+            if !businessSpecName.nil?
+                update_stable_lock(business_stable_yaml(businessSpecName), pod_targets)
+            else
+                puts "没有配置业务线公共源，请确认!!!".yellow
+            end
         end
          # podfile 更新配置文件使用(项目)
          def update_product_stable_lock(pod_targets)
@@ -65,21 +75,24 @@ module BB
             stableMgr.update_common_stable_lock(pod_targets)
         end
         # podfile 更新配置文件使用(业务线)
-        def self.updateBusinessStableLock(businessSpecName, pod_targets)
+        def self.updateBusinessStableLock(pod_targets)
             stableMgr = StableManager.new()
-            stableMgr.update_stable_lock(businessSpecName, pod_targets)
+            stableMgr.update_business_stable_lock(pod_targets)
         end
         # 更新产品lock
         def self.updateProductStableLock(pod_targets)
             stableMgr = StableManager.new()
             stableMgr.update_product_stable_lock(pod_targets)
         end
+        # pod助手ruby文件路径
+        def self.pod_assistant_path()
+            stableMgr = StableManager.new()
+            return File.join(stableMgr.cachePath, "PodAssistant/PodAssistant.rb") #名称固定
+        end
+        # pod助手机器人ruby文件路径
+        def self.pod_assistant_robot_path()
+            stableMgr = StableManager.new()
+            return File.join(stableMgr.cachePath, "PodAssistant/robot.rb") #名称固定
+        end
     end
-
-    # class << self
-    #     def updateCommonStableLock(pod_targets)
-    #         stableMgr = StableManager.new()
-    #         stableMgr.update_common_stable_lock(pod_targets)
-    #     end
-    # end
 end

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

@@ -82,8 +82,17 @@ module Pod
             BB::StableManager.updateCommonStableLock(installer.pod_targets)
         end
         # 更新业务公共lock
-        def update_business_stable_lock(businessSpecName, pod_targets)
-            BB::StableManager.updateBusinessStableLock(businessSpecName, pod_targets)
+        def update_business_stable_lock(installer)
+            BB::StableManager.updateBusinessStableLock(installer.pod_targets)
+        end
+
+        # pod助手ruby文件路径
+        def pod_assistant_path()
+            return BB::StableManager.pod_assistant_path
+        end
+        # pod助手机器人ruby文件路径
+        def pod_assistant_robot_path()
+            return BB::StableManager.pod_assistant_robot_path
         end
         
         # 从列表中搜索得到对应配置

metadata

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