chef-cli 5.6.11 → 5.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f99463373ae13f85a16df321c3bb756e8eba19d8e1e7f15b3ae3f2eb173253f2
-  data.tar.gz: 9f7d1ebb555efa92cc22c8957f24b18f1bb823e19e140518838318584158b8c0
+  metadata.gz: 91bf4c20f2e571268b98a467e2f708ff7e87f5a6f1caddf6c1d2eaab0815e6a9
+  data.tar.gz: f337d8fefb2dfbc90cbb37f003b65948dffbf901918b81ddadd0c671df93547e
 SHA512:
-  metadata.gz: c602f596eac142ce3fbf2f81dbdc987f22768e3b4c35fbb0c1d5615eb94eaba4085444ae4a7270986229c1ff90b4f81eddb36b87a1ae9db353c96f43f613d25d
-  data.tar.gz: e2956dcc853d9a61e74ad243e9fd7f8a391687f5be8e82a72ba89408b1a97025ef1a5f274867ca4ff99f807dee0432bb76ec1a75a3ea478132253d5f965acc50
+  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/command/generator_commands/cookbook.rb

@@ -180,7 +180,11 @@ module ChefCLI
         end
 
         def cookbook_full_path
-          File.expand_path(cookbook_name_or_path, Dir.pwd)
+          if !cookbook_name_or_path.nil? && !cookbook_name_or_path.empty?
+            File.expand_path(cookbook_name_or_path, Dir.pwd)
+          else
+            ""
+          end
         end
 
         def policy_mode?
@@ -205,6 +209,13 @@ module ChefCLI
             msg("Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/workstation/ctl_chef/#chef-generate-cookbook for more information.")
           end
 
+          if !generator_cookbook_path.empty? &&
+              !cookbook_full_path.empty? &&
+              File.identical?(Pathname.new(cookbook_full_path).parent, generator_cookbook_path)
+            err("The generator and the cookbook cannot be in the same directory. Please specify a cookbook directory that is different from the generator's parent.")
+            @params_valid = false
+          end
+
           if config[:berks] && config[:policy]
             err("Berkshelf and Policyfiles are mutually exclusive. Please specify only one.")
             @params_valid = false

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.11".freeze
+  VERSION = "5.6.13".freeze
 end

data/spec/shared/custom_generator_cookbook.rb

@@ -24,15 +24,13 @@ shared_examples_for "custom generator cookbook" do
       end
     end
 
-    before do
+    it "configures the generator context" do
       reset_tempdir
       code_generator.read_and_validate_params
       allow(code_generator.config_loader).to receive(:load)
-    end
 
-    it "configures the generator context" do
       code_generator.setup_context
-      expect(generator_context.cookbook_name).to eq(generator_arg)
+      expect(generator_context.cookbook_name).to eq(File.basename(generator_arg))
       expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
       expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
     end
@@ -55,19 +53,33 @@ shared_examples_for "custom generator cookbook" do
       end
 
       before do
+        reset_tempdir
+        code_generator.read_and_validate_params
+        allow(code_generator.config_loader).to receive(:load)
         allow(code_generator).to receive(:chefcli_config).and_return(chefcli_config)
       end
 
       it "configures the generator context" do
         code_generator.setup_context
-        expect(generator_context.cookbook_name).to eq(generator_arg)
-        expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
-        expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
+        expect(generator_context.cookbook_name).to eq(File.basename(generator_arg))
+        expect(code_generator.chef_runner.cookbook_path).to eq(File.expand_path("lib/chef-cli/skeletons", project_root))
+        expect(code_generator.chef_runner.run_list).to eq(["recipe[code_generator::#{generator_name}]"])
       end
     end
 
     context "with an invalid generator-cookbook path" do
 
+      let(:argv) { ["new_cookbook", "--generator-cookbook", "#{tempdir}/nested/a_generator_cookbook"] }
+
+      before do
+        reset_tempdir
+        FileUtils.mkdir_p("#{tempdir}/nested")
+        FileUtils.cp_r(default_generator_cookbook_path, "#{tempdir}/nested/")
+
+        code_generator.read_and_validate_params
+        allow(code_generator.config_loader).to receive(:load)
+      end
+
       it "fails with an informative error" do
         Dir.chdir(tempdir) do
           allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
@@ -88,6 +100,10 @@ shared_examples_for "custom generator cookbook" do
       let(:metadata_file) { File.join(generator_cookbook_path, "metadata.rb") }
 
       before do
+        reset_tempdir
+        code_generator.read_and_validate_params
+        allow(code_generator.config_loader).to receive(:load)
+
         FileUtils.cp_r(default_generator_cookbook_path, generator_cookbook_path)
 
         # have to update metadata with the correct name
@@ -95,7 +111,7 @@ shared_examples_for "custom generator cookbook" do
       end
 
       it "creates the new files" do
-        expect(code_generator.chef_runner.cookbook_path).to eq(tempdir)
+        expect(code_generator.chef_runner.cookbook_path).to eq("#{tempdir}")
         expect(code_generator.chef_runner.run_list).to eq(["recipe[a_generator_cookbook::#{generator_name}]"])
 
         Dir.chdir(tempdir) do
@@ -108,11 +124,16 @@ shared_examples_for "custom generator cookbook" do
 
     context "with a generator-cookbook path to a directory containing a 'code_generator' cookbook" do
 
+      let(:argv) { ["#{tempdir}/new_cookbook", "--generator-cookbook", generator_cookbook_path] }
+
       before do
+        reset_tempdir
         FileUtils.mkdir_p(generator_cookbook_path)
         FileUtils.cp_r(default_generator_cookbook_path, generator_cookbook_path)
 
         allow(code_generator).to receive(:stderr).and_return(stderr_io)
+        code_generator.read_and_validate_params
+        allow(code_generator.config_loader).to receive(:load)
       end
 
       it "creates the new_files (and warns about deprecated usage)" do
@@ -121,7 +142,7 @@ shared_examples_for "custom generator cookbook" do
         Dir.chdir(tempdir) do
           code_generator.run
         end
-        generated_files = Dir.glob("#{tempdir}/#{generator_arg}/**/*", File::FNM_DOTMATCH)
+        generated_files = Dir.glob("#{tempdir}/new_cookbook/**/*", File::FNM_DOTMATCH)
         expected_cookbook_files.each do |expected_file|
           expect(generated_files).to include(expected_file)
         end

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -152,6 +152,12 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       expect(stderr_io.string).to include(message)
     end
 
+    it "errors if cookbook parent folder is same as generator parent folder" do
+      expect(with_argv(%w{ my_cookbook -g my_generator }).run).to eq(1)
+      message = "The generator and the cookbook cannot be in the same directory. Please specify a cookbook directory that is different from the generator's parent."
+      expect(stderr_io.string).to include(message)
+    end
+
     it "warns if a hyphenated cookbook name is passed" do
       expect(with_argv(%w{my-cookbook}).run).to eq(0)
       message = "Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/workstation/ctl_chef/#chef-generate-cookbook for more information."

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.11
+  version: 5.6.13
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 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