pindo 5.14.3 → 5.14.5

data/lib/pindo/module/task/model/jps/jps_workflow_message_task.rb

@@ -0,0 +1,190 @@
+require 'pindo/module/task/model/jps_task'
+require 'pindo/module/task/task_config'
+require 'pindo/module/pgyer/pgyerhelper'
+
+module Pindo
+  module TaskSystem
+    # JPS 工作流消息发送任务
+    # 使用 commit_log/send_message 接口发送 Git commit 消息到工作流
+    class JPSWorkFlowMessageTask < JPSTask
+      attr_reader :git_commit_id, :git_commit_time, :git_commit_desc
+      attr_reader :project_id, :workflow_id, :branch
+
+      # 任务键
+      def self.task_key
+        :jps_workflow_message
+      end
+
+      # 初始化工作流消息发送任务
+      # @param options [Hash] 选项
+      # @option options [String] :git_commit_id Git commit SHA（可选，从依赖任务获取）
+      # @option options [String] :git_commit_time Git commit 时间（可选）
+      # @option options [String] :git_commit_desc Git commit 描述（可选）
+      # @option options [String] :project_id 项目 ID（可选，从 app_info_obj 获取）
+      # @option options [Integer] :workflow_id 工作流 ID（可选，从 workflow_info 获取）
+      # @option options [String] :branch 分支名（可选，默认 'master'）
+      # @option options [Boolean] :single 是否单个提交（默认 true）
+      # @option options [Hash] :app_info_obj JPS 应用信息对象（可选，用于获取 project_id）
+      # @option options [Hash] :workflow_info 工作流信息（可选，用于获取 workflow_id）
+      def initialize(options = {})
+        @git_commit_id = options[:git_commit_id]
+        @git_commit_time = options[:git_commit_time]
+        @git_commit_desc = options[:git_commit_desc]
+        @project_id = options[:project_id]
+        @workflow_id = options[:workflow_id]
+        @branch = options[:branch] || 'master'
+        @single = options.fetch(:single, true)
+
+        # 消息发送任务优先级为 LOW，确保在其他任务之后执行
+        options[:priority] ||= TaskPriority::LOW
+
+        super("JPS 工作流消息发送", options)
+      end
+
+      def validate
+        # 参数可以从依赖任务获取，这里不做严格验证
+        true
+      end
+
+      protected
+
+      def do_work
+        puts "\n  📋 开始发送 JPS 工作流消息..."
+
+        begin
+          # 1. 如果没有提供参数，从依赖任务获取
+          fetch_data_from_dependencies if need_fetch_dependencies?
+
+          # 2. 验证必需参数
+          validate_required_params!
+
+          # 3. 发送消息
+          send_workflow_message
+
+          puts "  ✅ JPS 工作流消息发送完成\n"
+
+          {
+            success: true,
+            git_commit_id: @git_commit_id,
+            project_id: @project_id,
+            workflow_id: @workflow_id
+          }
+        rescue => e
+          # 外层错误保护：消息发送失败不应影响整体流程
+          puts "  ⚠️  JPS 工作流消息发送发生错误: #{e.message}"
+          puts "  ⚠️  错误堆栈: #{e.backtrace.first(3).join("\n           ")}" if ENV['PINDO_DEBUG'] && e.backtrace
+          puts "  ℹ️  消息发送失败不影响主流程\n"
+
+          # 消息发送失败不抛出异常，返回成功但带警告
+          {
+            success: true,
+            warning: e.message,
+            git_commit_id: @git_commit_id
+          }
+        end
+      end
+
+      private
+
+      # 判断是否需要从依赖任务获取数据
+      def need_fetch_dependencies?
+        @git_commit_id.nil? || @project_id.nil? || @workflow_id.nil?
+      end
+
+      # 从依赖任务获取数据
+      def fetch_data_from_dependencies
+        # 1. 从 GitCommitTask 获取 commit 信息
+        if @git_commit_id.nil?
+          git_commit_data = get_data_param_by_key(:git_commit)
+          if git_commit_data && git_commit_data[:task_param]
+            param = git_commit_data[:task_param]
+            @git_commit_id = param[:git_commit_id] if param[:git_commit_id]
+            @git_commit_time = param[:git_commit_time] if param[:git_commit_time]
+            @git_commit_desc = param[:git_commit_desc] if param[:git_commit_desc]
+          end
+        end
+
+        # 2. 从 JPSUploadTask 获取 project_id 和 workflow_id
+        if @project_id.nil? || @workflow_id.nil?
+          upload_data = get_data_param_by_key(:jps_upload)
+          if upload_data && upload_data[:task_param]
+            param = upload_data[:task_param]
+
+            # 从 app_info_obj 获取 project_id
+            if @project_id.nil? && param[:app_info_obj]
+              @project_id = param[:app_info_obj]["id"] || param[:app_info_obj][:id]
+            end
+
+            # 从 workflow_info 获取 workflow_id
+            if @workflow_id.nil? && param[:workflow_info]
+              @workflow_id = param[:workflow_info]["id"] ||
+                             param[:workflow_info][:id] ||
+                             param[:workflow_info]["workflow_id"] ||
+                             param[:workflow_info][:workflow_id]
+            end
+          end
+        end
+
+        # 3. 如果还没有，尝试从 app_info_obj 和 workflow_info（基类属性）获取
+        if @project_id.nil? && @app_info_obj
+          @project_id = @app_info_obj["id"] || @app_info_obj[:id]
+        end
+
+        if @workflow_id.nil? && @workflow_info
+          @workflow_id = @workflow_info["id"] ||
+                         @workflow_info[:id] ||
+                         @workflow_info["workflow_id"] ||
+                         @workflow_info[:workflow_id]
+        end
+      end
+
+      # 验证必需参数
+      def validate_required_params!
+        missing_params = []
+        missing_params << "git_commit_id" if @git_commit_id.nil? || @git_commit_id.empty?
+        missing_params << "project_id" if @project_id.nil? || @project_id.empty?
+        missing_params << "workflow_id" if @workflow_id.nil?
+
+        unless missing_params.empty?
+          raise "缺少必需参数: #{missing_params.join(', ')}"
+        end
+      end
+
+      # 发送工作流消息
+      def send_workflow_message
+        puts "  📨 发送工作流消息..."
+        puts "     Project ID: #{@project_id}"
+        puts "     Workflow ID: #{@workflow_id}"
+        puts "     Commit ID: #{@git_commit_id[0..7]}" if @git_commit_id
+        puts "     Branch: #{@branch}"
+        puts ""
+
+        pgyer_helper = PgyerHelper.share_instace
+
+        # 确保已登录
+        unless pgyer_helper.login
+          raise "无法登录 JPS，请检查配置"
+        end
+
+        # 使用 PgyerHelper 的便捷方法发送工作流消息
+        result = pgyer_helper.send_workflow_message(
+          project_id: @project_id,
+          workflow_id: @workflow_id,
+          commit_id: @git_commit_id,
+          branch: @branch,
+          single: @single
+        )
+
+        if result[:success]
+          puts "  ✓ 工作流消息发送成功"
+        else
+          if ENV['PINDO_DEBUG']
+            puts "[PINDO_DEBUG] send_workflow_message 返回结果: #{result.inspect}"
+          end
+
+          raise "工作流消息发送失败: #{result[:error]}"
+        end
+      end
+    end
+  end
+end

data/lib/pindo/module/task/model/unity/unity_config_task.rb

@@ -8,6 +8,10 @@ module Pindo
     class UnityConfigTask < UnityTask
       attr_reader :deploy_mode
 
+      def self.task_key
+        :unity_config
+      end
+
       # @param deploy_mode [String] 部署模式 ('dev', 'adhoc', 'release')
       # @param options [Hash] 额外选项
       #   - :project_path [String] Unity 项目路径（默认当前目录）

data/lib/pindo/module/task/pindo_task.rb

@@ -1,4 +1,5 @@
 require 'securerandom'
+require 'pindo/base/informative'
 
 module Pindo
   module TaskSystem

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

@@ -134,19 +134,27 @@ module Pindo
 
 
         def modify_appprefix_plist(project_dir:nil, appprefix_file:nil, config_json:nil)
-            
+
+            # 如果未指定 appprefix_file，输出警告并返回
+            if appprefix_file.nil? || appprefix_file.empty?
+                Funlog.instance.fancyinfo_warning("⚠️  未指定 AppPrefix.plist 配置文件，跳过配置")
+                return
+            end
+
             project_fullname = Dir.glob(File.join(project_dir, "/*.xcodeproj")).max_by {|f| File.mtime(f)}
-            project_obj = Xcodeproj::Project.open(project_fullname) 
+            project_obj = Xcodeproj::Project.open(project_fullname)
             presources_path = nil
 
+            # 1. 尝试在 Xcode 项目组中查找 PResources 或 PResource 组
             presources_group = find_group(group:project_obj.main_group, group_name:"PResources")
-            if presources_group.nil? 
+            if presources_group.nil?
                 presources_group = find_group(group:project_obj.main_group, group_name:"PResource")
             end
-            if !presources_group.nil? 
+            if !presources_group.nil?
                 presources_path = presources_group.real_path
-            end 
+            end
 
+            # 2. 如果项目组中未找到，尝试在文件系统中查找 PResources 目录
             if presources_path.nil?
                 presources_path_array = Dir.glob(File.join(project_dir, "**", "PResources"))
                 if presources_path_array.size > 1
@@ -156,6 +164,7 @@ module Pindo
                 end
             end
 
+            # 3. 如果仍未找到，尝试在文件系统中查找 PResource 目录
             if presources_path.nil?
                 presources_path_array = Dir.glob(File.join(project_dir, "**", "PResource"))
                 if presources_path_array.size > 1
@@ -165,22 +174,23 @@ module Pindo
                 end
             end
 
-
+            # 4. 如果找不到资源目录，抛出异常
             if presources_path.nil? || !File.exist?(presources_path)
-                raise Informative, "没有找到资源目录PResources !!!!"
+                raise Informative, "未找到资源目录 PResources/PResource！请在项目根目录创建 PResources/ 目录并添加配置文件。"
             end
 
-            
+            # 5. 在找到的资源目录中查找配置文件
             config_file = Dir.glob(File.join(presources_path, "**", appprefix_file)).first
             if config_file.nil? || config_file.empty? || !File.exist?(config_file)
-                raise Informative, "工程本地配置未修改，PResources/目录下没有找到对应的配置文件 #{appprefix_file} !!!!"
-            end 
-
+                raise Informative, "在资源目录 #{presources_path} 下未找到配置文件: #{appprefix_file}！请确保配置文件存在。"
+            end
 
-            config_json['app_setting'].each do |key, value|
-                # puts value
-                if !value.nil? && value.to_s.include?("__________config")
-                    raise Informative, "config.json 配置文件key : #{key} 包含初始值未修改, 配置正确的值或者删除！！！"
+            # 6. 验证 config_json 中的 app_setting 配置（如果存在）
+            if config_json['app_setting']
+                config_json['app_setting'].each do |key, value|
+                    if !value.nil? && value.to_s.include?("__________config")
+                        raise Informative, "config.json 配置文件 key: #{key} 包含初始值未修改，请配置正确的值或删除该项！"
+                    end
                 end
             end
 
@@ -291,7 +301,7 @@ module Pindo
 
             rescue StandardError => e
                 Funlog.instance.fancyinfo_error("创建 tag 失败: #{e.message}")
-                puts e.backtrace
+                puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
                 return false
             end
         end

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

@@ -481,7 +481,7 @@ module Pindo
 
             rescue => e
                 Funlog.instance.fancyinfo_error("Icon 处理失败: #{e.message}")
-                puts e.backtrace
+                puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
                 replace_success = false
             ensure
                 # 清理临时文件（无论成功失败都清理）
@@ -624,7 +624,7 @@ module Pindo
             return true
         rescue StandardError => e
             Funlog.instance.fancyinfo_error("配置 Xcode 项目失败: #{e.message}")
-            puts e.backtrace
+            puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
             raise Informative, "配置 Xcode 项目失败: #{e.message}"
         end
 

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

@@ -57,7 +57,7 @@ module Pindo
 
       rescue StandardError => e
         Funlog.instance.fancyinfo_error("配置 Quark 环境失败: #{e.message}")
-        puts e.backtrace
+        puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
         return false
       end
     end
@@ -115,7 +115,7 @@ module Pindo
 
       rescue StandardError => e
         Funlog.instance.fancyinfo_error("配置 Swark 环境失败: #{e.message}")
-        puts e.backtrace
+        puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
         return false
       end
     end
@@ -207,7 +207,7 @@ module Pindo
 
       rescue StandardError => e
         Funlog.instance.fancyinfo_error("Swark 配置失败: #{e.message}")
-        puts e.backtrace
+        puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
         return false
       end
     end
@@ -274,7 +274,7 @@ module Pindo
 
       rescue StandardError => e
         Funlog.instance.fancyinfo_error("Quark 配置失败: #{e.message}")
-        puts e.backtrace
+        puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
         return false
       end
     end
@@ -340,7 +340,7 @@ module Pindo
 
       rescue StandardError => e
         Funlog.instance.fancyinfo_error("Swark 授权失败: #{e.message}")
-        puts e.backtrace
+        puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
         return false
       end
     end

data/lib/pindo/version.rb

@@ -6,7 +6,7 @@ require 'time'
 
 module Pindo
 
-  VERSION = "5.14.3"
+  VERSION = "5.14.5"
 
   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.14.3
+  version: 5.14.5
 platform: ruby
 authors:
 - wade
@@ -33,9 +33,6 @@ dependencies:
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.2
@@ -43,9 +40,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.2
@@ -53,9 +47,6 @@ dependencies:
   name: fastlane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.220'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.220.0
@@ -63,9 +54,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.220'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.220.0
@@ -115,20 +103,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,53 +137,24 @@ 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
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.4
@@ -203,9 +162,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.4
@@ -299,6 +255,7 @@ files:
 - lib/pindo/base/funlog.rb
 - lib/pindo/base/git_handler.rb
 - lib/pindo/base/hashhelper.rb
+- lib/pindo/base/informative.rb
 - lib/pindo/base/output_sink.rb
 - lib/pindo/base/plaininformative.rb
 - lib/pindo/base/plistbuddyexecutable.rb
@@ -449,10 +406,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
@@ -529,9 +488,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 requirements: []
-rubygems_version: 3.6.9
-specification_version: 3
+rubygems_version: 4.0.3
+specification_version: 4
 summary: easy work
 test_files: []