pindo 5.11.4 → 5.12.1

data/lib/pindo/module/unity/unity_helper.rb

@@ -355,14 +355,16 @@ module Pindo
 
       # 检查 GoodUnityBuild 版本是否满足要求
       def check_goodunitybuild_version(unity_exe_full_path, project_path)
+        Funlog.instance.fancyinfo_start("检查 GoodUnityBuild 版本")
+
         library_version = get_library_version(unity_exe_full_path: unity_exe_full_path, project_path: project_path)
 
         return unless library_version
 
         required_version = Pindoconfig.instance.pindo_user_config_json["goodunitybuild_version"]
 
-        puts "当前使用的 GoodUnityBuild 版本: #{library_version}"
-        puts "要求的 GoodUnityBuild 最底版本: #{required_version}"
+        Funlog.info("当前使用的 GoodUnityBuild 版本: #{library_version}")
+        Funlog.info("要求的 GoodUnityBuild 最底版本: #{required_version}")
 
         return unless required_version
 
@@ -374,10 +376,12 @@ module Pindo
             请更新 GoodUnityBuild 库到 #{required_version} 或更高版本
           MSG
         end
+
+        Funlog.instance.fancyinfo_success("GoodUnityBuild 版本检查通过")
       rescue Informative
         raise
       rescue => e
-        puts "GoodUnityBuild 库版本检查失败: #{e.message}"
+        Funlog.warning("GoodUnityBuild 库版本检查失败: #{e.message}")
       end
 
       # 获取 GoodUnityBuild 库版本

data/lib/pindo/module/xcode/xcode_build_config.rb

@@ -2,6 +2,7 @@ require 'fileutils'
 require 'xcodeproj'
 require 'json'
 require 'pindo/module/xcode/xcode_res_helper'
+require 'pindo/module/build/icon_downloader'
 require 'open-uri'
 require_relative '../../base/funlog'
 
@@ -449,16 +450,9 @@ module Pindo
                 FileUtils.mkdir_p(temp_icon_dir) unless File.exist?(temp_icon_dir)
                 icon_download_path = File.join(temp_icon_dir, "downloaded_icon.png")
 
-                # 下载 icon
-                Funlog.instance.fancyinfo_start("正在从 JPS 下载项目 Icon...")
-                URI.open(icon_url) do |file|
-                    File.binwrite(icon_download_path, file.read)
-                end
-                Funlog.instance.fancyinfo_success("Icon 下载成功!")
-
-                # 验证文件已下载
-                unless File.exist?(icon_download_path)
-                    Funlog.instance.fancyinfo_error("Icon 下载失败: 文件未创建")
+                # 使用带重试机制的下载
+                unless IconDownloader.download_icon_with_retry(icon_url: icon_url, save_path: icon_download_path, max_retries: 3)
+                    Funlog.instance.fancyinfo_error("Icon 下载失败: 已重试3次")
                     return false
                 end
 

data/lib/pindo/module/xcode/xcode_build_helper.rb

@@ -8,6 +8,25 @@ module Pindo
     class XcodeBuildHelper
         class << self
 
+            # 删除 Unity-iPhone 项目中的 Firebase Crashlytics 脚本
+            def delete_libtarget_firebase_shell(project_path)
+              puts "[-] 开始检查并删除 Unity-iPhone下的Firebase Crashlytics脚本..."
+              if File.directory?(File.join(project_path, 'Unity')) && File.exist?(File.join(project_path, 'Unity', 'Unity-iPhone.xcodeproj'))
+                unity_project_path = File.join(project_path, 'Unity', 'Unity-iPhone.xcodeproj')
+                xcdoe_unitylib_project = Xcodeproj::Project::open(unity_project_path)
+                xcdoe_unitylib_project.targets.each do |target|
+                  target.shell_script_build_phases&.each do |phase|
+                    if phase.name.eql?("Crashlytics Run Script")
+                      puts "    从target:#{target.name}中删除: #{phase.name} ..."
+                      target.build_phases.delete(phase)
+                    end
+                  end
+                end
+                xcdoe_unitylib_project.save()
+                puts "[✔] 完成检查并删除 Unity-iPhone下的Firebase Crashlytics脚本..."
+              end
+            end
+
             def pull_podfile_lock(project_dir:nil, app_config_dir:nil)
             begin
                 src_pod_file = File.join(app_config_dir, "Podfile.lock")

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.11.4"
+  VERSION = "5.12.1"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.11.4
+  version: 5.12.1
 platform: ruby
 authors:
 - wade
@@ -389,13 +389,10 @@ files:
 - lib/pindo/command/repo/search.rb
 - lib/pindo/command/setup.rb
 - lib/pindo/command/unity.rb
-- lib/pindo/command/unity/apk.rb
 - lib/pindo/command/unity/autobuild.rb
-- lib/pindo/command/unity/ipa.rb
 - lib/pindo/command/unity/packbuild.rb
 - lib/pindo/command/unity/packinit.rb
 - lib/pindo/command/unity/packpush.rb
-- lib/pindo/command/unity/web.rb
 - lib/pindo/command/utils.rb
 - lib/pindo/command/utils/boss.rb
 - lib/pindo/command/utils/clearcert.rb
@@ -429,6 +426,8 @@ files:
 - lib/pindo/module/appstore/appstore_metadata_fastlane_helper.rb
 - lib/pindo/module/build/build_helper.rb
 - lib/pindo/module/build/confuse_xcodeproj.rb
+- lib/pindo/module/build/git_repo_helper.rb
+- lib/pindo/module/build/icon_downloader.rb
 - lib/pindo/module/build/swark_helper.rb
 - lib/pindo/module/build/version_helper.rb
 - lib/pindo/module/cert/cert_helper.rb
@@ -437,7 +436,14 @@ files:
 - lib/pindo/module/cert/provisioning_helper.rb
 - lib/pindo/module/cert/xcodecerthelper.rb
 - lib/pindo/module/pgyer/pgyerhelper.rb
+- lib/pindo/module/task/model/build/android_dev_build_task.rb
+- lib/pindo/module/task/model/build/android_release_build_task.rb
+- lib/pindo/module/task/model/build/ios_adhoc_build_task.rb
+- lib/pindo/module/task/model/build/ios_dev_build_task.rb
+- lib/pindo/module/task/model/build/ios_release_build_task.rb
+- lib/pindo/module/task/model/build/web_dev_build_task.rb
 - lib/pindo/module/task/model/build_task.rb
+- lib/pindo/module/task/model/git_tag_task.rb
 - lib/pindo/module/task/model/unity_export_task.rb
 - lib/pindo/module/task/model/upload_task.rb
 - lib/pindo/module/task/pindo_task.rb

data/lib/pindo/command/unity/apk.rb

@@ -1,185 +0,0 @@
-require 'highline/import'
-require 'xcodeproj'
-require 'find'
-require 'fileutils'
-require 'pindo/base/executable'
-require 'pindo/module/unity/unity_helper'
-require 'pindo/module/build/build_helper'
-
-module Pindo
-    class Command
-        class Unity < Command
-            class Apk < Unity
-                include Appselect
-
-                # 命令的简要说明 - 编译Unity工程生成Android APK
-                self.summary = 'Unity工程编译APK(优先使用pindo and autobuild命令)'
-
-                # 启用缓存机制
-                def self.use_cache?
-                    true  # 此命令启用缓存
-                end
-
-                # 命令的详细说明,包含用法示例
-                self.description = <<-DESC
-                    Unity工程编译APK(优先使用pindo and autobuild命令)
-
-                    支持功能:
-
-                        * 自动检测Unity版本
-
-                        * 编译生成Android APK文件
-
-                        * 支持上传到JPS测试平台
-
-                        * 支持发送测试通知
-
-                        * 支持CI/CD自动化构建
-
-                    使用示例:
-
-                        $ pindo unity apk                    # 编译APK
-
-                        $ pindo unity apk --upload           # 编译并上传到JPS
-
-                        $ pindo unity apk --send             # 编译、上传并发送通知
-
-                        $ pindo unity apk --proj="My App"    # 指定项目名称
-
-                        $ pindo unity apk --base             # Unity lib模式
-                DESC
-
-                # 命令的参数列表
-                self.arguments = [
-
-                ]
-
-                # 命令的选项列表
-                def self.options
-                    [
-                        ['--proj=NAME',   '指定上传到测试平台的项目名称'],
-                        ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）'],
-                        ['--upload',      '编译后上传到测试平台（自动发送给自己）'],
-                        ['--send',        '发送通知到测试群组（同时发送给自己）']
-                    ].concat(super)
-                end
-
-                def initialize(argv)
-
-                    @args_proj_name = argv.option('proj')
-                    @args_bundle_name = argv.option('bundle_name')
-                    @args_upload_flag = argv.flag?('upload', false)
-                    @args_send_flag = argv.flag?('send', false)
-
-                    if @args_send_flag
-                        @args_upload_flag = true
-                    end
-
-                    super
-                end
-
-                def run
-                    pindo_project_dir = Dir.pwd
-
-                    # 加载 JPS 配置（如果存在）
-                    context = Pindo::PindoContext.instance
-                    context.load_and_apply_jps_config(pindo_project_dir)
-
-                    # 确认并应用缓存（如果有）
-                    context.confirm_and_apply_cache
-
-                    @main_bundle_name = nil
-                    if @args_bundle_name
-                        @main_bundle_name = @args_bundle_name
-                    else
-                        @main_bundle_name = get_selected_dev_bundle_name()
-                    end
-
-
-                    # 检查是否是Unity工程
-                    unity_helper = Pindo::Client::UnityHelper.share_instance
-                    unless unity_helper.unity_project?(pindo_project_dir)
-                        raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
-                    end
-                    build_helper = Pindo::BuildHelper.share_instance
-                    if @args_upload_flag
-                      is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
-                      if is_need_add_tag
-                          Pindo::Command::Utils::Tag::run(tag_action_parms)
-                      end
-                    end
-                    
-                    project_unity_version = unity_helper.get_unity_version(pindo_project_dir)
-                    puts
-                    puts "工程的Unity版本: #{project_unity_version}"
-                    unity_exe_path = unity_helper.find_unity_path(project_unity_version:project_unity_version, force_change_version: @force_select_unity)
-                    puts "选择的Unity路径: #{unity_exe_path}"
-                    puts
-
-                    app_info_obj = nil
-                    workflow_info = nil
-                    proj_name = @args_proj_name
-                    # 传入 package_type 获取 workflow_info
-                    app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
-                      working_directory: Dir.pwd,
-                      proj_name: proj_name,
-                      package_type: 'apk'
-                    )
-
-                    isLibrary = @args_base_flag
-
-                    android_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseAndroid")
-                    if File.directory?(android_export_lib_dir)
-                        isLibrary = true
-                    end
-
-                    pindo_android_project_dir = File.join(pindo_project_dir, "GoodPlatform/Android")
-                    if isLibrary
-                        pindo_android_project_dir = android_export_lib_dir
-                    end
-
-                    # 获取 apkCount 用于传递给 Unity 构建
-                    apk_count = app_info_obj&.dig("apkCount") || -1
-
-                    puts "开始构建Unity项目..."
-
-                    begin
-                        unity_helper.build_project(
-                            unity_exe_full_path: unity_exe_path,
-                            project_path: pindo_project_dir,
-                            platform: 'Android',
-                            isLibrary: isLibrary,
-                            indexNo: apk_count
-                        )
-                    rescue => e
-                        Funlog.instance.fancyinfo_error("调用GoodUnityBuild导出工程失败！")
-                        Funlog.instance.fancyinfo_error("错误信息: #{e.message}")
-                        raise e
-                    end
-
-                    puts "Unity项目构建完成，准备处理Android项目..."
-
-                    args_temp = []
-
-                    # 传递 bundle_name 参数
-                    if @main_bundle_name
-                        args_temp << "--bundle_name=#{@main_bundle_name}"
-                    end
-
-                    if @args_upload_flag
-                        args_temp << "--proj=#{app_info_obj["projectName"]}"
-                        args_temp << "--upload"
-                    end
-                    if @args_send_flag
-                        args_temp << "--send"
-                    end
-
-                    Dir.chdir(pindo_android_project_dir)
-
-                    Pindo::Command::Android::Autobuild::run(args_temp)
-                end
-
-            end
-        end
-    end
-end

data/lib/pindo/command/unity/ipa.rb

@@ -1,198 +0,0 @@
-require 'highline/import'
-require 'xcodeproj'
-require 'find'
-require 'fileutils'
-require 'pindo/base/executable'
-require 'pindo/module/unity/unity_helper'
-require 'pindo/module/build/build_helper'
-require 'pindo/base/pindocontext'
-
-module Pindo
-    class Command
-        class Unity < Command
-            class Ipa < Unity
-
-                include Appselect
-
-                include Pindo::Githelper
-                # Unity IPA包编译和上传命令
-                self.summary = 'Unity工程编译IPA (优先使用pindo ios autobuild命令)'
-
-                # 启用缓存机制
-                def self.use_cache?
-                    true  # 此命令启用缓存
-                end
-                # 缓存组已在 PindoContext#get_command_group 中定义
-                # unity:ipa 与 ios:autobuild 共享 'ios:autobuild' 缓存组
-
-                # 详细说明
-                self.description = <<-DESC
-                    Unity工程编译IPA (优先使用pindo ios autobuild命令)
-
-                    支持功能:
-
-                        * 自动检测Unity版本
-
-                        * 编译生成iOS IPA文件
-
-                        * 支持上传到JPS测试平台
-
-                        * 支持发送测试通知
-
-                        * 支持CI/CD自动化构建
-
-                    使用示例:
-
-                        $ pindo unity ipa                        # 编译IPA
-
-                        $ pindo unity ipa --upload               # 编译并上传到JPS
-
-                        $ pindo unity ipa --send                 # 编译、上传并发送通知
-
-                        $ pindo unity ipa --bundleid=com.example.app  # 指定Bundle ID
-
-                        $ pindo unity ipa --proj="My App"       # 指定项目名称
-
-                        $ pindo unity ipa --base                 # Unity lib模式
-DESC
-
-                # 命令参数
-                self.arguments = [
-                    # 暂无参数
-                ]
-
-                # 命令选项
-                def self.options
-                    [
-                        ['--bundleid=ID', '指定打包的Bundle ID'],
-                        ['--proj=NAME',   '指定上传到测试平台的项目名称'],
-                        ['--upload',      '编译后上传到测试平台（上传成功后自动发送给自己）'],
-                        ['--send',        '发送通知到测试群组（同时也会发送给自己）'],
-                        ['--base',        'Unity工程编译lib模式'],
-                        ['--unity-version', '强制选择Unity版本'],
-                        ['--deploy',      '使用发布证书打包']
-                    ].concat(super)
-                end
-
-
-                def initialize(argv)
-
-                    @args_proj_name = argv.option('proj')
-                    @args_upload_flag = argv.flag?('upload', false)
-                    @args_send_flag = argv.flag?('send', false)
-                    @args_deploy_flag = argv.flag?('deploy', false)
-                    @args_base_flag = argv.flag?('base', false)
-                    @force_select_unity = argv.flag?('unity-version', false)
-                    @args_bundle_id = argv.option('bundleid')
-
-                    if @args_send_flag
-                        @args_upload_flag = true
-                    end
-
-                    super
-                end
-                
-
-                def run
-                    pindo_project_dir = Dir.pwd
-
-                    # 加载 JPS 配置（如果存在）
-                    context = Pindo::PindoContext.instance
-                    context.load_and_apply_jps_config(pindo_project_dir)
-
-                    # 确认并应用缓存（如果有）
-                    context.confirm_and_apply_cache
-
-
-                    @mainapp_bundleid= nil
-                    if @args_bundle_id
-                        @mainapp_bundleid = @args_bundle_id
-                    else
-                        if @args_deploy_flag
-                            @mainapp_bundleid = get_selected_deploy_bundleid()
-                        else
-                            @mainapp_bundleid = get_selected_dev_bundleid()
-                        end
-                    end
-
-
-
-                    # 检查是否是Unity工程
-                    unity_helper = Pindo::Client::UnityHelper.share_instance
-                    unless unity_helper.unity_project?(pindo_project_dir)
-                        raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
-                    end
-                    
-                    build_helper = Pindo::BuildHelper.share_instance
-                    if @args_upload_flag
-                      is_need_add_tag,tag_action_parms = build_helper.check_is_need_add_tag?(pindo_project_dir)
-                      if is_need_add_tag
-                          Pindo::Command::Utils::Tag::run(tag_action_parms)
-                      end
-                    end
-
-                    project_unity_version = unity_helper.get_unity_version(pindo_project_dir)
-                    puts
-                    puts "工程的Unity版本: #{project_unity_version}"
-                    unity_exe_path = unity_helper.find_unity_path(project_unity_version:project_unity_version, force_change_version: @force_select_unity)
-                    puts "选择的Unity路径: #{unity_exe_path}"
-                    puts
-
-                    app_info_obj = nil
-                    workflow_info = nil
-                    proj_name = @args_proj_name
-                    # 传入 package_type 获取 workflow_info
-                    app_info_obj, workflow_info = PgyerHelper.share_instace.prepare_upload(
-                      working_directory: Dir.pwd,
-                      proj_name: proj_name,
-                      package_type: 'ipa'
-                    )
-
-                    isLibrary = @args_base_flag
-
-                    ios_export_lib_dir = File.join(pindo_project_dir, "GoodPlatform/BaseiOS")
-                    if File.directory?(ios_export_lib_dir)
-                        isLibrary = true
-                    end
-
-                    pindo_ios_project_dir = File.join(pindo_project_dir, "GoodPlatform/iOS")
-                    if isLibrary
-                        pindo_ios_project_dir = ios_export_lib_dir
-                    end
-
-                    # 获取 ipaCount 用于传递给 Unity 构建
-                    ipa_count = app_info_obj&.dig("ipaCount") || -1
-
-                    begin
-                        unity_helper.build_project(unity_exe_full_path:unity_exe_path, project_path:pindo_project_dir, platform:'iOS', isLibrary:isLibrary, indexNo:ipa_count)
-                    rescue => e
-                        Funlog.instance.fancyinfo_error("调用GoodUnityBuild导出工程失败！")
-                        Funlog.instance.fancyinfo_error("错误信息: #{e.message}")
-                        raise e
-                    end
-
-
-                    args_temp = []
-                    args_temp << "--bundleid=#{@mainapp_bundleid}"
-
-                    if @args_upload_flag
-                        args_temp << "--proj=#{app_info_obj["projectName"]}"
-                        args_temp << "--upload"
-                    end
-                    if @args_send_flag
-                        args_temp << "--send"
-                    end
-
-
-                    Dir.chdir(pindo_ios_project_dir)
-
-                    Pindo::Command::Ios::Autobuild::run(args_temp)
-
-
-                end
-
-
-            end
-        end
-    end
-end