chef-cli 2.0.10 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ebc60c7c08e91010059db01bc99774da3a071cb08320ed2cedd0f3faec80efa
-  data.tar.gz: '08b56a1c62d520a03198a1c7e5dbbff004d967571945eb0049f665a7379e5e96'
+  metadata.gz: adb138942d756bfa17638b7ba9308e77730ba9b77bb505821d68ee9b7cdc3d2c
+  data.tar.gz: 4b9d246fe278ec0d4f230d6694e30c64dae2a6b426e4b5020639dc01d0401e98
 SHA512:
-  metadata.gz: fff531a5e154a54d3bc751ae067abfcf2febeae073d9ba22739fc814089fb3d019259ea7a4d04c71967b44c698543cadeefe0c5d0bc9fa51a2fc1541430ba9fd
-  data.tar.gz: 3bec22ca55b7f1c04e38695b5a1f26c4e308c996c613bf008fd17a66ec0bae8576ef9716f35cd126cad65b43d4b58436fb265c2df797edc5f9ad3694d5d09b57
+  metadata.gz: 32d8f2e150ff38eefdb26b17fa2b5eda415c697df4324aa3e63ef9545646a346388e4c985cee379773d4311b0421228fbfcb5a8adf3750bbc40a64882a6aacd7
+  data.tar.gz: 3a455461956da321300c610c56d78d594b789474017807d0c986dabdd45541e1260b123f838d52e179247f2e6ab4ec911dc7e09ba611c3855dd2b9b4a4cbc4fb

data/Gemfile

@@ -9,10 +9,6 @@ group :docs do
 end
 
 group :test do
-  # For ruby 2.4 testing we need to use ohai 14
-  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5")
-    gem "ohai", "~> 14"
-  end
   gem "rake"
   gem "rspec", "~> 3.8"
   gem "rspec-expectations", "~> 3.8"

data/chef-cli.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -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.4"
+  gem.required_ruby_version = ">= 2.6"
 
   gem.files = %w{Rakefile LICENSE} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
   gem.add_dependency "minitar", "~> 0.6"
-  gem.add_dependency "chef", ">= 14.0"
+  gem.add_dependency "chef", ">= 15.0"
   gem.add_dependency "solve", "< 5.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.8"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"

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

@@ -37,7 +37,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -36,7 +36,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -36,7 +36,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -36,7 +36,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -41,7 +41,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -216,7 +216,7 @@ module ChefCLI
           if !@cookbook_name_or_path
             @params_valid = false
           elsif /-/ =~ File.basename(@cookbook_name_or_path)
-            msg("Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef.html#chef-generate-cookbook for more information.")
+            msg("Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef/#chef-generate-cookbook for more information.")
           end
 
           if config[:berks] && config[:policy]

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

@@ -40,7 +40,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -38,7 +38,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -38,7 +38,7 @@ module ChefCLI
 
         For more information about Policyfiles, see our detailed README:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
       E

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

@@ -40,7 +40,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -47,7 +47,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

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

@@ -43,7 +43,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/generator.rb

@@ -150,7 +150,7 @@ module ChefCLI
             along with this program.  If not, see <http://www.gnu.org/licenses/>.
           EOH
         else
-          raise ArgumentError, "Invalid generator.license setting: #{license}.  See available licenses at https://docs.chef.io/ctl_chef.html#chef-generate-cookbook"
+          raise ArgumentError, "Invalid generator.license setting: #{license}. See available licenses at https://docs.chef.io/ctl_chef/#chef-generate-cookbook"
         end
         if comment
           # Ensure there's no trailing whitespace

data/lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/kitchen.yml

@@ -11,7 +11,7 @@ provisioner:
   product_name: chefdk
 
 platforms:
-  - name: ubuntu-18.04
+  - name: ubuntu-20.04
   - name: centos-8
 
 suites:

data/lib/chef-cli/skeletons/code_generator/files/default/repo/README.md

@@ -13,7 +13,7 @@ This repository contains several directories, and each directory contains a READ
 
 # Configuration
 
-The config file, `.chef/config.rb` is a repository-specific configuration file for the knife command line tool. If you're using the Hosted Chef platform, you can download one for your organization from the management console. You can also generate a new config.rb by running `knife configure`. For more information about configuring Knife, see the Knife documentation at https://docs.chef.io/knife.html
+The config file, `.chef/config.rb` is a repository-specific configuration file for the knife command line tool. If you're using the Hosted Chef platform, you can download one for your organization from the management console. You can also generate a new config.rb by running `knife configure`. For more information about configuring Knife, see the Knife documentation at https://docs.chef.io/workstation/knife/
 
 # Next Steps
 

data/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb

@@ -4,4 +4,4 @@
 # Set a default name
 default['example']['name'] = 'Sam Doe'
 
-# For further information, see the Chef documentation (https://docs.chef.io/attributes.html).
+# For further information, see the Chef Infra documentation (https://docs.chef.io/attributes/).

data/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb

@@ -5,4 +5,4 @@ log "Welcome to Chef Infra Client, #{node['example']['name']}!" do
   level :info
 end
 
-# For more information, see the documentation: https://docs.chef.io/recipes.html
+# For more information, see the documentation: https://docs.chef.io/recipes

data/lib/chef-cli/skeletons/code_generator/files/default/repo/data_bags/README.md

@@ -12,9 +12,9 @@ Then we can upload the items in the data bag's directory to the Chef Infra Serve
 
     knife data bag from file example example_item.json
 
-For more information on data bags, see the Chef docs site:
+For more information on data bags, see the Chef Infra docs site:
 
-https://docs.chef.io/data_bags.html
+https://docs.chef.io/data_bags/
 
 # Encrypted Data Bags
 
@@ -51,6 +51,6 @@ Use the secret_key to view the contents.
     password:  abc123
 
 
-For more information on encrypted data bags, see the Chef docs site:
+For more information on encrypted data bags, see the Chef Infra docs site:
 
-https://docs.chef.io/data_bags.html
+https://docs.chef.io/data_bags/

data/lib/chef-cli/skeletons/code_generator/files/default/repo/environments/README.md

@@ -4,6 +4,6 @@ For example, in this directory, you'll find an example environment file called `
 
     knife environment from file environments/example.json
 
-For more information on environments, see the Chef docs site:
+For more information on environments, see the Chef Infra docs site:
 
-https://docs.chef.io/environments.html
+https://docs.chef.io/environments/

data/lib/chef-cli/skeletons/code_generator/files/default/repo/roles/README.md

@@ -4,6 +4,6 @@ For example, in this directory, you'll find an example role file called `example
 
     knife role from file roles/example.json
 
-For more information on roles, see the Chef docs site:
+For more information on roles, see the Chef Infra docs site:
 
-https://docs.chef.io/roles.html
+https://docs.chef.io/roles/

data/lib/chef-cli/skeletons/code_generator/templates/default/CHANGELOG.md.erb

@@ -2,10 +2,9 @@
 
 This file is used to list changes made in each version of the <%= cookbook_name %> cookbook.
 
-# 0.1.0
+## 0.1.0
 
 Initial release.
 
 - change 0
 - change 1
-

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

@@ -1,7 +1,7 @@
 # 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.html
+# https://docs.chef.io/policyfile/
 
 # A name that describes what the system you're building with Chef does.
 name '<%= policy_name %>'

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

@@ -1,6 +1,6 @@
 #
-# Chef Documentation
-# https://docs.chef.io/libraries.html
+# Chef Infra Documentation
+# https://docs.chef.io/libraries/
 #
 
 #

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

@@ -17,15 +17,15 @@ provisioner:
   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/config_yml_kitchen.html
+  ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
   #  product_name: chef
-  #  product_version: 15
+  #  product_version: 16
 
 verifier:
   name: inspec
 
 platforms:
-  - name: ubuntu-18.04
+  - name: ubuntu-20.04
   - name: centos-8
 
 suites:

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

@@ -14,9 +14,9 @@ verifier:
 platforms:
   # @see https://github.com/chef-cookbooks/testing_examples/blob/master/kitchen.dokken.yml
   # @see https://hub.docker.com/u/dokken
-  - name: ubuntu-18.04
+  - name: ubuntu-20.04
     driver:
-      image: dokken/ubuntu-18.04
+      image: dokken/ubuntu-20.04
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update

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

@@ -13,15 +13,15 @@ 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/config_yml_kitchen.html
+  ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
   #  product_name: chef
-  #  product_version: 15
+  #  product_version: 16
 
 verifier:
   name: inspec
 
 platforms:
-  - name: ubuntu-18.04
+  - name: ubuntu-20.04
   - name: centos-8
 
 suites:

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

@@ -7,20 +7,20 @@
 require 'spec_helper'
 
 describe '<%= cookbook_name %>::<%= recipe_name %>' do
-  context 'When all attributes are default, on Ubuntu 18.04' 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
-    platform 'ubuntu', '18.04'
+    platform 'ubuntu', '20.04'
 
     it 'converges successfully' do
       expect { chef_run }.to_not raise_error
     end
   end
 
-  context 'When all attributes are default, on CentOS 7' 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
-    platform 'centos', '7'
+    platform 'centos', '8'
 
     it 'converges successfully' do
       expect { chef_run }.to_not raise_error

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

@@ -1 +1 @@
-# To learn more about Custom Resources, see https://docs.chef.io/custom_resources.html
+# To learn more about Custom Resources, see https://docs.chef.io/custom_resources/

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "2.0.10".freeze
+  VERSION = "3.0.1".freeze
 end

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

@@ -129,7 +129,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
 
     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/ctl_chef.html#chef-generate-cookbook for more information."
+      message = "Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef/#chef-generate-cookbook for more information."
       expect(stdout_io.string).to include(message)
     end
 
@@ -523,7 +523,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
             # 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.html
+            # https://docs.chef.io/policyfile/
 
             # A name that describes what the system you're building with Chef does.
             name 'new_cookbook'
@@ -571,15 +571,15 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
               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/config_yml_kitchen.html
+              ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
               #  product_name: chef
-              #  product_version: 15
+              #  product_version: 16
 
             verifier:
               name: inspec
 
             platforms:
-              - name: ubuntu-18.04
+              - name: ubuntu-20.04
               - name: centos-8
 
             suites:
@@ -658,15 +658,15 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
               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/config_yml_kitchen.html
+              ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
               #  product_name: chef
-              #  product_version: 15
+              #  product_version: 16
 
             verifier:
               name: inspec
 
             platforms:
-              - name: ubuntu-18.04
+              - name: ubuntu-20.04
               - name: centos-8
 
             suites:

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

@@ -118,7 +118,7 @@ describe ChefCLI::Command::GeneratorCommands::Policyfile do
         # 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.html
+        # https://docs.chef.io/policyfile/
 
         # A name that describes what the system you're building with Chef does.
         name 'my-app-frontend'

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

@@ -331,9 +331,9 @@ describe ChefCLI::Command::GeneratorCommands::Repo do
 
                     knife role from file roles/example.json
 
-                For more information on roles, see the Chef docs site:
+                For more information on roles, see the Chef Infra docs site:
 
-                https://docs.chef.io/roles.html
+                https://docs.chef.io/roles/
               README
             end
 
@@ -355,9 +355,9 @@ describe ChefCLI::Command::GeneratorCommands::Repo do
 
                     knife environment from file environments/example.json
 
-                For more information on environments, see the Chef docs site:
+                For more information on environments, see the Chef Infra docs site:
 
-                https://docs.chef.io/environments.html
+                https://docs.chef.io/environments/
               README
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 3.0.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -592,7 +592,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="