chef-cli 5.6.12 → 5.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 545307db6897b00d78f3b25421371e56f37fe7ef0f58698ad2cef26ff761ac1e
-  data.tar.gz: f66467c288febf6b0f1a7ab85fac3a2a9881ca9976b571f29abd966372d91548
+  metadata.gz: 91bf4c20f2e571268b98a467e2f708ff7e87f5a6f1caddf6c1d2eaab0815e6a9
+  data.tar.gz: f337d8fefb2dfbc90cbb37f003b65948dffbf901918b81ddadd0c671df93547e
 SHA512:
-  metadata.gz: 398f7c876022b50b7f6f35788c28e40cc722d1ebc66930d0ae93a1a8b276c731ae44b5c679a8b52b930d5bbc4442b2875dcb2bf8dd90ac0a260bc58db31ff540
-  data.tar.gz: 18a0ff8e27a0d5aaabb95104091f134127f73db19c63fc1d4f3cb9b4ae6e475c09322b325fe624691f522058e4b78ea1cd2f1bea61324cf1e1a45a92636dd374
+  metadata.gz: 7fbf23fb835d00f629d14c1dfd1457874db6db968e2a9095d3869359aa73c8a8fd881fb6d0f98367e382482c63e8c035984270171be31510c7353ba47882df5f
+  data.tar.gz: 9d7737dc9edd87a309635c13de1819b7bf366612ed7a3f629adbe1ca8b8d6a0a840a2a4cf4de5dfe71ed2e211ef792f9f2f5f58077f51dba0c3582acb4b4265f

data/chef-cli.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "mixlib-cli", ">= 1.7", "< 3.0"
   gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
-  gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
+  gem.add_dependency "ffi-yajl", ">= 1.0", "< 4.0"
   gem.add_dependency "minitar", "~> 0.6"
   gem.add_dependency "chef", ">= 16.0"
   gem.add_dependency "solve", "< 5.0", "> 2.0"

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.13".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.13
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-22 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -59,7 +59,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement