pindo 5.14.3 → 5.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e97032afdd7d590fd621e5c599145d5396eb0467621d0f495f9066607b71099c
-  data.tar.gz: e91776711d62b11a4c2b93476a982dae863345165eaa686f5fbd218d757a6e25
+  metadata.gz: 60289998ea7be5f175400dbd6038a6aebe104095280ee7fe10aba1ea513d20f8
+  data.tar.gz: 1a4fddd44fa17a17716a4e55a9c3ad7df41fed6357934e2b179801779dd7a139
 SHA512:
-  metadata.gz: 2d1ed6b1532c44638f7e257fb38f4bb73474d9abebe20c3ccb31b8ac1d4ae6bfd018ff6c42cf7df78127e3ca0e8493f6eecb0480a4ba4e86c52c3b6050a3a9a6
-  data.tar.gz: 18b0f536893c80cf362bb8f583e74f1bde122dc77a8da80e4e2c202187b8932dbc378c8bb6d5138e5a8e6068efb91235a515d1e5a313b4956467a9f9da115b11
+  metadata.gz: 99b491f10a169e0aeac7fef944d969b48bfa8520a220f3705f4762e3643515dd9e978bef2f5d519abc3970dc29ca734d41d5d6532beb61157389a92aee562ff2
+  data.tar.gz: b806779564f476de930e152265f2b36a340bd0a1dc82a7d703d8a3789f162910991a2a50d26a5c9b5ae9da719ba9b61032d9b4c58eec6ab5360305213547a700

data/lib/pindo/base/aeshelper.rb

@@ -1,6 +1,7 @@
 
 require 'openssl'
 require 'match'
+require 'pindo/base/informative'
 
 module Pindo
 

data/lib/pindo/base/executable.rb

@@ -1,3 +1,5 @@
+require 'pindo/base/informative'
+
 module Pindo
   # Module which provides support for running executables.
   #

data/lib/pindo/base/git_handler.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'pindo/base/executable'
+require 'pindo/base/informative'
 require 'etc'
 require 'claide'
 require 'highline/import'
@@ -460,11 +461,21 @@ module Pindo
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
 
             begin
+                # 1. 检查是否是 Git 仓库，并获取 Git 根目录
+                git_root = git_root_directory(local_repo_dir: project_dir)
+
+                # 2. 如果不是 Git 仓库，返回 nil
+                unless git_root
+                    Funlog.instance.fancyinfo_warning("当前目录不是Git仓库，跳过Git操作")
+                    return nil
+                end
+
+                # 3. 使用 Git 根目录执行 Git 命令
                 # 重置暂存区
-                git!(%W(-C #{project_dir} restore --staged #{project_dir}))
+                git!(%W(-C #{git_root} restore --staged #{git_root}))
 
                 # 获取未跟踪和已修改的文件
-                files_list = git!(%W(-C #{project_dir} ls-files --other --modified --exclude-standard)) || []
+                files_list = git!(%W(-C #{git_root} ls-files --other --modified --exclude-standard)) || []
 
                 # 返回文件列表（如果为空则返回 nil）
                 if files_list.nil? || files_list.empty?
@@ -488,7 +499,14 @@ module Pindo
             raise ArgumentError, "项目目录不能为空" if project_dir.nil?
             raise ArgumentError, "处理方式不能为空" if process_type.nil?
 
-            current_project_dir = project_dir
+            # 获取 Git 根目录
+            git_root = git_root_directory(local_repo_dir: project_dir)
+            unless git_root
+                Funlog.instance.fancyinfo_warning("当前目录不是Git仓库，跳过处理未提交文件")
+                return
+            end
+
+            current_project_dir = git_root
             origin_path = Dir.pwd
 
             begin
@@ -555,9 +573,23 @@ module Pindo
 
             Funlog.instance.fancyinfo_start("开始提交文件...")
             git! ['add', '-A']
-            git! ['commit', '-m', message]
+
+            # 检查是否有文件需要提交
+            begin
+                git! ['commit', '-m', message]
+                Funlog.instance.fancyinfo_success("commit文件完成!")
+            rescue => e
+                # 如果是 "nothing to commit" 错误，说明没有变更，这是正常情况
+                if e.message.include?("nothing to commit") || e.message.include?("working tree clean")
+                    Funlog.instance.fancyinfo_warning("没有需要提交的变更")
+                    return  # 直接返回，不需要 push
+                else
+                    # 其他错误则继续抛出
+                    raise e
+                end
+            end
+
             git!(%W(-C #{project_dir} fetch origin))
-            Funlog.instance.fancyinfo_success("commit文件完成!")
             Funlog.instance.fancyinfo_start("正在push...")
             if remote_branch_exists?(local_repo_dir: project_dir, branch: branch)
                 git!(%W(-C #{project_dir} branch --set-upstream-to=origin/#{branch} #{branch}))
@@ -802,8 +834,14 @@ module Pindo
           return 'skip'
         end
 
-        # 4. 获取当前分支名并显示状态
-        current_branch = git!(%W(-C #{project_dir} rev-parse --abbrev-ref HEAD)).strip
+        # 4. 获取 Git 根目录并获取当前分支名
+        git_root = git_root_directory(local_repo_dir: project_dir)
+        unless git_root
+          Funlog.instance.fancyinfo_warning("当前目录不是Git仓库")
+          return 'skip'
+        end
+
+        current_branch = git!(%W(-C #{git_root} rev-parse --abbrev-ref HEAD)).strip
         display_file_status(current_branch, uncommitted_files)
 
         # 5. 交互式选择

data/lib/pindo/base/informative.rb

@@ -0,0 +1,11 @@
+require 'pindo/base/plaininformative'
+
+module Pindo
+  # Pindo 的标准异常类，带有红色错误消息格式
+  # 用于所有需要向用户显示错误信息的场景
+  class Informative < PlainInformative
+    def message
+      "[!] #{super}".red
+    end
+  end
+end

data/lib/pindo/base/plistbuddyexecutable.rb

@@ -1,3 +1,5 @@
+require 'pindo/base/informative'
+
 module Pindo
 
   module Plistbuddyexecutable

data/lib/pindo/client/feishuclient.rb

@@ -85,7 +85,7 @@ module Pindo
       result
     rescue => e
       puts "请求发送失败: #{e.message}"
-      puts e.backtrace
+      puts e.backtrace.join("\n") if ENV['PINDO_DEBUG']
       raise
     end
     

data/lib/pindo/client/httpclient.rb

@@ -3,13 +3,80 @@ require 'uri'
 require 'json'
 require 'faraday'
 require 'pindo/base/aeshelper'
-require 'faraday/retry'
+require 'typhoeus'
+require 'typhoeus/adapters/faraday'
 
 module Pindo
- 
 
-  class HttpClient
+  # 简单的 Faraday 重试中间件（替代 faraday-retry）
+  class SimpleRetryMiddleware < Faraday::Middleware
+    # 默认幂等的 HTTP 方法（可安全重试）
+    IDEMPOTENT_METHODS = [:get, :head, :put, :delete, :options, :trace].freeze
+    # 可重试的 HTTP 状态码（5xx 服务器错误）
+    RETRIABLE_STATUS_CODES = (500..599).freeze
+
+    def initialize(app, options = {})
+      super(app)
+      @max = options[:max] || 3  # 最大重试次数（不包括首次尝试）
+      @interval = options[:interval] || 0.5
+      @backoff_factor = options[:backoff_factor] || 2
+      @interval_randomness = options[:interval_randomness] || 0.5
+      @exceptions = options[:exceptions] || [Faraday::TimeoutError, Faraday::ConnectionFailed]
+      @methods = options[:methods] || IDEMPOTENT_METHODS  # 允许重试的 HTTP 方法
+      @retry_statuses = options[:retry_statuses] || RETRIABLE_STATUS_CODES
+    end
+
+    def call(env)
+      retries = 0
+
+      loop do
+        begin
+          response = @app.call(env)
+
+          # 检查 HTTP 状态码是否需要重试（5xx 错误）
+          # 同时必须满足幂等性要求，避免非幂等请求（如 POST）被意外重试
+          if retriable_response?(response) && retriable_request?(env) && retries < @max
+            retries += 1
+            sleep_with_jitter(retries)
+            next  # 继续下一次循环（重试）
+          end
+
+          return response  # 成功，返回响应
+
+        rescue *@exceptions => e
+          # 检查是否为幂等方法，非幂等方法不自动重试
+          if retriable_request?(env) && retries < @max
+            retries += 1
+            sleep_with_jitter(retries)
+            next  # 继续下一次循环（重试）
+          else
+            raise e  # 不能重试，抛出异常
+          end
+        end
+      end
+    end
+
+    private
 
+    # 检查请求是否可重试（幂等性检查）
+    def retriable_request?(env)
+      @methods.include?(env[:method])
+    end
+
+    # 检查响应是否需要重试（5xx 状态码）
+    def retriable_response?(response)
+      @retry_statuses.include?(response.status)
+    end
+
+    # 指数退避 + 随机抖动
+    def sleep_with_jitter(retry_count)
+      sleep_time = @interval * (@backoff_factor ** (retry_count - 1))
+      jitter = rand * sleep_time * @interval_randomness
+      sleep(sleep_time + jitter)
+    end
+  end
+
+  class HttpClient
 
       attr_accessor :token
       attr_accessor :baseurl
@@ -25,23 +92,32 @@ module Pindo
           }
 
           retry_options = {
-            max: 3,                   # Retry a failed request up to 5 times
-            interval: 0.5,            # First retry after 0.5s
-            backoff_factor: 2,        # Double the delay for each subsequent retry
-            interval_randomness: 0.5, # Specify "jitter" of up to 50% of interval
+            max: 3,
+            interval: 0.5,
+            backoff_factor: 2,
+            interval_randomness: 0.5
           }
 
           con = Faraday.new do |config|
-            config.request :retry, retry_options
-            config.proxy = proxy_options.compact if proxy_options[:uri]  
+            # 使用自定义重试中间件
+            config.use SimpleRetryMiddleware, retry_options
+            # 使用 Typhoeus 适配器（支持代理和连接池）
+            config.adapter :typhoeus
+            config.proxy = proxy_options.compact if proxy_options[:uri]
           end
-          
+
           con
       end
 
       def self.create_instance()
-          
-          con = Faraday.new 
+
+          con = Faraday.new do |config|
+            # 使用自定义重试中间件
+            config.use SimpleRetryMiddleware, max: 3, interval: 0.5, backoff_factor: 2
+            # 使用 Typhoeus 适配器
+            config.adapter :typhoeus
+          end
+
           con
       end
 

data/lib/pindo/command/android/autobuild.rb

@@ -276,14 +276,10 @@ module Pindo
             tasks << build_task
 
             # 4. Git 标签任务（依赖第一个编译任务）
-            git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-              config[:project_path],
-              release_branch: @args_release_branch,
-              ver_inc: @args_ver_inc,
-              tag_type: @args_tag_type,
-              tag_pre: @args_tag_pre
-            )
+            # 所有参数都从 GitCommitTask 获取
+            git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
             git_tag_task.dependencies << build_task.id
+            git_tag_task.dependencies << git_commit_task.id
             tasks << git_tag_task
 
             # 5. 上传和消息发送任务（如果需要）

data/lib/pindo/command/appstore/autobuild.rb

@@ -280,33 +280,23 @@ module Pindo
             build_task.dependencies << last_task.id
             tasks << build_task
 
-            # 3. Git 标签任务 - 项目仓库（使用 IosConfigParser 的版本号）
-            fixed_version = Pindo::IosConfigParser.instance.app_version
-            git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-              project_path,
-              release_branch: @args_release_branch,
-              tag_type: @args_tag_type,
-              tag_pre: @args_tag_pre,
-              fixed_version: fixed_version
-            )
+            # 3. Git 标签任务 - 项目仓库
+            # 所有参数（版本号、tag_pre、release_branch 等）都从 GitCommitTask 获取
+            git_tag_task = Pindo::TaskSystem::GitTagTask.new(project_path)
             git_tag_task.dependencies << build_task.id
+            git_tag_task.dependencies << git_commit_task.id
             tasks << git_tag_task
 
-            # 4. Git 标签任务 - 配置仓库（使用 IosConfigParser 的版本号）
+            # 4. Git 标签任务 - 配置仓库
+            # 所有参数都从 GitCommitTask 获取
             app_repo_name = Pindo::IosConfigParser.instance.app_repo_name
             if app_repo_name && !app_repo_name.empty?
               pindo_dir = File.expand_path(Pindoconfig.instance.pindo_dir)
               config_repo_path = File.join(pindo_dir, app_repo_name)
 
               if File.exist?(config_repo_path)
-                config_git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-                  config_repo_path,
-                  release_branch: @args_release_branch,
-                  tag_type: @args_tag_type,
-                  tag_pre: @args_tag_pre,
-                  fixed_version: fixed_version
-                )
-                config_git_tag_task.dependencies << git_tag_task.id
+                config_git_tag_task = Pindo::TaskSystem::GitTagTask.new(config_repo_path)
+                config_git_tag_task.dependencies << git_commit_task.id
                 tasks << config_git_tag_task
               end
             end

data/lib/pindo/command/gplay/pullconfig.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'pindo/base/git_handler'
 
 module Pindo
   class Command
@@ -35,8 +36,8 @@ module Pindo
         end
 
         def run
-          # 克隆配置仓库（使用继承的方法）
-          app_config_dir = clong_buildconfig_repo(repo_name: @bundle_name)
+          # 克隆配置仓库
+          app_config_dir = Pindo::GitHandler.clong_buildconfig_repo(repo_name: @bundle_name)
 
           # 返回配置仓库路径
           app_config_dir

data/lib/pindo/command/ios/autobuild.rb

@@ -295,14 +295,10 @@ module Pindo
                         tasks << build_task
 
                         # 4. Git 标签任务（依赖第一个编译任务）
-                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(
-                            config[:project_path],
-                            release_branch: @args_release_branch,
-                            ver_inc: @args_ver_inc,
-                            tag_type: @args_tag_type,
-                            tag_pre: @args_tag_pre
-                        )
+                        # 所有参数都从 GitCommitTask 获取
+                        git_tag_task = Pindo::TaskSystem::GitTagTask.new(config[:project_path])
                         git_tag_task.dependencies << build_task.id
+                        git_tag_task.dependencies << git_commit_task.id
                         tasks << git_tag_task
 
                         # 5. 上传和消息发送任务（如果需要）