pindo 5.14.4 → 5.14.6

data/lib/pindo/options/core/option_configuration.rb

@@ -9,11 +9,9 @@ module Pindo
       # 初始化
       # @param available_options [Array<OptionItem>] 可用参数列表
       # @param raw_values [Hash] 原始参数值
-      # @param command_instance [Object, nil] 命令实例（用于 value_block）
-      def initialize(available_options, raw_values = {}, command_instance: nil)
+      def initialize(available_options, raw_values = {})
         @available_options = available_options
         @raw_values = raw_values
-        @command_instance = command_instance
         @values = {}
         @options_map = build_options_map
 
@@ -94,16 +92,13 @@ module Pindo
         # 2. 应用原始值（命令行参数和环境变量）
         apply_raw_values
 
-        # 3. 应用 value_block（交互式获取值）
-        apply_value_blocks
-
-        # 4. 类型转换
+        # 3. 类型转换
         convert_types
 
-        # 5. 验证必填参数
+        # 4. 验证必填参数
         validate_required
 
-        # 6. 自定义验证
+        # 5. 自定义验证
         validate_custom
       end
 
@@ -130,33 +125,6 @@ module Pindo
         end
       end
 
-      # 应用 value_block（交互式获取值）
-      # 优先级：命令行参数 > 缓存（已在 raw_values） > value_block > 默认值
-      def apply_value_blocks
-        # 检测是否是 help 请求，跳过交互式选择
-        return if ARGV.include?('--help') || ARGV.include?('-h')
-
-        @available_options.each do |item|
-          # 只有当参数没有值时，才调用 value_block
-          next if @values.key?(item.key) && !@values[item.key].nil?
-          next unless item.value_block
-
-          begin
-            # 调用 value_block 获取值
-            # 如果 value_block 接受参数，则传入命令实例
-            value = if item.value_block.arity > 0
-                      item.value_block.call(@command_instance)
-                    else
-                      item.value_block.call
-                    end
-            @values[item.key] = value unless value.nil?
-          rescue StandardError => e
-            # value_block 执行失败，记录错误但不中断流程
-            puts "[OptionConfiguration] value_block 执行失败 (#{item.key}): #{e.message}"
-          end
-        end
-      end
-
       # 类型转换
       def convert_types
         @available_options.each do |item|

data/lib/pindo/options/core/option_initializer.rb

@@ -21,7 +21,10 @@ module Pindo
         raw_values = OptionValueParser.parse(argv, option_items)
 
         # 2. 如果启用缓存，合并缓存值到 raw_values
-        if enable_cache
+        # 注意：如果是 --help 参数，跳过缓存逻辑
+        is_help_flag = argv.flag?('help')
+
+        if enable_cache && !is_help_flag
           state = GlobalOptionsState.instance
           state.prepare_cache(command_name, directory || Dir.pwd)
           cached_values = state.load_cached_values
@@ -33,8 +36,8 @@ module Pindo
           end
         end
 
-        # 3. 创建参数配置（自动处理验证等，传入命令实例用于 value_block）
-        options = OptionConfiguration.new(option_items, raw_values, command_instance: command_instance)
+        # 3. 创建参数配置（自动处理验证等）
+        options = OptionConfiguration.new(option_items, raw_values)
 
         # 4. 设置全局状态
         GlobalOptionsState.instance.set_command(

data/lib/pindo/options/core/option_item.rb

@@ -14,7 +14,6 @@ module Pindo
       attr_accessor :optional         # Boolean: 是否可选（默认为 true）
       attr_accessor :cacheable        # Boolean: 是否存入缓存（默认为 true）
       attr_accessor :verify_block     # Proc: 自定义验证逻辑
-      attr_accessor :value_block      # Proc: 获取参数值的 block（交互式输入）
       attr_accessor :example          # String: 使用示例
 
       # Boolean 类型标记
@@ -36,7 +35,6 @@ module Pindo
         @optional = options.fetch(:optional, true)
         @cacheable = options.fetch(:cacheable, false)  # 默认不存入缓存
         @verify_block = options[:verify_block]
-        @value_block = options[:value_block]
         @example = options[:example]
 
         validate_type!
@@ -129,7 +127,6 @@ module Pindo
           optional: overrides.key?(:optional) ? overrides[:optional] : @optional,
           cacheable: overrides.key?(:cacheable) ? overrides[:cacheable] : @cacheable,
           verify_block: overrides[:verify_block] || @verify_block,
-          value_block: overrides[:value_block] || @value_block,
           example: overrides[:example] || @example
         )
       end

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

@@ -61,16 +61,6 @@ module Pindo
             example: 'pindo jps upload --resign'
           ),
 
-          certid: OptionItem.new(
-            key: :certid,
-            name: '重签名Bundle ID',
-            description: '设置重签名的Bundle ID',
-            type: String,
-            env_name: 'PINDO_CERT_ID',
-            optional: true,
-            example: 'pindo jps resign --certid=com.test.bundleid'
-          ),
-
           media: OptionItem.new(
             key: :media,
             name: '上传媒体附件',
@@ -79,6 +69,36 @@ module Pindo
             env_name: 'PINDO_UPLOAD_MEDIA',
             optional: true,
             example: 'pindo ios autobuild --media'
+          ),
+
+          bind: OptionItem.new(
+            key: :bind,
+            name: '绑定Git Commit',
+            description: '上传完成后，将 Git commit 绑定到已上传的项目包',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_BIND_COMMIT',
+            optional: true,
+            example: 'pindo ios autobuild --bind'
+          ),
+
+          list: OptionItem.new(
+            key: :list,
+            name: '列出历史版本',
+            description: '列出历史上传记录并选择',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_LIST_VERSIONS',
+            optional: true,
+            example: 'pindo jps apptest --list'
+          ),
+
+          group: OptionItem.new(
+            key: :group,
+            name: '发送到测试组',
+            description: '发送消息到测试组（DevTest）而不是只发给自己',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_SEND_GROUP',
+            optional: true,
+            example: 'pindo jps apptest --group'
           )
         }
       end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.14.4"
+  VERSION = "5.14.6"
 
   class VersionCheck
     RUBYGEMS_API = 'https://rubygems.org/api/v1/gems/pindo.json'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.14.4
+  version: 5.14.6
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2025-12-29 00:00:00.000000000 Z
+date: 2025-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -115,20 +115,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -149,46 +149,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.0
-- !ruby/object:Gem::Dependency
-  name: faraday-retry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -362,7 +336,6 @@ files:
 - lib/pindo/command/jps.rb
 - lib/pindo/command/jps/apptest.rb
 - lib/pindo/command/jps/bind.rb
-- lib/pindo/command/jps/comment.rb
 - lib/pindo/command/jps/download.rb
 - lib/pindo/command/jps/login.rb
 - lib/pindo/command/jps/media.rb
@@ -450,10 +423,12 @@ files:
 - 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_bind_package_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/jps_workflow_message_task.rb
 - lib/pindo/module/task/model/jps_task.rb
 - lib/pindo/module/task/model/nuget/nuget_build_task.rb
 - lib/pindo/module/task/model/nuget/nuget_upload_task.rb
@@ -530,9 +505,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 requirements: []
 rubygems_version: 3.6.3
-specification_version: 3
+specification_version: 4
 summary: easy work
 test_files: []

data/lib/pindo/command/jps/comment.rb

@@ -1,84 +0,0 @@
-require 'highline/import'
-require 'fileutils'
-require 'pindo/module/pgyer/pgyerhelper'
-
-
-module Pindo
-    class Command
-        class Jps < Command
-            class Comment < Jps
-
-                self.summary = '修改jps中已经上传安装包的备注信息'
-
-                self.description = <<-DESC
-                修改jps中已经上传安装包的备注信息。
-
-                支持功能:
-
-                    * 修改版本备注
-                    * 查看历史版本
-                    * 选择指定版本
-
-                使用示例:
-
-                        $ pindo jps comment                    # 修改当前目录项目的最新版本备注
-
-                        $ pindo jps comment --proj=demo       # 修改指定项目的版本备注
-
-                        $ pindo jps comment --list            # 列出历史版本供选择修改
-                DESC
-
-                self.arguments = [
-
-                ]
-
-                def self.options
-                  [
-                    ['--login', '强制再次登录jps网站'],
-                    ['--proj', '指定哪个项目(忽略大小写空格等等字符),用法：pindo jps comment --proj=prancksoundv4'],
-                    ['--list', '列出上传记录并选择，用法：pindo jps comment --list'],
-
-                  ].concat(super)
-                end
-
-
-
-                def initialize(argv)
-
-                    @args_login_flag = argv.flag?('login', false)
-                    @args_list_flag = argv.flag?('list', false)
-                    @args_proj_name = argv.option('proj')
-
-                    super(argv)
-                    @additional_args = argv.remainder!
-                end
-
-                def validate!
-
-                    super
-                end
-
-                def run
-
-                    PgyerHelper.share_instace.setForeLogin(beforeLogin:@args_login_flag)
-                    app_info_obj = PgyerHelper.share_instace.prepare_upload(working_directory:Dir.pwd, proj_name:@args_proj_name)
-
-                    if app_info_obj.nil?
-                        raise Informative, "#{proj_name} 错误， 请输入正确的App代号名称， jps网站没有该App"
-                    end
-
-
-                    version_item_obj = PgyerHelper.share_instace.get_versioon_history_item(app_info_obj:app_info_obj, list_select_flat:@args_list_flag)
-
-                    if version_item_obj.nil?
-                        raise Informative, "没有找到上传记录"
-                    end
-
-                    PgyerHelper.share_instace.modify_coment(app_info_obj:app_info_obj, version_item_obj:version_item_obj)
-
-                end
-
-            end
-        end
-    end
-end