pindo 5.13.9 → 5.13.10

data/lib/pindo/command/android/autoresign.rb

@@ -1,332 +1,33 @@
-require 'highline/import'
-require 'fileutils'
-require 'pindo/base/executable'
-
 module Pindo
-    class Command
-        class Android < Command
-            class Autoresign < Android
-
-                include Appselect
-
-                self.summary = 'APK包重签名工具'
-
-                self.description = <<-DESC
-                    使用指定的keystore重新签名APK包。
-
-                    支持功能:
-
-                        * 自动查找APK文件
-
-                        * 使用debug或release keystore签名
-
-                        * 支持指定APK路径
-
-                        * 支持上传到JPS测试平台
-
-                        * 支持发送测试通知
-
-                        * 自动zipalign优化
-
-                    使用示例:
-
-                        $ pindo and autoresign                   # 重签名当前目录下的APK
-
-                        $ pindo and autoresign demo.apk          # 重签名指定APK文件
-
-                        $ pindo and autoresign --release         # 使用release keystore签名
-
-                        $ pindo and autoresign --adhoc           # 使用adhoc keystore签名
-
-                        $ pindo and autoresign --upload          # 重签名并上传到JPS
-
-                        $ pindo and autoresign --send            # 重签名、上传并发送通知
-                DESC
-
-                self.arguments = [
-                    CLAide::Argument.new('path/to/demo.apk', true),
-                ]
-
-                def self.options
-                    [
-                        ['--apk',      '指定要重签名的APK文件路径'],
-                        ['--release',  '使用release keystore签名'],
-                        ['--adhoc',    '使用adhoc keystore签名(默认)'],
-                        ['--proj',     '指定上传到测试平台的项目名称'],
-                        ['--upload',   '上传重签名后的APK到测试平台'],
-                        ['--send',     '上传成功后发送测试通知'],
-                    ].concat(super)
-                end
-
-                def initialize(argv)
-                    @args_apk_file = argv.shift_argument
-                    @args_set_apk_name = argv.option('apk')
-                    @args_release_flag = argv.flag?('release', false)
-                    @args_adhoc_flag = argv.flag?('adhoc', true)
-
-                    @args_upload_flag = argv.flag?('upload', false)
-                    @args_send_flag = argv.flag?('send', false)
-                    @args_proj_name = argv.option('proj')
-
-                    if @args_send_flag
-                        @args_upload_flag = true
-                    end
-
-                    super
-                    @additional_args = argv.remainder!
-                end
-
-                def run
-                    # 查找APK文件
-                    apk_file_name = find_apk_file
-
-                    if apk_file_name.nil? || !File.exist?(apk_file_name)
-                        Funlog.instance.fancyinfo_error("未找到APK文件")
-                        return
-                    end
-
-                    puts
-                    puts "正在重签名的APK: #{apk_file_name}"
-                    puts "文件大小: #{(File.size(apk_file_name) / 1024.0 / 1024.0).round(2)} MB"
-                    puts "修改时间: #{File.mtime(apk_file_name)}"
-                    puts
-
-                    # 获取keystore配置
-                    keystore_info = get_keystore_info
-
-                    if keystore_info.nil?
-                        Funlog.instance.fancyinfo_error("无法获取keystore配置")
-                        return
-                    end
-
-                    # 执行重签名
-                    resigned_apk = resign_apk(apk_file_name, keystore_info)
-
-                    if resigned_apk.nil?
-                        Funlog.instance.fancyinfo_error("重签名失败")
-                        return
-                    end
-
-                    puts
-                    Funlog.instance.fancyinfo_success("重签名成功: #{resigned_apk}")
-                    puts
-
-                    # 上传到JPS
-                    if @args_upload_flag
-                        upload_to_jps(resigned_apk)
-                    end
-                end
+  class Command
+    class Android < Command
+      class Autoresign < Android
 
-                private
+        # TODO: 待实现
+        self.summary = 'APK包重签名工具（暂未实现）'
 
-                def find_apk_file
-                    apk_file_name = @args_apk_file
-                    if !@args_set_apk_name.nil?
-                        apk_file_name = @args_set_apk_name
-                    end
+        self.description = <<-DESC
+            使用指定的keystore重新签名APK包。
 
-                    if !apk_file_name.nil? && File.exist?(apk_file_name)
-                        return apk_file_name
-                    end
+            注意: 此命令暂未实现。
+        DESC
 
-                    # 查找当前目录下最新的APK文件
-                    current_dir = Dir.pwd
-                    apk_files = Dir.glob(File.join(current_dir, "*.apk"))
+        self.arguments = []
 
-                    # 排除已经重签名的文件，优先选择最新的
-                    apk_file_name = apk_files.max_by do |f|
-                        if File.basename(f).include?("_resigned")
-                            Time.local(0, 1, 1)
-                        else
-                            File.mtime(f)
-                        end
-                    end
-
-                    return apk_file_name
-                end
-
-                def get_keystore_info
-                    # 根据参数确定使用哪个keystore
-                    keystore_type = @args_release_flag ? "release" : "adhoc"
-
-                    # 从配置中获取keystore信息
-                    config_json = load_config_json
-                    return nil if config_json.nil?
-
-                    keystore_info = {}
-
-                    if keystore_type == "release"
-                        keystore_info[:path] = config_json['app_android_keystore_release']
-                        keystore_info[:password] = config_json['app_android_keystore_release_password']
-                        keystore_info[:alias] = config_json['app_android_keystore_release_alias']
-                        keystore_info[:alias_password] = config_json['app_android_keystore_release_alias_password']
-                    else
-                        keystore_info[:path] = config_json['app_android_keystore_adhoc']
-                        keystore_info[:password] = config_json['app_android_keystore_adhoc_password']
-                        keystore_info[:alias] = config_json['app_android_keystore_adhoc_alias']
-                        keystore_info[:alias_password] = config_json['app_android_keystore_adhoc_alias_password']
-                    end
-
-                    # 验证keystore文件存在
-                    if keystore_info[:path].nil? || !File.exist?(keystore_info[:path])
-                        Funlog.instance.fancyinfo_error("Keystore文件不存在: #{keystore_info[:path]}")
-                        return nil
-                    end
-
-                    puts "使用Keystore: #{keystore_info[:path]}"
-                    puts "Keystore类型: #{keystore_type}"
-
-                    return keystore_info
-                end
-
-                def resign_apk(apk_file, keystore_info)
-                    # 准备输出文件名
-                    base_name = File.basename(apk_file, ".apk")
-                    output_dir = File.dirname(apk_file)
-
-                    # 生成临时文件名
-                    unsigned_apk = File.join(output_dir, "#{base_name}_unsigned.apk")
-                    aligned_apk = File.join(output_dir, "#{base_name}_aligned.apk")
-                    resigned_apk = File.join(output_dir, "#{base_name}_resigned.apk")
-
-                    begin
-                        # 1. 移除原有签名
-                        puts "1. 移除原有签名..."
-                        FileUtils.cp(apk_file, unsigned_apk)
-                        system("zip -d \"#{unsigned_apk}\" META-INF/\\* > /dev/null 2>&1")
-
-                        # 2. zipalign优化
-                        puts "2. 执行zipalign优化..."
-                        zipalign_cmd = "zipalign -v 4 \"#{unsigned_apk}\" \"#{aligned_apk}\""
-
-                        if !system(zipalign_cmd)
-                            # 如果zipalign失败，尝试使用Android SDK中的zipalign
-                            android_home = ENV['ANDROID_HOME'] || ENV['ANDROID_SDK_ROOT']
-                            if android_home
-                                build_tools_dir = Dir.glob(File.join(android_home, "build-tools", "*")).max
-                                if build_tools_dir
-                                    zipalign_path = File.join(build_tools_dir, "zipalign")
-                                    if File.exist?(zipalign_path)
-                                        zipalign_cmd = "\"#{zipalign_path}\" -v 4 \"#{unsigned_apk}\" \"#{aligned_apk}\""
-                                        system(zipalign_cmd)
-                                    end
-                                end
-                            else
-                                # 如果没有zipalign，直接使用未对齐的APK
-                                FileUtils.cp(unsigned_apk, aligned_apk)
-                            end
-                        end
-
-                        # 3. 使用apksigner重新签名
-                        puts "3. 重新签名APK..."
-                        apksigner_cmd = [
-                            "apksigner", "sign",
-                            "--ks", keystore_info[:path],
-                            "--ks-pass", "pass:#{keystore_info[:password]}",
-                            "--ks-key-alias", keystore_info[:alias],
-                            "--key-pass", "pass:#{keystore_info[:alias_password]}",
-                            "--out", resigned_apk,
-                            aligned_apk
-                        ].join(" ")
-
-                        if !system(apksigner_cmd)
-                            # 如果apksigner失败，尝试使用jarsigner
-                            puts "尝试使用jarsigner..."
-                            jarsigner_cmd = [
-                                "jarsigner",
-                                "-verbose",
-                                "-sigalg", "SHA256withRSA",
-                                "-digestalg", "SHA-256",
-                                "-keystore", keystore_info[:path],
-                                "-storepass", keystore_info[:password],
-                                "-keypass", keystore_info[:alias_password],
-                                aligned_apk,
-                                keystore_info[:alias]
-                            ].join(" ")
-
-                            if system(jarsigner_cmd)
-                                FileUtils.mv(aligned_apk, resigned_apk)
-                            else
-                                Funlog.instance.fancyinfo_error("签名失败")
-                                return nil
-                            end
-                        end
-
-                        # 4. 验证签名
-                        puts "4. 验证签名..."
-                        verify_cmd = "apksigner verify \"#{resigned_apk}\""
-                        if !system(verify_cmd)
-                            # 尝试使用jarsigner验证
-                            system("jarsigner -verify \"#{resigned_apk}\"")
-                        end
-
-                        return resigned_apk
-
-                    ensure
-                        # 清理临时文件
-                        FileUtils.rm_f(unsigned_apk) if File.exist?(unsigned_apk)
-                        FileUtils.rm_f(aligned_apk) if File.exist?(aligned_apk)
-                    end
-                end
-
-                def upload_to_jps(apk_file)
-                    # 上传到JPS平台
-                    Funlog.instance.fancyinfo_start("开始上传到JPS测试平台...")
-
-                    upload_params = [apk_file]
-                    upload_params << "--proj=#{@args_proj_name}" if @args_proj_name
-                    upload_params << "--send" if @args_send_flag
-
-                    # 调用jps upload命令
-                    Pindo::Command::Jps::Upload.run(upload_params)
-
-                    Funlog.instance.fancyinfo_success("上传完成")
-                end
-
-                def load_config_json
-                    # 查找并加载配置文件
-                    config_file = find_config_file
-                    return nil if config_file.nil?
-
-                    begin
-                        config_json = JSON.parse(File.read(config_file))
-                        return config_json
-                    rescue => e
-                        Funlog.instance.fancyinfo_error("解析配置文件失败: #{e.message}")
-                        return nil
-                    end
-                end
-
-                def find_config_file
-                    current_dir = Dir.pwd
-
-                    # 查找顺序：当前目录 -> 父目录（向上查找）
-                    while current_dir != "/"
-                        config_file = File.join(current_dir, "config.json")
-                        if File.exist?(config_file)
-                            return config_file
-                        end
-
-                        # 检查.pindo目录
-                        pindo_config = File.join(current_dir, ".pindo", "config.json")
-                        if File.exist?(pindo_config)
-                            return pindo_config
-                        end
-
-                        current_dir = File.dirname(current_dir)
-                    end
-
-                    # 使用默认配置
-                    default_config = pindo_single_config.app_config_dir
-                    if default_config && File.exist?(default_config)
-                        config_file = File.join(default_config, "config.json")
-                        return config_file if File.exist?(config_file)
-                    end
+        def self.options
+          [].concat(super)
+        end
 
-                    return nil
-                end
+        def initialize(argv)
+          super
+        end
 
-            end
+        def run
+          # TODO: 待实现
+          raise Informative, "pindo android autoresign 命令暂未实现"
         end
+
+      end
     end
-end
+  end
+end

data/lib/pindo/command/android/keystore.rb

@@ -1,153 +1,30 @@
-require 'fileutils'
-
 module Pindo
   class Command
     class Android < Command
       class Keystore < Android
 
-        # Android签名管理工具
-        self.summary = 'Android签名密钥(keystore)管理工具'
+        # TODO: 待实现
+        self.summary = 'Android签名密钥(keystore)管理工具（暂未实现）'
 
-        # 详细说明
         self.description = <<-DESC
             Android签名密钥(keystore)管理和配置工具。
 
-            支持功能:
-
-                * 管理Debug和Release签名密钥
-
-                * 配置工程签名设置
-
-                * 支持AdHoc模式签名
-
-                * 从配置仓库获取签名文件
-
-            使用示例:
-
-                $ pindo android keystore                 # 使用Debug模式签名
-
-                $ pindo android keystore --release       # 使用Release模式签名
-
-                $ pindo android keystore --adhoc         # 使用AdHoc模式签名
+            注意: 此命令暂未实现，请使用 pindo android autobuild 命令。
         DESC
 
-        # 命令参数
-        self.arguments = [
-          # 暂无参数
-        ]
+        self.arguments = []
 
-        # 命令选项
         def self.options
-          [
-            ['--adhoc', '使用adhoc模式'],
-            ['--release', '使用release模式'],
-          ].concat(super)
+          [].concat(super)
         end
 
         def initialize(argv)
-          @args_release_flag = argv.flag?('release', false)
-          @upload_flag = argv.flag?('upload', false)
-          @send_flag = argv.flag?('send', false)
-          @proj_name = argv.option('proj')
-          @args_dsign_flag = argv.flag?('dsign', false)
-          if @send_flag
-            @upload_flag = true
-          end
-          @args_direct_flag = argv.flag?('direct', false)
-
           super
         end
 
         def run
-          pindo_project_dir = Dir.pwd
-
-          # # 如果设置了 dsign 标志，则执行签名文件获取并直接返回
-          # if @args_dsign_flag
-          #   Pindo::AndroidBuildHelper.share_instance.dsign(pindo_project_dir, !@args_release_flag)
-          #   return
-          # end
-
-
-          app_info_obj = nil
-          workflow_info = nil
-          if @upload_flag
-              proj_name = @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'
-              )
-
-              # ===== 使用 workflow 配置更新 Android 项目 =====
-              if workflow_info && workflow_info[:package_name]
-                workflow_packname = workflow_info[:package_name]
-
-                puts "\n使用工作流配置更新 Android 项目:"
-                puts "  Workflow Package Name: #{workflow_packname}"
-
-                # 一次性更新 App Name、Application ID 和 URL Schemes
-                Pindo::AndroidConfigHelper.update_project_with_workflow(
-                  project_dir: pindo_project_dir,
-                  workflow_packname: workflow_packname
-                )
-
-                # 添加基于 Application ID 的 Scheme（在 workflow 设置完成后）
-                Pindo::AndroidConfigHelper.add_application_id_based_scheme(
-                  project_dir: pindo_project_dir
-                )
-              else
-                raise Informative, "未获取到工作流信息"
-              end
-          end
-
-          begin
-            apk_path = Pindo::AndroidBuildHelper.share_instance.auto_build_apk(pindo_project_dir, !@args_release_flag, @args_direct_flag)
-            ipa_file_upload = Dir.glob(apk_path).max_by {|f| File.mtime(f)}
-
-            if !ipa_file_upload.nil? && !app_info_obj.nil?
-                description = nil
-                result_data = PgyerHelper.share_instace.start_upload(
-                    app_info_obj: app_info_obj,
-                    ipa_file_upload: ipa_file_upload,
-                    description: description,
-                    workflow_info: workflow_info
-                )
-                if !result_data.nil? && !result_data["data"].nil? && !result_data["data"]["id"].nil?
-                    PgyerHelper.share_instace.print_app_version_info(
-                        app_info_obj: app_info_obj,
-                        app_version_info_obj: result_data["data"]
-                    )
-                    if @send_flag
-                        # 始终发送给自己
-                        PgyerHelper.share_instace.send_apptest_msg(
-                            app_info_obj: app_info_obj,
-                            app_version_info_obj: result_data["data"],
-                            receiveType: "self"
-                        )
-
-                        # 额外发送到测试群
-                        PgyerHelper.share_instace.send_apptest_msg(
-                            app_info_obj: app_info_obj,
-                            app_version_info_obj: result_data["data"],
-                            chatEnv: "DevTest",
-                            receiveType: "chat"
-                        )
-                    end
-                end
-            end
-
-            # 只在构建成功完成时弹出目标文件夹
-            puts "\e[32m构建完成！正在打开目标文件夹...\e[0m"
-            system "open #{pindo_project_dir}"
-            
-          rescue => e
-            puts "\e[31m构建失败: #{e.message}\e[0m"
-            puts "\e[33m正在打开项目文件夹以便检查错误...\e[0m"
-            system "open #{pindo_project_dir}"
-            raise e
-          end
-
+          # TODO: 待实现
+          raise Informative, "pindo android keystore 命令暂未实现，请使用 pindo android autobuild"
         end
 
       end

data/lib/pindo/command/appstore/adhocbuild.rb

@@ -4,12 +4,11 @@ require 'find'
 require 'fileutils'
 require 'pindo/base/executable'
 require 'pindo/module/build/build_helper'
-require 'pindo/module/build/version_helper'
+require 'pindo/module/build/git_repo_helper'
 require 'pindo/module/xcode/xcode_build_config'
 require 'pindo/module/xcode/xcode_build_helper'
 require 'pindo/config/ios_config_parser'
 require 'pindo/config/build_info_manager'
-require 'pindo/base/pindocontext'
 require 'pindo/module/task/task_manager'
 require 'pindo/module/task/model/unity/unity_config_task'
 require 'pindo/module/task/model/unity/unity_update_task'
@@ -80,7 +79,8 @@ module Pindo
           @option_items ||= begin
             items = Pindo::Options::OptionGroup.merge(
               Pindo::Options::BuildOptions.select(:bundleid),
-              Pindo::Options::JPSOptions.select(:proj, :upload, :send)
+              Pindo::Options::JPSOptions.select(:proj, :upload, :send),
+              Pindo::Options::UnityOptions.all
             )
 
             # 添加 increase 参数
@@ -98,12 +98,7 @@ module Pindo
 
         # 命令的选项列表
         def self.options
-          # 转换为 CLAide 格式
-          option_items.map { |item| item.to_claide_option }.concat([
-            ['--skipconfig', '跳过Unity编译模式配置（加快构建速度）'],
-            ['--skiplib', '跳过Unity必备库更新（加快构建速度）'],
-            ['--skipyoo', '跳过YooAsset资源打包（加快构建速度）']
-          ]).concat(super)
+          option_items.map(&:to_claide_option).concat(super)
         end
 
         def initialize(argv)
@@ -138,11 +133,7 @@ module Pindo
 
           begin
             # 加载 JPS 配置（如果存在）
-            context = Pindo::PindoContext.instance
-            context.load_and_apply_jps_config(pindo_project_dir)
-
-            # 注意：参数缓存已在 initialize 中通过 GlobalOptionsState 处理
-            # 不再使用 PindoContext 的缓存机制
+            Pindo::BuildHelper.share_instance.load_jps_build_config(pindo_project_dir)
 
             # 处理配置文件
             prepare_config(pindo_project_dir)