chef-cli 3.0.16 → 3.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba95803ebaddd3034b21130fda13e0a001c5ef02b304897d7808c0286268d9b
-  data.tar.gz: 7c64aed7f98666dc5677f11036cbbb7671cc9d8d09f410f25222332c1fd10ac6
+  metadata.gz: f4ad30b471d00e7b8b9d9b2c94a9722d4fa2dbd5a2b8db6eaf6340ad5cbee006
+  data.tar.gz: e925152292893332d5f846db05bc52299823f6e4e7043cc23783ed1ffd7b3a17
 SHA512:
-  metadata.gz: a42c1780fe0865c527c8787bd1122abcb06867b0f3e01e142684ac2cda519215c9801d031c6266ac94c7965d890dd5c6e0af8eebb195aecdfd0fa36f0691422c
-  data.tar.gz: 3133b68e4e51bd548e180bdbf3d8bae0735834118e0c9b81a781b0e869196a4108ea72ea38904cc1662a3d1863af4dcdf92a5508073efcd53408e7704f792c9e
+  metadata.gz: 7f1860d196d449214a2e5511c4add38e0b50a39c660837a1f6052fe145e274706f80dc44c474f0480c2b16518c08f77b424c902b1664cfa9bb7ab63408d3dc07
+  data.tar.gz: b1ad7b8563c1389e9ae62e906c998be45ee23d3bb2f044c7cc62fe4fd061577d33d70ab46e00445cb3d84d3754d033432c8cdbd553b9a263b8a5bc5eddb1ce23

data/Gemfile

@@ -13,7 +13,7 @@ group :test do
   gem "rspec", "~> 3.8"
   gem "rspec-expectations", "~> 3.8"
   gem "rspec-mocks", "~> 3.8"
-  gem "cookstyle", "6.13.3" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
+  gem "cookstyle", "6.14.7" # 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")

data/lib/chef-cli/cli.rb

@@ -59,7 +59,7 @@ module ChefCLI
     end
 
     def run(enforce_license: false)
-      sanity_check!
+      path_check!
 
       subcommand_name, *subcommand_params = argv
 
@@ -149,8 +149,15 @@ module ChefCLI
       commands_map.command_specs
     end
 
+    #
+    # Is a passed parameter actually an option aka does it start with '-'
+    #
+    # @param [String] param The passed parameter to check
+    #
+    # @return [Boolean]
+    #
     def option?(param)
-      param =~ /^-/
+      param[0] == "-"
     end
 
     def instantiate_subcommand(name)
@@ -178,12 +185,12 @@ module ChefCLI
     end
 
     def manifest_hash
-      require "json"
+      require "json" unless defined?(JSON)
       @manifest_hash ||= JSON.parse(read_version_manifest_json)
     end
 
     def gem_manifest_hash
-      require "json"
+      require "json" unless defined?(JSON)
       @gem_manifest_hash ||= JSON.parse(read_gem_version_manifest_json)
     end
 
@@ -224,7 +231,7 @@ module ChefCLI
     # catch the cases where users setup only the embedded_bin_dir in their path, or
     # when they have the embedded_bin_dir before the omnibus_bin_dir -- both of which will
     # defeat appbundler and interact very badly with our intent.
-    def sanity_check!
+    def path_check!
       # When installed outside of omnibus, trust the user to configure their PATH
       return true unless omnibus_install?
 

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

@@ -21,7 +21,7 @@ require_relative "../ui"
 require_relative "../version"
 require_relative "../dist"
 require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
-require "yaml"
+require "yaml" unless defined?(YAML)
 
 module ChefCLI
   module Command

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

@@ -20,7 +20,6 @@ require_relative "../dist"
 require "rubygems" unless defined?(Gem)
 require "rubygems/gem_runner"
 require "rubygems/exceptions"
-require "pp" unless defined?(PP)
 
 module ChefCLI
   module Command

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

@@ -16,7 +16,6 @@
 #
 
 require "mixlib/cli" unless defined?(Mixlib::CLI)
-require "rbconfig"
 require "pathname" unless defined?(Pathname)
 require_relative "base"
 require_relative "../chef_runner"
@@ -38,7 +37,7 @@ module ChefCLI
         long: "--license LICENSE",
         description: "all_rights, apachev2, mit, gplv2, gplv3 - defaults to all_rights",
         proc: Proc.new { |l|
-          l =~ /apache2/ ? "apachev2" : l
+          /apache2/.match?(l) ? "apachev2" : l
         },
         default: nil
 

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

@@ -187,27 +187,30 @@ module ChefCLI
           @verbose
         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
 
-          path_to_check = File.expand_path(Dir.pwd)
-          result = false
-
-          Pathname.new(path_to_check).ascend do |path|
-            if contains_delivery_cli_toml?(path)
-              result = true
-              break
-            end
+          Pathname.new(Dir.pwd).ascend do |path|
+            return true if contains_delivery_cli_toml?(path)
           end
 
-          result
+          false # nothing was found
         end
 
+        #
+        # @param [Pathname] path a directory
+        #
+        # @return [Boolean] delivery cli.toml exists
+        #
         def contains_delivery_cli_toml?(path)
-          delivery_cli_path = path.join(".delivery/cli.toml")
-          delivery_cli_path.exist?
+          path.join(".delivery/cli.toml").exist?
         end
 
         def read_and_validate_params
@@ -215,7 +218,7 @@ module ChefCLI
           @cookbook_name_or_path = arguments[0]
           if !@cookbook_name_or_path
             @params_valid = false
-          elsif /-/ =~ File.basename(@cookbook_name_or_path)
+          elsif File.basename(@cookbook_name_or_path).include?("-")
             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
 

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

@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-require "ostruct"
-
 require_relative "base"
 require_relative "../chef_runner"
 require_relative "../dist"

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "erb"
+require "erb" unless defined?(ERB)
 
 require_relative "../commands_map"
 require_relative "../builtin_commands"

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

@@ -15,11 +15,11 @@
 # limitations under the License.
 #
 
-require "json"
+require "json" unless defined?(JSON)
 require_relative "../cookbook_omnifetch"
 require_relative "source_uri"
 require_relative "../exceptions"
-require "chef/http/simple"
+require "chef/http/simple" unless defined?(Chef::HTTP::Simple)
 
 module ChefCLI
   module Policyfile

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "chef/mash"
+require "chef/mash" unless defined?(Mash)
 
 module ChefCLI
   module Policyfile

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "json"
+require "json" unless defined?(JSON)
 require_relative "../cookbook_omnifetch"
 require_relative "../exceptions"
 require "chef/http/simple"

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "semverse"
+require "semverse" unless defined?(Semverse)
 require_relative "../cookbook_omnifetch"
 require_relative "storage_config"
 

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

@@ -16,9 +16,7 @@
 #
 
 require "forwardable" unless defined?(Forwardable)
-
-require "semverse"
-
+require "semverse" unless defined?(Semverse)
 require_relative "community_cookbook_source"
 
 module ChefCLI

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

@@ -233,7 +233,7 @@ module ChefCLI
             message = "#{run_list_desc} has invalid cookbook name '#{cookbook}'.\nCookbook names can only contain alphanumerics, hyphens, and underscores."
 
             # Special case when there's only one colon instead of two:
-            if cookbook =~ /[^:]:[^:]/
+            if /[^:]:[^:]/.match?(cookbook)
               message << "\nDid you mean '#{item.sub(":", "::")}'?"
             end
 

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "3.0.16".freeze
+  VERSION = "3.0.22".freeze
 end

data/lib/kitchen/provisioner/chef_zero_capture.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "json"
+require "json" unless defined?(JSON)
 require "kitchen"
 require "kitchen/provisioner/base"
 require "kitchen/provisioner/chef_zero"

data/spec/unit/cli_spec.rb

@@ -55,7 +55,7 @@ describe ChefCLI::CLI do
 
   def run_cli(expected_exit_code)
     expect(cli).to receive(:exit).with(expected_exit_code)
-    expect(cli).to receive(:sanity_check!)
+    expect(cli).to receive(:path_check!)
     cli.run
   end
 
@@ -256,7 +256,7 @@ describe ChefCLI::CLI do
     end
   end
 
-  context "sanity_check!" do
+  context "path_check!" do
 
     before do
       allow(Gem).to receive(:ruby).and_return(ruby_path)

data/spec/unit/command/env_spec.rb

@@ -16,7 +16,7 @@
 #
 
 require "spec_helper"
-require "yaml"
+require "yaml" unless defined?(YAML)
 require "chef-cli/command/env"
 
 describe ChefCLI::Command::Env do

data/spec/unit/fixtures/cookbooks_api/update_fixtures.rb

@@ -1,6 +1,6 @@
 require "openssl"
 require "net/https"
-require "json"
+require "json" unless defined?(JSON)
 require "pp"
 require "uri"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.16
+  version: 3.0.22
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli