pindo 5.18.4 → 5.18.5

data/lib/pindo/options/groups/build_options.rb

@@ -48,16 +48,17 @@ module Pindo
           build_type: OptionItem.new(
             key: :build_type,
             name: '构建类型',
-            description: '指定构建类型（dev/adhoc/appstore/developer_id）',
+            description: '构建类型: dev(开发), adhoc(测试), release/appstore(发布), developer_id(macOS)',
             type: String,
             env_name: 'PINDO_BUILD_TYPE',
             default_value: nil,
             optional: true,
+            cacheable: true,
             verify_block: proc do |value|
-              next if value.nil?  # 允许 nil 值
-              valid_types = ['dev', 'adhoc', 'appstore', 'developer_id']
+              next if value.nil?
+              valid_types = %w[dev development adhoc release appstore developer_id develop_id]
               unless valid_types.include?(value.to_s.downcase)
-                raise "构建类型错误: #{value}，必须是 #{valid_types.join('、')} 之一"
+                raise "构建类型错误: #{value}，必须是 #{valid_types.join(', ')} 之一"
               end
             end,
             example: 'pindo ios autobuild --build_type=appstore'
@@ -82,6 +83,83 @@ module Pindo
             optional: true,
             cacheable: false,
             example: 'pindo unity autobuild --types=ipa,apk'
+          ),
+
+          dev: OptionItem.new(
+            key: :dev,
+            name: '开发模式',
+            description: '使用开发证书构建（等价于 --build_type=dev）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BUILD_DEV',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore cert --dev'
+          ),
+
+          adhoc: OptionItem.new(
+            key: :adhoc,
+            name: 'AdHoc 模式',
+            description: '使用 AdHoc 证书构建 iOS（等价于 --build_type=adhoc）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BUILD_ADHOC',
+            default_value: false,
+            optional: true,
+            example: 'pindo unity autobuild --adhoc'
+          ),
+
+          release: OptionItem.new(
+            key: :release,
+            name: 'Release 模式',
+            description: '使用 Release/发布模式构建（等价于 --build_type=release）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BUILD_RELEASE',
+            default_value: false,
+            optional: true,
+            example: 'pindo android autobuild --release'
+          ),
+
+          develop_id: OptionItem.new(
+            key: :develop_id,
+            name: 'Developer ID 模式',
+            description: '使用 macOS Developer ID 证书（等价于 --build_type=developer_id，仅 macOS）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BUILD_DEVELOP_ID',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore cert --develop_id --platform=macos'
+          ),
+
+          skipclean: OptionItem.new(
+            key: :skipclean,
+            name: '跳过 Gradle Clean',
+            description: '跳过 Android AAB 构建前的 Gradle clean 步骤（加速本地开发）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_SKIP_GRADLE_CLEAN',
+            default_value: false,
+            optional: true,
+            example: 'pindo android autobuild --skipclean'
+          ),
+
+          skipvalidate: OptionItem.new(
+            key: :skipvalidate,
+            name: '跳过 Unity 库校验',
+            description: '跳过 Unity unityLibrary/libs 符号链接有效性校验',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_SKIP_UNITY_LIBS_VALIDATE',
+            default_value: false,
+            optional: true,
+            example: 'pindo android autobuild --skipvalidate'
+          ),
+
+          injectsigning: OptionItem.new(
+            key: :injectsigning,
+            name: '注入签名配置',
+            description: '注入签名配置到 Android build.gradle（自动改写 signingConfigs）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_INJECT_ANDROID_SIGNING_GRADLE',
+            default_value: false,
+            optional: true,
+            example: 'pindo android autobuild --injectsigning'
           )
         }
       end

data/lib/pindo/options/groups/cert_options.rb

@@ -32,58 +32,6 @@ module Pindo
             example: 'pindo appstore cert --config=/path/config.json'
           ),
 
-          build_type: OptionItem.new(
-            key: :build_type,
-            name: '构建类型',
-            description: '构建类型: dev/development(开发), adhoc(测试), release/appstore(发布), developer_id/develop_id(macOS)',
-            type: String,
-            env_name: 'PINDO_BUILD_TYPE',
-            default_value: nil,
-            optional: true,
-            cacheable: true,
-            verify_block: proc do |value|
-              next if value.nil?  # 允许 nil 值
-              unless BUILD_TYPES.include?(value.to_s.downcase)
-                raise "构建类型错误: #{value}，必须是 #{BUILD_TYPES.join(', ')} 之一"
-              end
-            end,
-            example: 'pindo appstore cert --build_type=dev'
-          ),
-
-          # 证书类型快捷方式（等价于 --build_type）
-          dev: OptionItem.new(
-            key: :dev,
-            name: '使用开发证书',
-            description: '使用开发证书（等价于 --build_type=dev）',
-            type: OptionItem::Boolean,
-            env_name: 'PINDO_CERT_DEV',
-            optional: true,
-            default_value: false,
-            example: 'pindo appstore cert --dev'
-          ),
-
-          adhoc: OptionItem.new(
-            key: :adhoc,
-            name: '使用 AdHoc 证书',
-            description: '使用 AdHoc 证书（等价于 --build_type=adhoc）',
-            type: OptionItem::Boolean,
-            env_name: 'PINDO_CERT_ADHOC',
-            optional: true,
-            default_value: false,
-            example: 'pindo appstore cert --adhoc'
-          ),
-
-          develop_id: OptionItem.new(
-            key: :develop_id,
-            name: '使用 Developer ID 证书',
-            description: '使用 macOS Developer ID Application 证书（等价于 --build_type=developer_id，仅 macOS）',
-            type: OptionItem::Boolean,
-            env_name: 'PINDO_CERT_DEVELOP_ID',
-            optional: true,
-            default_value: false,
-            example: 'pindo appstore cert --develop_id --platform=macos'
-          ),
-
           renew: OptionItem.new(
             key: :renew,
             name: '重新生成证书',

data/lib/pindo/options/groups/common_options.rb

@@ -0,0 +1,27 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # 通用参数组
+    # 定义跨命令共享的通用参数（如 login、force、auto 等常见操作参数）
+    module CommonOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+          force: OptionItem.new(
+            key: :force,
+            name: '强制执行',
+            description: '强制执行操作，跳过确认或验证',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_FORCE',
+            default_value: false,
+            optional: true,
+            example: 'pindo unity packpush --force'
+          )
+        }
+      end
+    end
+  end
+end

data/lib/pindo/options/groups/global_options.rb

@@ -0,0 +1,18 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # 全局行为参数组
+    # 控制 pindo 运行时的全局行为（调试、缓存、UI、版本检查等）
+    # 与 CommonOptions（命令级共享参数）不同，GlobalOptions 影响所有命令的运行环境
+    module GlobalOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+        }
+      end
+    end
+  end
+end

data/lib/pindo/options/groups/ios_tool_options.rb

@@ -0,0 +1,60 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # iOS 工具命令参数组
+    # 定义 iOS 专属工具命令的参数（fixproj、applovin 等）
+    module IosToolOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+          allproj: OptionItem.new(
+            key: :allproj,
+            name: '批量修复',
+            description: '扫描当前目录及 GoodPlatform/BaseiOS 下的所有 iOS 项目并修复',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_ALL_PROJ',
+            default_value: false,
+            optional: true,
+            example: 'pindo ios fixproj --allproj'
+          ),
+
+          appstore: OptionItem.new(
+            key: :appstore,
+            name: 'App Store 模式',
+            description: 'App Store 模式（一般不使用）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_IOS_APPSTORE',
+            default_value: false,
+            optional: true,
+            example: 'pindo ios applovin --appstore'
+          ),
+
+          install: OptionItem.new(
+            key: :install,
+            name: '安装',
+            description: '运行安装脚本',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_IOS_INSTALL',
+            default_value: false,
+            optional: true,
+            example: 'pindo ios applovin --install'
+          ),
+
+          upload: OptionItem.new(
+            key: :upload,
+            name: '保存配置',
+            description: '保存 SKAdNetwork IDs 配置到本地',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_IOS_UPLOAD',
+            default_value: false,
+            optional: true,
+            example: 'pindo ios applovin --upload'
+          )
+        }
+      end
+    end
+  end
+end

data/lib/pindo/options/groups/jps_options.rb

@@ -99,6 +99,47 @@ module Pindo
             env_name: 'PINDO_SEND_GROUP',
             optional: true,
             example: 'pindo jps apptest --group'
+          ),
+
+          login: OptionItem.new(
+            key: :login,
+            name: '强制登录',
+            description: '强制重新登录 JPS 平台',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_JPS_LOGIN',
+            default_value: false,
+            optional: true,
+            example: 'pindo jps upload --login'
+          ),
+
+          file: OptionItem.new(
+            key: :file,
+            name: '上传文件',
+            description: '指定要上传的文件路径（支持 ipa/apk/app/exe/html）',
+            type: String,
+            env_name: 'PINDO_JPS_FILE',
+            optional: true,
+            example: 'pindo jps upload --file=path/to/app.ipa'
+          ),
+
+          attach: OptionItem.new(
+            key: :attach,
+            name: '附件',
+            description: '指定需要和安装包一起上传的附件文件',
+            type: String,
+            env_name: 'PINDO_JPS_ATTACH',
+            optional: true,
+            example: 'pindo jps upload --attach=file.zip'
+          ),
+
+          index: OptionItem.new(
+            key: :index,
+            name: '版本序号',
+            description: '指定下载的版本序号',
+            type: String,
+            env_name: 'PINDO_JPS_INDEX',
+            optional: true,
+            example: 'pindo jps download --index=1'
           )
         }
       end

data/lib/pindo/options/groups/option_group.rb

@@ -41,7 +41,7 @@ module Pindo
       # @param defaults [Hash{Symbol => Any}] key => default_value 的映射
       # @return [Array<OptionItem>] 修改后的参数列表
       # @example
-      #   UnityOptions.select_with_defaults(skipconfig: true, skiplib: true)
+      #   UnityOptions.select_with_defaults(skipmacro: true, skiplib: true)
       def select_with_defaults(**defaults)
         defaults.map do |key, default_value|
           option = all_options[key]

data/lib/pindo/options/groups/pod_options.rb

@@ -0,0 +1,37 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # Pod 相关参数组
+    # 定义 CocoaPods 操作相关的参数（podupdate、podlint、podpush）
+    module PodOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+          path: OptionItem.new(
+            key: :path,
+            name: '项目目录',
+            description: '指定 Pod 库所在的项目目录',
+            type: String,
+            env_name: 'PINDO_POD_PATH',
+            optional: true,
+            example: 'pindo ios podupdate --path=./MyPodLib'
+          ),
+
+          install: OptionItem.new(
+            key: :install,
+            name: '执行安装',
+            description: '更新完 lib 之后执行 pod install',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_POD_INSTALL',
+            default_value: false,
+            optional: true,
+            example: 'pindo ios podupdate --install'
+          )
+        }
+      end
+    end
+  end
+end

data/lib/pindo/options/groups/unity_options.rb

@@ -10,15 +10,15 @@ module Pindo
 
       def self.all_options
         @all_options ||= {
-          skipconfig: OptionItem.new(
-            key: :skipconfig,
+          skipmacro: OptionItem.new(
+            key: :skipmacro,
             name: '跳过宏设置',
             description: '跳过Unity编译宏设置（加快构建速度）',
             type: OptionItem::Boolean,
-            env_name: 'PINDO_SKIP_CONFIG',
+            env_name: 'PINDO_SKIP_MACRO',
             default_value: false,
             optional: true,
-            example: 'pindo appstore autobuild --skipconfig'
+            example: 'pindo appstore autobuild --skipmacro'
           ),
 
           skiplib: OptionItem.new(

data/lib/pindo/options/groups/utils_options.rb

@@ -0,0 +1,125 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # 工具及辅助命令参数组
+    # 定义 utils、appstore、gplay 等命令中共享的辅助参数
+    module UtilsOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+          down: OptionItem.new(
+            key: :down,
+            name: '下载',
+            description: '下载资源（元数据、截图等）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_DOWN',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore metadata --down'
+          ),
+
+          test: OptionItem.new(
+            key: :test,
+            name: '测试模式',
+            description: '使用测试环境仓库',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_TEST',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore initconfig --test'
+          ),
+
+          mode: OptionItem.new(
+            key: :mode,
+            name: '版本模式',
+            description: '版本增加模式（major/minor/patch），默认 minor',
+            type: String,
+            env_name: 'PINDO_REPO_MODE',
+            default_value: 'minor',
+            optional: true,
+            example: 'pindo utils repoinit --mode=minor'
+          ),
+
+          retag: OptionItem.new(
+            key: :retag,
+            name: '重新打标签',
+            description: '强制重新创建当前版本的 Git Tag',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_RETAG',
+            default_value: false,
+            optional: true,
+            example: 'pindo utils repoinit --retag'
+          ),
+
+          fast: OptionItem.new(
+            key: :fast,
+            name: '快速模式',
+            description: '快速更新证书（跳过部分验证）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_CERT_FAST',
+            default_value: false,
+            optional: true,
+            example: 'pindo utils renewcert --fast'
+          ),
+
+          fixedid: OptionItem.new(
+            key: :fixedid,
+            name: '固定 ID',
+            description: '重新更新 Bundle ID 的功能配置',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_CERT_FIXEDID',
+            default_value: false,
+            optional: true,
+            example: 'pindo utils renewcert --fixedid'
+          ),
+
+          nupkg: OptionItem.new(
+            key: :nupkg,
+            name: 'NuGet 包',
+            description: '指定要上传的 .nupkg 文件路径',
+            type: String,
+            env_name: 'PINDO_NUPKG',
+            optional: true,
+            example: 'pindo unity packpush --nupkg=path/to/package.nupkg'
+          ),
+
+          run: OptionItem.new(
+            key: :run,
+            name: '本地运行',
+            description: '编译完成后在本地打开运行',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_RUN',
+            default_value: false,
+            optional: true,
+            example: 'pindo web autobuild --run'
+          ),
+
+          port: OptionItem.new(
+            key: :port,
+            name: '端口号',
+            description: '指定本地 HTTP 服务器端口',
+            type: String,
+            env_name: 'PINDO_PORT',
+            default_value: '8000',
+            optional: true,
+            example: 'pindo web run --port=3000'
+          ),
+
+          debug: OptionItem.new(
+            key: :debug,
+            name: '调试模式',
+            description: '显示详细的调试信息',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_DEBUG_MODE',
+            default_value: false,
+            optional: true,
+            example: 'pindo web run --debug'
+          )
+        }
+      end
+    end
+  end
+end

data/lib/pindo/options/options.rb

@@ -10,8 +10,14 @@ require 'pindo/options/core/global_options_state'
 
 # 参数组 (groups/)
 require 'pindo/options/groups/option_group'
+require 'pindo/options/groups/global_options'
+require 'pindo/options/groups/common_options'
 require 'pindo/options/groups/build_options'
 require 'pindo/options/groups/jps_options'
 require 'pindo/options/groups/unity_options'
 require 'pindo/options/groups/git_options'
 require 'pindo/options/groups/tool_options'
+require 'pindo/options/groups/appstore_options'
+require 'pindo/options/groups/pod_options'
+require 'pindo/options/groups/ios_tool_options'
+require 'pindo/options/groups/utils_options'

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.18.4"
+  VERSION = "5.18.5"
 
   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.18.4
+  version: 5.18.5
 platform: ruby
 authors:
 - wade
@@ -486,14 +486,20 @@ files:
 - 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/appstore_options.rb
 - lib/pindo/options/groups/build_options.rb
 - lib/pindo/options/groups/cert_options.rb
+- lib/pindo/options/groups/common_options.rb
 - lib/pindo/options/groups/git_options.rb
+- lib/pindo/options/groups/global_options.rb
+- lib/pindo/options/groups/ios_tool_options.rb
 - lib/pindo/options/groups/jps_options.rb
 - lib/pindo/options/groups/option_group.rb
+- lib/pindo/options/groups/pod_options.rb
 - lib/pindo/options/groups/task_options.rb
 - lib/pindo/options/groups/tool_options.rb
 - lib/pindo/options/groups/unity_options.rb
+- lib/pindo/options/groups/utils_options.rb
 - lib/pindo/options/helpers/bundleid_selector.rb
 - lib/pindo/options/helpers/git_constants.rb
 - lib/pindo/options/options.rb