chef-cli 3.0.4 → 3.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8ef75d64aed76476f1ca99d5e36ebba9d39f408dd2a7dfc842929e0b74e6b44
-  data.tar.gz: 246b506ff8bae1577ffdeac5888f26d94fa45223fe02c0236d82d2ab0cfed326
+  metadata.gz: 32790ab3b088b47eecb22d5be42cb45915584d117687f6133f689fa7ae40b9b4
+  data.tar.gz: 3225502afa9009b0fb4d7cec8d0e1c5a2de851c8bcc982ef26a985e1e6e2aed1
 SHA512:
-  metadata.gz: a2105386dd0b2fd89e09e9ba027c3da1b2557cb3cb5ff1a655215d936e5224034ded81d07e08f65c5971228b7391277e9ecf7ebaafd46933de16fe105882c68a
-  data.tar.gz: 9ba7a7cd5f85f3e577710621f701f266750e25ac24383ef688f821599642fa7b61e25bb3ff6f0fc7ef88a75a981269449e5c6b675852aca91b936210c51f05bf
+  metadata.gz: 79d8e068694829682f02159f01ab4aeb38930ce9a1f967fb90dc89958a0870c0ad4b804f1a75da6dcc36174dafae0d18569ca3a20cb4448a1f55db23bc83baee
+  data.tar.gz: 7a708060fc06c798514384e6ac4f8367a138d0d37aae8cda9ccb5cecabff6c0a953880801f808e12774b6210c18d3c4dde761fe98b5a8a7c18a4d07f8b8864bb

data/Gemfile

@@ -13,13 +13,18 @@ group :test do
   gem "rspec", "~> 3.8"
   gem "rspec-expectations", "~> 3.8"
   gem "rspec-mocks", "~> 3.8"
-  gem "cookstyle"
-  gem "chefstyle"
+  gem "cookstyle", "6.13.3" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
+  gem "chefstyle", "1.2.0"
+  gem "test-kitchen", "> 2.5"
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
+    gem "chef-zero", "~> 14"
+    gem "chef", "~> 15"
+  end
 end
 
 group :development do
   gem "pry"
   gem "pry-byebug"
-  gem "pry-stack_explorer"
+  gem "pry-stack_explorer", "~> 0.4.0"
   gem "rb-readline"
 end

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.7"
+  gem.required_ruby_version = ">= 2.5"
 
   gem.files = %w{Rakefile LICENSE} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
@@ -47,8 +47,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "solve", "< 5.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.8"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"
-  gem.add_dependency "diff-lcs", "~> 1.0"
+  gem.add_dependency "diff-lcs", ">= 1.0", "< 1.4" # 1.4 changes the output
   gem.add_dependency "paint", ">= 1", "< 3"
   gem.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.11"
-  gem.add_development_dependency "test-kitchen", "> 2.5"
 end

data/lib/chef-cli/cli.rb

@@ -122,7 +122,13 @@ module ChefCLI
         "Test Kitchen": "kitchen",
         "Cookstyle": "cookstyle",
       }.each do |name, cli|
-        result = Bundler.with_unbundled_env { shell_out("#{cli} --version") }
+        # @todo when Ruby 2.5/2.6 support goes away this if statement can go away
+        if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new("2")
+          result = Bundler.with_unbundled_env { shell_out("#{cli} --version") }
+        else
+          result = Bundler.with_clean_env { shell_out("#{cli} --version") }
+        end
+
         if result.exitstatus != 0
           msg("#{name} version: ERROR")
         else

data/lib/chef-cli/command/generator_commands/chef_exts/generator_desc_resource.rb

@@ -28,6 +28,7 @@ module ChefCLI
     # takes to create a cookbook.
     class GeneratorDesc < Chef::Resource
       resource_name :generator_desc
+      provides :generator_desc
 
       property :message, String, name_property: true
 

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

@@ -70,7 +70,7 @@ module ChefCLI
 
       option :exclude_deps,
         long:         "--exclude-deps",
-        description:  "Only update cookbooks explicitely mentioned on the command line",
+        description:  "Only update cookbooks explicitly mentioned on the command line",
         boolean:      true,
         default:      false
 

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

@@ -31,7 +31,7 @@ module ChefCLI
         @unborn_branch_ref = nil
       end
 
-      # @return [Hash] Hashed used for pinning cookbook versions within a Policfile.lock
+      # @return [Hash] Hashed used for pinning cookbook versions within a Policyfile.lock
       def profile_data
         {
           "scm" => "git",

data/lib/chef-cli/policyfile/chef_server_lock_fetcher.rb

@@ -67,7 +67,7 @@ module ChefCLI
         errors.empty?
       end
 
-      # Check the options provided when craeting this class for errors
+      # Check the options provided when creating this class for errors
       #
       # @return [Array<String>] A list of errors found
       def errors

data/lib/chef-cli/policyfile/cookbook_locks.rb

@@ -400,8 +400,8 @@ module ChefCLI
 
         dot_git = Pathname.new(".git")
         Pathname.new(cookbook_path).ascend do |parent_dir|
-          possbile_git_dir = parent_dir + dot_git
-          if possbile_git_dir.exist?
+          possible_git_dir = parent_dir + dot_git
+          if possible_git_dir.exist?
             @cookbook_in_git_repo = true
             break
           end

data/lib/chef-cli/policyfile/delivery_supermarket_source.rb

@@ -39,7 +39,7 @@ module ChefCLI
     # * Version numbers for cookbooks that pass through the Ci pipeline always
     #   increase over time (so that largest version number == newest)
     #
-    # In the future, alternative approaches may be persued to achieve the goal
+    # In the future, alternative approaches may be pursued to achieve the goal
     # of continuously integrating at the cookbook level without imposing those
     # constraints.
     #

data/lib/chef-cli/policyfile/local_lock_fetcher.rb

@@ -48,7 +48,7 @@ module ChefCLI
         errors.empty?
       end
 
-      # Check the options provided when craeting this class for errors
+      # Check the options provided when creating this class for errors
       #
       # @return [Array<String>] A list of errors found
       def errors

data/lib/chef-cli/policyfile/policyfile_location_specification.rb

@@ -85,7 +85,7 @@ module ChefCLI
         errors.empty?
       end
 
-      # Check the options provided when craeting this class for errors
+      # Check the options provided when creating this class for errors
       #
       # @return [Array<String>] A list of errors found
       def errors

data/lib/chef-cli/policyfile/read_cookbook_for_compat_mode_upload.rb

@@ -89,9 +89,9 @@ module ChefCLI
         @cookbook_version ||=
           begin
             cookbook_version = loader.cookbook_version
-            # TODO: dont do this for non-compat mode
+            # TODO: don't do this for non-compat mode
             cookbook_version.version = version_override
-            # TODO: dont do this either
+            # TODO: don't do this either
 
             # Fixup manifest.
             # What happens is, the 'manifest' representation of cookbook

data/lib/chef-cli/policyfile_compiler.rb

@@ -274,7 +274,7 @@ module ChefCLI
     # compared to an unmodified copy upstream. For example, the community site
     # may have a cookbook "apache2" at version "1.10.4", which the user has
     # forked on github and modified the dependencies without changing the
-    # version number. To accomodate this, the local_artifacts_graph should be
+    # version number. To accommodate this, the local_artifacts_graph should be
     # merged over the upstream's artifacts graph.
     def local_artifacts_graph
       cookbook_location_specs.inject({}) do |local_artifacts, (cookbook_name, cookbook_location_spec)|

data/lib/chef-cli/policyfile_lock.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #
 # Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
 # License:: Apache License, Version 2.0
@@ -362,7 +361,7 @@ module ChefCLI
         # doubles give 15-17 digits of precision, so we err on the safe side
         # and only use 15 digits in the string conversion. We use the `g`
         # format, which is a documented-enough "do what I mean" where floats
-        # >= 0.1 and < precsion are represented as floating point literals, and
+        # >= 0.1 and < precision are represented as floating point literals, and
         # other numbers use the exponent notation with a lowercase 'e'. Note
         # that both Ruby and Erlang document what their `g` does but have some
         # differences both subtle and non-subtle:

data/lib/chef-cli/skeletons/code_generator/files/default/chefignore

@@ -9,10 +9,7 @@ ehthumbs.db
 Icon?
 nohup.out
 Thumbs.db
-
-# SASS #
-########
-.sass-cache
+.envrc
 
 # EDITORS #
 ###########
@@ -26,11 +23,11 @@ Thumbs.db
 *.tmproj
 *~
 \#*
-mkmf.log
 REVISION
 TAGS*
 tmtags
 .vscode
+.editorconfig
 
 ## COMPILED ##
 ##############
@@ -43,22 +40,29 @@ tmtags
 *.so
 */rdoc/
 a.out
+mkmf.log
 
 # Testing #
 ###########
 .circleci/*
 .codeclimate.yml
+.delivery/*
 .foodcritic
 .kitchen*
+.mdlrc
+.overcommit.yml
 .rspec
 .rubocop.yml
 .travis.yml
 .watchr
+.yamllint
 azure-pipelines.yml
+Dangerfile
 examples/*
 features/*
 Guardfile
 kitchen.yml*
+mlc_config.json
 Procfile
 Rakefile
 spec/*
@@ -71,6 +75,7 @@ test/*
 .gitconfig
 .github/*
 .gitignore
+.gitkeep
 .gitmodules
 .svn
 */.bzr/*
@@ -98,10 +103,11 @@ Policyfile.lock.json
 
 # Documentation #
 #############
-CHANGELOG*
+CODE_OF_CONDUCT*
 CONTRIBUTING*
+documentation/*
 TESTING*
-CODE_OF_CONDUCT*
+UPGRADING*
 
 # Vagrant #
 ###########

data/lib/chef-cli/skeletons/code_generator/metadata.rb

@@ -4,4 +4,4 @@ maintainer_email 'dev@chef.io'
 license          'Apache-2.0'
 description      'Generates Chef code for Chef CLI'
 version          '0.1.0'
-chef_version     '>= 14.0'
+chef_version     '>= 15.0'

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

@@ -3,7 +3,7 @@ maintainer '<%= copyright_holder %>'
 maintainer_email '<%= email %>'
 license '<%= license %>'
 version '0.1.0'
-chef_version '>= 14.0'
+chef_version '>= 15.0'
 <% if build_cookbook_parent_is_cookbook -%>
 
 depends 'delivery-truck'

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

@@ -4,7 +4,7 @@ maintainer_email '<%= email %>'
 license '<%= @spdx_license %>'
 description 'Installs/Configures <%= cookbook_name %>'
 version '0.1.0'
-chef_version '>= 14.0'
+chef_version '>= 15.0'
 
 # The `issues_url` points to the location where issues for this cookbook are
 # tracked.  A `View Issues` link will be displayed on this cookbook's page when

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "3.0.4".freeze
+  VERSION = "3.0.14".freeze
 end

data/lib/kitchen/provisioner/chef_zero_capture.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Marc Paradise <marc@chef.io>
 #
@@ -45,7 +44,7 @@ module Kitchen
     #
     # This provisioner does not do any cookbook dependency
     # resolution and will not pull in external cookbooks.  All cookbooks
-    # or cookbook artificats  + policy data as captured from the live node and are
+    # or cookbook artifacts + policy data as captured from the live node and are
     # expected to be available for chef-zero to provide to the client.
     class ChefZeroCapture < ChefZero
       # Declaring these ensure that they're available to the sandbox - it's initialized
@@ -55,7 +54,7 @@ module Kitchen
       default_config :cookbook_artifacts_path, "cookbook_artifacts"
 
       # This will load policyfile/berkshelf.  We don't want either - the client resolves all
-      # dependencies from chef-zero, exactly as preppped in the captured repository.
+      # dependencies from chef-zero, exactly as prepped in the captured repository.
       def load_needed_dependencies!; end
 
       def create_sandbox
@@ -73,7 +72,7 @@ module Kitchen
       end
 
       # Overriding the private ProviderChefZero#default_config_rb
-      # so that we can add additional configuratoin required for  chef-zeor
+      # so that we can add additional configuration required for chef-zero
       # to be able to locate our policies/, policy groups, and cookbook artifacts
       # at run-time.
       def default_config_rb

data/lib/kitchen/provisioner/policyfile_zero.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
@@ -54,7 +53,7 @@ module Kitchen
     # @author Daniel DeLeo <dan@chef.io>
     class PolicyfileZero < ChefBase
 
-      # This provsioner will forcibly set the following config options:
+      # This provisioner will forcibly set the following config options:
       # * `use_policyfile`: `true`
       # * `versioned_cookbooks`: `true`
       # * `deployment_group`: `POLICY_NAME-local`

data/spec/unit/command/clean_policy_cookbooks_spec.rb

@@ -50,9 +50,9 @@ describe ChefCLI::Command::CleanPolicyCookbooks do
 
     context "when given a path to the config" do
 
-      let(:params) { %w{ -c ~/otherstuff/config.rb } }
+      let(:params) { %w{ -c ~/other_stuff/config.rb } }
 
-      let(:config_arg) { "~/otherstuff/config.rb" }
+      let(:config_arg) { "~/other_stuff/config.rb" }
 
       before do
         expect(chef_config_loader).to receive(:load)

data/spec/unit/command/env_spec.rb

@@ -69,7 +69,7 @@ describe ChefCLI::Command::Env do
       it "output should be valid yaml" do
         expect { yaml }.not_to raise_error
       end
-      it "Workstation version should indicate that that we're not runnign from a WS install" do
+      it "Workstation version should indicate that that we're not running from a WS install" do
         expect(yaml).to have_key ChefCLI::Dist::PRODUCT
         expect(yaml[ChefCLI::Dist::PRODUCT]["Version"]).to eql "Not running from within Workstation"
       end

data/spec/unit/command/exec_spec.rb

@@ -59,7 +59,7 @@ describe ChefCLI::Command::Exec do
     before do
       allow(Gem).to receive(:ruby).and_return(ruby_path)
 
-      # Using a fake path separator to keep to prevent people from accidently
+      # Using a fake path separator to keep to prevent people from accidentally
       # getting things correct on their system. This enforces that, in general,
       # you should use the path separator ruby is telling you to use.
       stub_const("File::PATH_SEPARATOR", "<>")

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

@@ -198,7 +198,7 @@ describe ChefCLI::Command::GeneratorCommands::BuildCookbook do
               maintainer_email 'you@example.com'
               license 'all_rights'
               version '0.1.0'
-              chef_version '>= 14.0'
+              chef_version '>= 15.0'
 
               depends 'delivery-truck'
             METADATA

data/spec/unit/commands_map_spec.rb

@@ -25,7 +25,7 @@ describe ChefCLI::CommandsMap do
 
   before do
     mapping.builtin("example", :Example)
-    mapping.builtin("hypenated-example", :HyphenatedExample)
+    mapping.builtin("hyphenated-example", :HyphenatedExample)
     mapping.builtin("explicit-path-example", :ExplicitPathExample, require_path: "unit/fixtures/command/explicit_path_example")
     mapping.builtin("documented-example", :DocumentedExample, desc: "I have documentation")
   end
@@ -34,16 +34,16 @@ describe ChefCLI::CommandsMap do
     expect(mapping.have_command?("example")).to be true
   end
 
-  it "infers a non-hypenated command's require path" do
+  it "infers a non-hyphenated command's require path" do
     expect(mapping.spec_for("example").require_path).to eq("chef-cli/command/example")
   end
 
   it "infers a hyphenated command's require path" do
-    expect(mapping.spec_for("hypenated-example").require_path).to eq("chef-cli/command/hypenated_example")
+    expect(mapping.spec_for("hyphenated-example").require_path).to eq("chef-cli/command/hyphenated_example")
   end
 
   it "lists the available commands" do
-    expect(mapping.command_names).to match_array(%w{example hypenated-example explicit-path-example documented-example})
+    expect(mapping.command_names).to match_array(%w{example hyphenated-example explicit-path-example documented-example})
   end
 
   it "keeps the docstring of a command" do

data/spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 #
 # Author:: Marc Paradsie <marc.paradise@gmail.com>
 #

data/spec/unit/policyfile_includes_spec.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #
 # Copyright:: Copyright (c) 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/policyfile_install_with_includes_spec.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #
 # Copyright:: Copyright (c) 2017 Chef Software Inc.
 # License:: Apache License, Version 2.0

data/spec/unit/policyfile_lock_build_spec.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 #
 # Copyright:: Copyright (c) 2014-2018 Chef Software Inc.
 # License:: Apache License, Version 2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.14
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -156,16 +156,22 @@ dependencies:
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
-- !ruby/object:Gem::Dependency
-  name: test-kitchen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '2.5'
 description: A streamlined development and deployment workflow for Chef platform.
 email:
 - info@chef.io
@@ -608,7 +600,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="