chef-cli 3.0.36 → 3.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75b5fd57e86db29bb68a615fdf19d525619d825cf5569fc19f01af72ac64c355
-  data.tar.gz: 7659576815fb41138d60c1aba5996eddba6ea6229f4900a4177bbf969e567d80
+  metadata.gz: 589401fa72480dd7b3e4ad63f7023af6ad9cc312c105978667d7b164df0144ad
+  data.tar.gz: de56186f0f6a2e9fe5e2aa1b21abe467dc97548710e1a92bec0adaa5d7c82a64
 SHA512:
-  metadata.gz: 00da7122004fa0123b09833996c1a5ac0abba1c891f508c7b06bad885db4872c4a718493f91a101779e3628183793437ffb52cbc5c71740ae318ce5fa6823ab3
-  data.tar.gz: 800b5fd86118674375ed4d97f0084889a4d03594fabbb54d948db5e84eeb5b7b1123e6a742e16571a4ce965284866cf1db705ad609ec6e8d400549ea98b48d2b
+  metadata.gz: de377459543532084875b808fd2b7c0ab897fe2bae2b54bca4f82c90a59c565f1d0a04c8ccaf19710a5b9982d09a6bf2f805371b83a7ae77ae68656e0b1299d4
+  data.tar.gz: 64e33de89273df76855c56b599e4b8da396df569c7c787100f3b22640675dfbb47ad5dd9546b20eb072e1cebd2ffce29687297e0ee94962758745cbf26d4ead9

data/Gemfile

@@ -13,8 +13,8 @@ group :test do
   gem "rspec", "~> 3.8"
   gem "rspec-expectations", "~> 3.8"
   gem "rspec-mocks", "~> 3.8"
-  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 "cookstyle", "=7.7.2" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
+  gem "chefstyle", "=1.6.2"
   gem "test-kitchen", "> 2.5"
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
     gem "chef-zero", "~> 14"

data/chef-cli.gemspec

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "chef-cli/version"
 

data/lib/chef-cli/cli.rb

@@ -171,11 +171,7 @@ module ChefCLI
     private
 
     def manifest_field(field)
-      if manifest_hash[field]
-        manifest_hash[field]
-      else
-        "unknown"
-      end
+      manifest_hash[field] || "unknown"
     end
 
     def component_version(name)

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

@@ -86,7 +86,7 @@ module ChefCLI
           # chefcli.generator_cookbook would make this command copy the custom
           # generator, but that doesn't make sense because the user can easily
           # do that anyway.
-          File.expand_path("../../../skeletons/code_generator", __FILE__)
+          File.expand_path("../../skeletons/code_generator", __dir__)
         end
 
         private

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

@@ -142,7 +142,7 @@ module ChefCLI
       end
 
       def expand_completion_template_path(basename)
-        File.join(File.expand_path("../../completions", __FILE__), basename)
+        File.join(File.expand_path("../completions", __dir__), basename)
       end
 
       def shell_completion_template_context

data/lib/chef-cli/configurable.rb

@@ -33,7 +33,7 @@ class Chef::Config
     # instead of `chefcli.generator_cookbook`).
     config_strict_mode(true)
 
-    default(:generator_cookbook, File.expand_path("../skeletons/code_generator", __FILE__))
+    default(:generator_cookbook, File.expand_path("skeletons/code_generator", __dir__))
 
     config_context(:generator) do
       config_strict_mode(true)

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

@@ -120,14 +120,10 @@ module ChefCLI
         @unborn_branch = false
         branch
       rescue Mixlib::ShellOut::ShellCommandFailed => e
-        # We may have an "unborn" branch, i.e. one with no commits.
-        if unborn_branch_ref
-          unborn_branch_ref
-        else
-          # if we got here, but verify_ref_cmd didn't error, we don't know why
-          # the original git command failed, so re-raise.
-          raise e
-        end
+        # "unborn" branch, i.e. one with no commits or
+        # verify_ref_cmd didn't error, we don't know why
+        # the original git command failed, so re-raise.
+        unborn_branch_ref || raise(e)
       end
 
       def unborn_branch_ref

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

@@ -82,10 +82,14 @@ module ChefCLI
         "artifactory(#{uri})"
       end
 
+      def artifactory_api_key
+        chef_config&.artifactory_api_key || ENV["ARTIFACTORY_API_KEY"]
+      end
+
       private
 
       def http_connection_for(base_url)
-        headers = { "X-Jfrog-Art-API" => chef_config.artifactory_api_key || ENV["ARTIFACTORY_API_KEY"] }
+        headers = { "X-Jfrog-Art-API" => artifactory_api_key }
         @http_connections[base_url] ||= Chef::HTTP::Simple.new(base_url, headers: headers)
       end
 

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

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

data/lib/chef-cli/service_exceptions.rb

@@ -123,6 +123,7 @@ module ChefCLI
 
   class DeletePolicyError < PolicyfileNestedException
   end
+
   class PolicyCookbookCleanError < PolicyfileNestedException
   end
 

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

@@ -22,4 +22,4 @@ else
     source 'cookbook_file.erb'
     helpers(ChefCLI::Generator::TemplateHelper)
   end
-end
+end

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

@@ -4,7 +4,7 @@ driver:
 
 ## The forwarded_port port feature lets you connect to ports on the VM guest via
 ## localhost on the host.
-## see also: https://www.vagrantup.com/docs/networking/forwarded_ports.html
+## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
 
 #  network:
 #    - ["forwarded_port", {guest: 80, host: 8080}]

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

@@ -4,7 +4,7 @@ driver:
 
 ## The forwarded_port port feature lets you connect to ports on the VM guest via
 ## localhost on the host.
-## see also: https://www.vagrantup.com/docs/networking/forwarded_ports.html
+## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
 
 #  network:
 #    - ["forwarded_port", {guest: 80, host: 8080}]

data/lib/chef-cli/version.rb

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

data/spec/test_helpers.rb

@@ -39,7 +39,7 @@ module TestHelpers
   end
 
   def project_root
-    File.expand_path("../..", __FILE__)
+    File.expand_path("..", __dir__)
   end
 
   def reset_tempdir

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

@@ -562,7 +562,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
 
             ## The forwarded_port port feature lets you connect to ports on the VM guest via
             ## localhost on the host.
-            ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports.html
+            ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
 
             #  network:
             #    - ["forwarded_port", {guest: 80, host: 8080}]
@@ -645,7 +645,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
 
             ## The forwarded_port port feature lets you connect to ports on the VM guest via
             ## localhost on the host.
-            ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports.html
+            ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
 
             #  network:
             #    - ["forwarded_port", {guest: 80, host: 8080}]

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

@@ -26,7 +26,7 @@ describe ChefCLI::Command::GeneratorCommands::GeneratorGenerator do
   let(:stdout_io) { StringIO.new }
   let(:stderr_io) { StringIO.new }
 
-  let(:repo_root) { File.expand_path("../../../../..", __FILE__) }
+  let(:repo_root) { File.expand_path("../../../..", __dir__) }
 
   let(:builtin_generator_path) { File.join(repo_root, "lib/chef-cli/skeletons/code_generator") }
 

data/spec/unit/policyfile/artifactory_cookbook_source_spec.rb

@@ -20,8 +20,9 @@ require "chef-cli/policyfile/source_uri"
 require "chef-cli/policyfile/artifactory_cookbook_source"
 
 describe ChefCLI::Policyfile::ArtifactoryCookbookSource do
-  subject { described_class.new(cookbook_source) }
+  subject { described_class.new(cookbook_source, chef_config: config) }
 
+  let(:config) { nil }
   let(:cookbook_source) { "https://supermarket.chef.io/api/v1" }
 
   let(:http_connection) { double("Chef::HTTP::Simple") }
@@ -56,4 +57,29 @@ describe ChefCLI::Policyfile::ArtifactoryCookbookSource do
       expect(subject.source_options_for("apache2", "1.10.4")).to eq(expected_opts)
     end
   end
+
+  describe "#artifactory_api_key" do
+    before do
+      ENV["ARTIFACTORY_API_KEY"] = "test"
+    end
+
+    context "when config is not present" do
+      let(:config) { nil }
+      it "should get artifactory key from the env" do
+        expect(subject.artifactory_api_key).to eq("test")
+      end
+    end
+
+    context "when config is present" do
+      let(:config) { double("Chef::Config") }
+      it "should get artifactory key from config when key is present" do
+        expect(config).to receive(:artifactory_api_key).and_return "test1"
+        expect(subject.artifactory_api_key).to eq("test1")
+      end
+      it "should get artifactory key from env when config is present but has a nil key" do
+        expect(config).to receive(:artifactory_api_key).and_return nil
+        expect(subject.artifactory_api_key).to eq("test")
+      end
+    end
+  end
 end

data/spec/unit/policyfile/undo_stack_spec.rb

@@ -223,7 +223,7 @@ describe ChefCLI::Policyfile::UndoStack do
       end
 
       it "removes the oldest record" do
-        oldest_record_file = undo_stack_files.sort.first
+        oldest_record_file = undo_stack_files.min
 
         undo_stack.push(incremented_undo_record(11))
 
@@ -251,7 +251,7 @@ describe ChefCLI::Policyfile::UndoStack do
         end
 
         it "removes the oldest record" do
-          oldest_record_file = undo_stack_files.sort.first
+          oldest_record_file = undo_stack_files.min
 
           undo_stack.push(incremented_undo_record(11))
 

data/spec/unit/policyfile_install_with_includes_spec.rb

@@ -17,7 +17,7 @@
 
 require "spec_helper"
 require "chef-cli/policyfile_compiler"
-require "chef-cli/policyfile_lock.rb"
+require "chef-cli/policyfile_lock"
 
 describe ChefCLI::PolicyfileLock, "installing cookbooks from included policies" do
 

data/spec/unit/policyfile_lock_build_spec.rb

@@ -19,7 +19,7 @@ require "spec_helper"
 require "shared/setup_git_cookbooks"
 require "shared/fixture_cookbook_checksums"
 require "chef-cli/policyfile/storage_config"
-require "chef-cli/policyfile_lock.rb"
+require "chef-cli/policyfile_lock"
 
 describe ChefCLI::PolicyfileLock, "building a lockfile", :skip_on_windows do
 

data/spec/unit/policyfile_lock_install_spec.rb

@@ -17,7 +17,7 @@
 
 require "spec_helper"
 require "shared/fixture_cookbook_checksums"
-require "chef-cli/policyfile_lock.rb"
+require "chef-cli/policyfile_lock"
 
 describe ChefCLI::PolicyfileLock, "installing cookbooks from a lockfile" do
 

data/spec/unit/policyfile_lock_validation_spec.rb

@@ -16,7 +16,7 @@
 #
 
 require "spec_helper"
-require "chef-cli/policyfile_lock.rb"
+require "chef-cli/policyfile_lock"
 
 describe ChefCLI::PolicyfileLock, "validating locked cookbooks" do
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 3.0.36
+  version: 3.0.40
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 2021-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli