pindo 5.13.1 → 5.13.3

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.13.1"
+  VERSION = "5.13.3"
 
   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.13.1
+  version: 5.13.3
 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
@@ -318,40 +319,24 @@ files:
 - 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
@@ -396,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
@@ -403,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
@@ -423,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
@@ -433,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
@@ -457,15 +456,27 @@ 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/applovin_xcode_helper.rb
+- lib/pindo/module/xcode/cocoapods_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/appstore/import.rb

@@ -1,259 +0,0 @@
-require 'highline/import'
-require 'xcodeproj'
-require 'cocoapods'
-require 'find'
-require 'fileutils'
-require 'pindo/base/executable'
-require 'pindo/module/xcode/xcodeappconfig'
-require 'pindo/module/xcode/xcode_build_helper'
-
-module Pindo
-    class Command
-        class Appstore < Command
-            class Import < Appstore
-
-                include Command::DeployOptions
-                include Pindo::XcodeAppConfig
-                include Appselect
-
-                self.summary = '提交时设置Xcode工程编译参数'
-
-                self.description = <<-DESC
-                    提交时设置Xcode工程编译参数。
-
-                    支持功能:
-
-                        * 设置Xcode工程编译参数
-
-                        * 自动增加版本号
-
-                        * 支持编译后上传
-
-                    使用示例:
-
-                        $ pindo appstore import                    # 设置编译参数
-
-                        $ pindo appstore import --build            # 设置参数并编译
-
-                        $ pindo appstore import --upload           # 设置参数、编译并上传
-
-                        $ pindo appstore import --send             # 设置参数、编译、上传并发送通知
-                DESC
-
-                self.arguments = [
-                    CLAide::Argument.new('path/to/ipa', false),
-                ]
-
-                def self.options
-                    [
-                        ['--build', '修改完工程之后直接编译，用法：pindo appstore import --build'],
-                        ['--increase', '自动增加编译的app版本号，用法:pindo appstore import --increase'],
-                        ['--proj', '指定哪个项目(忽略大小写空格等等字符): --proj=\"prancksoundv4\"'],
-                        ['--upload', '编译完成后是否上传ipa到JPS: 用法:pindo appstore import --upload'],
-                        ['--send',  '上传到之后是否发送测试信息,用法:pindo appstore import --send'],
-                        ['--resign',  '上传到之后是否发送测试信息,用法:pindo appstore import --resign'],
-
-
-                    ].concat(super)
-                end
-
-                def initialize(argv)
-                    @build_flag = argv.flag?('build', false)
-                    @args_increase_flag = argv.flag?('increase', false)
-
-                    @args_upload_flag = argv.flag?('upload', false)
-                    @args_send_flag = argv.flag?('send', false)
-                    @args_resign_flag = argv.flag?('resign', false)
-                    @args_proj_name = argv.option('proj')
-
-                    if @args_resign_flag
-                        @args_send_flag = true
-                    end
-
-                    if @args_send_flag
-                        @args_upload_flag = true
-                        @build_flag = true
-                    end
-
-                    super
-                end
-
-                def run
-
-
-                    build_type_array = @config_json["project_info"]["xcode_build_type"].split("_") || []
-                    @args_nocreate_flag = false
-                    @args_quswark_flag = false
-                    @args_normal_flag = false
-
-                    if build_type_array.include?("nocreate")
-                        @args_nocreate_flag = true
-                    end
-
-                    if build_type_array.include?("normal")
-                        @args_normal_flag = true
-                    end
-                    if build_type_array.include?("quark") || build_type_array.include?("swark")
-                        @args_quswark_flag = true
-                    end
-
-
-
-                    clone_pindo_common_config_repo(force_delete:false)
-                    clone_pindo_env_config_repo(force_delete:false)
-
-                    Pindo::VersionCheck::check_pindo_force_upgrade()
-
-                    import_fun
-
-                end
-
-                def import_fun
-
-                    current_dir = Dir.pwd
-                    pindo_dir = File::expand_path(pindo_single_config.pindo_dir)
-                    app_config_dir = File.join(pindo_dir, @deploy_identifier)
-
-                    args_temp = []
-                    args_temp << @args_appconfig
-                    args_temp = args_temp | @args_array
-
-                    @args_appstore_flag = true
-                    args = get_build_type_args()
-                    args_temp = args_temp | args
-
-                    pindo_new_project_dir = Dir.pwd
-
-                    if @args_increase_flag
-                        auto_increase_buildnumber(app_config_file:File.join(pindo_new_project_dir, "config.json"))
-                        app_config_repo_dir = File.join(pindo_single_config.pindo_dir, @deploy_identifier)
-                        auto_increase_buildnumber(app_config_file:File.join(app_config_repo_dir, "config.json"))
-                        git_addpush_repo(path:app_config_repo_dir, message:"increate build number", commit_file_params:["config.json"])
-                    end
-
-
-
-                    build_verify_file = File.join(app_config_dir, "build_verify.json")
-                    build_verify_json = nil
-
-                    begin
-                        build_verify_json = JSON.parse(File.read(build_verify_file))
-                    rescue => error
-                        build_verify_json = nil
-                    end
-
-                    release_code_commit = git_latest_commit_id(local_repo_dir:pindo_new_project_dir)
-                    if !release_code_commit.nil? && !build_verify_json.nil? && !build_verify_json["output_code_commit"].nil?
-                        output_code_commit = build_verify_json["output_code_commit"]
-                        if !release_code_commit.eql?(output_code_commit)
-
-                            puts
-                            puts
-                            puts "不是最新代码，请更新代码 ！！！"
-                            puts "不是最新代码，请更新代码 ！！！"
-                            puts
-                            answer = agree("请确认要用当前代码编译:(commit: #{release_code_commit}) (Y/n）:")
-                            if answer
-
-                            else
-                                raise Informative,  "请更新代码重新打包！！！"
-                            end
-
-                        end
-                    end
-
-                    Dir.chdir(pindo_new_project_dir)
-
-                    pod_lock_file = File.join(pindo_new_project_dir, "Podfile.lock")
-                    begin
-                        FileUtils.rm_rf(pod_lock_file)
-                        FileUtils.rm_rf(File.join(pindo_new_project_dir, "Pods"))
-                    rescue StandardError => e
-                    end
-
-                    Pindo::Command::Deploy::Configproj::run(args_temp)
-
-                    if File.exist?(File.join(pindo_new_project_dir, "Podfile"))
-
-                        Pindo::XcodeBuildHelper.pull_podfile_lock(project_dir:pindo_new_project_dir, app_config_dir:app_config_dir)
-                        Pindo::Command::Ios::Podupdate::run([])
-                        begin
-                            remove_test_pod_modue(project_dir:pindo_new_project_dir)
-                            Pod::Command::Install::run([])
-                        rescue => error
-                            puts(error.to_s)
-                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
-                        end
-
-
-                        pod_lock_file = File.join(pindo_new_project_dir, "Podfile.lock")
-                        if !File.exist?(pod_lock_file)
-                            raise Informative, "pod install失败！！先pod install 完成后成编译 !"
-                        end
-                    end
-
-                    if @args_quswark_flag
-                        Dir.chdir(pindo_new_project_dir)
-                        Pindo::Command::Deploy::Quswark::run([])
-                    end
-                    Dir.chdir(pindo_new_project_dir)
-                    Pindo::Command::Deploy::Cert::run(args_temp)
-                    Pindo::Command::Deploy::Tag::run(args_temp)
-
-
-                    pod_lock_json = Pod::YAMLHelper.load_file(pod_lock_file)
-                    pods_array = []
-                    if !pod_lock_json["SPEC REPOS"].nil?
-                        pod_lock_json["SPEC REPOS"].each do |source, pod_items|
-                            pods_array += pod_items
-                        end
-                    end
-
-                    if pods_array.include?("FancyAD") || pods_array.include?("AppLovinSDK")
-                        puts
-                        puts "Run Applovin Script ..."
-                        Dir.chdir(pindo_new_project_dir)
-                        applovin_args = []
-                        applovin_args << "--appstore"
-                        applovin_args << "--install"
-                        Pindo::Command::Ios::Applovin::run(applovin_args)
-                    end
-
-                    if @build_flag
-                        Dir.chdir(pindo_new_project_dir)
-                        if @args_upload_flag
-                            args_temp << "--upload"
-                            args_temp << "--proj=#{@args_proj_name}"
-                        end
-                        if @args_send_flag
-                            args_temp << "--send"
-                        end
-
-                        if @args_resign_flag
-                            args_temp << "--resign"
-                            if  @config_json && @config_json['project_info'] && @config_json['project_info']['app_type']
-                                output_repo_name = get_deploy_repo_with_modul_name(module_name:@config_json['project_info']['app_type'])
-                                if output_repo_name.nil? || output_repo_name == ""
-                                    raise Informative, "config.json app_type is error!!!"
-                                end
-                                output_config_dir = clong_buildconfig_repo(repo_name: output_repo_name)
-                                args_bundle_id = get_setting_bundleid_withdir(repo_dir:output_config_dir)
-                                args_temp << "--certid=#{args_bundle_id}"
-                            end
-                        end
-
-                        Pindo::Command::Deploy::Build::run(args_temp)
-                    end
-
-                    Dir.chdir(current_dir)
-                    puts "Buiid Done !!!"
-                    puts "#{pindo_new_project_dir}"
-                    system "open #{pindo_new_project_dir}"
-
-                end
-
-
-            end
-        end
-    end
-end