pindo 5.18.4 → 5.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57fbad3f66c9cdf2e2dda64e647feeeb46be84b6739ef7140c133855f57d548b
-  data.tar.gz: 17f7f6f7bfa9cd4a9353814c64e4eb77f0605a8c92dbd34933370f33f4e5172b
+  metadata.gz: 0c5570599c0e84edb77c22267e890c57f736800bc046581d7a902e28b4b5c33f
+  data.tar.gz: 46b689df14719e8a7b0ef3af23e209d9e70484b3915b45a02c8c014ab1d2ddb3
 SHA512:
-  metadata.gz: 948e941ffb9d6695421264fc413366d07faf0563b224e9b7a0f05370bd98559d1ebd15a99d7b43ef50bb3624a0bea8ffc228331baed069d674532390b6bb5266
-  data.tar.gz: d085420dff707aaa1ea8c2a9577c02e7be4b0d753ba9aa6a8bfe141b510835c75407adb11176b533f137b2f71e16893a8cc07faa64d03225bbc4cfb057f7d411
+  metadata.gz: c2e5bb57d0a922210eff69f20fc7aabdf42660f01073e2a56378f32ff2380173eedd37b00e54f368051566903ac95c37f7139b17760c19c17ce889422e7078a8
+  data.tar.gz: 84d21199d7e08ad161a286090fbbc40c0a421f021f654dfde9b663fffc2c0921927e6a95a7cc0db21b074a1a4af0dcd28e354183bcf4bd5bb318dc178cf0a37b

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

@@ -96,25 +96,23 @@ module Pindo
         # 定义此命令使用的参数项
         def self.option_items
           @option_items ||= Pindo::Options::OptionGroup.merge(
-            Pindo::Options::BuildOptions.select(:bundle_name),  # 添加 bundle_name 参数
+            Pindo::Options::BuildOptions.select(:bundle_name, :release, :skipclean, :skipvalidate, :injectsigning),
             Pindo::Options::JPSOptions.select(:conf, :upload, :media, :bind, :send),
             Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
-            Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
+            Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
             Pindo::Options::TaskOptions.select(:multi),
             Pindo::Options::GitOptions.all
           )
         end
 
         def self.options
-          [
-            ['--release',     '使用Release模式构建']
-          ].concat(option_items.map(&:to_claide_option)).concat(super)
+          option_items.map(&:to_claide_option).concat(super)
         end
 
         def initialize(argv)
           @options = initialize_options(argv)
 
-          @args_release_flag = argv.flag?('release', false)
+          @args_release_flag = @options[:release] || false
           @args_conf = @options[:conf]
           @args_bundle_name = @options[:bundle_name]  # 从 @options 获取，确保能被缓存
 

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

@@ -116,9 +116,9 @@ module Pindo
           @args_upload_flag = @options[:send] || @options[:upload]
           @args_conf = @options[:conf]
           @args_increase_flag = @options[:increase]
-          @args_skip_config = argv.flag?('skipconfig', false)
-          @args_skip_lib = argv.flag?('skiplib', false)
-          @args_skip_yoo = argv.flag?('skipyoo', false)
+          @args_skip_config = @options[:skipmacro] || false
+          @args_skip_lib = @options[:skiplib] || false
+          @args_skip_yoo = @options[:skipyoo] || false
 
           super
           @additional_args = argv.remainder!

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

@@ -89,9 +89,9 @@ module Pindo
           # 保存参数到实例变量
           # 优先使用选项参数，如果没有则使用位置参数
           @args_bundle_id = @options[:bundleid] || positional_bundleid
-          @args_skip_config = argv.flag?('skipconfig', false)
-          @args_skip_lib = argv.flag?('skiplib', false)
-          @args_skip_yoo = argv.flag?('skipyoo', false)
+          @args_skip_config = @options[:skipmacro] || false
+          @args_skip_lib = @options[:skiplib] || false
+          @args_skip_yoo = @options[:skipyoo] || false
 
           # Git 参数
           @args_release_branch = @options[:release_branch] || 'master'

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

@@ -78,9 +78,13 @@ module Pindo
             # 添加工具参数（ToolOptions）
             items.concat(Pindo::Options::ToolOptions.select(:ipa))
 
+            # 添加构建类型参数（BuildOptions）
+            items.concat(Pindo::Options::BuildOptions.select(
+              :dev, :adhoc, :develop_id, :build_type
+            ))
+
             # 添加证书相关参数（CertOptions）
             items.concat(Pindo::Options::CertOptions.select(
-              :dev, :adhoc, :develop_id, :build_type,
               :platform, :macos, :cert_mode, :storage, :match
             ))
 
@@ -141,7 +145,7 @@ module Pindo
           end
 
           # 标准化构建类型
-          @args_build_type = Pindo::Options::CertOptions.normalize_build_type(@args_build_type)
+          @args_build_type = Pindo::Options::BuildOptions.normalize_build_type(@args_build_type)
 
           # 处理平台类型
           @platform_type = @options[:platform]

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

@@ -42,9 +42,12 @@ module Pindo
           # 无位置参数
         ]
 
-        # 定义此命令使用的参数项（使用 CertOptions）
+        # 定义此命令使用的参数项
         def self.option_items
-          @option_items ||= Pindo::Options::CertOptions.all
+          @option_items ||= Pindo::Options::OptionGroup.merge(
+            Pindo::Options::BuildOptions.select(:build_type, :dev, :adhoc, :release, :develop_id),
+            Pindo::Options::CertOptions.all
+          )
         end
 
         # 命令的选项列表
@@ -56,9 +59,10 @@ module Pindo
           # 使用 Options 模块初始化参数
           @options = initialize_options(argv)
 
-          # 证书类型快捷参数
+          # 构建类型快捷参数
           @args_dev_flag = @options[:dev]
           @args_adhoc_flag = @options[:adhoc]
+          @args_release_flag = @options[:release]
           @args_develop_id_flag = @options[:develop_id]
           @args_macos_flag = @options[:macos]
 
@@ -78,20 +82,22 @@ module Pindo
           @cert_mode ||= 'match'           # 默认使用 Match 模式
           @storage ||= 'git'               # 默认使用 Git 存储
 
-          # 参数优先级：--develop_id > --adhoc > --dev > 用户指定的 build_type > 默认 appstore
+          # 参数优先级：--develop_id > --release > --adhoc > --dev > 用户指定的 build_type > 默认 appstore
           if @args_develop_id_flag
             @build_type = 'developer_id'
+          elsif @args_release_flag
+            @build_type = 'appstore'
           elsif @args_adhoc_flag
             @build_type = 'adhoc'
           elsif @args_dev_flag
             @build_type = 'dev'
           elsif @build_type.nil? || @build_type.empty?
-            @build_type = 'appstore'       # 默认使用 appstore 证书
+            @build_type = 'appstore'
           end
           # 如果用户明确指定了 --build_type，则保持用户指定的值
 
           # 标准化构建类型（dev -> development, release -> appstore）
-          @build_type = Pindo::Options::CertOptions.normalize_build_type(@build_type)
+          @build_type = Pindo::Options::BuildOptions.normalize_build_type(@build_type)
 
           # 处理平台类型
           if @args_macos_flag

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

@@ -31,18 +31,20 @@ module Pindo
                 self.arguments = [
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::AppStoreOptions.select(:metadata, :screenshots, :overwrite)
+                end
+
                 def self.options
-                    [
-                        ['--metadata', '获取metadata信息'],
-                        ['--screenshots', '下载商店截屏'],
-                        ['--overwrite', '覆盖已存在的文件'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-                    @upload_metadata_flag = argv.flag?('metadata', false)
-                    @upload_screenshots_flag = argv.flag?('screenshots', false)
-                    @over_write = argv.flag?('overwrite', false)
+                    @options = initialize_options(argv)
+
+                    @upload_metadata_flag = @options[:metadata] || false
+                    @upload_screenshots_flag = @options[:screenshots] || false
+                    @over_write = @options[:overwrite] || false
 
                     super
                 end

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

@@ -31,13 +31,12 @@ module Pindo
                 self.arguments = [
                 ]
 
-                def self.options
-                  [
-                    ['--check', '检查iap信息'],
-                    ['--download', '从appstore下载app的iap信息'],
-                    ['--boss', '生成boss的iap信息'],
+                def self.option_items
+                    @option_items ||= Pindo::Options::AppStoreOptions.select(:check, :boss, :download)
+                end
 
-                  ].concat(super)
+                def self.options
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def validate!
@@ -53,10 +52,11 @@ module Pindo
                 end
 
                 def initialize(argv)
+                  @options = initialize_options(argv)
 
-                  @check_flag = argv.flag?('check', false)
-                  @download_flag = argv.flag?('download', false)
-                  @boss_flag = argv.flag?('boss', false)
+                  @check_flag = @options[:check] || false
+                  @download_flag = @options[:download] || false
+                  @boss_flag = @options[:boss] || false
 
                   super
                 end

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

@@ -49,28 +49,27 @@ module Pindo
 
                 # 定义此命令使用的参数项
                 def self.option_items
-                    @option_items ||= Pindo::Options::BuildOptions.select(:bundleid)
+                    @option_items ||= Pindo::Options::OptionGroup.merge(
+                        Pindo::Options::BuildOptions.select(:bundleid),
+                        Pindo::Options::UtilsOptions.select(:test)
+                    )
                 end
 
                 # 命令的选项列表
                 def self.options
-                    [
-                        ['--test', '创建测试环境仓库']
-                    ].concat(option_items.map { |item| item.to_claide_option }).concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
                     # 首先获取位置参数（向后兼容）
                     positional_bundleid = argv.shift_argument
 
-                    # 获取 test 标志
-                    @test_flag = argv.flag?('test', false)
-
                     # 使用 Options 模块初始化参数
                     @options = initialize_options(argv)
 
                     # 优先使用选项参数，如果没有则使用位置参数
                     @bundle_id = @options[:bundleid] || positional_bundleid
+                    @test_flag = @options[:test] || false
 
                     super
                     @additional_args = argv.remainder!

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

@@ -33,22 +33,22 @@ module Pindo
                 self.arguments = [
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::AppStoreOptions.select(:metadata, :screenshots, :overwrite, :sync, :ipa)
+                end
+
                 def self.options
-                    [
-                        ['--metadata', '上传元数据到iTunes Connect'],
-                        ['--screenshots', '上传截图到iTunes Connect'],
-                        ['--overwrite', '覆盖iTunes Connect中的截图'],
-                        ['--sync', '同步截图到iTunes Connect'],
-                        ['--ipa', '上传ipa到iTunes Connect'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-                    @upload_metadata_flag = argv.flag?('metadata', false)
-                    @upload_screenshots_flag = argv.flag?('screenshots', false)
-                    @overwrite_flag = argv.flag?('overwrite', false)
-                    @sync_flag = argv.flag?('sync', false)
-                    @upload_ipa_flag = argv.flag?('ipa', false)
+                    @options = initialize_options(argv)
+
+                    @upload_metadata_flag = @options[:metadata] || false
+                    @upload_screenshots_flag = @options[:screenshots] || false
+                    @overwrite_flag = @options[:overwrite] || false
+                    @sync_flag = @options[:sync] || false
+                    @upload_ipa_flag = @options[:ipa] || false
 
                     super
                 end

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

@@ -33,16 +33,17 @@ module Pindo
                     CLAide::Argument.new('path/to/config.json', false),
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::UtilsOptions.select(:down)
+                end
+
                 def self.options
-                    [
-                        ['--download', '下载app的所有购买项,用法:pindo appstore metadata --download'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-
-                        @args_download_name = argv.option('download')
-
+                    @options = initialize_options(argv)
+                    @args_download_name = @options[:down] || false
                     super
                 end
 

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

@@ -33,16 +33,17 @@ module Pindo
                     CLAide::Argument.new('path/to/config.json', false),
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::UtilsOptions.select(:down)
+                end
+
                 def self.options
-                    [
-                        ['--download', '下载app的所有购买项,用法:pindo appstore screenshots --download'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-
-                        @args_download_name = argv.option('download')
-
+                    @options = initialize_options(argv)
+                    @args_download_name = @options[:down] || false
                     super
                 end
 

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

@@ -24,14 +24,17 @@ module Pindo
         self.arguments = [
         ]
 
+        def self.option_items
+          @option_items ||= Pindo::Options::AppStoreOptions.select(:delete)
+        end
+
         def self.options
-          [
-            ['--delete=TAG_NAME', '删除指定的tag'],
-          ].concat(super)
+          option_items.map(&:to_claide_option).concat(super)
         end
 
         def initialize(argv)
-            @delete_tag_name = argv.option('delete')
+            @options = initialize_options(argv)
+            @delete_tag_name = @options[:delete]
             super
         end
 

data/lib/pindo/command/gplay/iap.rb

@@ -35,16 +35,17 @@ DESC
                     CLAide::Argument.new('path/to/config.json', false),
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::UtilsOptions.select(:down)
+                end
+
                 def self.options
-                    [
-                        ['--download', '下载app的所有购买项,用法:pindo appstore iap --download'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-
-                    @args_download_name = argv.option('download')
-                    
+                    @options = initialize_options(argv)
+                    @args_download_name = @options[:down] || false
                     super
                 end
 

data/lib/pindo/command/gplay/metadata.rb

@@ -37,16 +37,17 @@ DESC
                     CLAide::Argument.new('path/to/config.json', false),
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::UtilsOptions.select(:down)
+                end
+
                 def self.options
-                    [
-                        ['--download', '下载app的所有购买项,用法:pindo appstore metadata --download'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-
-                        @args_download_name = argv.option('download')
-
+                    @options = initialize_options(argv)
+                    @args_download_name = @options[:down] || false
                     super
                 end
 

data/lib/pindo/command/gplay/screenshots.rb

@@ -37,16 +37,17 @@ DESC
                     CLAide::Argument.new('path/to/config.json', false),
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::UtilsOptions.select(:down)
+                end
+
                 def self.options
-                    [
-                        ['--download', '下载app的所有购买项,用法:pindo appstore screenshots --download'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
-
-                        @args_download_name = argv.option('download')
-
+                    @options = initialize_options(argv)
+                    @args_download_name = @options[:down] || false
                     super
                 end
 

data/lib/pindo/command/ios/applovin.rb

@@ -39,19 +39,20 @@ module Pindo
                 self.arguments = [
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::IosToolOptions.select(:appstore, :install, :upload)
+                end
+
                 def self.options
-                    [
-                        ['--appstore', 'AppStore模式，一般不使用'],
-                        ['--install',  '运行applovin安装脚本'],
-                        ['--upload',   '保存SKAdNetwork IDs到本地配置'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
+                    @options = initialize_options(argv)
 
-                    @args_appstore_flag = argv.flag?('appstore', false)
-                    @args_install_flag = argv.flag?('install', false)
-                    @args_upload_flag = argv.flag?('upload', false)
+                    @args_appstore_flag = @options[:appstore] || false
+                    @args_install_flag = @options[:install] || false
+                    @args_upload_flag = @options[:upload] || false
 
                     super(argv)
                     @additional_args = argv.remainder!

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

@@ -102,7 +102,7 @@ module Pindo
                         Pindo::Options::BuildOptions.select(:bundleid, :build_type),
                         Pindo::Options::JPSOptions.select(:conf, :upload, :media, :bind, :send),
                         Pindo::Options::UnityOptions.select(:skiplib, :skipyoo),
-                        Pindo::Options::UnityOptions.select_with_defaults(skipconfig: true),
+                        Pindo::Options::UnityOptions.select_with_defaults(skipmacro: true),
                         Pindo::Options::TaskOptions.select(:multi),
                         Pindo::Options::GitOptions.all
                     )

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

@@ -75,9 +75,13 @@ module Pindo
                         # 添加工具参数（ToolOptions）
                         items.concat(Pindo::Options::ToolOptions.select(:ipa, :deploy))
 
+                        # 添加构建类型参数（BuildOptions）
+                        items.concat(Pindo::Options::BuildOptions.select(
+                            :dev, :adhoc, :develop_id, :build_type
+                        ))
+
                         # 添加证书相关参数（CertOptions）
                         items.concat(Pindo::Options::CertOptions.select(
-                            :dev, :adhoc, :develop_id, :build_type,
                             :platform, :macos, :cert_mode, :storage, :match
                         ))
 
@@ -146,7 +150,7 @@ module Pindo
                     end
 
                     # 标准化构建类型
-                    @build_type = Pindo::Options::CertOptions.normalize_build_type(@build_type)
+                    @build_type = Pindo::Options::BuildOptions.normalize_build_type(@build_type)
 
                     # 处理平台类型
                     @platform_type = @options[:platform]

data/lib/pindo/command/ios/cert.rb

@@ -57,9 +57,12 @@ module Pindo
                 # 暂无参数
             ]
 
-            # 定义此命令使用的参数项（直接使用 CertOptions）
+            # 定义此命令使用的参数项
             def self.option_items
-              @option_items ||= Pindo::Options::CertOptions.all
+              @option_items ||= Pindo::Options::OptionGroup.merge(
+                Pindo::Options::BuildOptions.select(:build_type, :dev, :adhoc, :release, :develop_id),
+                Pindo::Options::CertOptions.all
+              )
             end
 
             # 命令的选项列表
@@ -71,9 +74,10 @@ module Pindo
               # 使用 Options 模块初始化参数
               @options = initialize_options(argv)
 
-              # 证书快捷参数
+              # 构建类型快捷参数
               @args_dev_flag = @options[:dev]
               @args_adhoc_flag = @options[:adhoc]
+              @args_release_flag = @options[:release]
               @args_develop_id_flag = @options[:develop_id]
               @args_macos_flag = @options[:macos]
 
@@ -94,21 +98,22 @@ module Pindo
               # 根据快捷参数确定构建类型
               @build_type = @options[:build_type]
 
-              # 参数优先级：--develop_id > --adhoc > --dev > 用户指定的 build_type > 默认 dev
+              # 参数优先级：--develop_id > --release > --adhoc > --dev > 用户指定的 build_type > 默认 dev
               if @args_develop_id_flag
                 @build_type = 'developer_id'
+              elsif @args_release_flag
+                @build_type = 'appstore'
               elsif @args_adhoc_flag
                 @build_type = 'adhoc'
               elsif @args_dev_flag
                 @build_type = 'dev'
               elsif @build_type.nil? || @build_type.empty?
-                # build_type 为 nil 时，iOS cert 命令默认使用 dev
                 @build_type = 'dev'
               end
               # 如果用户明确指定了 --build_type，则保持用户指定的值
 
               # 标准化构建类型（dev -> development, release -> appstore）
-              @build_type = Pindo::Options::CertOptions.normalize_build_type(@build_type)
+              @build_type = Pindo::Options::BuildOptions.normalize_build_type(@build_type)
 
               # 处理平台类型
               @platform_type = @options[:platform]

data/lib/pindo/command/ios/fixproj.rb

@@ -19,7 +19,7 @@ module Pindo
 
             * 删除 Unity-iPhone 项目中的 Firebase Crashlytics 脚本
 
-            * 自动扫描模式 (--auto): 自动扫描当前目录及 GoodPlatform/BaseiOS 下的 iOS 项目
+            * 批量修复模式 (--allproj): 自动扫描当前目录及 GoodPlatform/BaseiOS 下的所有 iOS 项目
 
           使用示例:
 
@@ -27,7 +27,7 @@ module Pindo
 
             $ pindo ios fixproj path/to/project     # 修复指定目录的项目
 
-            $ pindo ios fixproj --auto             # 自动扫描并修复 Unity 导出的 iOS 项目
+            $ pindo ios fixproj --allproj           # 扫描并修复所有 iOS 项目
         DESC
 
         # 定义位置参数
@@ -35,17 +35,20 @@ module Pindo
           CLAide::Argument.new('path/to/project', true)
         ]
 
+        def self.option_items
+          @option_items ||= Pindo::Options::IosToolOptions.select(:allproj)
+        end
+
         # 命令的选项列表
         def self.options
-          [
-            ['--auto', '自动扫描当前目录及 GoodPlatform/BaseiOS 下的 iOS 项目'],
-          ].concat(super)
+          option_items.map(&:to_claide_option).concat(super)
         end
 
         def initialize(argv)
           # 获取位置参数（项目路径）
           @project_path = argv.shift_argument
-          @auto_mode = argv.flag?('auto')
+          @options = initialize_options(argv)
+          @auto_mode = @options[:allproj] || false
           super(argv)
         end
 

data/lib/pindo/command/ios/podlint.rb

@@ -1,6 +1,7 @@
 require 'highline/import'
 require 'fileutils'
 require 'json'
+require 'pindo/options/options'
 
 module Pindo
     class Command
@@ -30,7 +31,7 @@ module Pindo
 
                         $ pindo ios podlint MyPod.podspec          # 指定podspec文件
 
-                        $ pindo ios podlint --p=~/MyPod            # 指定pod库目录
+                        $ pindo ios podlint --path=~/MyPod         # 指定pod库目录
 
                         $ pindo ios podlint --verbose              # 显示详细输出
                 DESC
@@ -40,15 +41,19 @@ module Pindo
                     CLAide::Argument.new('podspec', true)
                 ]
 
+                def self.option_items
+                    @option_items ||= Pindo::Options::PodOptions.select(:path)
+                end
+
                 def self.options
-                    [
-                        ['--p', '指定需要lint的pod库所在目录， 例如 --p=~/Users/xxx/MyPod'],
-                    ].concat(super)
+                    option_items.map(&:to_claide_option).concat(super)
                 end
 
                 def initialize(argv)
                     @pod_spec_file = argv.shift_argument || nil
-                    @project_dir = argv.option('p')
+
+                    @options = initialize_options(argv)
+                    @project_dir = @options[:path]
 
                     super(argv)
                     @additional_args = argv.remainder!