chef-cli 3.0.30 → 3.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a39366b7f1920937b7329ef1a5b54d810d4b3c017e331926608356c55c68250
-  data.tar.gz: 20882fcd4590d7969d7afd83aec868e89be1c032651dc594dcc61f4eee2eb632
+  metadata.gz: 75b5fd57e86db29bb68a615fdf19d525619d825cf5569fc19f01af72ac64c355
+  data.tar.gz: 7659576815fb41138d60c1aba5996eddba6ea6229f4900a4177bbf969e567d80
 SHA512:
-  metadata.gz: 621b7594acfcb6968c5ddd3d690fc49a86b4c6932d4011debdadee19d86d638b7caea04eba2aa89776be213533ec4c14be65b715418edf83a39fda0f651c8bba
-  data.tar.gz: 315dd298b75add288ff031a1c9b7d3a0d5d4994454476570b4fd3c46a4c0ae3d693ecc8d9ac0b43aa5c10f3ffa1901921fb841e63198612b84d0cbb6e630d582
+  metadata.gz: 00da7122004fa0123b09833996c1a5ac0abba1c891f508c7b06bad885db4872c4a718493f91a101779e3628183793437ffb52cbc5c71740ae318ce5fa6823ab3
+  data.tar.gz: 800b5fd86118674375ed4d97f0084889a4d03594fabbb54d948db5e84eeb5b7b1123e6a742e16571a4ce965284866cf1db705ad609ec6e8d400549ea98b48d2b

data/lib/chef-cli/cli.rb

@@ -33,9 +33,9 @@ module ChefCLI
     include Chef::Mixin::ShellOut
 
     banner(<<~BANNER)
-      The Chef command line tool for managing your infrastructure from your workstation.
-      Docs: https://docs.chef.io/workstation/
-      Patents: https://www.chef.io/patents
+      #{ChefCLI::Dist::WORKSTATION_HEADER}
+      Docs: #{ChefCLI::Dist::WORKSTATION_DOCS}
+      Patents: #{ChefCLI::Dist::PATENTS}
 
       Usage:
           #{ChefCLI::Dist::EXEC} -h/--help

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

@@ -20,8 +20,11 @@ require_relative "../cookbook_omnifetch"
 require_relative "../ui"
 require_relative "../version"
 require_relative "../dist"
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
-require "yaml" unless defined?(YAML)
+
+module Mixlib
+  autoload :ShellOut, "mixlib/shellout"
+end
+autoload :YAML, "yaml"
 
 module ChefCLI
   module Command
@@ -40,7 +43,7 @@ module ChefCLI
         info[ChefCLI::Dist::PRODUCT] = workstation_info
         info["Ruby"] = ruby_info
         info["Path"] = paths
-        ui.msg info.to_yaml
+        ui.msg YAML.dump(info)
       end
 
       def workstation_info

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

@@ -17,7 +17,10 @@
 
 require_relative "base"
 require_relative "../dist"
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+
+module Mixlib
+  autoload :ShellOut, "mixlib/shellout"
+end
 
 module ChefCLI
   module Command

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

@@ -16,7 +16,7 @@
 #
 
 require "mixlib/cli" unless defined?(Mixlib::CLI)
-require "pathname" unless defined?(Pathname)
+autoload :Pathname, "pathname"
 require_relative "base"
 require_relative "../chef_runner"
 require_relative "../generator"

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

@@ -137,6 +137,7 @@ module ChefCLI
           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?)
         end
 
         def kitchen
@@ -235,6 +236,10 @@ module ChefCLI
           end
           false
         end
+
+        def create_vscode_dir?
+          ::File.exist?("/Applications/Visual Studio Code.app") || ::File.exist?("#{ENV["APPDATA"]}\\Code")
+        end
       end
     end
   end

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

@@ -15,13 +15,16 @@
 # limitations under the License.
 #
 
-require "erb" unless defined?(ERB)
+autoload :ERB, "erb"
 
 require_relative "../commands_map"
 require_relative "../builtin_commands"
 require_relative "base"
 require_relative "../dist"
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+
+module Mixlib
+  autoload :ShellOut, "mixlib/shellout"
+end
 
 module ChefCLI
 

data/lib/chef-cli/dist.rb

@@ -27,7 +27,6 @@ module ChefCLI
 
     # The name of the server product
     SERVER_PRODUCT = "Chef Infra Server".freeze
-
     WORKFLOW = "Chef Workflow (Delivery)".freeze
 
     # The chef executable, as in `chef gem install` or `chef generate cookbook`
@@ -38,7 +37,13 @@ module ChefCLI
 
     HAB_PRODUCT = "Chef Habitat".freeze
     HAB_SOFTWARE_NAME = "habitat".freeze
-
     HAB_CLI = "hab".freeze
+
+    # product patents page
+    PATENTS = "https://www.chef.io/patents".freeze
+
+    # Workstation banner/help text
+    WORKSTATION_DOCS = "https://docs.chef.io/workstation/".freeze
+    WORKSTATION_HEADER = "The Chef command line tool for managing your infrastructure from your workstation.".freeze
   end
 end

data/lib/chef-cli/helpers.rb

@@ -15,7 +15,10 @@
 # limitations under the License.
 #
 
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+module Mixlib
+  autoload :ShellOut, "mixlib/shellout"
+end
+
 require_relative "exceptions"
 
 module ChefCLI

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl" unless defined?(FFI_Yajl)
+autoload :FFI_Yajl, "ffi_yajl"
 require_relative "../exceptions"
 require_relative "source_uri"
 require_relative "../chef_server_api_multi"

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

@@ -15,9 +15,13 @@
 # limitations under the License.
 #
 
-require "ffi_yajl" unless defined?(FFI_Yajl)
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+module Mixlib
+  autoload :ShellOut, "mixlib/shellout"
+end
+
+autoload :FFI_Yajl, "ffi_yajl"
 require_relative "../service_exceptions"
+require "net/protocol" unless defined?(Net::ProtocolError)
 
 module ChefCLI
   module Policyfile

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

@@ -18,7 +18,7 @@
 require "diff/lcs"
 require "diff/lcs/hunk"
 require "pastel"
-require "ffi_yajl" unless defined?(FFI_Yajl)
+autoload :FFI_Yajl, "ffi_yajl"
 
 module ChefCLI
   module Policyfile

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

@@ -15,10 +15,13 @@
 # limitations under the License.
 #
 
+module Mixlib
+  autoload :ShellOut, "mixlib/shellout"
+end
+
 require_relative "../policyfile_lock"
 require_relative "../exceptions"
 require_relative "../helpers"
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 require "tmpdir" unless defined?(Dir.mktmpdir)
 
 module ChefCLI

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "set" unless defined?(Set)
+autoload :Set, "set"
 
 require "chef/server_api"
 require_relative "../service_exceptions"

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

@@ -18,7 +18,7 @@
 require_relative "../policyfile_lock"
 require_relative "lock_fetcher_mixin"
 require_relative "../exceptions"
-require "chef/http"
+require "net/protocol" unless defined?(Net::ProtocolError)
 require "tempfile" unless defined?(Tempfile)
 
 module ChefCLI

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

@@ -16,7 +16,7 @@
 #
 
 require "semverse"
-require "set" unless defined?(Set)
+autoload :Set, "set"
 require_relative "../exceptions"
 
 module ChefCLI

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

@@ -15,7 +15,10 @@
 # limitations under the License.
 #
 
-require "addressable/uri" unless defined?(Addressable::URI)
+module Addressable
+  autoload :URI, "addressable/uri"
+end
+
 require_relative "../exceptions"
 
 module ChefCLI

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

@@ -17,7 +17,7 @@
 
 require "fileutils" unless defined?(FileUtils)
 
-require "ffi_yajl" unless defined?(FFI_Yajl)
+autoload :FFI_Yajl, "ffi_yajl"
 
 require_relative "../helpers"
 require_relative "undo_record"

data/lib/chef-cli/policyfile_compiler.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "set" unless defined?(Set)
+autoload :Set, "set"
 require "forwardable" unless defined?(Forwardable)
 
 require "solve"

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "set" unless defined?(Set)
+autoload :Set, "set"
 
 require "chef/server_api"
 require_relative "../service_exceptions"

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl" unless defined?(FFI_Yajl)
+autoload :FFI_Yajl, "ffi_yajl"
 
 require_relative "../helpers"
 require_relative "../service_exceptions"

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl" unless defined?(FFI_Yajl)
+autoload :FFI_Yajl, "ffi_yajl"
 
 require_relative "../service_exceptions"
 require "chef/server_api"

data/lib/chef-cli/service_exception_inspectors/http.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl" unless defined?(FFI_Yajl)
+autoload :FFI_Yajl, "ffi_yajl"
 
 module ChefCLI
   module ServiceExceptionInspectors
@@ -33,17 +33,11 @@ module ChefCLI
 
       def extended_error_info
         <<~END
-          --- REQUEST DATA ----
-          #{http_method} #{uri}
-          #{request_headers}
-          #{req_body}
-
           --- RESPONSE DATA ---
           #{code} #{response_message}
           #{response_headers}
 
           #{response_body}
-
         END
       end
 
@@ -90,30 +84,10 @@ module ChefCLI
         headers_s
       end
 
-      def request
-        exception.chef_rest_request
-      end
-
       def uri
         request.uri.to_s + request.path.to_s
       end
 
-      def http_method
-        request.method
-      end
-
-      def request_headers
-        headers_s = ""
-        request.each_header do |key, value|
-          headers_s << key << ": " << value << "\n"
-        end
-        headers_s
-      end
-
-      def req_body
-        request.body
-      end
-
     end
   end
 end

data/lib/chef-cli/shell_out.rb

@@ -15,7 +15,9 @@
 # limitations under the License.
 #
 
-require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+module Mixlib
+  autoload :ShellOut, "mixlib/shellout"
+end
 
 module ChefCLI
 

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

@@ -16,7 +16,10 @@ bin/*
 .kitchen/
 kitchen.local.yml
 
-# Chef
+# Chef Infra
 Berksfile.lock
 .zero-knife.rb
 Policyfile.lock.json
+
+.idea/
+

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

@@ -2,7 +2,7 @@
 
 Every Chef Infra installation needs a Chef Repository. This is the place where cookbooks, policyfiles, config files and other artifacts for managing systems with Chef Infra will live. We strongly recommend storing this repository in a version control system such as Git and treating it like source code.
 
-# Repository Directories
+## Repository Directories
 
 This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef.
 
@@ -11,10 +11,10 @@ This repository contains several directories, and each directory contains a READ
 - `roles/` - Store roles in .rb or .json in the repository.
 - `environments/` - Store environments in .rb or .json in the repository.
 
-# Configuration
+## 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/workstation/knife/
 
-# Next Steps
+## Next Steps
 
 Read the README file in each of the subdirectories for more information about what goes in those directories.

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

@@ -91,7 +91,7 @@ template "#{cookbook_dir}/test/integration/default/default_test.rb" do
   action :create_if_missing
 end
 
-# Chefspec
+# ChefSpec
 directory "#{cookbook_dir}/spec/unit/recipes" do
   recursive true
 end
@@ -113,7 +113,6 @@ template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
 end
 
 # Recipes
-
 directory "#{cookbook_dir}/recipes"
 
 template "#{cookbook_dir}/recipes/default.rb" do
@@ -164,4 +163,18 @@ if context.have_git
   end
 end
 
+if context.vscode_dir
+  directory "#{cookbook_dir}/.vscode"
+
+  file "#{cookbook_dir}/.vscode/extensions.json" do
+    content <<~CONTENT
+    {
+      "recommendations": [
+          "chef-software.chef"
+      ]
+    }
+    CONTENT
+  end
+end
+
 include_recipe '::build_cookbook' if context.enable_workflow

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

@@ -1,7 +1,10 @@
 context = ChefCLI::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-files_dir = File.join(cookbook_dir, 'files')
-cookbook_file_path = File.join(files_dir, context.new_file_basename)
+new_file_basename = File.basename(context.new_file_basename)
+relative_path = File.dirname(context.new_file_basename)
+relative_path.slice! "."
+files_dir = File.join(cookbook_dir, 'files', relative_path)
+cookbook_file_path = File.join(files_dir, new_file_basename)
 
 directory files_dir do
   recursive true
@@ -19,5 +22,4 @@ else
     source 'cookbook_file.erb'
     helpers(ChefCLI::Generator::TemplateHelper)
   end
-
-end
+end

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "3.0.30".freeze
+  VERSION = "3.0.36".freeze
 end

data/lib/kitchen/provisioner/chef_zero_capture.rb

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

data/spec/unit/cli_spec.rb

@@ -41,9 +41,9 @@ describe ChefCLI::CLI do
 
   let(:base_help_message) do
     <<~E
-      The Chef command line tool for managing your infrastructure from your workstation.
-      Docs: https://docs.chef.io/workstation/
-      Patents: https://www.chef.io/patents
+      #{ChefCLI::Dist::WORKSTATION_HEADER}
+      Docs: #{ChefCLI::Dist::WORKSTATION_DOCS}
+      Patents: #{ChefCLI::Dist::PATENTS}
 
       Usage:
           chef -h/--help

data/spec/unit/command/env_spec.rb

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

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

@@ -28,4 +28,13 @@ describe ChefCLI::Command::GeneratorCommands::CookbookFile do
     let(:new_file_name) { "new_file.txt" }
 
   end
+
+  include_examples "a file generator" do
+
+    let(:generator_name) { "file" }
+    let(:generated_files) { [ "files/file/new_file.txt" ] }
+    let(:new_file_name) { "file/new_file.txt" }
+
+  end
+
 end

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -16,8 +16,7 @@
 #
 
 require "spec_helper"
-require "net/http" unless defined?(Net::HTTP)
-require "chef/monkey_patches/net_http"
+require "net/http"
 require "chef-cli/service_exception_inspectors/http"
 
 describe ChefCLI::ServiceExceptionInspectors::HTTP do
@@ -64,7 +63,7 @@ describe ChefCLI::ServiceExceptionInspectors::HTTP do
   end
 
   let(:exception) do
-    Net::HTTPClientException.new(message, response).tap { |e| e.chef_rest_request = request }
+    Net::HTTPClientException.new(message, response)
   end
 
   subject(:inspector) { described_class.new(exception) }
@@ -103,23 +102,10 @@ describe ChefCLI::ServiceExceptionInspectors::HTTP do
 
   end
 
-  describe "showing the request and response in extended error info" do
+  describe "showing the response in extended error info" do
 
     let(:response_body) { "this is the response" }
 
-    it "shows the request in a format similar to HTTP messages" do
-      expected_request_string = <<~E
-        --- REQUEST DATA ----
-        POST /organizations/chef-oss-dev/cookbooks
-        content-type: application/json
-        accept: application/json
-
-        this is the request
-
-      E
-      expect(inspector.extended_error_info).to include(expected_request_string)
-    end
-
     it "shows the response in a format similar to HTTP messages" do
       expected_response_string = <<~E
         --- RESPONSE DATA ---

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.30
+  version: 3.0.36
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -102,22 +102,22 @@ dependencies:
   name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -601,7 +601,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A streamlined development and deployment workflow for Chef platform.