pindo 5.17.4 → 5.18.3

data/lib/pindo/module/xcode/xcode_build_helper.rb

@@ -95,7 +95,7 @@ module Pindo
 
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
             project_obj = Xcodeproj::Project.open(project_fullname)
-            select_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
+            select_target = project_obj.targets.select { |target| target.respond_to?(:product_type) && target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])  }.first
             file_ref = select_target.resources_build_phase.files_references.select { |file| file.display_name.include?("GoogleService-Info.plist") }.first
 
             if !file_ref.nil?
@@ -113,10 +113,10 @@ module Pindo
             end
         end
 
-        # 获取 Target 名称映射
+        # 获取扩展 Target 名称后缀到 config key 的映射
+        # 注意：MainTarget 不在此映射中，主应用 target 直接使用 app_identifier
         def get_target_name_map
             return {
-                "MainTarget" => "bundle_id",
                 "Content" => "bundle_id_pushcontent",
                 "Service" => "bundle_id_pushservice",
                 "Keyboard" => "bundle_id_keyboard",
@@ -143,24 +143,47 @@ module Pindo
             end
 
             project_obj.targets.each do |target|
+                # 跳过非 native target（如 PBXAggregateTarget）
+                next unless target.respond_to?(:product_type)
 
                 exe_binary_name = config_json['app_info']['app_display_name']
                 exe_binary_name = exe_binary_name.gsub(/ /, '');
                 exe_binary_name = exe_binary_name.gsub(/\'/, '');
 
+                target_name_map = get_target_name_map
+
+                # 根据 target 类型确定 bundle_id
+                target_bundle_id = nil
+                if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
+                    # 主应用 target：使用 app_identifier
+                    target_bundle_id = config_json['app_info']['app_identifier']
+                else
+                    # 扩展 target：从 target_name_map 查找对应的 bundle_id
+                    # target_name_map 的 value 是 bundle_id_* 格式，config_json 中实际字段名是 app_identifier_*
+                    target_name_map.each do |suffix, config_key|
+                        if target.name.to_s.end_with?(suffix)
+                            json_key = config_key.sub('bundle_id_', 'app_identifier_')
+                            target_bundle_id = config_json['app_info'][json_key]
+                            break
+                        end
+                    end
+                end
+
                 target.build_configurations.each do |config|
                     config.build_settings['CURRENT_PROJECT_VERSION'] = config_json['app_info']['app_build_version']
                     config.build_settings['MARKETING_VERSION'] = config_json['app_info']['app_version']
                     config.build_settings['INFOPLIST_KEY_CFBundleDisplayName'] = config_json['app_info']['app_display_name']
+                    if target_bundle_id && !target_bundle_id.empty? && !target_bundle_id.include?("*")
+                        config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = target_bundle_id
+                    end
                 end
 
-                target_name_map = get_target_name_map
-               if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
+                if target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application])
                     target.build_configurations.each do |config|
                         config.build_settings['PRODUCT_NAME'] = exe_binary_name
                         config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = ios_deployment_targe
                     end
-                elsif
+                else
                     target_name_map.each do |k, v|
                         if target.name.to_s.end_with?(k)
                             target.build_configurations.each do |config|
@@ -321,33 +344,171 @@ module Pindo
 
         end
 
+        # 解析 INFOPLIST_FILE 路径，处理 Xcode 变量和引号
+        # @param project_dir [String] 项目目录
+        # @param raw_path [String] INFOPLIST_FILE 原始值
+        # @param target [Xcodeproj::Project::Object::PBXNativeTarget, nil] target（用于解析 TARGET_NAME 等变量）
+        # @return [String, nil] 解析后的绝对路径，文件不存在时返回 nil
+        def resolve_info_plist_path(project_dir, raw_path, target: nil)
+            return nil if raw_path.nil? || raw_path.empty?
+
+            # 去除首尾引号
+            resolved = raw_path.gsub(/\A["']|["']\z/, '')
+
+            # 解析 Xcode 变量
+            resolved = resolved
+                .gsub('$(SRCROOT)', project_dir)
+                .gsub('${SRCROOT}', project_dir)
+                .gsub('$(PROJECT_DIR)', project_dir)
+                .gsub('${PROJECT_DIR}', project_dir)
+
+            # 解析 target 相关变量
+            if target
+                target_name = target.name.to_s
+                resolved = resolved
+                    .gsub('$(TARGET_NAME)', target_name)
+                    .gsub('${TARGET_NAME}', target_name)
+
+                # PRODUCT_NAME 从 build settings 获取，降级到 TARGET_NAME
+                product_name = target.build_configurations.first.build_settings['PRODUCT_NAME'] || target_name
+                # PRODUCT_NAME 本身可能是 $(TARGET_NAME)，递归替换
+                product_name = product_name
+                    .gsub('$(TARGET_NAME)', target_name)
+                    .gsub('${TARGET_NAME}', target_name)
+                resolved = resolved
+                    .gsub('$(PRODUCT_NAME)', product_name)
+                    .gsub('${PRODUCT_NAME}', product_name)
+            end
+
+            # 如果仍有未解析的变量，尝试去掉变量部分做 glob 匹配
+            if resolved.match?(/\$[\({]/)
+                # 将未解析的变量替换为通配符，尝试 glob 查找
+                glob_pattern = resolved.gsub(/\$[\({][^)\}]+[\)}]/, '*')
+                glob_path = File.absolute_path?(glob_pattern) ? glob_pattern : File.join(project_dir, glob_pattern)
+                matches = Dir.glob(glob_path)
+                return matches.first if matches.size == 1
+                if matches.size > 1
+                    Funlog.instance.fancyinfo_warning("INFOPLIST_FILE 变量解析后匹配到多个文件: #{matches.join(', ')}，跳过")
+                end
+                return nil
+            end
+
+            # 如果是相对路径，拼接 project_dir
+            abs_path = File.absolute_path?(resolved) ? resolved : File.join(project_dir, resolved)
+            File.exist?(abs_path) ? abs_path : nil
+        end
+
+        # 确保 Info.plist 文件存在，不存在时自动创建并配置 Xcode 工程
+        # 仅在需要写入复杂配置（URL Schemes 等）时调用
+        # @param project_dir [String] 项目目录
+        # @param target [Xcodeproj::Project::Object::PBXNativeTarget] Xcode target
+        # @param project_obj [Xcodeproj::Project] Xcode 工程对象
+        # @return [String, nil] Info.plist 文件路径
+        def ensure_info_plist_exists(project_dir:, target:, project_obj:)
+            # 1. 尝试从 build settings 获取已有路径
+            raw_path = target.build_configurations.first.build_settings['INFOPLIST_FILE']
+            existing_path = resolve_info_plist_path(project_dir, raw_path, target: target)
+            return existing_path if existing_path
+
+            # 2. 检查是否是 GENERATE_INFOPLIST_FILE=YES 的合法模式
+            generate_flag = target.build_configurations.first.build_settings['GENERATE_INFOPLIST_FILE']
+            is_generated_mode = (generate_flag.to_s.upcase == 'YES') && (raw_path.nil? || raw_path.empty?)
+
+            # 3. 创建 Info.plist（GENERATE_INFOPLIST_FILE 模式下作为补充 plist，Xcode 会合并）
+            target_name = target.name.to_s
+            # 优先使用原始 INFOPLIST_FILE 路径（用已知变量替换后）创建，避免覆盖工程配置
+            if raw_path && !raw_path.empty?
+                # 用 resolve 中相同的变量替换逻辑解析路径（不检查文件是否存在）
+                resolved_raw = raw_path
+                    .gsub(/\A["']|["']\z/, '')
+                    .gsub('$(SRCROOT)', project_dir).gsub('${SRCROOT}', project_dir)
+                    .gsub('$(PROJECT_DIR)', project_dir).gsub('${PROJECT_DIR}', project_dir)
+                    .gsub('$(TARGET_NAME)', target_name).gsub('${TARGET_NAME}', target_name)
+                product_name = target.build_configurations.first.build_settings['PRODUCT_NAME'] || target_name
+                product_name = product_name.gsub('$(TARGET_NAME)', target_name).gsub('${TARGET_NAME}', target_name)
+                resolved_raw = resolved_raw.gsub('$(PRODUCT_NAME)', product_name).gsub('${PRODUCT_NAME}', product_name)
+
+                # 如果仍含未解析变量，降级到 target_name/Info.plist
+                if resolved_raw.match?(/\$[\({]/)
+                    relative_plist_path = "#{target_name}/Info.plist"
+                elsif File.absolute_path?(resolved_raw)
+                    # 绝对路径转为相对路径
+                    relative_plist_path = resolved_raw.sub(/\A#{Regexp.escape(project_dir)}\//, '')
+                else
+                    relative_plist_path = resolved_raw
+                end
+            else
+                relative_plist_path = "#{target_name}/Info.plist"
+            end
+            info_plist_path = File.join(project_dir, relative_plist_path)
+
+            if is_generated_mode
+                Funlog.instance.fancyinfo_warning("Target #{target_name} 使用 GENERATE_INFOPLIST_FILE 模式，创建补充 Info.plist 用于复杂配置")
+            else
+                Funlog.instance.fancyinfo_warning("Target #{target_name} 未找到 Info.plist，自动创建: #{relative_plist_path}")
+            end
+
+            # 3.1 创建目录和最小 Info.plist
+            FileUtils.mkdir_p(File.dirname(info_plist_path))
+            empty_plist = {}
+            Xcodeproj::Plist.write_to_path(empty_plist, info_plist_path)
+
+            # 3.2 设置 build settings
+            target.build_configurations.each do |config|
+                config.build_settings['INFOPLIST_FILE'] = relative_plist_path
+                # 保持 GENERATE_INFOPLIST_FILE = YES，Xcode 自动合并
+                config.build_settings['GENERATE_INFOPLIST_FILE'] ||= 'YES'
+            end
+
+            # 3.3 将文件添加到 Xcode 工程引用，保持与实际相对路径一致
+            plist_dir = File.dirname(relative_plist_path)
+            plist_name = File.basename(relative_plist_path)
+            target_group =
+                if plist_dir == "." || plist_dir.empty?
+                    project_obj.main_group.find_subpath(target_name, true)
+                else
+                    project_obj.main_group.find_subpath(plist_dir, true)
+                end
+
+            unless target_group.files.any? { |f| f.path == plist_name } ||
+                   project_obj.files.any? { |f| f.path == relative_plist_path }
+                target_group.new_file(plist_name)
+                Funlog.instance.fancyinfo_success("已将 Info.plist 添加到 Xcode 工程: #{relative_plist_path}")
+            end
+
+            project_obj.save
+
+            info_plist_path
+        end
+
         def modify_info_plist(project_dir:nil, proj_name:nil, config_json:nil)
 
             ## Main Info.plist
             proj_fullname = File.join(project_dir, proj_name) + ".xcodeproj"
             project_obj = Xcodeproj::Project.open(proj_fullname)
 
-            info_plist_path = nil
             project_obj.targets.each do |target|
-                temp_info = target.build_configurations.first.build_settings['INFOPLIST_FILE']
-                if !temp_info.nil?
-                    info_plist_path = File.join(project_dir, temp_info)
-                end
-
-                # if target.product_type.to_s.eql?("com.apple.product-type.application") && !File.exist?(info_plist_path)
-                #     info_plist_array = Dir.glob(File.join(project_dir, target.name, "**", "Info.plist"))
-                #     if info_plist_array.size == 1
-                #         info_plist_path = info_plist_array.first
-                #     else
-                #         raise Informative, "Missing Target #{target.name.to_s} Info.plist !!! Modify Info.plist Error !!!"
-                #     end
-                # end
-                
-                if target.product_type.to_s.eql?("com.apple.product-type.application") &&  (info_plist_path.nil? || !File.exist?(info_plist_path))
-                    raise Informative, "Target #{target.name.to_s} 没有找到Info.plist, 修改Info.plist出错了！！"
+                # 跳过非 native target（如 PBXAggregateTarget）
+                next unless target.respond_to?(:product_type)
+
+                is_app_target = target.product_type.to_s.eql?("com.apple.product-type.application")
+
+                # 主应用 target：确保 Info.plist 存在（需要写入 URL Schemes 等复杂配置）
+                # 非主应用 target：仅在已有 Info.plist 时修改，不强制创建
+                if is_app_target
+                    info_plist_path = ensure_info_plist_exists(
+                        project_dir: project_dir,
+                        target: target,
+                        project_obj: project_obj
+                    )
+                else
+                    raw_path = target.build_configurations.first.build_settings['INFOPLIST_FILE']
+                    info_plist_path = resolve_info_plist_path(project_dir, raw_path, target: target)
                 end
 
-                if target.product_type.to_s.eql?("com.apple.product-type.application") then
+                next if info_plist_path.nil?
+
+                if is_app_target
                     modify_maintarget_info_plist(plist_file_name:info_plist_path, config_json:config_json, target_name:proj_name)
                 end
 
@@ -513,7 +674,7 @@ module Pindo
             project_obj = Xcodeproj::Project.open(project_fullname)
 
             project_build_platform = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")["Release"]
-            main_target = project_obj.targets.select { |target| target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) }.first
+            main_target = project_obj.targets.select { |target| target.respond_to?(:product_type) && target.product_type.include?(Xcodeproj::Constants::PRODUCT_TYPE_UTI[:application]) }.first
             provisioning_profile_name = main_target.build_configurations.first.build_settings['PROVISIONING_PROFILE_SPECIFIER'].downcase
 
             # 确定构建类型和 iCloud 环境

data/lib/pindo/module/xcode/xcode_project_helper.rb

@@ -125,7 +125,7 @@ module Pindo
             config.build_settings['CODE_SIGN_IDENTITY'] = "iPhone Developer"
             config.build_settings['DEVELOPMENT_TEAM'] = "9WX2E4VC26"
             config.build_settings['PROVISIONING_PROFILE'] = ""
-            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] =  bundle_id unless bundle_id.eql?("com.heroneverdie101.*")
+            config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] =  bundle_id unless bundle_id.include?("*")
             config.build_settings['PROVISIONING_PROFILE_SPECIFIER'] = "match Development " + bundle_id
             # config.build_settings['TARGETED_DEVICE_FAMILY'] = "1,2"
             if is_extention

data/lib/pindo/module/xcode/xcode_res_helper.rb

@@ -8,23 +8,38 @@ module Pindo
 
     class XcodeResHelper
         class << self
+            def macos_project?(proj_dir)
+                xcodeproj_file_name = Dir.glob(File.join(proj_dir, "*.xcodeproj")).max_by { |f| File.mtime(f) }
+                return false if xcodeproj_file_name.nil?
+
+                project_obj = Xcodeproj::Project.open(xcodeproj_file_name)
+                sdkroot_settings = project_obj.root_object.build_configuration_list.get_setting("SDKROOT")
+                sdkroot = sdkroot_settings.values.compact.first
+                !sdkroot.nil? && sdkroot.eql?("macosx")
+            end
+
+            def image_dimensions(image_data)
+                width, height = image_data.fetch("size").split("x").map(&:to_f)
+                scale = image_data.fetch("scale", "1x").to_s.chomp("x").to_f
+
+                [
+                    (width * scale).to_i,
+                    (height * scale).to_i
+                ]
+            end
             
             def create_icon(icon_name:nil, new_icon_dir:nil, xcode_icon_json:nil)
             if !File.exist?(icon_name)
                 raise  Informative, "文件不存在:#{icon_name}"
             end
             xcode_icon_json["images"].each do |image_data|
-                width,height  = image_data["size"].split("x")
+                width, height = image_dimensions(image_data)
                 image_name = image_data["filename"]
-                iNum = image_name.split("@").last.chomp(".png").chomp("x").to_f
-                width = width.to_f * iNum
-                height = height.to_f * iNum
-
-                width = width.to_i
-                height = height.to_i
+                next if image_name.nil? || image_name.empty?
 
                 command = [
                     'sips',
+                    '-s', 'format', 'png',
                     '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
                     '-z', width.to_s, height.to_s,
                     icon_name,
@@ -48,14 +63,9 @@ module Pindo
                 raise  Informative, "文件不存在:#{image_icon_name} or #{icon_name}"
             end
             xcode_icon_json["images"].each do |image_data|
-
-                height, width = image_data["size"].split("x")
+                width, height = image_dimensions(image_data)
                 image_name = image_data["filename"]
-                iNum = image_name.split("@").last.chomp(".png").chomp("x").to_f
-                width = width.to_f * iNum
-                height = height.to_f * iNum
-                width = width.to_i
-                height = height.to_i
+                next if image_name.nil? || image_name.empty?
 
                 icon_ori_name = image_icon_name
                 if width.to_s.eql?(height.to_s)
@@ -64,6 +74,7 @@ module Pindo
 
                 command = [
                     'sips',
+                    '-s', 'format', 'png',
                     '--matchTo', '/System/Library/ColorSync/Profiles/sRGB Profile.icc',
                     '-z', width.to_s, height.to_s,
                     icon_ori_name,
@@ -77,13 +88,18 @@ module Pindo
             end
         end
 
-        def create_icons(icon_name:nil, new_icon_dir:nil)
+        def create_icons(icon_name:nil, new_icon_dir:nil, proj_dir:nil)
             begin
                 FileUtils.mkdir_p(new_icon_dir)
             rescue => e
                 puts e
             end
-            create_icon(icon_name: icon_name, new_icon_dir: new_icon_dir, xcode_icon_json: XcodoeResConst.xcode_ios_icon_json)
+            xcode_icon_json = if !proj_dir.nil? && macos_project?(proj_dir)
+                                XcodoeResConst.xcode_macos_icon_json
+                              else
+                                XcodoeResConst.xcode_ios_icon_json
+                              end
+            create_icon(icon_name: icon_name, new_icon_dir: new_icon_dir, xcode_icon_json: xcode_icon_json)
             icon_dir = File.dirname(icon_name)
             imessage_icon = File.join(icon_dir, "icon1024_768.png")
             new_imessage_icon_dir = File.join(new_icon_dir, "imessage")

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

@@ -19,13 +19,13 @@ module Pindo
             type: String,
             env_name: 'PINDO_BUNDLE_ID',
             optional: true,
-            cacheable: true,  # 存入文件缓存
+            cacheable: false,  # 从 JPSBuildConfig.json 获取，不需要缓存
             verify_block: proc do |value|
               unless value =~ /^[a-zA-Z0-9\-\.\*]+$/
                 raise "Bundle ID 格式错误: #{value}，应该类似 com.example.app"
               end
             end,
-            example: 'pindo ios autobuild --bundleid=com.example.app'
+            example: 'pindo ios autobuild --bundleid=com.example.*'
           ),
 
           bundle_name: OptionItem.new(
@@ -35,14 +35,14 @@ module Pindo
             type: String,
             env_name: 'PINDO_BUNDLE_NAME',
             optional: true,
-            cacheable: true,  # 存入文件缓存
+            cacheable: false,  # 从 JPSBuildConfig.json 获取，不需要缓存
             verify_block: proc do |value|
               # 允许标准格式（com.example.app）或带通配符格式（com.example.*）
-              unless value =~ /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_\*]*)+$/i
+              unless value =~ /\A[a-z][a-z0-9_]*(\.(?:[a-z][a-z0-9_]*|\*))+\z/i
                 raise "Package Name 格式错误: #{value}，应该类似 com.example.app 或 com.example.*"
               end
             end,
-            example: 'pindo android autobuild --bundle_name=com.example.app'
+            example: 'pindo android autobuild --bundle_name=com.example.*'
           ),
 
           build_type: OptionItem.new(

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

@@ -81,19 +81,19 @@ module Pindo
           git_commit: OptionItem.new(
             key: :git_commit,
             name: 'Git 未提交处理方式',
-            description: '处理未提交文件的方式: commit/skip/reset/stash/exit',
+            description: '处理未提交文件的方式: commit/skip-with-tag/skip-without-tag/reset/stash/exit',
             type: String,
             env_name: 'PINDO_GIT_COMMIT',
             default_value: nil,
             optional: true,
             cacheable: false,
             verify_block: proc do |value|
-              allowed = %w[commit skip reset delete stash exit resetde discard]
+              allowed = %w[commit skip-with-tag skip-without-tag reset delete stash exit resetde discard]
               unless allowed.include?(value.to_s.downcase)
                 raise "git_commit 值错误: #{value}, 必须是 #{allowed.join(', ')} 之一"
               end
             end,
-            example: 'pindo unity autobuild --git-commit=skip'
+            example: 'pindo unity autobuild --git-commit=skip-with-tag'
           )
         }
       end
@@ -122,8 +122,10 @@ module Pindo
         case value.to_s.downcase
         when 'commit', 'comm'
           Pindo::UncommittedFilesProcessType::COMMIT
-        when 'skip', 'none', 'dont'
-          Pindo::UncommittedFilesProcessType::SKIP
+        when 'skip-with-tag'
+          Pindo::UncommittedFilesProcessType::SKIP_WITH_TAG
+        when 'skip-without-tag'
+          Pindo::UncommittedFilesProcessType::SKIP_WITHOUT_TAG
         when 'reset', 'delete', 'resetde', 'discard'
           Pindo::UncommittedFilesProcessType::RESET
         when 'stash'

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

@@ -41,6 +41,17 @@ module Pindo
             default_value: false,
             optional: true,
             example: 'pindo unity autobuild --skipyoo'
+          ),
+
+          kill_unity: OptionItem.new(
+            key: :kill_unity,
+            name: '自动关闭Unity',
+            description: '自动关闭检测到的Unity进程（不询问用户确认）',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_KILL_UNITY',
+            default_value: false,
+            optional: true,
+            example: 'pindo unity autobuild --kill-unity'
           )
         }
       end

data/lib/pindo/options/helpers/bundleid_selector.rb

@@ -94,6 +94,31 @@ module Pindo
         bundleids
       end
 
+      # 加载 all_bundleid_group 映射表
+      # @return [Hash] group_name => bundle_id 的映射，如 {"fancyapptest" => "com.heroneverdie101.fancyapptest"}
+      def self.load_bundleid_group
+        config_file = File.join(pindo_env_configdir, 'bundleid_config.json')
+        return {} unless File.exist?(config_file)
+
+        begin
+          config = JSON.parse(File.read(config_file))
+          config['all_bundleid_group'] || {}
+        rescue => e
+          puts "加载 bundleid_config.json 失败: #{e.message}"
+          {}
+        end
+      end
+
+      # 通过 group name 查找真实 bundle ID
+      # @param group_name [String] 组名（如 "fancyapptest"、"wildcarddevelopmentid"）
+      # @return [String, nil] 真实 bundle ID（如 "com.heroneverdie101.fancyapptest"），未找到返回 nil
+      def self.resolve_bundleid_by_group_name(group_name)
+        return nil if group_name.nil? || group_name.empty?
+
+        group = load_bundleid_group
+        group[group_name]
+      end
+
       # 获取 pindo 环境配置目录
       def self.pindo_env_configdir
         require_relative '../../config/pindoconfig'

data/lib/pindo/options/helpers/git_constants.rb

@@ -18,11 +18,12 @@ module Pindo
   # Git 未提交文件处理类型枚举
   # 用于控制构建前未提交文件的处理方式
   module UncommittedFilesProcessType
-    COMMIT = :commit # 自动提交所有更改
-    SKIP = :skip     # 跳过处理，继续执行
-    RESET = :reset   # 丢弃所有更改，重置到远程
-    STASH = :stash   # 保存到 stash 区域
-    EXIT = :exit     # 退出程序，要求手动处理
-    NONE = :none     # 没有需要提交的内容
+    COMMIT = :commit                     # 自动提交所有更改
+    SKIP_WITH_TAG = :skip_with_tag       # 不提交，但合并分支并打 tag
+    SKIP_WITHOUT_TAG = :skip_without_tag # 不提交，不合并分支，不打 tag
+    RESET = :reset                       # 丢弃所有更改，重置到远程
+    STASH = :stash                       # 保存到 stash 区域
+    EXIT = :exit                         # 退出程序，要求手动处理
+    NONE = :none                         # 没有需要提交的内容
   end
 end

data/lib/pindo/version.rb

@@ -6,13 +6,13 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.17.4"
+  VERSION = "5.18.3"
 
   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.5.0'  # 硬编码的配置版本要求
+    CONFIG_MIN_VERSION = '1.7.0'  # 硬编码的配置版本要求
 
     class << self
       # 主版本检查方法（保持向后兼容）
@@ -557,4 +557,4 @@ module Pindo
       end
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 5.17.4
+  version: 5.18.3
 platform: ruby
 authors:
 - wade
 bindir: bin
 cert_chain: []
-date: 2026-03-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide
@@ -109,20 +109,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -304,6 +304,7 @@ files:
 - lib/pindo/command/appstore/quswauth.rb
 - lib/pindo/command/appstore/screenshots.rb
 - lib/pindo/command/appstore/tag.rb
+- lib/pindo/command/appstore/updateid.rb
 - lib/pindo/command/appstore/upload.rb
 - lib/pindo/command/env.rb
 - lib/pindo/command/env/dreamstudio.rb
@@ -348,14 +349,17 @@ files:
 - lib/pindo/command/unity/packinit.rb
 - lib/pindo/command/unity/packpush.rb
 - lib/pindo/command/utils.rb
+- lib/pindo/command/utils/allcopyconfig.rb
 - lib/pindo/command/utils/boss.rb
 - lib/pindo/command/utils/clearcert.rb
+- lib/pindo/command/utils/copyconfig.rb
 - lib/pindo/command/utils/decrypt.rb
 - lib/pindo/command/utils/device.rb
 - lib/pindo/command/utils/encrypt.rb
 - lib/pindo/command/utils/fabric.rb
 - lib/pindo/command/utils/icon.rb
 - lib/pindo/command/utils/installskills.rb
+- lib/pindo/command/utils/renewbundleid.rb
 - lib/pindo/command/utils/renewcert.rb
 - lib/pindo/command/utils/renewproj.rb
 - lib/pindo/command/utils/repoinit.rb
@@ -379,6 +383,7 @@ files:
 - lib/pindo/module/android/gradle_helper.rb
 - lib/pindo/module/android/java_env_helper.rb
 - lib/pindo/module/android/keystore_helper.rb
+- lib/pindo/module/android/workflow_gradle_injector.rb
 - lib/pindo/module/appselect.rb
 - lib/pindo/module/appstore/appstore_iap_tier.json
 - lib/pindo/module/appstore/appstore_in_app_purchase.rb
@@ -511,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 3.0.0
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 4.0.3
 specification_version: 4
 summary: easy work
 test_files: []