pindo 5.12.2 → 5.13.2

data/lib/pindo/options/helpers/bundleid_selector.rb

@@ -0,0 +1,103 @@
+require 'highline/import'
+
+module Pindo
+  module Options
+    module BundleIdSelector
+      # 选择开发环境的 Bundle ID
+      # @param build_type [String] 构建类型 (dev/adhoc/release)
+      # @return [String, nil] 选择的 Bundle ID
+      def self.select_bundleid(build_type)
+        case build_type
+        when 'adhoc', 'release'
+          select_deploy_bundleid
+        else
+          select_dev_bundleid
+        end
+      end
+
+      # 选择开发环境的 Bundle ID
+      # @return [String] 选择的 Bundle ID
+      def self.select_dev_bundleid
+        all_bundleid = load_dev_bundleids
+        return nil if all_bundleid.empty?
+
+        select_from_list(all_bundleid, "开发环境")
+      end
+
+      # 选择发布环境的 Bundle ID
+      # @return [String] 选择的 Bundle ID
+      def self.select_deploy_bundleid
+        all_bundleid = load_deploy_bundleids
+        return nil if all_bundleid.empty?
+
+        select_from_list(all_bundleid, "发布环境")
+      end
+
+      private
+
+      # 从列表中选择 Bundle ID
+      def self.select_from_list(bundleid_list, env_name)
+        cli = HighLine.new
+        puts
+        puts "可用的Bundle Id如下::"
+
+        bundleid_list.each_with_index do |bundleid, index|
+          puts "#{index + 1}. #{bundleid}"
+        end
+
+        choice = cli.ask("请选择使用的Bundle Id,请输入选项(1/2/3...):", Integer) do |q|
+          q.in = 1..bundleid_list.size
+        end
+
+        selected = bundleid_list[choice - 1]
+        puts "已选择 #{env_name} Bundle ID: #{selected}\n"
+        selected
+      end
+
+      # 加载开发环境的 Bundle ID 列表
+      def self.load_dev_bundleids
+        bundleids = []
+
+        # 从配置文件加载
+        config_file = File.join(pindo_env_configdir, 'bundleid_config.json')
+        if File.exist?(config_file)
+          begin
+            config = JSON.parse(File.read(config_file))
+            bundleids |= config['all_dev_bundleid'] if config['all_dev_bundleid']
+            bundleids |= config['all_tool_bundleid'] if config['all_tool_bundleid']
+          rescue => e
+            puts "加载 bundleid_config.json 失败: #{e.message}"
+          end
+        end
+
+        bundleids
+      end
+
+      # 加载发布环境的 Bundle ID 列表
+      def self.load_deploy_bundleids
+        bundleids = []
+
+        # 从配置文件加载
+        config_file = File.join(pindo_env_configdir, 'bundleid_config.json')
+        if File.exist?(config_file)
+          begin
+            config = JSON.parse(File.read(config_file))
+            bundleids |= config['all_release_bundleid'] if config['all_release_bundleid']
+          rescue => e
+            puts "加载 bundleid_config.json 失败: #{e.message}"
+          end
+        end
+
+        bundleids
+      end
+
+      # 获取 pindo 环境配置目录
+      def self.pindo_env_configdir
+        require_relative '../../config/pindoconfig'
+        Pindoconfig.instance.pindo_env_configdir
+      rescue
+        File.join(Dir.home, '.pindo', 'config')
+      end
+    end
+  end
+end

data/lib/pindo/options/options.rb

@@ -0,0 +1,14 @@
+# Pindo 参数管理模块统一入口
+# 提供统一的参数定义、解析、验证和全局访问功能
+
+# 核心组件 (core/)
+require 'pindo/options/core/option_item'
+require 'pindo/options/core/option_configuration'
+require 'pindo/options/core/option_value_parser'
+require 'pindo/options/core/option_initializer'
+require 'pindo/options/core/global_options_state'
+
+# 参数组 (groups/)
+require 'pindo/options/groups/option_group'
+require 'pindo/options/groups/build_options'
+require 'pindo/options/groups/jps_options'

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.12.2"
+  VERSION = "5.13.2"
 
   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.12.2
+  version: 5.13.2
 platform: ruby
 authors:
 - wade
@@ -297,6 +297,7 @@ files:
 - lib/pindo/base/deviceinfo.rb
 - lib/pindo/base/executable.rb
 - lib/pindo/base/funlog.rb
+- lib/pindo/base/git_handler.rb
 - lib/pindo/base/githelper.rb
 - lib/pindo/base/hashhelper.rb
 - lib/pindo/base/pindocontext.rb
@@ -315,44 +316,27 @@ files:
 - lib/pindo/command/android.rb
 - lib/pindo/command/android/autobuild.rb
 - lib/pindo/command/android/autoresign.rb
-- lib/pindo/command/android/build.rb
 - lib/pindo/command/android/keystore.rb
 - lib/pindo/command/appstore.rb
 - lib/pindo/command/appstore/adhocbuild.rb
+- lib/pindo/command/appstore/autobuild.rb
 - lib/pindo/command/appstore/autoresign.rb
+- lib/pindo/command/appstore/bundleid.rb
+- lib/pindo/command/appstore/cert.rb
+- lib/pindo/command/appstore/configproj.rb
+- lib/pindo/command/appstore/getitcinfo.rb
 - lib/pindo/command/appstore/iap.rb
-- lib/pindo/command/appstore/import.rb
+- lib/pindo/command/appstore/initconfig.rb
 - lib/pindo/command/appstore/itcapp.rb
+- lib/pindo/command/appstore/itcinfo.rb
 - lib/pindo/command/appstore/metadata.rb
+- lib/pindo/command/appstore/pem.rb
+- lib/pindo/command/appstore/pullconfig.rb
+- lib/pindo/command/appstore/quswark.rb
+- lib/pindo/command/appstore/quswauth.rb
 - lib/pindo/command/appstore/screenshots.rb
+- lib/pindo/command/appstore/tag.rb
 - lib/pindo/command/appstore/upload.rb
-- lib/pindo/command/deploy.rb
-- lib/pindo/command/deploy/build.rb
-- lib/pindo/command/deploy/bundleid.rb
-- lib/pindo/command/deploy/cert.rb
-- lib/pindo/command/deploy/check.rb
-- lib/pindo/command/deploy/configproj.rb
-- lib/pindo/command/deploy/confusecode.rb
-- lib/pindo/command/deploy/confuseproj.rb
-- lib/pindo/command/deploy/fabric.rb
-- lib/pindo/command/deploy/getitcinfo.rb
-- lib/pindo/command/deploy/iap.rb
-- lib/pindo/command/deploy/initconfig.rb
-- lib/pindo/command/deploy/itcapp.rb
-- lib/pindo/command/deploy/itcinfo.rb
-- lib/pindo/command/deploy/pem.rb
-- lib/pindo/command/deploy/pullconfig.rb
-- lib/pindo/command/deploy/pushconfig.rb
-- lib/pindo/command/deploy/quswark.rb
-- lib/pindo/command/deploy/quswauth.rb
-- lib/pindo/command/deploy/reportbug.rb
-- lib/pindo/command/deploy/resign.rb
-- lib/pindo/command/deploy/tag.rb
-- lib/pindo/command/deploy/updateconfig.rb
-- lib/pindo/command/deploy/uploadipa.rb
-- lib/pindo/command/dev/autobuild.rb
-- lib/pindo/command/dev/build.rb
-- lib/pindo/command/dev/debug.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb
 - lib/pindo/command/env/quarkenv.rb
@@ -397,6 +381,7 @@ files:
 - lib/pindo/command/utils/boss.rb
 - lib/pindo/command/utils/clearcert.rb
 - lib/pindo/command/utils/device.rb
+- lib/pindo/command/utils/fabric.rb
 - lib/pindo/command/utils/feishu.rb
 - lib/pindo/command/utils/icon.rb
 - lib/pindo/command/utils/renewcert.rb
@@ -404,11 +389,14 @@ files:
 - lib/pindo/command/utils/repoinit.rb
 - lib/pindo/command/utils/tag.rb
 - lib/pindo/command/utils/tgate.rb
+- lib/pindo/command/utils/updateconfig.rb
 - lib/pindo/command/utils/xcassets.rb
 - lib/pindo/command/utils/xcassets.sh
 - lib/pindo/command/web.rb
 - lib/pindo/command/web/autobuild.rb
 - lib/pindo/command/web/run.rb
+- lib/pindo/config/build_info_manager.rb
+- lib/pindo/config/ios_config_parser.rb
 - lib/pindo/config/pindoconfig.rb
 - lib/pindo/config/pindouserlocalconfig.rb
 - lib/pindo/module/android/android_build_helper.rb
@@ -424,6 +412,8 @@ files:
 - lib/pindo/module/appstore/appstore_in_app_purchase.rb
 - lib/pindo/module/appstore/appstore_metadata_connect_api_helper.rb
 - lib/pindo/module/appstore/appstore_metadata_fastlane_helper.rb
+- lib/pindo/module/appstore/bundleid_helper.rb
+- lib/pindo/module/appstore/itcapp_helper.rb
 - lib/pindo/module/build/build_helper.rb
 - lib/pindo/module/build/confuse_xcodeproj.rb
 - lib/pindo/module/build/git_repo_helper.rb
@@ -434,18 +424,26 @@ files:
 - lib/pindo/module/cert/keychain_helper.rb
 - lib/pindo/module/cert/pem_helper.rb
 - lib/pindo/module/cert/provisioning_helper.rb
-- lib/pindo/module/cert/xcodecerthelper.rb
+- lib/pindo/module/cert/xcode_cert_helper.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/appstore/appstore_task.rb
+- lib/pindo/module/task/model/appstore/appstore_upload_ipa_task.rb
+- lib/pindo/module/task/model/appstore/appstore_upload_metadata_task.rb
+- lib/pindo/module/task/model/appstore/appstore_upload_screenshot_task.rb
+- lib/pindo/module/task/model/build/android_build_adhoc_task.rb
+- lib/pindo/module/task/model/build/android_build_dev_task.rb
+- lib/pindo/module/task/model/build/android_build_gplay_task.rb
+- lib/pindo/module/task/model/build/android_build_task.rb
+- lib/pindo/module/task/model/build/ios_build_adhoc_task.rb
+- lib/pindo/module/task/model/build/ios_build_appstore_task.rb
+- lib/pindo/module/task/model/build/ios_build_dev_task.rb
+- lib/pindo/module/task/model/build/ios_build_task.rb
+- lib/pindo/module/task/model/build/web_build_dev_task.rb
 - lib/pindo/module/task/model/build_task.rb
 - lib/pindo/module/task/model/git_tag_task.rb
+- lib/pindo/module/task/model/jps_resign_task.rb
+- lib/pindo/module/task/model/jps_upload_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
 - lib/pindo/module/task/task_config.rb
 - lib/pindo/module/task/task_manager.rb
@@ -458,15 +456,25 @@ files:
 - lib/pindo/module/webserver/responsive_preview_handler.rb
 - lib/pindo/module/webserver/webgl_page_handler.rb
 - lib/pindo/module/webserver/webgl_server_helper.rb
+- lib/pindo/module/xcode/ipa_resign_helper.rb
 - lib/pindo/module/xcode/res/xcode_res_constant.rb
 - lib/pindo/module/xcode/res/xcode_res_handler.rb
+- lib/pindo/module/xcode/xcode_app_config.rb
 - lib/pindo/module/xcode/xcode_build_config.rb
 - lib/pindo/module/xcode/xcode_build_helper.rb
 - lib/pindo/module/xcode/xcode_project_helper.rb
 - lib/pindo/module/xcode/xcode_res_helper.rb
-- lib/pindo/module/xcode/xcodeappconfig.rb
-- lib/pindo/options/appconfigoptions.rb
-- lib/pindo/options/deployoptions.rb
+- lib/pindo/module/xcode/xcode_swark_helper.rb
+- lib/pindo/options/core/global_options_state.rb
+- lib/pindo/options/core/option_configuration.rb
+- lib/pindo/options/core/option_initializer.rb
+- lib/pindo/options/core/option_item.rb
+- lib/pindo/options/core/option_value_parser.rb
+- lib/pindo/options/groups/build_options.rb
+- lib/pindo/options/groups/jps_options.rb
+- lib/pindo/options/groups/option_group.rb
+- lib/pindo/options/helpers/bundleid_selector.rb
+- lib/pindo/options/options.rb
 - lib/pindo/version.rb
 homepage: https://gitee.com/test/pindo.git
 licenses:

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

@@ -1,186 +0,0 @@
-require 'highline/import'
-require 'fileutils'
-require 'json'
-require 'pindo/module/build/build_helper'
-require 'pindo/module/build/git_repo_helper'
-require 'pindo/module/android/android_build_helper'
-
-module Pindo
-  class Command
-    class Android < Command
-      class Build < Android
-
-        self.summary = '只编译APK不修改工程'
-        self.description = <<-DESC
-            只编译APK不修改工程
-
-            支持功能:
-
-                * 编译Android工程
-
-                * 生成APK文件
-
-                * 支持上传到JPS测试平台
-
-                * 支持发送测试通知
-
-            使用示例:
-
-                $ pindo android build                    # 编译APK
-
-                $ pindo android build --upload           # 编译并上传到JPS
-
-                $ pindo android build --send             # 编译、上传并发送通知
-
-                $ pindo android build --proj="My App"    # 指定项目名称
-        DESC
-
-        def self.options
-          [
-            ['--proj', '指定上传到测试平台的项目名称'],
-            ['--upload', '上传编译后的apk到测试平台'],
-            ['--send', '上传成功后发送测试通知'],
-          ].concat(super)
-        end
-
-        def initialize(argv)
-          @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
-
-          pindo_project_dir = Dir.pwd
-
-          build_helper = Pindo::BuildHelper.share_instance
-          project_type = build_helper.project_type(pindo_project_dir)
-
-          args_temp = []
-          args_temp << "--proj=#{@args_proj_name}" if @args_proj_name
-          args_temp << "--upload" if @args_upload_flag
-          args_temp << "--send" if @args_send_flag
-          case project_type
-          when :ios
-            raise Informative,  "iOS 工程， 请使用 pindo ios build"
-          when :android
-            android_build
-          when :unity
-              raise Informative,  "Unity 工程， 请使用 pindo unity apk"
-          else
-              raise Informative, "当前目录不是工程目录，不能编译"
-          end
-        end
-
-        def android_build
-          pindo_project_dir = Dir.pwd
-          build_helper = Pindo::BuildHelper.share_instance
-          if @args_upload_flag
-            git_repo_helper = Pindo::GitRepoHelper.share_instance
-            is_need_add_tag, tag_action_parms = git_repo_helper.check_is_need_add_tag?(pindo_project_dir)
-            if is_need_add_tag
-              git_repo_helper.create_and_push_tag(
-                project_dir: pindo_project_dir,
-                mode: 'minor',
-                force_retag: tag_action_parms&.include?('--retag') || false,
-                custom_tag: nil,
-                release_branch: 'master'
-              )
-            end
-          end
-          
-          app_info_obj = nil
-          workflow_info = nil
-          if @args_upload_flag
-              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'
-              )
-
-              # ===== 使用 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
-
-
-          android_build_helper = Pindo::AndroidBuildHelper.share_instance
-          
-          begin
-            apk_path = android_build_helper.auto_build_apk(pindo_project_dir, !@args_release_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 @args_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
-        end
-      end
-    end
-  end
-end