pindo 5.13.7 → 5.13.10

data/lib/pindo/command/jps/media.rb

@@ -0,0 +1,146 @@
+require 'highline/import'
+require 'fileutils'
+require 'json'
+require 'pindo/module/pgyer/pgyerhelper'
+require 'pindo/module/task/task_manager'
+require 'pindo/module/task/model/jps/jps_upload_media_task'
+
+module Pindo
+    class Command
+        class Jps < Command
+            class Media < Jps
+
+                self.summary = '上传media文件到jps提交记录'
+
+                self.description = <<-DESC
+                    上传media文件（图片、视频等）到jps提交记录。
+
+                    支持功能:
+
+                        * 上传多个media文件（图片、视频等）
+                        * 并发上传，支持重试
+                        * 自动关联到指定的commit记录
+                        * 支持追加模式（保留已有附件）
+                        * 自动模式：从项目 JPSMedia/ 目录查找文件
+
+                    使用示例:
+
+                        $ pindo jps media                              # 自动模式：使用 HEAD commit，从 JPSMedia/ 查找文件
+
+                        $ pindo jps media path/to/1.png path/to/2.mov  # 自动模式：使用 HEAD commit，上传指定文件
+
+                        $ pindo jps media --commit_id=9e959ffd         # 指定 git commit id
+
+                        $ pindo jps media --workflow_id=2720           # 指定工作流ID
+
+                        $ pindo jps media --proj=demo *.png            # 指定项目
+
+                DESC
+
+                self.arguments = [
+                    CLAide::Argument.new('files...', false),
+                ]
+
+                def self.options
+                  [
+                    ['--commit_id', '指定 git commit id（默认使用 HEAD）'],
+                    ['--workflow_id', '指定工作流ID（用于查找 commit_log）'],
+                    ['--proj', '指定项目代号名称'],
+                    ['--login', '强制再次登录jps网站'],
+                  ].concat(super)
+                end
+
+                def initialize(argv)
+                    # 收集所有文件参数
+                    @file_paths = []
+                    while (arg = argv.shift_argument)
+                        @file_paths << arg.strip.gsub(/\"/, '')
+                    end
+
+                    @args_commit_id = argv.option('commit_id')
+                    @args_workflow_id = argv.option('workflow_id')
+                    @args_proj_name = argv.option('proj')
+                    @args_login_flag = argv.flag?('login', false)
+
+                    # 转换 workflow_id 为整数
+                    if @args_workflow_id
+                        @args_workflow_id = @args_workflow_id.to_i
+                    end
+
+                    super(argv)
+                end
+
+                def validate!
+                    super
+                    # 不再强制要求参数，Task 会自动从 git 获取
+                end
+
+                def run
+                    project_path = Dir.pwd
+
+                    # 展开文件路径（支持通配符）
+                    expanded_files = expand_file_paths(@file_paths)
+
+                    # 设置 PgyerHelper 登录选项
+                    PgyerHelper.share_instace.setForeLogin(beforeLogin: @args_login_flag)
+
+                    # 创建并执行任务
+                    # 所有逻辑都在 Task 中处理：
+                    # - 自动查找 git 仓库和 HEAD 信息
+                    # - 自动查找 JPSMedia/ 目录
+                    # - 匹配 git_commit_id 到 JPS commit_log
+                    task = Pindo::TaskSystem::JPSUploadMediaTask.new(
+                        expanded_files,
+                        git_commit_id: @args_commit_id,
+                        workflow_id: @args_workflow_id,
+                        project_name: @args_proj_name,
+                        project_path: project_path
+                    )
+
+                    task_manager = Pindo::TaskSystem::TaskManager.instance
+                    task_manager.clear_all
+                    task_manager.add_task(task)
+                    task_manager.start
+
+                    # 输出结果
+                    report = task_manager.execution_report
+                    if report[:success] > 0
+                        puts "\n上传完成!"
+                    else
+                        raise Informative, "上传失败"
+                    end
+                end
+
+                private
+
+                # 展开文件路径（支持通配符和目录）
+                def expand_file_paths(paths)
+                    return [] if paths.nil? || paths.empty?
+
+                    expanded = []
+                    media_extensions = %w[png jpg jpeg gif bmp webp mp4 mov avi mkv webm]
+
+                    paths.each do |path|
+                        if path.include?('*')
+                            # 通配符展开
+                            expanded.concat(Dir.glob(path))
+                        elsif File.directory?(path)
+                            # 目录：查找所有图片和视频文件
+                            pattern = File.join(path, "**", "*.{#{media_extensions.join(',')}}")
+                            expanded.concat(Dir.glob(pattern))
+                        elsif File.exist?(path)
+                            # 单个文件
+                            expanded << path
+                        else
+                            Funlog.instance.warning("文件不存在: #{path}")
+                        end
+                    end
+
+                    # 去重并过滤有效文件
+                    expanded.uniq.select { |f| File.file?(f) }
+                end
+
+            end
+        end
+    end
+end

data/lib/pindo/command/jps/upload.rb

@@ -6,8 +6,10 @@ require 'pindo/module/pgyer/pgyerhelper'
 require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/build/build_helper'
 require 'pindo/module/task/task_manager'
-require 'pindo/module/task/model/jps_upload_task'
-require 'pindo/module/task/model/git_tag_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
+require 'pindo/module/task/model/git/git_commit_task'
+require 'pindo/module/task/model/git/git_tag_task'
+require 'pindo/options/options'
 
 module Pindo
     class Command
@@ -42,29 +44,34 @@ module Pindo
                         $ pindo jps upload --resign                 # 上传后重签名
 
                         $ pindo jps upload --send                   # 上传后发送企业微信测试信息
+
+                        $ pindo jps upload --ver_inc=main           # 大版本号增加
+
+                        $ pindo jps upload --tag_type=recreate      # 重新创建当前版本tag
                 DESC
 
                 self.arguments = [
                     CLAide::Argument.new('path/to/demo.ipa', false),
                 ]
 
+                # 定义此命令使用的参数项
+                def self.option_items
+                  @option_items ||= Pindo::Options::OptionGroup.merge(
+                    Pindo::Options::JPSOptions.except(:upload),  # 排除 upload 参数（本命令就是上传）
+                    Pindo::Options::GitOptions.all
+                  )
+                end
+
                 def self.options
                   [
-                    ['--login', '强制再次登录jps网站，用法: pindo jps upload --login'],
-                    ['--ipa', '强制指定上传的ipa文件: pindo jps upload --ipa=path/to/demo.ipa'],
-                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo jps upload --proj=prancksoundv4'],
-                    ['--attach', '指定需要和ipa一起上传的附件: pindo jps upload --attach=path/to/attach.zip'],
-                    ['--send',  '发送消息到项目群(注意:不带此参数也会发送给自己),用法:pindo jps upload --send'],
-                    ['--desc', '指定上传的备注信息: -pindo jps upload -desc="1.upload message"'],
-                    ['--resign',  '上传到之后是否重签名,用法:pindo jps upload --resign'],
-                    ['--certid',  '设置重签名的正式id,用法:pindo jps upload --certid=com.test.bundleid'],
-
-                  ].concat(super)
+                    ['--login', '强制再次登录jps网站'],
+                    ['--ipa', '强制指定上传的ipa文件'],
+                    ['--attach', '指定需要和ipa一起上传的附件'],
+                  ].concat(option_items.map(&:to_claide_option)).concat(super)
                 end
 
 
                 def initialize(argv)
-
                     @args_ipa_file = argv.shift_argument
                     @ipa_file = argv.option('ipa')
 
@@ -76,20 +83,27 @@ module Pindo
                     end
 
                     @args_login_flag = argv.flag?('login', false)
-                    @args_send_flag = argv.flag?('send', false)
-                    @args_resign_flag = argv.flag?('resign', false)
-
-                    @args_proj_name = argv.option('proj')
                     @args_attach_name = argv.option('attach')
-                    @args_upload_desc = argv.option('desc')
-                    @args_cert_id = argv.option('certid')
 
+                    # 使用 Options 系统解析参数
+                    @options = initialize_options(argv)
 
+                    # JPS 参数
+                    @args_proj_name = @options[:proj]
+                    @args_send_flag = @options[:send] || false
+                    @args_resign_flag = @options[:resign] || false
+                    @args_upload_desc = @options[:desc]
+                    @args_cert_id = @options[:certid]
 
                     if @args_upload_desc && !@args_upload_desc.empty?
                         @args_upload_desc = @args_upload_desc.strip.gsub(/\"/, '')
                     end
 
+                    # Git 参数
+                    @args_release_branch = @options[:release_branch] || 'master'
+                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
+                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+                    @args_tag_pre = @options[:tag_pre] || 'v'
 
                     if !@args_cert_id.nil? && !@args_cert_id.empty?
                         @args_resign_flag = true
@@ -141,8 +155,22 @@ module Pindo
                 def make_upload_tasks(project_dir)
                     tasks = []
 
-                    # 1. Git Tag 任务（检查并添加标签）
-                    git_tag_task = Pindo::TaskSystem::GitTagTask.new(project_dir)
+                    # Git 参数
+                    git_options = {
+                        release_branch: @args_release_branch,
+                        ver_inc: @args_ver_inc,
+                        tag_type: @args_tag_type,
+                        tag_pre: @args_tag_pre
+                    }
+
+                    # 1. Git 提交和标签任务
+                    # 1.1 Git 提交任务
+                    git_commit_task = Pindo::TaskSystem::GitCommitTask.new(project_dir, git_options)
+                    tasks << git_commit_task
+
+                    # 1.2 Git 标签任务（依赖提交任务）
+                    git_tag_task = Pindo::TaskSystem::GitTagTask.new(project_dir, git_options)
+                    git_tag_task.dependencies << git_commit_task.id
                     tasks << git_tag_task
 
                     # 2. 查找并创建上传任务

data/lib/pindo/command/jps.rb

@@ -1,5 +1,6 @@
 require 'pindo/command/jps/login'
 require 'pindo/command/jps/upload'
+require 'pindo/command/jps/media'
 require 'pindo/command/jps/download'
 require 'pindo/command/jps/comment'
 require 'pindo/command/jps/apptest'

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

@@ -9,11 +9,16 @@ require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/task/pindo_task'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/build_task'
-require 'pindo/module/task/model/unity_export_task'
-require 'pindo/module/task/model/jps_upload_task'
-require 'pindo/module/task/model/git_tag_task'
+require 'pindo/module/task/model/unity/unity_update_task'
+require 'pindo/module/task/model/unity/unity_yoo_asset_task'
+require 'pindo/module/task/model/unity/unity_export_task'
+require 'pindo/module/task/model/jps/jps_upload_task'
+require 'pindo/module/task/model/jps/jps_message_task'
+require 'pindo/module/task/model/git/git_commit_task'
+require 'pindo/module/task/model/git/git_tag_task'
 require 'pindo/config/build_info_manager'
 require 'pindo/config/ios_config_parser'
+require 'pindo/options/options'
 
 module Pindo
     class Command
@@ -21,8 +26,7 @@ module Pindo
             class Autobuild < Unity
 
                 include Appselect
-                
-                include Pindo::Githelper
+
                 # Unity 多平台编译和上传命令
                 self.summary = '编译Unity工程,生成IPA、APK、Html文件(默认编译三个平台的包)并支持上传到JPS平台'
 
@@ -66,33 +70,49 @@ module Pindo
                     # 暂无参数
                 ]
 
+                # 定义此命令使用的参数项
+                def self.option_items
+                    @option_items ||= Pindo::Options::OptionGroup.merge(
+                        Pindo::Options::JPSOptions.select(:proj, :upload, :send),
+                        Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
+                        Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
+                        Pindo::Options::GitOptions.all
+                    )
+                end
+
                 # 命令选项
                 def self.options
                     [
                         ['--bundleid=ID', '指定iOS打包的bundleID'],
                         ['--bundle_name=NAME', '指定Android Package Name（如com.example.app，会拉取对应配置）'],
-                        ['--proj=NAME',   '指定上传到测试平台的项目名称'],
                         ['--types=TYPES', '指定要构建的类型，逗号分隔（如：ipa,apk,html），默认全部类型'],
-                        ['--upload', '上传编译后的IPA/APK到测试平台'],
-                        ['--send', '发送通知到测试群组（同时也会发送给自己）'],
                         ['--adhoc', '使用AdHoc证书打包iOS（默认使用Dev证书）'],
                         ['--deploy', '使用发布证书打包iOS'],
-                        ['--release', '使用Release模式构建Android（默认使用Debug）'],
-                    ].concat(super)
+                        ['--release', '使用Release模式构建Android（默认使用Debug）']
+                    ].concat(option_items.map(&:to_claide_option)).concat(super)
                 end
 
 
                 def initialize(argv)
+                    @options = initialize_options(argv)
 
-                    @args_proj_name = argv.option('proj')
-                    @args_upload_flag = argv.flag?('upload', false)
-                    @args_send_flag = argv.flag?('send', false)
+                    @args_proj_name = @options[:proj]
+                    @args_upload_flag = @options[:upload] || false
+                    @args_send_flag = @options[:send] || false
                     @args_adhoc_flag = argv.flag?('adhoc', false)
                     @args_deploy_flag = argv.flag?('deploy', false)
                     @args_release_flag = argv.flag?('release', false)
                     @args_bundle_id = argv.option('bundleid')
                     @args_bundle_name = argv.option('bundle_name')
                     @args_types = argv.option('types')
+                    @args_skip_lib = @options[:skiplib] || false
+                    @args_skip_yoo = @options[:skipyoo] || false
+
+                    # Git 参数
+                    @args_release_branch = @options[:release_branch] || 'master'
+                    @args_ver_inc = Pindo::Options::GitOptions.parse_version_increase_type(@options[:ver_inc] || 'mini')
+                    @args_tag_type = Pindo::Options::GitOptions.parse_create_tag_type(@options[:tag_type] || 'new')
+                    @args_tag_pre = @options[:tag_pre] || 'v'
 
                     # 如果开启 send，自动开启 upload
                     if @args_send_flag
@@ -137,7 +157,7 @@ module Pindo
                     pindo_project_dir = Dir.pwd
 
                     # 检查是否是Unity工程
-                    unity_helper = Pindo::Client::UnityHelper.share_instance
+                    unity_helper = Pindo::Unity::UnityHelper.share_instance
                     unless unity_helper.unity_project?(pindo_project_dir)
                         raise Informative, "当前目录不是Unity工程，请在Unity工程根目录下执行此命令"
                     end
@@ -169,32 +189,120 @@ module Pindo
                     all_tasks = []
                     platform_build_tasks = {}  # 存储平台对应的构建任务
 
-                    # 第零步：创建 Git 标签任务（所有编译场景都需要打 Tag）
-                    git_tag_task = Pindo::TaskSystem::GitTagTask.new(Dir.pwd)
-                    all_tasks << git_tag_task
+                    # 按优先级排序：iOS → Android → Web
+                    platform_order = ['ios', 'android', 'web']
+                    selected_platforms = selected_platforms.sort_by { |p| platform_order.index(p) || 999 }
+
+                    # 第零步：创建 Git 提交任务
+                    git_commit_task = Pindo::TaskSystem::GitCommitTask.new(
+                        Dir.pwd,
+                        release_branch: @args_release_branch,
+                        ver_inc: @args_ver_inc,
+                        tag_type: @args_tag_type,
+                        tag_pre: @args_tag_pre
+                    )
+                    all_tasks << git_commit_task
+
+                    # 记录依赖任务（用于后续平台任务的依赖链）
+                    common_dependency_task = git_commit_task
+
+                    # 判断是否只有 web 平台（web 平台需要在导出前创建 Tag）
+                    only_web_platform = selected_platforms == ['web']
+
+                    # 如果只有 web 平台，在 Unity 导出之前创建 Git 标签任务
+                    if only_web_platform
+                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(
+                            Dir.pwd,
+                            release_branch: @args_release_branch,
+                            ver_inc: @args_ver_inc,
+                            tag_type: @args_tag_type,
+                            tag_pre: @args_tag_pre
+                        )
+                        git_tag_task.dependencies << git_commit_task.id
+                        all_tasks << git_tag_task
+                        common_dependency_task = git_tag_task
+                    end
+
+                    # 第一步：创建 Unity 更新任务（所有平台共享，可选）
+                    unless @args_skip_lib
+                        unity_update_task = Pindo::TaskSystem::UnityUpdateTask.new(
+                            project_path: Dir.pwd
+                        )
+                        unity_update_task.dependencies << common_dependency_task.id
+                        all_tasks << unity_update_task
+                        common_dependency_task = unity_update_task
+                    end
 
-                    # 第一步：为每个平台创建导出和构建任务
+                    # 存储每个平台的 YooAsset 任务（每个平台有自己的 YooAsset 任务）
+                    platform_yoo_tasks = {}
+
+                    # 第二步：为每个平台创建导出和构建任务
                     selected_platforms.each do |platform|
                         platform_config = all_platform_configs[platform]
 
-                        # 1. 创建 Unity 导出任务（依赖 Git 标签任务）
-                        unity_task = create_unity_export_task(platform, all_platform_configs)
-                        unity_task.dependencies << git_tag_task.id
-                        all_tasks << unity_task
+                        # 记录当前平台的依赖任务
+                        platform_dependency_task = common_dependency_task
+
+                        # 2.1 创建 Unity YooAsset 资源构建任务（可选，依赖共同任务）
+                        unless @args_skip_yoo
+                            unity_yoo_task = Pindo::TaskSystem::UnityYooAssetTask.new(
+                                platform,
+                                project_path: Dir.pwd
+                            )
+                            unity_yoo_task.dependencies << platform_dependency_task.id
+                            all_tasks << unity_yoo_task
+                            platform_yoo_tasks[platform] = unity_yoo_task
+                            platform_dependency_task = unity_yoo_task
+                        end
+
+                        # 2.2 创建 Unity 导出任务（依赖上一个任务）
+                        unity_export_task = create_unity_export_task(platform, all_platform_configs)
+                        unity_export_task.dependencies << platform_dependency_task.id
+                        all_tasks << unity_export_task
 
-                        # 2. 创建构建任务（依赖导出任务）
-                        build_task = create_build_task(platform, platform_config, all_platform_configs, unity_task)
+                        # 2.3 创建构建任务（依赖导出任务）
+                        build_task = create_build_task(platform, platform_config, all_platform_configs, unity_export_task)
                         all_tasks << build_task
                         platform_build_tasks[platform] = build_task
                     end
 
-                    # 第二步：创建所有上传任务（最后添加，只依赖对应平台的构建任务）
-                    # 注意：create_upload_task 内部已设置 dependencies: [build_task.id]
+                    # 第三步：创建 Git 标签任务（依赖第一个平台的构建任务）
+                    # 注意：如果只有 web 平台，GitTagTask 已在前面创建，这里跳过
+                    unless only_web_platform
+                        first_build_task = platform_build_tasks[selected_platforms.first]
+                        if first_build_task
+                            git_tag_task = Pindo::TaskSystem::GitTagTask.new(
+                                Dir.pwd,
+                                release_branch: @args_release_branch,
+                                ver_inc: @args_ver_inc,
+                                tag_type: @args_tag_type,
+                                tag_pre: @args_tag_pre
+                            )
+                            git_tag_task.dependencies << first_build_task.id
+                            all_tasks << git_tag_task
+                        end
+                    end
+
+                    # 第四步：创建所有上传和消息发送任务（最后添加，只依赖对应平台的构建任务）
                     if @args_upload_flag
                         selected_platforms.each do |platform|
                             build_task = platform_build_tasks[platform]
+                            platform_config = all_platform_configs[platform]
+
+                            # 创建上传任务
                             upload_task = create_upload_task(platform, all_platform_configs, build_task)
                             all_tasks << upload_task
+
+                            # 创建消息发送任务（依赖上传任务）
+                            message_task = Pindo::TaskSystem::JPSMessageTask.new(
+                                nil,  # app_version_info 为 nil，从依赖任务获取
+                                app_info_obj: all_platform_configs["app_info_obj"],
+                                project_name: all_platform_configs["project_name"],
+                                send_message_type: @args_send_flag ? 'group' : 'self',
+                                data_dependencies: [upload_task.id]  # 从 upload_task 获取数据
+                            )
+                            message_task.dependencies << upload_task.id  # 执行顺序依赖
+                            all_tasks << message_task
                         end
                     end
 
@@ -261,7 +369,11 @@ module Pindo
                         send: @args_send_flag,
                         app_info_obj: all_platform_configs["app_info_obj"],      # 共享的项目信息
                         workflow_info: platform_config["workflow_info"],     # 平台特定的工作流
-                        project_path: platform_path
+                        project_path: platform_path,
+                        # Git 版本参数
+                        ver_inc: @args_ver_inc,
+                        tag_type: @args_tag_type,
+                        tag_pre: @args_tag_pre
                     }
 
                     # 设置平台特定参数
@@ -315,12 +427,9 @@ module Pindo
                         nil,
                         app_info_obj: all_platform_configs["app_info_obj"],  # 使用共享的项目信息
                         workflow_info: platform_config["workflow_info"],  # 使用平台特定的工作流
-                        project_name: all_platform_configs["project_name"],
-                        context: {
-                            send_to_chat: @args_send_flag  # 是否发送到测试群
-                        },
-                        dependencies: [build_task.id]  # 依赖构建任务
+                        project_name: all_platform_configs["project_name"]
                     )
+                    upload_task.dependencies << build_task.id  # 依赖构建任务
 
                     upload_task
                 end

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

@@ -9,9 +9,6 @@ module Pindo
   class Command
     class Unity < Command
       class Packpush < Unity
-        include Pindo::Githelper
-        extend Pindo::Executable
-        executable :git
 
         self.summary = 'NuGet: 将NuGet包到推送到JPS系统'
 
@@ -311,9 +308,9 @@ module Pindo
 
         def check_uncommitted_files(package_dir)
           # 获取未跟踪和已修改的文件
-          untracked_files = git!(%W(-C #{package_dir} ls-files --others --exclude-standard)).strip
-          modified_files = git!(%W(-C #{package_dir} diff --name-only)).strip
-          staged_files = git!(%W(-C #{package_dir} diff --cached --name-only)).strip
+          untracked_files = Pindo::GitHandler.git!(%W(-C #{package_dir} ls-files --others --exclude-standard)).strip
+          modified_files = Pindo::GitHandler.git!(%W(-C #{package_dir} diff --name-only)).strip
+          staged_files = Pindo::GitHandler.git!(%W(-C #{package_dir} diff --cached --name-only)).strip
 
           all_uncommitted = []
           all_uncommitted += untracked_files.split("\n").reject(&:empty?) if !untracked_files.empty?
@@ -386,8 +383,8 @@ module Pindo
 
             # 提交 .gitignore 的更改
             begin
-              git!(%W(-C #{package_dir} add .gitignore))
-              git!(%W(-C #{package_dir} commit -m "chore: 添加 build 目录到 .gitignore"))
+              Pindo::GitHandler.git!(%W(-C #{package_dir} add .gitignore))
+              Pindo::GitHandler.git!(%W(-C #{package_dir} commit -m "chore: 添加 build 目录到 .gitignore"))
               puts "✅ 已提交 .gitignore 更改"
             rescue => e
               puts "⚠️  提交 .gitignore 失败: #{e.message}"

data/lib/pindo/command/utils/repoinit.rb

@@ -6,8 +6,6 @@ module Pindo
     class Utils < Command
       class Repoinit < Utils
 
-        include Pindo::Githelper
-
         # 命令的简要说明 - 初始化git仓库配置
         self.summary = '初始化git仓库中git cliff的配置'