knapsack_pro 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faf54d04d0dc54356dc2e748db408a9b05ee5d012eb0e56f57029f7341db3feb
-  data.tar.gz: fdfc75c76af649348241cdfce8a4910e3647bb57dbd6058b013863e49f5e4640
+  metadata.gz: 388e3d47f2da2b0d9f1377677b912a44af5919111a86869115713488a83d84e2
+  data.tar.gz: '08fd59b79cc652a4045f11f24a363cac8928644a2cf2a705b766e558e77d104f'
 SHA512:
-  metadata.gz: 14bd3b971bf915d2354cb06e6450d6db587d8df36d9c042e0379f5ad77d972e78361109f6bafd9624b86edfcbe8030805eb95a20efd519c85d9bc459a68c8985
-  data.tar.gz: 5a4128dcc5b84d38cef6cb21f3a68685c7d68e41be16088cb8d5b76c11a82679a33cc3e95a0a4fb2f7bfb576a22bd42305763b6cbd738ebc83ebb76f8c56420e
+  metadata.gz: 881dc5a753a3af8ffc1320eab7dd5a50ba38909812e971a1aeb2e282a3566f27afea3b601d99784d27d9959d7cf13f2d93b8db7634f73ccfb72a82b33e4243b2
+  data.tar.gz: d7887b2f0bb7854b1d926f422b70ab1e4ac21904026e01863aa9b83e7a690a4df0d576f6ed863fe86e8f9dfb574db106553a7a61fc0913b1dc26ac22903c422b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### 5.3.3
+
+* Fix hanging CI when `git fetch --shallow-since` takes too long
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/213
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v5.3.2...v5.3.3
+
 ### 5.3.2
 
 * On top of 5.3.1, avoid noise to stderr when git is not available when collecting the build author

data/lib/knapsack_pro/repository_adapters/git_adapter.rb

@@ -41,8 +41,15 @@ module KnapsackPro
       private
 
       def git_commit_authors
-        if KnapsackPro::Config::Env.ci?
-          `git fetch --shallow-since "one month ago" --quiet 2>/dev/null`
+        if KnapsackPro::Config::Env.ci? && shallow_repository?
+          command = 'git fetch --shallow-since "one month ago" --quiet 2>/dev/null'
+          begin
+            Timeout.timeout(5) do
+              `#{command}`
+            end
+          rescue Timeout::Error
+            KnapsackPro.logger.debug("Skip the `#{command}` command because it took too long.")
+          end
         end
 
         `git log --since "one month ago" 2>/dev/null | git shortlog --summary --email 2>/dev/null`
@@ -52,6 +59,11 @@ module KnapsackPro
         `git log --format="%aN <%aE>" -1 2>/dev/null`
       end
 
+      def shallow_repository?
+        result = `git rev-parse --is-shallow-repository 2>/dev/null`
+        result.strip == 'true'
+      end
+
       def working_dir
         dir = KnapsackPro::Config::Env.project_dir
         File.expand_path(dir)

data/lib/knapsack_pro/version.rb

@@ -1,3 +1,3 @@
 module KnapsackPro
-  VERSION = '5.3.2'
+  VERSION = '5.3.3'
 end

data/lib/knapsack_pro.rb

@@ -6,6 +6,7 @@ require 'uri'
 require 'rake/testtask'
 require 'digest'
 require 'securerandom'
+require 'timeout'
 require_relative 'knapsack_pro/urls'
 require_relative 'knapsack_pro/version'
 require_relative 'knapsack_pro/extensions/time'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.3
 platform: ruby
 authors:
 - ArturT
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-20 00:00:00.000000000 Z
+date: 2023-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake