chef-cli 3.0.27 → 3.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 577fd81ddfd9035362ceca91e8657bf85601baa80a3b810bb3a537fb1c138f55
-  data.tar.gz: f54bf84b3b02697a25a0b6df304255322a31baa22c8fff25dcdd3b917daac99f
+  metadata.gz: 8a39366b7f1920937b7329ef1a5b54d810d4b3c017e331926608356c55c68250
+  data.tar.gz: 20882fcd4590d7969d7afd83aec868e89be1c032651dc594dcc61f4eee2eb632
 SHA512:
-  metadata.gz: fa616d709e416e96c148010b895e5d7e95c440544d66e9e39f2768242443f3aecaafe0fbcc3c3fa6715fbe5426bf7b55ec939db0b31338943b1a84f6bdbb04bf
-  data.tar.gz: 691fd1a5d1cde311bbe3c6bb8678704857733261a1b19e83f2f418ac10d2af22e3fa09c5de26a4a5599bb50733d9deca2a4f70d937b63270ad747b405db31094
+  metadata.gz: 621b7594acfcb6968c5ddd3d690fc49a86b4c6932d4011debdadee19d86d638b7caea04eba2aa89776be213533ec4c14be65b715418edf83a39fda0f651c8bba
+  data.tar.gz: 315dd298b75add288ff031a1c9b7d3a0d5d4994454476570b4fd3c46a4c0ae3d693ecc8d9ac0b43aa5c10f3ffa1901921fb841e63198612b84d0cbb6e630d582

data/bin/chef-cli

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Copyright:: Copyright (c) 2014-2018 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");
@@ -19,7 +19,7 @@
 # Set a trap for ctrl-C right away so we don't surface interrupt exceptions inside of rubygems or whatever.
 Kernel.trap(:INT) { print("\n"); exit 1 }
 
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+$:.unshift(File.expand_path(File.join(__dir__, "..", "lib")))
 require "chef-cli/cli"
 
 ChefCLI::CLI.new(ARGV.clone).run(enforce_license: true)

data/lib/chef-cli/cli.rb

@@ -33,6 +33,10 @@ 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
+
       Usage:
           #{ChefCLI::Dist::EXEC} -h/--help
           #{ChefCLI::Dist::EXEC} -v/--version
@@ -119,13 +123,13 @@ module ChefCLI
 
     def show_help
       msg(banner)
-      msg("\nAvailable Commands:")
+      msg("Available Commands:")
 
       justify_length = subcommands.map(&:length).max + 2
       subcommand_specs.each do |name, spec|
         next if spec.hidden
 
-        msg("    #{"#{name}".ljust(justify_length)}#{spec.description}")
+        msg("    #{name.to_s.ljust(justify_length)}#{spec.description}")
       end
     end
 

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

@@ -37,7 +37,7 @@ module ChefCLI
 
       def run(params)
         info = {}
-        info["#{ChefCLI::Dist::PRODUCT}"] = workstation_info
+        info[ChefCLI::Dist::PRODUCT] = workstation_info
         info["Ruby"] = ruby_info
         info["Path"] = paths
         ui.msg info.to_yaml

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

@@ -18,7 +18,7 @@
 # TODO: Chef should require its dependency correctly.
 require "singleton" unless defined?(Singleton)
 require "chef/cookbook/cookbook_version_loader"
-require "digest/sha1"
+require "digest/sha1" unless defined?(Digest::SHA1)
 
 require "chef/digester"
 

data/lib/chef-cli/generator.rb

@@ -154,7 +154,7 @@ module ChefCLI
         end
         if comment
           # Ensure there's no trailing whitespace
-          result.gsub(/^(.+)$/, "#{comment} \\1").gsub(/^$/, "#{comment}").strip
+          result.gsub(/^(.+)$/, "#{comment} \\1").gsub(/^$/, comment).strip
         else
           result
         end

data/lib/chef-cli/helpers.rb

@@ -141,7 +141,7 @@ module ChefCLI
 
     def default_package_home
       if Chef::Platform.windows?
-        File.join(ENV["LOCALAPPDATA"], "#{ChefCLI::Dist::PRODUCT_PKG_HOME}")
+        File.join(ENV["LOCALAPPDATA"], ChefCLI::Dist::PRODUCT_PKG_HOME)
       else
         File.expand_path("~/.#{ChefCLI::Dist::PRODUCT_PKG_HOME}")
       end

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

@@ -52,7 +52,7 @@ module ChefCLI
           return use_policyfile_lock(policyfile_filename)
         end
         unless policyfile_filename.end_with?(".rb")
-          raise InvalidPolicyfileFilename, "Policyfile filenames must end with `.rb' extension (you gave: `#{policyfile_filename}')"
+          raise InvalidPolicyfileFilename, "Policyfile filenames must end with an `.rb' or `.lock.json' extension (you gave: `#{policyfile_filename}')"
         end
 
         @policyfile_filename = policyfile_filename

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

@@ -18,7 +18,7 @@
 require "pathname" unless defined?(Pathname)
 require "fileutils" unless defined?(FileUtils)
 require "tmpdir" unless defined?(Dir.mktmpdir)
-require "zlib"
+require "zlib" unless defined?(Zlib)
 
 require "archive/tar/minitar"
 

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

@@ -42,8 +42,8 @@ module ChefCLI
         @overwrite = overwrite
         @chef_config = config
 
-        policyfile_rel_path = policyfile || "Policyfile.rb"
-        policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
+        @policyfile_rel_path = policyfile || "Policyfile.rb"
+        policyfile_full_path = File.expand_path(@policyfile_rel_path, root_dir)
         @storage_config = Policyfile::StorageConfig.new.use_policyfile(policyfile_full_path)
 
         @policyfile_content = nil
@@ -51,9 +51,11 @@ module ChefCLI
       end
 
       def run(cookbooks_to_update = [], exclude_deps = false)
-        unless File.exist?(policyfile_expanded_path)
-          # TODO: suggest next step. Add a generator/init command? Specify path to Policyfile.rb?
-          # See card CC-232
+        # TODO: suggest next step. Add a generator/init command? Specify path to Policyfile.rb?
+        # See card CC-232
+        if @policyfile_rel_path.end_with?(".lock.json") && !File.exist?(policyfile_lock_expanded_path)
+          raise PolicyfileNotFound, "Policyfile lock not found at path #{policyfile_lock_expanded_path}"
+        elsif @policyfile_rel_path.end_with?(".rb") && !File.exist?(policyfile_expanded_path)
           raise PolicyfileNotFound, "Policyfile not found at path #{policyfile_expanded_path}"
         end
 

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

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require "zlib"
+require "zlib" unless defined?(Zlib)
 require "archive/tar/minitar"
 
 require_relative "../service_exceptions"

data/lib/chef-cli/version.rb

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

data/spec/test_helpers.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 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");
@@ -35,7 +35,7 @@ module TestHelpers
   end
 
   def fixtures_path
-    File.expand_path(File.dirname(__FILE__) + "/unit/fixtures/")
+    File.expand_path(__dir__ + "/unit/fixtures/")
   end
 
   def project_root

data/spec/unit/cli_spec.rb

@@ -41,12 +41,15 @@ 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
+
       Usage:
           chef -h/--help
           chef -v/--version
           chef command [arguments...] [options...]
 
-
       Available Commands:
           gem      Runs the `gem` command in context of the embedded ruby
           example  Example subcommand for testing

data/spec/unit/command/exec_spec.rb

@@ -127,7 +127,7 @@ describe ChefCLI::Command::Exec do
         end
 
         context "when running a exec with #{switch}" do
-          let(:command_options) { ["#{switch}"] }
+          let(:command_options) { [switch] }
 
           it "should call not call exec, but it should print the banner" do
             allow(command_instance).to receive(:msg)

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

@@ -1,14 +1,11 @@
 require "openssl"
 require "net/http" unless defined?(Net::HTTP)
 require "json" unless defined?(JSON)
-require "pp"
 require "uri"
 
-THIS_DIR = File.expand_path(File.dirname(__FILE__))
-
-UNIVERSE_JSON_PATH = File.join(THIS_DIR, "universe.json")
-SMALL_UNIVERSE_JSON_PATH = File.join(THIS_DIR, "small_universe.json")
-PRUNED_UNIVERSE_PATH = File.join(THIS_DIR, "pruned_small_universe.json")
+UNIVERSE_JSON_PATH = File.join(__dir__, "universe.json")
+SMALL_UNIVERSE_JSON_PATH = File.join(__dir__, "small_universe.json")
+PRUNED_UNIVERSE_PATH = File.join(__dir__, "pruned_small_universe.json")
 
 COOKBOOKS_IN_SMALL_UNIVERSE = %w{apache2 application apt database mysql nginx postgresql yum}.freeze
 

data/spec/unit/policyfile/storage_config_spec.rb

@@ -106,10 +106,10 @@ describe ChefCLI::Policyfile::StorageConfig do
 
     end
 
-    context "when the policyfile file name doesn't have a .rb extension" do
+    context "when the policyfile file name doesn't have an .rb or .lock.json extension" do
 
       it "raises an error" do
-        err_string = %q{Policyfile filenames must end with `.rb' extension (you gave: `Policyfile')}
+        err_string = %q{Policyfile filenames must end with an `.rb' or `.lock.json' extension (you gave: `Policyfile')}
         expect { storage_config.use_policyfile("Policyfile") }.to raise_error(ChefCLI::InvalidPolicyfileFilename, err_string)
       end
 

data/spec/unit/policyfile_services/install_spec.rb

@@ -77,6 +77,26 @@ describe ChefCLI::PolicyfileServices::Install do
 
   end
 
+  context "When an explicit Policfyfile lock name is given and does not exist" do
+
+    let(:policyfile_rb_explicit_name) { "i_do_not_exist.lock.json" }
+
+    it "errors out" do
+      expect { install_service.run }.to raise_error(ChefCLI::PolicyfileNotFound, "Policyfile lock not found at path #{policyfile_rb_path}")
+    end
+
+  end
+
+  context "When an explicit Policfyfile name is given and does not exist" do
+
+    let(:policyfile_rb_explicit_name) { "i_do_not_exist.rb" }
+
+    it "errors out" do
+      expect { install_service.run }.to raise_error(ChefCLI::PolicyfileNotFound, "Policyfile not found at path #{policyfile_rb_path}")
+    end
+
+  end
+
   context "when a Policyfile exists" do
 
     before do

metadata

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