pindo 5.20.0 → 5.20.1

data/lib/pindo/module/task/model/git/git_tag_task.rb

@@ -1,5 +1,6 @@
 require 'pindo/module/task/model/git_task'
 require 'pindo/base/git_handler'
+require 'pindo/module/source_files_guard'
 require 'pindo/module/utils/git_repo_helper'
 
 module Pindo
@@ -26,9 +27,9 @@ module Pindo
       #   - tag_pre: tag前缀，默认 'v'
       # 注意：版本号从 GitCommitTask 获取（GitTagTask 必须依赖 GitCommitTask）
       def initialize(project_path, options = {})
-        options[:project_path] = project_path
+        @process_type = options[:process_type]
         # 调用基类初始化（基类会设置所有通用属性）
-        super("Git仓库打Tag", options)
+        super("Git仓库打Tag", options.merge(project_path: project_path))
       end
 
       def validate
@@ -57,19 +58,25 @@ module Pindo
         stash_saved = false
 
         begin
-          # 1. 工作目录不干净则暂存
+          # 1. 先从 GitCommitTask 回填 process_type，再决定提交或 stash
+          backfill_params_from_commit_task(git_commit_data)
+
+          build_changes_committed = commit_build_changes? && commit_build_changes(root_dir)
+
+          # 未命中固定源码清单的构建产物不进入提交；暂存后再合并、打 tag。
           stash_saved = stash_if_dirty(root_dir, stash_name)
 
-          # 2. 从 GitCommitTask 回填参数（须在合并之前，确保 release_branch 等正确）
-          backfill_params_from_commit_task(git_commit_data)
+          if build_changes_committed
+            Pindo::GitHandler.check_unpushed_commits(project_dir: root_dir, branch: coding_branch)
+          end
 
-          # 3. 合并到发布分支
+          # 2. 合并到发布分支
           merge_to_release_branch(root_dir, coding_branch)
 
-          # 4. 解析版本号
+          # 3. 解析版本号
           resolve_build_version(root_dir, git_commit_data, git_repo_helper)
 
-          # 5. 创建并推送 Tag
+          # 4. 创建并推送 Tag
           tag_name = "#{@tag_pre}#{@build_version}"
           git_repo_helper.create_and_push_tag(
             project_dir: root_dir,
@@ -77,7 +84,7 @@ module Pindo
             tag_type: @tag_type
           )
         ensure
-          # 6. 还原 stash
+          # 5. 还原 stash
           restore_stash(root_dir, stash_name) if stash_saved
         end
       end
@@ -94,7 +101,7 @@ module Pindo
         true
       end
 
-      # 从 GitCommitTask 回填 release_branch / tag_pre / tag_type / ver_inc
+      # 从 GitCommitTask 回填 Git 参数和未提交文件处理方式
       def backfill_params_from_commit_task(git_commit_data)
         return unless git_commit_data && git_commit_data[:task_param]
 
@@ -103,10 +110,59 @@ module Pindo
         @tag_pre = param[:tag_pre] if param[:tag_pre]
         @tag_type = param[:tag_type] if param[:tag_type]
         @ver_inc = param[:ver_inc] if param[:ver_inc]
+        @process_type = param[:process_type] if param[:process_type]
+        @build_version = param[:build_version] if param[:build_version]
+        @build_number = param[:build_number] if param[:build_number]
+      end
+
+      def commit_build_changes?
+        @process_type == Pindo::UncommittedFilesProcessType::COMMIT
+      end
+
+      # 只提交 autobuild 明确注入的源码文件，避免把 Pods、DerivedData 等构建产物带入发布提交。
+      def commit_build_changes(root_dir)
+        guard_paths = existing_guard_paths(
+          root_dir,
+          Pindo::BuildSourceFilesGuard.for_project(@project_path)
+        )
+        return false if guard_paths.empty?
+
+        Pindo::GitHandler.git!(git_command(root_dir, 'add', '--', *guard_paths))
+        staged_files = Pindo::GitHandler.git!(
+          git_command(root_dir, 'diff', '--cached', '--name-only', '--', *guard_paths)
+        ).lines.map(&:strip).reject(&:empty?)
+        return false if staged_files.empty?
+
+        commit_message = "chore(build): 更新版本至 #{@build_version}"
+        Pindo::GitHandler.git!(
+          git_command(root_dir, 'commit', '--only', '-m', commit_message, '--', *staged_files)
+        )
+        Funlog.instance.fancyinfo_success("已提交构建注入源码: #{staged_files.join(', ')}")
+        true
+      end
+
+      def existing_guard_paths(root_dir, source_files)
+        expanded_root = File.realpath(root_dir)
+        root_prefix = "#{expanded_root}#{File::SEPARATOR}"
+
+        Array(source_files).filter_map do |path|
+          next unless File.exist?(path)
+
+          expanded_path = File.realpath(path)
+          next unless expanded_path.start_with?(root_prefix)
+
+          expanded_path.delete_prefix(root_prefix)
+        end.uniq
+      end
+
+      def git_command(root_dir, command, *arguments)
+        ['--literal-pathspecs', '-C', root_dir, command, *arguments]
       end
 
       # 将编码分支双向合并到发布分支，确保两分支同步到同一节点
       def merge_to_release_branch(root_dir, coding_branch)
+        # 解析发布分支（独立运行、或未经 GitCommitTask 回填时也能得到正确分支）
+        @release_branch = Pindo::GitHandler.resolve_release_branch(local_repo_dir: root_dir, preferred: @release_branch)
         return if coding_branch == @release_branch
 
         Pindo::GitHandler.merge_branches(

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

@@ -141,6 +141,49 @@ module Pindo
             env_name: 'PINDO_JPS_INDEX',
             optional: true,
             example: 'pindo jps download --index=1'
+          ),
+
+          type: OptionItem.new(
+            key: :type,
+            name: '工作流类型',
+            description: '指定要配置的工作流类型，逗号分隔（ipa,apk,zip,mac,exe,git）；不指定时弹出交互多选菜单',
+            type: String,
+            env_name: 'PINDO_JPS_CONFIG_TYPE',
+            optional: true,
+            cacheable: false,
+            example: 'pindo jps config --type=ipa,apk,git'
+          ),
+
+          clean: OptionItem.new(
+            key: :clean,
+            name: '清除配置',
+            description: '清除 JPSBuildConfig.json 中指定或选中的工作流绑定',
+            type: OptionItem::Boolean,
+            env_name: 'PINDO_JPS_CONFIG_CLEAN',
+            optional: true,
+            example: 'pindo jps config --clean'
+          ),
+
+          proj: OptionItem.new(
+            key: :proj,
+            name: 'JPS项目名',
+            description: '直接指定 JPS 上的项目名称，跳过项目选择菜单（非交互场景使用）',
+            type: String,
+            env_name: 'PINDO_JPS_PROJ',
+            optional: true,
+            cacheable: false,
+            example: 'pindo jps config --proj=MyApp --type=ipa'
+          ),
+
+          workflow_name: OptionItem.new(
+            key: :workflow_name,
+            name: '工作流名称',
+            description: '按名称指定工作流，用于某类型匹配到多个工作流时消歧（非交互场景使用）',
+            type: String,
+            env_name: 'PINDO_JPS_WORKFLOW_NAME',
+            optional: true,
+            cacheable: false,
+            example: 'pindo jps config --proj=MyApp --type=ipa --workflow_name="iOS IPA Upload"'
           )
         }
       end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.20.0"
+  VERSION = "5.20.1"
 
   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.20.0
+  version: 5.20.1
 platform: ruby
 authors:
 - wade
@@ -333,6 +333,7 @@ files:
 - lib/pindo/command/jps.rb
 - lib/pindo/command/jps/apptest.rb
 - lib/pindo/command/jps/bind.rb
+- lib/pindo/command/jps/config.rb
 - lib/pindo/command/jps/download.rb
 - lib/pindo/command/jps/login.rb
 - lib/pindo/command/jps/media.rb
@@ -408,6 +409,7 @@ files:
 - lib/pindo/module/pgyer/pgyerhelper.rb
 - lib/pindo/module/resign/ipa_resign_adapter.rb
 - lib/pindo/module/resign/mac_app_resign_adapter.rb
+- lib/pindo/module/source_files_guard.rb
 - lib/pindo/module/task/core/concurrent_execution_strategy.rb
 - lib/pindo/module/task/core/dependency_checker.rb
 - lib/pindo/module/task/core/execution_strategy.rb