knapsack_pro 9.2.2 → 9.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d7f0f50c7114a8e5cefd993a8ef8cb5fa05a6d36dd78cf8f9784884a6ac5d9
-  data.tar.gz: 56366ca74436f87208e2a297941d00ec403589e0e6d0ed3759862d059b8b16bb
+  metadata.gz: a3330a86d699278a67d1523c197659a2a22921efe0df740c09d384d5721ae43f
+  data.tar.gz: c1a7821b44628a0f3c4e5d1f54b952221a53f66a5b48b917faea5d97093ce002
 SHA512:
-  metadata.gz: 315e0df100e135cdd2646b546ce331291514c24d40f0ff88ea0a69f0d60842623cc35cb8f390a07b725c6b89ecbbebe61cf587a067728c2d2c59c99f531df4f0
-  data.tar.gz: 8d51be76e65fce53d2cdae3c45359ad5ce1dcdfab0a48c6ccacef0fe4d85636879c2586d1f937853f7d3d7b4652846e182af4fa2a548d9e2405399a538695599
+  metadata.gz: f6d0259620d28ef1e3ff77a051464404f668ddc574a503dafa3b430fff6ecfd7414013f2973eaac2a00c189e1885693c4cb91407df11390cc83005220a22e692
+  data.tar.gz: 37c7dd08524763b60e8ba9e401a7092e3d4c0bf11979e499915da8756fbbafcd7c03765469c079aca33af09ee34566478e672c47846e117e9f5379178aca2864

data/lib/knapsack_pro/repository_adapters/git_adapter.rb

@@ -43,18 +43,39 @@ module KnapsackPro
       private
 
       def git_commit_authors
-        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
+        git_unshallow if KnapsackPro::Config::Env.ci? && shallow_repository?
+        `git log --since "one month ago" 2>/dev/null | git shortlog --summary --email 2>/dev/null`
+      end
+
+      def git_unshallow
+        args = ['git', 'fetch', '--quiet', '--shallow-since', 'one month ago']
+
+        begin
+          pid = Process.spawn(*args, [:out, :err] => File::NULL)
+        rescue StandardError => e
+          KnapsackPro.logger.debug("Failed to unshallow (#{args.join(' ')}): #{e.message}")
+          return
         end
 
-        `git log --since "one month ago" 2>/dev/null | git shortlog --summary --email 2>/dev/null`
+        begin
+          Timeout.timeout(5) { safe_waitpid(pid) }
+        rescue Timeout::Error
+          safe_kill(pid)
+          Timeout.timeout(1) { safe_waitpid(pid) } rescue Timeout::Error
+          KnapsackPro.logger.debug("Failed to unshallow (#{args.join(' ')}) in 5 seconds")
+        end
+      end
+
+      def safe_waitpid(pid)
+        Process.waitpid(pid)
+      rescue Errno::ECHILD
+        nil
+      end
+
+      def safe_kill(pid)
+        Process.kill('KILL', pid)
+      rescue Errno::ESRCH
+        nil
       end
 
       def git_build_author

data/lib/knapsack_pro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KnapsackPro
-  VERSION = '9.2.2'
+  VERSION = '9.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knapsack_pro
 version: !ruby/object:Gem::Version
-  version: 9.2.2
+  version: 9.2.3
 platform: ruby
 authors:
 - ArturT
@@ -23,6 +23,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement