chef-cli 4.0.1 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a10a665d45110e002c2e070387a8d91e0f6cdb365c8ed20b7f181739c0612e74
-  data.tar.gz: 8ee4a30784d2f1784a40d3be7bb5ef670970b6e9e55f922b1944d80253567ae1
+  metadata.gz: '08825f8c8c80fbf8119e1108de938d1dbe3c108309dfefb4f3454ac9fee3397d'
+  data.tar.gz: b3327078e2ee12265d9aabbeab42c9b510adfb1dad6a17cef3b9b8951239030f
 SHA512:
-  metadata.gz: '019fa209b216d7719c8c53ce8df805bd973edeeb84a386d2fc1d0dcc08e5094953ed952e8d1e21a31d85053ab9b752e40160674139e6e0929433c8d26ab59896'
-  data.tar.gz: 4f147e219f59c6b9d1ddf864c20aed77bdd99dc4165c5035b823f084824f10772518ff9e30a95f110a5270d7fd5a9c2551f9ffc542c7e21bf20e000370083851
+  metadata.gz: 2b579beed9b27e92883fd1990a8de48c36a04d947ff6eed0a01df1bd49c38b3d325cad36dcf1eb8801e6107f6fd3dbaa8b2d8afb29bd51618a9dab5861883d58
+  data.tar.gz: 14a6e42f8b8b24d731639ba48eb16b3dae8de21d35adce5f9bda99d59b1ad47accdd4686c883183328573ee04e14fddf114960705f930d110e490beaa017080a

data/Gemfile

@@ -10,17 +10,6 @@ group :test do
   gem "cookstyle", "=7.7.2" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
   gem "chefstyle", "=1.6.2"
   gem "test-kitchen", ">= 2.11.1"
-  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
-    gem "chef-zero", "~> 14"
-    gem "chef", "~> 15"
-    gem "chef-utils", "=16.6.14"
-  end
-end
-
-group :development do
-  gem "pry"
-  gem "pry-byebug"
-  gem "rb-readline"
 end
 
 group :profile do

data/chef-cli.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.license       = "Apache-2.0"
   gem.homepage      = "https://www.chef.io/"
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.6"
 
   gem.files = %w{Rakefile LICENSE} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks

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

@@ -65,7 +65,7 @@ module ChefCLI
         option :workflow,
           short:        "-w",
           long:         "--workflow",
-          description:  "Generate a cookbook with a full #{ChefCLI::Dist::WORKFLOW} build cookbook.",
+          description:  "DEPRECATED: Generate a cookbook with a full #{ChefCLI::Dist::WORKFLOW} build cookbook.",
           boolean:      true,
           default:      false
 

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

@@ -182,4 +182,17 @@ if context.vscode_dir
   end
 end
 
-include_recipe '::build_cookbook' if context.enable_workflow
+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/delivery-project.toml.erb

@@ -33,4 +33,4 @@ cleanup = "chef exec kitchen destroy"
 # manage the behavior of the `delivery local` command across many different
 # projects.
 #
-# remote_file = "https://url/project.toml"
+# remote_file = "https://url/project.toml"

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "4.0.1".freeze
+  VERSION = "5.0.1".freeze
 end

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

@@ -204,7 +204,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
           end
         end
 
-        describe ".delivery/project.toml" do
+        describe "when passed without --specs subcommand .delivery/project.toml" do
 
           let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "project.toml") }
 
@@ -221,7 +221,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
               #
 
               [local_phases]
-              unit = "chef exec rspec spec/"
+              unit = "echo skipping unit phase."
               lint = "chef exec cookstyle"
               # foodcritic has been deprecated in favor of cookstyle so we skip the syntax
               # phase now.
@@ -251,85 +251,55 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
 
         end
 
-        describe ".delivery/config.json" do
-
-          let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "config.json") }
-
-          let(:expected_content) do
-            <<~CONFIG_DOT_JSON
-              {
-                "version": "2",
-                "build_cookbook": {
-                  "name": "build_cookbook",
-                  "path": ".delivery/build_cookbook"
-                },
-                "delivery-truck": {
-                  "lint": {
-                    "enable_cookstyle": true
-                  }
-                },
-                "skip_phases": [],
-                "job_dispatch": {
-                  "version": "v2"
-                },
-                "dependencies": []
-              }
-            CONFIG_DOT_JSON
-          end
-
-          it "configures delivery to use a local build cookbook" do
-            expect(IO.read(file)).to eq(expected_content)
-          end
-
-        end
+        describe "when passed with --specs subcommand .delivery/project.toml" do
 
-        describe "build cookbook recipes" do
+          let(:argv) { %w{new_cookbook --workflow --specs} }
 
-          let(:file) do
-            File.join(dot_delivery, "build_cookbook", "recipes", "publish.rb")
-          end
+          let(:file) { File.join(tempdir, "new_cookbook", ".delivery", "project.toml") }
 
           let(:expected_content) do
-            <<~CONFIG_DOT_JSON
+            <<~PROJECT_DOT_TOML
+              # Delivery for Local Phases Execution
               #
-              # Cookbook:: build_cookbook
-              # Recipe:: publish
+              # 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
               #
-              # Copyright:: #{DateTime.now.year}, The Authors, All Rights Reserved.
-
-              include_recipe 'delivery-truck::publish'
-            CONFIG_DOT_JSON
-          end
-
-          it "delegates functionality to delivery-truck" do
-            expect(IO.read(file)).to include(expected_content)
-          end
-
-        end
-
-        describe "build cookbook Berksfile" do
-
-          let(:file) do
-            File.join(dot_delivery, "build_cookbook", "Berksfile")
-          end
-
-          let(:expected_content) do
-            <<~CONFIG_DOT_JSON
-              source 'https://supermarket.chef.io'
 
-              metadata
+              [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"
 
-              group :workflow do
-                cookbook 'test', path: './test/fixtures/cookbooks/test'
-              end
-            CONFIG_DOT_JSON
+              # 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"
+            PROJECT_DOT_TOML
           end
 
-          it "sets the sources for delivery library cookbooks to github" do
-            expect(IO.read(file)).to include(expected_content)
+          it "exists with default config for Cookbook Workflow" do
+            expect(IO.read(file)).to eq(expected_content)
           end
 
         end
+
       end
 
       context "when no delivery CLI configuration is present" do
@@ -352,11 +322,6 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
             Generating cookbook new_cookbook
             - Ensuring correct cookbook content
             - Committing cookbook files to git
-            - Ensuring delivery CLI configuration
-            - Ensuring correct Workflow (Delivery) build cookbook content
-            - Adding delivery configuration to feature branch
-            - Adding build cookbook to feature branch
-            - Merging delivery content feature branch to master
 
             #{non_delivery_breadcrumb}
           OUTPUT
@@ -406,11 +371,6 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
             Generating cookbook new_cookbook
             - Ensuring correct cookbook content
             - Committing cookbook files to git
-            - Ensuring delivery CLI configuration
-            - Ensuring correct Workflow (Delivery) build cookbook content
-            - Adding delivery configuration to feature branch
-            - Adding build cookbook to feature branch
-            - Merging delivery content feature branch to master
 
             Your cookbook is ready. To setup the pipeline, type `cd new_cookbook`, then run `delivery init`
           OUTPUT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-14 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -596,7 +596,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="