chef-cli 5.6.12 → 5.6.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 545307db6897b00d78f3b25421371e56f37fe7ef0f58698ad2cef26ff761ac1e
-  data.tar.gz: f66467c288febf6b0f1a7ab85fac3a2a9881ca9976b571f29abd966372d91548
+  metadata.gz: e5ace4297d04cb8c5d06220ff10b33482402d8addc46666af48ec7d4d059216d
+  data.tar.gz: df9ff23ccab179fef3074f774955c5c14e338aa19428b38c375ad2a2378c48da
 SHA512:
-  metadata.gz: 398f7c876022b50b7f6f35788c28e40cc722d1ebc66930d0ae93a1a8b276c731ae44b5c679a8b52b930d5bbc4442b2875dcb2bf8dd90ac0a260bc58db31ff540
-  data.tar.gz: 18a0ff8e27a0d5aaabb95104091f134127f73db19c63fc1d4f3cb9b4ae6e475c09322b325fe624691f522058e4b78ea1cd2f1bea61324cf1e1a45a92636dd374
+  metadata.gz: 1f2ec47a77bba0c528f942824c138586690dff1a0069841df0981fd27d91b7e15c431c0065de241e22476fcccf78f76ece7c306180182ee3e1c864c970c0565c
+  data.tar.gz: 87b4e9babe9b75b4469a96eebea4467f2165d5eb0daf738b296647469e58dd6025117d38d53301774913e10808faf5ddcaa6c2a75136b810afe7ca12932132f6

data/lib/chef-cli/cookbook_profiler/git.rb

@@ -23,10 +23,17 @@ module ChefCLI
 
       include Helpers
 
+      @@git_memo = {}
+
       attr_reader :cookbook_path
 
+      def self.uncache
+        @@git_memo = {}
+      end
+
       def initialize(cookbook_path)
         @cookbook_path = cookbook_path
+        @repo_path = nil
         @unborn_branch = nil
         @unborn_branch_ref = nil
       end
@@ -111,8 +118,24 @@ module ChefCLI
       end
 
       def git(subcommand, options = {})
-        options = { cwd: cookbook_path }.merge(options)
-        system_command("git #{subcommand}", options)
+        # memoize commands per-repo
+        repo_path = get_repo_path
+        memo_key = [repo_path, subcommand, options]
+        if @@git_memo.key?(memo_key)
+          rv = @@git_memo[memo_key]
+        else
+          options = { cwd: cookbook_path }.merge(options)
+          rv = system_command("git #{subcommand}", options)
+          @@git_memo[memo_key] = rv
+        end
+        rv
+      end
+
+      def get_repo_path
+        unless @repo_path
+          @repo_path = system_command("git rev-parse --show-toplevel", { cwd: cookbook_path }).stdout.strip
+        end
+        @repo_path
       end
 
       def detect_current_branch

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "5.6.12".freeze
+  VERSION = "5.6.14".freeze
 end

data/spec/unit/cookbook_profiler/git_spec.rb

@@ -25,7 +25,8 @@ describe ChefCLI::CookbookProfiler::Git do
 
   include ChefCLI::Helpers
 
-  let(:git_profiler) do
+  let!(:git_profiler) do
+    ChefCLI::CookbookProfiler::Git.uncache
     ChefCLI::CookbookProfiler::Git.new(cookbook_path)
   end
 

data/spec/unit/policyfile_lock_build_spec.rb

@@ -50,6 +50,10 @@ describe ChefCLI::PolicyfileLock, "building a lockfile", :skip_on_windows do
     ChefCLI::Policyfile::StorageConfig.new( cache_path: cache_path, relative_paths_root: relative_paths_root )
   end
 
+  let!(:git_memo) do
+    ChefCLI::CookbookProfiler::Git.uncache
+  end
+
   context "when a cached cookbook omits the cache key" do
 
     let(:policyfile_lock) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 5.6.12
+  version: 5.6.14
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli