chef-cli 5.4.1 → 5.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b300aa2d718271ab384ceed0a02e76fd2438740b86928ed439640b9d3b5625c
-  data.tar.gz: ef10c53f9088e32fa35df3756276f84e5adb1255169d8b98f7226a4256a15512
+  metadata.gz: 1716bb7f053b4836d2e2a2fc6e309ca583a059d537606361dabf0c8b40e7cc98
+  data.tar.gz: 75e3112b7e47f3bd96aa84727e76ec65d80c3ef977321c5132f0bebef962e201
 SHA512:
-  metadata.gz: 6c4cb1358e202649a77cca11c42c0238ca23c465c64ac5e13b29350f072d4df6305b4e9d08a37e45808af692361c0059b4d9fcb237af2e956e0aa24118af7052
-  data.tar.gz: c083c5d2a81b2215a4b6df359d638f87c16470d3620f40877e598bec9231625c337d82ec52ff926b48b0801162ce491d8097c20605bfda00e30b48427db378f6
+  metadata.gz: c10e74154812fc6db2b0b81f8bfa48d4e0e284824b8c3beb24e19518be85d909d5ca4f6f1c8263e09b019f6469479a071b78a09ee15b1e15566c7234d580708e
+  data.tar.gz: f2684d4b818592bbd2c1575aa46105292a3903c2f93d3b68b60f260001474ae52b26b593fdaf9fa73113cf9e3db9397732dccbb724b605f9b50e21f6f744044b

data/Gemfile

@@ -19,6 +19,8 @@ group :test do
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7")
     gem "ohai", "~> 16"
   end
+
+  gem "simplecov", require: false
 end
 
 group :development do

data/lib/chef-cli/builtin_commands.rb

@@ -57,7 +57,4 @@ ChefCLI.commands do |c|
 
   c.builtin "describe-cookbook", :DescribeCookbook, require_path: "chef-cli/command/describe_cookbook",
                                                     desc: "Prints cookbook checksum information used for cookbook identifier"
-
-  # deprecated command that throws a failure warning if used. This was removed 4.2019
-  c.builtin "provision", :Provision, desc: "Provision VMs and clusters via cookbook", hidden: true
 end

data/lib/chef-cli/command/base.rb

@@ -42,6 +42,17 @@ module ChefCLI
         description: "Show #{ChefCLI::Dist::PRODUCT} version",
         boolean: true
 
+      option :debug,
+        short:       "-D",
+        long:        "--debug",
+        description: "Enable stacktraces and other debug output",
+        default:     false
+
+      option :config_file,
+        short:       "-c CONFIG_FILE",
+        long:        "--config CONFIG_FILE",
+        description: "Path to configuration file"
+
       def initialize
         super
       end

data/lib/chef-cli/command/clean_policy_cookbooks.rb

@@ -43,17 +43,6 @@ module ChefCLI
 
       BANNER
 
-      option :config_file,
-        short:        "-c CONFIG_FILE",
-        long:         "--config CONFIG_FILE",
-        description:  "Path to configuration file"
-
-      option :debug,
-        short:        "-D",
-        long:         "--debug",
-        description:  "Enable stacktraces and other debug output",
-        default:      false
-
       include Configurable
 
       attr_accessor :ui

data/lib/chef-cli/command/clean_policy_revisions.rb

@@ -42,17 +42,6 @@ module ChefCLI
 
       BANNER
 
-      option :config_file,
-        short:        "-c CONFIG_FILE",
-        long:         "--config CONFIG_FILE",
-        description:  "Path to configuration file"
-
-      option :debug,
-        short:        "-D",
-        long:         "--debug",
-        description:  "Enable stacktraces and other debug output",
-        default:      false
-
       include Configurable
 
       attr_accessor :ui

data/lib/chef-cli/command/delete_policy.rb

@@ -42,17 +42,6 @@ module ChefCLI
 
       BANNER
 
-      option :config_file,
-        short:        "-c CONFIG_FILE",
-        long:         "--config CONFIG_FILE",
-        description:  "Path to configuration file"
-
-      option :debug,
-        short:        "-D",
-        long:         "--debug",
-        description:  "Enable stacktraces and other debug output",
-        default:      false
-
       include Configurable
 
       attr_accessor :ui

data/lib/chef-cli/command/delete_policy_group.rb

@@ -42,17 +42,6 @@ module ChefCLI
 
       BANNER
 
-      option :config_file,
-        short:        "-c CONFIG_FILE",
-        long:         "--config CONFIG_FILE",
-        description:  "Path to configuration file"
-
-      option :debug,
-        short:        "-D",
-        long:         "--debug",
-        description:  "Enable stacktraces and other debug output",
-        default:      false
-
       include Configurable
 
       attr_accessor :ui

data/lib/chef-cli/command/diff.rb

@@ -86,17 +86,6 @@ module ChefCLI
         default:     true,
         boolean:     true
 
-      option :config_file,
-        short:       "-c CONFIG_FILE",
-        long:        "--config CONFIG_FILE",
-        description: "Path to configuration file."
-
-      option :debug,
-        short:       "-D",
-        long:        "--debug",
-        description: "Enable stacktraces and other debug output.",
-        default:     false
-
       attr_accessor :ui
 
       attr_reader :old_base

data/lib/chef-cli/command/generate.rb

@@ -55,7 +55,6 @@ module ChefCLI
       generator(:repo, :Repo, "Generate a #{ChefCLI::Dist::INFRA_PRODUCT} code repository")
       generator(:policyfile, :Policyfile, "Generate a Policyfile for use with the install/push commands")
       generator(:generator, :GeneratorGenerator, "Copy #{ChefCLI::Dist::PRODUCT}'s generator cookbook so you can customize it")
-      generator(:'build-cookbook', :BuildCookbook, "DEPRECATED: Generate a build cookbook for use with #{ChefCLI::Dist::WORKFLOW}")
 
       def self.banner_headline
         <<~E
@@ -82,10 +81,6 @@ module ChefCLI
       end
 
       def run(params)
-        if params[0] == "build-cookbook"
-          warn "[DEPRECATION] Chef Workflow (Delivery) is end of life (EOL) as of December 31, 2020 and this generator subcommand has been removed".freeze
-          return 1
-        end
         if ( generator_spec = generator_for(params[0]) )
           params.shift
           generator = GeneratorCommands.build(generator_spec.class_name, params)

data/lib/chef-cli/command/generator_commands/cookbook.rb

@@ -65,7 +65,7 @@ module ChefCLI
         option :workflow,
           short:        "-w",
           long:         "--workflow",
-          description:  "DEPRECATED: Generate a cookbook with a full #{ChefCLI::Dist::WORKFLOW} build cookbook.",
+          description:  "REMOVED: #{ChefCLI::Dist::WORKFLOW} is EOL. This option has been removed.",
           boolean:      true,
           default:      false
 
@@ -85,7 +85,7 @@ module ChefCLI
 
         option :pipeline,
           long:         "--pipeline PIPELINE",
-          description:  "Use PIPELINE to set target branch to something other than master for the #{ChefCLI::Dist::WORKFLOW} build_cookbook",
+          description:  "REMOVED: #{ChefCLI::Dist::WORKFLOW} is EOL. This option has been removed.",
           default:      "master"
 
         options.merge!(SharedGeneratorOptions.options)
@@ -119,17 +119,12 @@ module ChefCLI
 
         def emit_post_create_message
           default_recipe_file = yaml ? "default.yml" : "default.rb"
-          if have_delivery_config?
-            msg("Your cookbook is ready. To setup the pipeline, type `cd #{cookbook_name_or_path}`, then run `delivery init`")
-          else
-            msg("Your cookbook is ready. Type `cd #{cookbook_name_or_path}` to enter it.")
-            msg("\nThere are several commands you can run to get started locally developing and testing your cookbook.")
-            msg("Type `delivery local --help` to see a full list of local testing commands.")
-            msg("\nWhy not start by writing an InSpec test? Tests for the default recipe are stored at:\n")
-            msg("test/integration/default/default_test.rb")
-            msg("\nIf you'd prefer to dive right in, the default recipe can be found at:")
-            msg("\nrecipes/#{default_recipe_file}\n")
-          end
+          msg("Your cookbook is ready. Type `cd #{cookbook_name_or_path}` to enter it.")
+          msg("\nThere are several commands you can run to get started locally developing and testing your cookbook.")
+          msg("\nWhy not start by writing an InSpec test? Tests for the default recipe are stored at:\n")
+          msg("test/integration/default/default_test.rb")
+          msg("\nIf you'd prefer to dive right in, the default recipe can be found at:")
+          msg("\nrecipes/#{default_recipe_file}\n")
         end
 
         def setup_context
@@ -143,16 +138,10 @@ module ChefCLI
           Generator.add_attr_to_context(:policy_run_list, policy_run_list)
           Generator.add_attr_to_context(:policy_local_cookbook, ".")
 
-          Generator.add_attr_to_context(:enable_workflow, enable_workflow?)
-          Generator.add_attr_to_context(:workflow_project_dir, cookbook_full_path)
-          Generator.add_attr_to_context(:build_cookbook_parent_is_cookbook, true)
-          Generator.add_attr_to_context(:workflow_project_git_initialized, have_git? && !cookbook_path_in_git_repo?)
-
           Generator.add_attr_to_context(:verbose, verbose?)
           Generator.add_attr_to_context(:specs, specs?)
 
           Generator.add_attr_to_context(:use_policyfile, policy_mode?)
-          Generator.add_attr_to_context(:pipeline, pipeline)
           Generator.add_attr_to_context(:kitchen, kitchen)
           Generator.add_attr_to_context(:vscode_dir, create_vscode_dir?)
           Generator.add_attr_to_context(:yaml, yaml)
@@ -162,10 +151,6 @@ module ChefCLI
           config[:kitchen]
         end
 
-        def pipeline
-          config[:pipeline]
-        end
-
         def yaml
           config[:yaml]
         end
@@ -202,10 +187,6 @@ module ChefCLI
           @policy_mode
         end
 
-        def enable_workflow?
-          config[:workflow]
-        end
-
         def verbose?
           @verbose
         end
@@ -214,22 +195,10 @@ module ChefCLI
           @specs
         end
 
-        #
-        # Is there a .delivery/cli.toml in the current dir or any of the parent dirs
-        #
-        # @return [Boolean]
-        #
-        def have_delivery_config?
-          # delivery-cli's logic is to look recursively upward for
-          # .delivery/cli.toml starting from pwd:
-          # https://github.com/chef/delivery-cli/blob/22cbef3987ebd0aee98405b7e161a100edc87e49/src/delivery/config/mod.rs#L225-L247
-
-          Pathname.pwd.ascend.any? { |path| path.join(".delivery/cli.toml").exist? }
-        end
-
         def read_and_validate_params
           arguments = parse_options(params)
           @cookbook_name_or_path = arguments[0]
+
           if !@cookbook_name_or_path
             @params_valid = false
           elsif File.basename(@cookbook_name_or_path).include?("-")
@@ -241,6 +210,11 @@ module ChefCLI
             @params_valid = false
           end
 
+          if config[:workflow] || config[:pipeline]
+            err("[DEPRECATION] Chef Workflow (Delivery) is end of life (EOL) as of December 31, 2020 and the --workflow and --pipeline flags have been removed")
+            @params_valid = false
+          end
+
           if config[:berks]
             @policy_mode = false
           end

data/lib/chef-cli/command/install.rb

@@ -46,17 +46,6 @@ module ChefCLI
 
       E
 
-      option :config_file,
-        short:       "-c CONFIG_FILE",
-        long:        "--config CONFIG_FILE",
-        description: "Path to configuration file"
-
-      option :debug,
-        short:       "-D",
-        long:        "--debug",
-        description: "Enable stacktraces and other debug output",
-        default:     false
-
       attr_reader :policyfile_relative_path
 
       attr_accessor :ui

data/lib/chef-cli/command/push.rb

@@ -44,17 +44,6 @@ module ChefCLI
 
       E
 
-      option :config_file,
-        short:       "-c CONFIG_FILE",
-        long:        "--config CONFIG_FILE",
-        description: "Path to configuration file"
-
-      option :debug,
-        short:       "-D",
-        long:        "--debug",
-        description: "Enable stacktraces and other debug output",
-        default:     false
-
       attr_reader :policyfile_relative_path
       attr_reader :policy_group
 

data/lib/chef-cli/command/push_archive.rb

@@ -43,17 +43,6 @@ module ChefCLI
         Options:
       E
 
-      option :config_file,
-        short:       "-c CONFIG_FILE",
-        long:        "--config CONFIG_FILE",
-        description: "Path to configuration file"
-
-      option :debug,
-        short:       "-D",
-        long:        "--debug",
-        description: "Enable stacktraces and other debug output",
-        default:     false
-
       attr_accessor :ui
 
       attr_reader :policy_group

data/lib/chef-cli/command/show_policy.rb

@@ -58,17 +58,6 @@ module ChefCLI
         default:     true,
         boolean:     true
 
-      option :config_file,
-        short:        "-c CONFIG_FILE",
-        long:         "--config CONFIG_FILE",
-        description:  "Path to configuration file"
-
-      option :debug,
-        short:        "-D",
-        long:         "--debug",
-        description:  "Enable stacktraces and other debug output",
-        default:      false
-
       include Configurable
 
       attr_accessor :ui

data/lib/chef-cli/command/undelete.rb

@@ -63,17 +63,6 @@ module ChefCLI
         long:         "--id ID",
         description:  "Undo the delete operation with the given ID"
 
-      option :config_file,
-        short:        "-c CONFIG_FILE",
-        long:         "--config CONFIG_FILE",
-        description:  "Path to configuration file"
-
-      option :debug,
-        short:        "-D",
-        long:         "--debug",
-        description:  "Enable stacktraces and other debug output",
-        default:      false
-
       include Configurable
 
       attr_accessor :ui

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

@@ -36,8 +36,8 @@ module ChefCLI
         {
           "scm" => "git",
           # To get this info, you need to do something like:
-          # figure out branch or assume 'master'
-          # git config --get branch.master.remote
+          # figure out branch or assume 'main'
+          # git config --get branch.main.remote
           # git config --get remote.opscode.url
           "remote" => remote,
           "revision" => revision,

data/lib/chef-cli/skeletons/code_generator/recipes/cookbook.rb

@@ -189,18 +189,3 @@ if context.vscode_dir
     CONTENT
   end
 end
-
-if context.enable_workflow
-  warn "\n---------WARNING---------\nThe --workflow flag is deprecated as #{ChefCLI::Dist::WORKFLOW} is EOL as of December 2020.\n\nThis flag will be ignored and will be removed in a future release.\n-------------------------\n\n"
-  directory "#{cookbook_dir}/.delivery"
-
-  template "#{cookbook_dir}/.delivery/project.toml" do
-    variables(
-      specs: context.specs
-    )
-    source 'delivery-project.toml.erb'
-    helpers(ChefCLI::Generator::TemplateHelper)
-    action :create_if_missing
-  end
-
-end

data/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb

@@ -13,7 +13,7 @@ verifier:
   name: inspec
 
 platforms:
-  # @see https://github.com/chef-cookbooks/testing_examples/blob/master/kitchen.dokken.yml
+  # @see https://github.com/chef-cookbooks/testing_examples/blob/main/kitchen.dokken.yml
   # @see https://hub.docker.com/u/dokken
   - name: ubuntu-20.04
     driver:

data/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb

@@ -2,8 +2,8 @@
 driver:
   name: vagrant
 
-## The forwarded_port port feature lets you connect to ports on the VM guest via
-## localhost on the host.
+## The forwarded_port port feature lets you connect to ports on the VM guest
+## via localhost on the host.
 ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
 
 #  network:
@@ -29,4 +29,3 @@ suites:
     verifier:
       inspec_tests:
         - test/integration/default
-    attributes:

data/lib/chef-cli/skeletons/code_generator/templates/default/recipe_spec.rb.erb

@@ -9,7 +9,7 @@ require 'spec_helper'
 describe '<%= cookbook_name %>::<%= recipe_name %>' do
   context 'When all attributes are default, on Ubuntu 20.04' do
     # for a complete list of available platforms and versions see:
-    # https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md
+    # https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md
     platform 'ubuntu', '20.04'
 
     it 'converges successfully' do
@@ -19,7 +19,7 @@ describe '<%= cookbook_name %>::<%= recipe_name %>' do
 
   context 'When all attributes are default, on CentOS 8' do
     # for a complete list of available platforms and versions see:
-    # https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md
+    # https://github.com/chefspec/fauxhai/blob/main/PLATFORMS.md
     platform 'centos', '8'
 
     it 'converges successfully' do

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "5.4.1".freeze
+  VERSION = "5.5.5".freeze
 end

data/spec/shared/custom_generator_cookbook.rb

@@ -66,23 +66,6 @@ shared_examples_for "custom generator cookbook" do
       end
     end
 
-    context "with an invalid generator-cookbook path" do
-
-      it "fails with an informative error" do
-        Dir.chdir(tempdir) do
-          allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          allow(code_generator).to receive(:stderr).and_return(stderr_io)
-          expect(code_generator.run).to eq(1)
-        end
-
-        cookbook_path = File.dirname(generator_cookbook_path)
-        expected_msg = %Q{ERROR: Could not find cookbook(s) to satisfy run list ["recipe[a_generator_cookbook::#{generator_name}]"] in #{cookbook_path}}
-
-        expect(stderr_io.string).to include(expected_msg)
-      end
-
-    end
-
     context "with a generator-cookbook path to a specific cookbook" do
 
       let(:metadata_file) { File.join(generator_cookbook_path, "metadata.rb") }
@@ -105,32 +88,5 @@ shared_examples_for "custom generator cookbook" do
       end
 
     end
-
-    context "with a generator-cookbook path to a directory containing a 'code_generator' cookbook" do
-
-      before do
-        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)
-      end
-
-      it "creates the new_files (and warns about deprecated usage)" do
-        allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-
-        Dir.chdir(tempdir) do
-          code_generator.run
-        end
-        generated_files = Dir.glob("#{tempdir}/#{generator_arg}/**/*", File::FNM_DOTMATCH)
-        expected_cookbook_files.each do |expected_file|
-          expect(generated_files).to include(expected_file)
-        end
-
-        code_generator_path = File.join(generator_cookbook_path, "code_generator")
-        warning_message = "WARN: Please configure the generator cookbook by giving the full path to the desired cookbook (like '#{code_generator_path}')"
-
-        expect(stderr_io.string).to include(warning_message)
-      end
-    end
   end
 end

data/spec/spec_helper.rb

@@ -24,6 +24,8 @@ require "chef/workstation_config_loader"
 require "chef/config"
 
 require "chef-cli/cli"
+require "simplecov"
+SimpleCov.start
 
 RSpec.configure do |c|
   running_on_windows = (RUBY_PLATFORM =~ /mswin|mingw|windows/)

data/spec/unit/command/base_spec.rb

@@ -16,6 +16,7 @@
 #
 
 require "spec_helper"
+require "chef-cli/command/base"
 
 describe ChefCLI::Command::Base do
   class TestCommand < ChefCLI::Command::Base
@@ -126,6 +127,8 @@ describe ChefCLI::Command::Base do
         use me please
             -a, --arg ARG                    An option with a required argument
                 --chef-license ACCEPTANCE    Accept the license for this product and any contained products ('accept', 'accept-no-persist', or 'accept-silent')
+            -c, --config CONFIG_FILE         Path to configuration file
+            -D, --debug                      Enable stacktraces and other debug output
             -h, --help                       Show this message
             -u, --user                       If the user exists
             -v, --version                    Show #{ChefCLI::Dist::PRODUCT} version
@@ -147,6 +150,8 @@ describe ChefCLI::Command::Base do
         use me please
             -a, --arg ARG                    An option with a required argument
                 --chef-license ACCEPTANCE    Accept the license for this product and any contained products ('accept', 'accept-no-persist', or 'accept-silent')
+            -c, --config CONFIG_FILE         Path to configuration file
+            -D, --debug                      Enable stacktraces and other debug output
             -h, --help                       Show this message
             -u, --user                       If the user exists
             -v, --version                    Show #{ChefCLI::Dist::PRODUCT} version

data/spec/unit/command/generate_spec.rb

@@ -137,13 +137,5 @@ describe ChefCLI::Command::Generate do
       end
 
     end
-
-    describe "When build-cookbookis given as subcommand" do
-      it "shows deprecation warning when" do
-        result = generate.run(%w{build-cookbook example})
-        expect(result).to eq(1)
-      end
-    end
-
   end
 end

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

@@ -87,7 +87,6 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       Your cookbook is ready. Type `cd new_cookbook` to enter it.
 
       There are several commands you can run to get started locally developing and testing your cookbook.
-      Type `delivery local --help` to see a full list of local testing commands.
 
       Why not start by writing an InSpec test? Tests for the default recipe are stored at:
 
@@ -152,7 +151,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
     end
 
     it "warns if a hyphenated cookbook name is passed" do
-      expect(with_argv(%w{my-cookbook}).run).to eq(0)
+      expect(with_argv(%w{my-cookbook}).run).to eq(1)
       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."
       expect(stdout_io.string).to include(message)
     end
@@ -177,18 +176,6 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       expect(generator_context.specs).to be(false)
     end
 
-    it "creates a new cookbook" do
-
-      Dir.chdir(tempdir) do
-        allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-        expect(cookbook_generator.run).to eq(0)
-      end
-      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
-    end
-
     context "when given the specs flag" do
 
       let(:argv) { %w{ new_cookbook --specs } }
@@ -198,17 +185,6 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
         cookbook_generator.setup_context
         expect(generator_context.specs).to be(true)
       end
-
-      it "creates a new cookbook" do
-        Dir.chdir(tempdir) do
-          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          expect(cookbook_generator.run).to eq(0)
-        end
-        generated_files = Dir.glob("#{tempdir}/new_cookbook/**/*", File::FNM_DOTMATCH)
-        expected_cookbook_files_specs.each do |expected_file|
-          expect(generated_files).to include(expected_file)
-        end
-      end
     end
 
     context "when given the verbose flag" do
@@ -220,34 +196,19 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
         cookbook_generator.setup_context
         expect(generator_context.verbose).to be(true)
       end
-
-      it "emits verbose output" do
-        Dir.chdir(tempdir) do
-          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          expect(cookbook_generator.run).to eq(0)
-        end
-
-        # The normal chef formatter puts a heading for each recipe like this.
-        # Full output is large and subject to change with minor changes in the
-        # generator cookbook, so we just look for this line
-        expected_line = "Recipe: code_generator::cookbook"
-
-        actual = stdout_io.string
-
-        expect(actual).to include(expected_line)
-      end
     end
 
     shared_examples_for "a generated file" do |context_var|
       before do
         Dir.chdir(tempdir) do
           allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          expect(cookbook_generator.run).to eq(0)
+          expect(cookbook_generator.run).to eq(1)
         end
       end
 
-      it "should contain #{context_var} from the generator context" do
-        expect(File.read(file)).to match line
+      it "should not generate a file" do
+        expect(File.directory?(file)).to be false
+        expect(File).not_to exist(file)
       end
     end
 
@@ -267,298 +228,6 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       end
     end
 
-    # This shared example group requires a let binding for
-    # `expected_kitchen_yml_content`
-    shared_examples_for "kitchen_yml_and_integration_tests" do
-
-      describe "Generating Test Kitchen and integration testing files" do
-
-        describe "generating kitchen config" do
-
-          before do
-            Dir.chdir(tempdir) do
-              allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-              expect(cookbook_generator.run).to eq(0)
-            end
-          end
-
-          let(:file) { File.join(tempdir, "new_cookbook", "kitchen.yml") }
-
-          it "creates a kitchen.yml with the expected content" do
-            expect(IO.read(file)).to eq(expected_kitchen_yml_content)
-          end
-
-        end
-
-        describe "test/integration/default/default_test.rb" do
-          let(:file) { File.join(tempdir, "new_cookbook", "test", "integration", "default", "default_test.rb") }
-
-          include_examples "a generated file", :cookbook_name do
-            let(:line) { "describe port" }
-          end
-        end
-      end
-    end
-
-    # This shared example group requires you to define a let binding for
-    # `expected_chefspec_spec_helper_content`
-    shared_examples_for "chefspec_spec_helper_file" do
-
-      describe "Generating ChefSpec files" do
-
-        before do
-          Dir.chdir(tempdir) do
-            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            expect(cookbook_generator.run).to eq(0)
-          end
-        end
-
-        let(:file) { File.join(tempdir, "new_cookbook", "spec", "spec_helper.rb") }
-
-        it "creates a spec/spec_helper.rb for ChefSpec with the expected content" do
-          expect(IO.read(file)).to eq(expected_chefspec_spec_helper_content)
-        end
-
-      end
-
-    end
-
-    context "when configured for Policyfiles" do
-
-      let(:argv) { %w{new_cookbook --policy} }
-
-      describe "Policyfile.rb" do
-
-        let(:file) { File.join(tempdir, "new_cookbook", "Policyfile.rb") }
-
-        let(:expected_content) do
-          <<~POLICYFILE_RB
-            # Policyfile.rb - Describe how you want Chef Infra Client to build your system.
-            #
-            # For more information on the Policyfile feature, visit
-            # https://docs.chef.io/policyfile/
-
-            # A name that describes what the system you're building with Chef does.
-            name 'new_cookbook'
-
-            # Where to find external cookbooks:
-            default_source :supermarket
-
-            # run_list: chef-client will run these recipes in the order specified.
-            run_list 'new_cookbook::default'
-
-            # Specify a custom source for a single cookbook:
-            cookbook 'new_cookbook', path: '.'
-          POLICYFILE_RB
-        end
-
-        before do
-          Dir.chdir(tempdir) do
-            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            expect(cookbook_generator.run).to eq(0)
-          end
-        end
-
-        it "has a run_list and cookbook path that will work out of the box" do
-          expect(IO.read(file)).to eq(expected_content)
-        end
-
-      end
-
-      include_examples "kitchen_yml_and_integration_tests" do
-
-        let(:expected_kitchen_yml_content) do
-          <<~KITCHEN_YML
-            ---
-            driver:
-              name: vagrant
-
-            ## The forwarded_port port feature lets you connect to ports on the VM guest via
-            ## localhost on the host.
-            ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
-
-            #  network:
-            #    - ["forwarded_port", {guest: 80, host: 8080}]
-
-            provisioner:
-              name: chef_zero
-
-              ## product_name and product_version specifies a specific Chef product and version to install.
-              ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
-              #  product_name: chef
-              #  product_version: 17
-
-            verifier:
-              name: inspec
-
-            platforms:
-              - name: ubuntu-20.04
-              - name: centos-8
-
-            suites:
-              - name: default
-                verifier:
-                  inspec_tests:
-                    - test/integration/default
-                attributes:
-          KITCHEN_YML
-        end
-
-      end
-
-      include_examples "chefspec_spec_helper_file" do
-        let(:argv) { %w{ new_cookbook --policy --specs } }
-
-        let(:expected_chefspec_spec_helper_content) do
-          <<~SPEC_HELPER
-            require 'chefspec'
-            require 'chefspec/policyfile'
-          SPEC_HELPER
-        end
-
-      end
-
-    end
-
-    context "when YAML recipe flag is passed" do
-
-      let(:argv) { %w{new_cookbook --yaml} }
-
-      describe "recipes/default.yml" do
-        let(:file) { File.join(tempdir, "new_cookbook", "recipes", "default.yml") }
-
-        let(:expected_content_header) do
-          <<~DEFAULT_YML_HEADER
-          #
-          # Cookbook:: new_cookbook
-          # Recipe:: default
-          #
-          DEFAULT_YML_HEADER
-        end
-
-        let(:expected_content) do
-          <<~DEFAULT_YML_CONTENT
-          ---
-          resources:
-          # Example Syntax
-          # Additional snippets are available using the Chef Infra Extension for Visual Studio Code
-          # - type: file
-          #   name: '/path/to/file'
-          #   content: 'content'
-          #   owner: 'root'
-          #   group: 'root'
-          #   mode: '0755'
-          #   action:
-          #     - create
-          DEFAULT_YML_CONTENT
-        end
-
-        before do
-          Dir.chdir(tempdir) do
-            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            expect(cookbook_generator.run).to eq(0)
-          end
-        end
-
-        it "has a default.yml file with template contents" do
-          expect(IO.read(file)).to match(expected_content_header)
-          expect(IO.read(file)).to match(expected_content)
-        end
-
-      end
-
-    end
-
-    context "when configured for Berkshelf" do
-
-      let(:argv) { %w{new_cookbook --berks} }
-
-      describe "Berksfile" do
-
-        let(:file) { File.join(tempdir, "new_cookbook", "Berksfile") }
-
-        let(:expected_content) do
-          <<~POLICYFILE_RB
-            source 'https://supermarket.chef.io'
-
-            metadata
-          POLICYFILE_RB
-        end
-
-        before do
-          Dir.chdir(tempdir) do
-            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-            expect(cookbook_generator.run).to eq(0)
-          end
-        end
-
-        it "pulls deps from metadata" do
-          expect(IO.read(file)).to eq(expected_content)
-        end
-
-      end
-
-      include_examples "kitchen_yml_and_integration_tests" do
-
-        let(:expected_kitchen_yml_content) do
-          <<~KITCHEN_YML
-            ---
-            driver:
-              name: vagrant
-
-            ## The forwarded_port port feature lets you connect to ports on the VM guest via
-            ## localhost on the host.
-            ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
-
-            #  network:
-            #    - ["forwarded_port", {guest: 80, host: 8080}]
-
-            provisioner:
-              name: chef_zero
-              # You may wish to disable always updating cookbooks in CI or other testing environments.
-              # For example:
-              #   always_update_cookbooks: <%= !ENV['CI'] %>
-              always_update_cookbooks: true
-
-              ## product_name and product_version specifies a specific Chef product and version to install.
-              ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
-              #  product_name: chef
-              #  product_version: 17
-
-            verifier:
-              name: inspec
-
-            platforms:
-              - name: ubuntu-20.04
-              - name: centos-8
-
-            suites:
-              - name: default
-                run_list:
-                  - recipe[new_cookbook::default]
-                verifier:
-                  inspec_tests:
-                    - test/integration/default
-                attributes:
-          KITCHEN_YML
-        end
-
-      end
-
-      include_examples "chefspec_spec_helper_file" do
-        let(:argv) { %w{ new_cookbook --berks --specs } }
-
-        let(:expected_chefspec_spec_helper_content) do
-          <<~SPEC_HELPER
-            require 'chefspec'
-            require 'chefspec/berkshelf'
-          SPEC_HELPER
-        end
-
-      end
-
-    end
-
     describe "metadata.rb" do
       let(:file) { File.join(tempdir, "new_cookbook", "metadata.rb") }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.5.5
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-31 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -254,7 +254,6 @@ files:
 - lib/chef-cli/command/generator_commands/resource.rb
 - lib/chef-cli/command/generator_commands/template.rb
 - lib/chef-cli/command/install.rb
-- lib/chef-cli/command/provision.rb
 - lib/chef-cli/command/push.rb
 - lib/chef-cli/command/push_archive.rb
 - lib/chef-cli/command/shell_init.rb
@@ -330,7 +329,6 @@ files:
 - lib/chef-cli/skeletons/code_generator/files/default/chefignore
 - lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md
 - lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README.md
-- lib/chef-cli/skeletons/code_generator/files/default/delivery-project.toml
 - lib/chef-cli/skeletons/code_generator/files/default/gitignore
 - lib/chef-cli/skeletons/code_generator/files/default/repo/README.md
 - lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/README.md
@@ -367,7 +365,6 @@ files:
 - lib/chef-cli/skeletons/code_generator/templates/default/README.md.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/attribute.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/cookbook_file.erb
-- lib/chef-cli/skeletons/code_generator/templates/default/delivery-project.toml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/helpers.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/inspec_default_test.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb

data/lib/chef-cli/command/provision.rb

@@ -1,36 +0,0 @@
-#
-# Copyright:: Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require_relative "base"
-require_relative "../chef_runner"
-require_relative "../dist"
-
-module ChefCLI
-
-  module Command
-
-    class Provision < Base
-
-      banner("DEPRECATED: Chef provisioning has been removed from #{ChefCLI::Dist::PRODUCT}. If you require Chef Provisioning you will need to install an earlier version of these products!")
-
-      def run(params = [])
-        raise "Chef provisioning has been removed from #{ChefCLI::Dist::PRODUCT}. If you require Chef Provisioning you will need to install an earlier version of these products!"
-      end
-
-    end
-  end
-end

data/lib/chef-cli/skeletons/code_generator/files/default/delivery-project.toml

@@ -1,32 +0,0 @@
-# Delivery for Local Phases Execution
-#
-# This file allows you to execute test phases locally on a workstation or
-# in a CI pipeline. The delivery-cli will read this file and execute the
-# command(s) that are configured for each phase. You can customize them
-# by just modifying the phase key on this file.
-#
-# By default these phases are configured for Cookbook Workflow only
-#
-
-[local_phases]
-unit = "chef exec rspec spec/"
-lint = "chef exec cookstyle"
-# foodcritic has been deprecated in favor of cookstyle so we skip the syntax
-# phase now.
-syntax = "echo skipping syntax phase. Use lint phase instead."
-provision = "chef exec kitchen create"
-deploy = "chef exec kitchen converge"
-smoke = "chef exec kitchen verify"
-# The functional phase is optional, you can define it by uncommenting
-# the line below and running the command: `delivery local functional`
-# functional = ""
-cleanup = "chef exec kitchen destroy"
-
-# Remote project.toml file
-#
-# Instead of the local phases above, you may specify a remote URI location for
-# the `project.toml` file. This is useful for teams that wish to centrally
-# manage the behavior of the `delivery local` command across many different
-# projects.
-#
-# remote_file = "https://url/project.toml"

data/lib/chef-cli/skeletons/code_generator/templates/default/delivery-project.toml.erb

@@ -1,36 +0,0 @@
-# Delivery for Local Phases Execution
-#
-# This file allows you to execute test phases locally on a workstation or
-# in a CI pipeline. The delivery-cli will read this file and execute the
-# command(s) that are configured for each phase. You can customize them
-# by just modifying the phase key on this file.
-#
-# By default these phases are configured for Cookbook Workflow only
-#
-
-[local_phases]
-<% if @specs %>
-unit = "chef exec rspec spec/"
-<% else %>
-unit = "echo skipping unit phase."
-<% end %>
-lint = "chef exec cookstyle"
-# foodcritic has been deprecated in favor of cookstyle so we skip the syntax
-# phase now.
-syntax = "echo skipping syntax phase. Use lint phase instead."
-provision = "chef exec kitchen create"
-deploy = "chef exec kitchen converge"
-smoke = "chef exec kitchen verify"
-# The functional phase is optional, you can define it by uncommenting
-# the line below and running the command: `delivery local functional`
-# functional = ""
-cleanup = "chef exec kitchen destroy"
-
-# Remote project.toml file
-#
-# Instead of the local phases above, you may specify a remote URI location for
-# the `project.toml` file. This is useful for teams that wish to centrally
-# manage the behavior of the `delivery local` command across many different
-# projects.
-#
-# remote_file = "https://url/project.toml"