pindo 5.13.7 → 5.13.10

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

@@ -11,26 +11,42 @@ module Pindo
       def self.all_options
 
         @all_options ||= {
-          
+
           bundleid: OptionItem.new(
             key: :bundleid,
-            description: '指定打包的 Bundle ID',
+            name: 'Bundle ID',
+            description: '指定 iOS Bundle ID',
             type: String,
             env_name: 'PINDO_BUNDLE_ID',
-            aliases: [:bundle_id, :package_name, :bundle_name],
             optional: true,
+            cacheable: true,  # 存入文件缓存
             verify_block: proc do |value|
-              # 支持 iOS 格式 (com.example.app) 和 Android 格式 (com.example.app)
-              # iOS 可以包含大写字母、连字符和通配符（*）
               unless value =~ /^[a-zA-Z0-9\-\.\*]+$/
-                raise "Bundle ID/Package Name 格式错误: #{value}，应该类似 com.example.app 或 com.example.*"
+                raise "Bundle ID 格式错误: #{value}，应该类似 com.example.app"
               end
             end,
             example: 'pindo ios autobuild --bundleid=com.example.app'
           ),
 
+          bundle_name: OptionItem.new(
+            key: :bundle_name,
+            name: 'Package Name',
+            description: '指定 Android Package Name',
+            type: String,
+            env_name: 'PINDO_BUNDLE_NAME',
+            optional: true,
+            cacheable: true,  # 存入文件缓存
+            verify_block: proc do |value|
+              unless value =~ /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$/i
+                raise "Package Name 格式错误: #{value}，应该类似 com.example.app"
+              end
+            end,
+            example: 'pindo android autobuild --bundle_name=com.example.app'
+          ),
+
           build_type: OptionItem.new(
             key: :build_type,
+            name: '构建类型',
             description: '指定构建类型（dev/adhoc/release）',
             type: String,
             env_name: 'PINDO_BUILD_TYPE',
@@ -47,6 +63,7 @@ module Pindo
 
           scheme: OptionItem.new(
             key: :scheme,
+            name: 'Scheme',
             description: '指定构建 Scheme',
             type: String,
             env_name: 'PINDO_SCHEME',

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

@@ -0,0 +1,115 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # Git 版本管理参数组
+    # 定义 Git tag 和版本控制相关的参数
+    module GitOptions
+      extend OptionGroup
+
+      # 版本增加类型的有效值
+      VERSION_INCREASE_TYPES = %w[main mini patch].freeze
+
+      # 创建 Tag 类型的有效值
+      CREATE_TAG_TYPES = %w[new recreate none].freeze
+
+      def self.all_options
+        @all_options ||= {
+          ver_inc: OptionItem.new(
+            key: :ver_inc,
+            name: '版本增加方式',
+            description: '版本号增加方式: main(大版本), mini(小版本), patch(补丁版本)',
+            type: String,
+            env_name: 'PINDO_VERSION_INCREASE',
+            default_value: 'mini',
+            aliases: [:version_increase],
+            optional: true,
+            cacheable: true,  # 存入文件缓存
+            verify_block: proc do |value|
+              unless VERSION_INCREASE_TYPES.include?(value.to_s.downcase)
+                raise "版本增加类型错误: #{value}，必须是 main、mini 或 patch 之一"
+              end
+            end,
+            example: 'pindo ios autobuild --ver_inc=mini'
+          ),
+
+          tag_type: OptionItem.new(
+            key: :tag_type,
+            name: 'Tag创建方式',
+            description: '创建Tag方式: new(新建tag), recreate(重新创建当前tag), none(不创建tag)',
+            type: String,
+            env_name: 'PINDO_CREATE_TAG',
+            default_value: 'new',
+            aliases: [:create_tag],
+            optional: true,
+            cacheable: true,  # 存入文件缓存
+            verify_block: proc do |value|
+              unless CREATE_TAG_TYPES.include?(value.to_s.downcase)
+                raise "创建Tag类型错误: #{value}，必须是 new、recreate 或 none 之一"
+              end
+            end,
+            example: 'pindo ios autobuild --tag_type=new'
+          ),
+
+          tag_pre: OptionItem.new(
+            key: :tag_pre,
+            name: 'Tag前缀',
+            description: 'Git tag 前缀',
+            type: String,
+            env_name: 'PINDO_TAG_PREFIX',
+            default_value: 'v',
+            aliases: [:tag_prefix],
+            optional: true,
+            cacheable: true,  # 存入文件缓存
+            example: 'pindo ios autobuild --tag_pre=v'
+          ),
+
+          release_branch: OptionItem.new(
+            key: :release_branch,
+            name: 'Release分支',
+            description: 'Release 分支名称',
+            type: String,
+            env_name: 'PINDO_RELEASE_BRANCH',
+            default_value: 'master',
+            optional: true,
+            cacheable: true,  # 存入文件缓存
+            example: 'pindo ios autobuild --release_branch=main'
+          )
+        }
+      end
+
+      # 将命令行参数值转换为 VersionIncreaseType 常量
+      # @param value [String] 命令行参数值 (main/mini/patch)
+      # @return [Symbol] VersionIncreaseType 常量值
+      def self.parse_version_increase_type(value)
+        case value.to_s.downcase
+        when 'main', 'major'
+          Pindo::VersionIncreaseType::MAIN
+        when 'mini', 'minor'
+          Pindo::VersionIncreaseType::MINI
+        when 'patch'
+          Pindo::VersionIncreaseType::PATCH
+        else
+          Pindo::VersionIncreaseType::MINI
+        end
+      end
+
+      # 将命令行参数值转换为 CreateTagType 常量
+      # @param value [String] 命令行参数值 (new/recreate/none)
+      # @return [Symbol] CreateTagType 常量值
+      def self.parse_create_tag_type(value)
+        case value.to_s.downcase
+        when 'new', 'create'
+          Pindo::CreateTagType::NEW
+        when 'recreate', 'retag'
+          Pindo::CreateTagType::RECREATE
+        when 'none', 'skip', 'dont'
+          Pindo::CreateTagType::NONE
+        else
+          Pindo::CreateTagType::NEW
+        end
+      end
+    end
+  end
+end

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

@@ -12,15 +12,18 @@ module Pindo
         @all_options ||= {
           proj: OptionItem.new(
             key: :proj,
+            name: '项目名称',
             description: '指定上传到测试平台的项目名称',
             type: String,
             env_name: 'PINDO_PROJECT_NAME',
             optional: true,
+            cacheable: true,  # 存入文件缓存
             example: 'pindo ios autobuild --proj="My App"'
           ),
 
           upload: OptionItem.new(
             key: :upload,
+            name: '上传JPS',
             description: '编译后上传到测试平台（上传成功后自动发送给自己）',
             type: OptionItem::Boolean,
             env_name: 'PINDO_UPLOAD',
@@ -30,6 +33,7 @@ module Pindo
 
           send: OptionItem.new(
             key: :send,
+            name: '发送通知',
             description: '发送通知到测试群组（同时也会发送给自己）',
             type: OptionItem::Boolean,
             env_name: 'PINDO_SEND',
@@ -38,6 +42,7 @@ module Pindo
           ),
           desc: OptionItem.new(
             key: :desc,
+            name: '备注信息',
             description: '指定上传的备注信息',
             type: String,
             env_name: 'PINDO_UPLOAD_DESC',
@@ -48,6 +53,7 @@ module Pindo
 
           resign: OptionItem.new(
             key: :resign,
+            name: 'JPS重签名',
             description: '上传后是否重签名',
             type: OptionItem::Boolean,
             env_name: 'PINDO_RESIGN',
@@ -57,6 +63,7 @@ module Pindo
 
           certid: OptionItem.new(
             key: :certid,
+            name: '重签名Bundle ID',
             description: '设置重签名的Bundle ID',
             type: String,
             env_name: 'PINDO_CERT_ID',

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

@@ -37,6 +37,21 @@ module Pindo
         all_options_hash.reject { |k, v| keys.include?(k) }.values
       end
 
+      # 选择指定的参数并覆盖默认值
+      # @param defaults [Hash{Symbol => Any}] key => default_value 的映射
+      # @return [Array<OptionItem>] 修改后的参数列表
+      # @example
+      #   UnityOptions.select_with_defaults(skipconfig: true, skiplib: true)
+      def select_with_defaults(**defaults)
+        defaults.map do |key, default_value|
+          option = all_options[key]
+          if option.nil?
+            raise ArgumentError, "参数组 #{self.name} 中不存在参数: #{key}"
+          end
+          option.with(default_value: default_value)
+        end
+      end
+
       # 获取所有参数（返回数组）
       # @return [Array<OptionItem>] 所有参数列表
       def all

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

@@ -0,0 +1,49 @@
+require 'pindo/options/core/option_item'
+require 'pindo/options/groups/option_group'
+
+module Pindo
+  module Options
+    # Unity 构建参数组
+    # 定义 Unity 项目特有的构建参数
+    module UnityOptions
+      extend OptionGroup
+
+      def self.all_options
+        @all_options ||= {
+          skipconfig: OptionItem.new(
+            key: :skipconfig,
+            name: '跳过宏设置',
+            description: '跳过Unity编译宏设置（加快构建速度）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_SKIP_CONFIG',
+            default_value: false,
+            optional: true,
+            example: 'pindo appstore autobuild --skipconfig'
+          ),
+
+          skiplib: OptionItem.new(
+            key: :skiplib,
+            name: '跳过库更新',
+            description: '跳过Unity必备库更新（加快构建速度）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_SKIP_LIB',
+            default_value: false,
+            optional: true,
+            example: 'pindo unity autobuild --skiplib'
+          ),
+
+          skipyoo: OptionItem.new(
+            key: :skipyoo,
+            name: '跳过YooAsset',
+            description: '跳过YooAsset资源打包（加快构建速度）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_SKIP_YOO',
+            default_value: false,
+            optional: true,
+            example: 'pindo unity autobuild --skipyoo'
+          )
+        }
+      end
+    end
+  end
+end

data/lib/pindo/options/options.rb

@@ -12,3 +12,5 @@ require 'pindo/options/core/global_options_state'
 require 'pindo/options/groups/option_group'
 require 'pindo/options/groups/build_options'
 require 'pindo/options/groups/jps_options'
+require 'pindo/options/groups/unity_options'
+require 'pindo/options/groups/git_options'

data/lib/pindo/version.rb

@@ -6,13 +6,13 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.13.7"
+  VERSION = "5.13.10"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'
     VERSION_INFO_FILE = File.expand_path('~/.pindo/version_info.yml')
     CHECK_INTERVAL = 5 * 60 * 60   # 5小时检查一次
-    CONFIG_MIN_VERSION = '1.0.0'  # 硬编码的配置版本要求
+    CONFIG_MIN_VERSION = '1.1.0'  # 硬编码的配置版本要求
 
     class << self
       # 主版本检查方法（保持向后兼容）

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.13.7
+  version: 5.13.10
 platform: ruby
 authors:
 - wade
@@ -115,20 +115,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -298,9 +298,7 @@ files:
 - 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
 - lib/pindo/base/plaininformative.rb
 - lib/pindo/base/plistbuddyexecutable.rb
 - lib/pindo/base/standarderror.rb
@@ -365,6 +363,7 @@ files:
 - lib/pindo/command/jps/comment.rb
 - lib/pindo/command/jps/download.rb
 - lib/pindo/command/jps/login.rb
+- lib/pindo/command/jps/media.rb
 - lib/pindo/command/jps/resign.rb
 - lib/pindo/command/jps/upload.rb
 - lib/pindo/command/repo.rb
@@ -383,7 +382,6 @@ files:
 - 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
 - lib/pindo/command/utils/renewproj.rb
@@ -420,7 +418,6 @@ files:
 - lib/pindo/module/build/git_repo_helper.rb
 - lib/pindo/module/build/icon_downloader.rb
 - lib/pindo/module/build/swark_helper.rb
-- lib/pindo/module/build/version_helper.rb
 - lib/pindo/module/cert/cert_helper.rb
 - lib/pindo/module/cert/keychain_helper.rb
 - lib/pindo/module/cert/pem_helper.rb
@@ -441,16 +438,28 @@ files:
 - 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/ipa_local_resign_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/git/git_commit_task.rb
+- lib/pindo/module/task/model/git/git_tag_task.rb
+- lib/pindo/module/task/model/git_task.rb
+- lib/pindo/module/task/model/jps/jps_message_task.rb
+- lib/pindo/module/task/model/jps/jps_resign_task.rb
+- lib/pindo/module/task/model/jps/jps_upload_media_task.rb
+- lib/pindo/module/task/model/jps/jps_upload_task.rb
+- lib/pindo/module/task/model/jps_task.rb
+- lib/pindo/module/task/model/resign/ipa_local_resign_task.rb
+- lib/pindo/module/task/model/unity/unity_config_task.rb
+- lib/pindo/module/task/model/unity/unity_export_task.rb
+- lib/pindo/module/task/model/unity/unity_update_task.rb
+- lib/pindo/module/task/model/unity/unity_yoo_asset_task.rb
+- lib/pindo/module/task/model/unity_task.rb
 - lib/pindo/module/task/pindo_task.rb
 - lib/pindo/module/task/task_config.rb
 - lib/pindo/module/task/task_manager.rb
 - lib/pindo/module/unity/nuget_helper.rb
+- lib/pindo/module/unity/unity_command_helper.rb
+- lib/pindo/module/unity/unity_env_helper.rb
 - lib/pindo/module/unity/unity_helper.rb
+- lib/pindo/module/unity/unity_proc_helper.rb
 - lib/pindo/module/webserver/brotli_file_handler.rb
 - lib/pindo/module/webserver/preview/preview.css
 - lib/pindo/module/webserver/preview/preview.html
@@ -475,8 +484,10 @@ files:
 - 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/git_options.rb
 - lib/pindo/options/groups/jps_options.rb
 - lib/pindo/options/groups/option_group.rb
+- lib/pindo/options/groups/unity_options.rb
 - lib/pindo/options/helpers/bundleid_selector.rb
 - lib/pindo/options/options.rb
 - lib/pindo/version.rb