chef-dk 4.1.7 → 4.2.0

data/lib/chef-dk/policyfile_services/clean_policies.rb

@@ -45,7 +45,7 @@ module ChefDK
           [ remove_policy(policy), policy ]
         end
 
-        failures = results.select { |result, _policy| result.kind_of?(Exception) }
+        failures = results.select { |result, _policy| result.is_a?(Exception) }
 
         unless failures.empty?
           details = failures.map do |result, policy|
@@ -76,8 +76,8 @@ module ChefDK
 
       def http_client
         @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
-                                               signing_key_filename: chef_config.client_key,
-                                               client_name: chef_config.node_name)
+          signing_key_filename: chef_config.client_key,
+          client_name: chef_config.node_name)
       end
 
       private

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

@@ -115,8 +115,8 @@ module ChefDK
       # server URL and credentials.
       def http_client
         @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
-                                             signing_key_filename: chef_config.client_key,
-                                             client_name: chef_config.node_name)
+          signing_key_filename: chef_config.client_key,
+          client_name: chef_config.node_name)
       end
     end
   end

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

@@ -90,6 +90,7 @@ module ChefDK
 
       def archive_file_location
         return nil unless archive?
+
         filename = "#{policyfile_lock.name}-#{policyfile_lock.revision_id}.tgz"
         File.join(export_dir, filename)
       end
@@ -158,7 +159,7 @@ module ChefDK
         dirname = "#{lock.name}-#{lock.identifier}"
         export_path = File.join(staging_dir, "cookbook_artifacts", dirname)
         metadata_rb_path = File.join(export_path, "metadata.rb")
-        FileUtils.mkdir(export_path) if not File.directory?(export_path)
+        FileUtils.mkdir(export_path) unless File.directory?(export_path)
         copy_unignored_cookbook_files(lock, export_path)
         FileUtils.rm_f(metadata_rb_path)
         metadata = lock.cookbook_version.metadata
@@ -320,6 +321,7 @@ module ChefDK
 
       def validate_lockfile
         return @policyfile_lock if @policyfile_lock
+
         @policyfile_lock = ChefDK::PolicyfileLock.new(storage_config).build_from_lock_data(policy_data)
         # TODO: enumerate any cookbook that have been updated
         @policyfile_lock.validate_cookbooks!
@@ -344,7 +346,7 @@ module ChefDK
 
       def assert_export_dir_clean!
         if !force_export? && !conflicting_fs_entries.empty? && !archive?
-          msg = "Export dir (#{export_dir}) not clean. Refusing to export. (Conflicting files: #{conflicting_fs_entries.join(', ')})"
+          msg = "Export dir (#{export_dir}) not clean. Refusing to export. (Conflicting files: #{conflicting_fs_entries.join(", ")})"
           raise ExportDirNotEmpty, msg
         end
       end

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

@@ -84,6 +84,7 @@ module ChefDK
 
       def policyfile_lock
         return nil if policyfile_lock_content.nil?
+
         @policyfile_lock ||= begin
           lock_data = FFI_Yajl::Parser.new.parse(policyfile_lock_content)
           PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(lock_data)
@@ -115,7 +116,7 @@ module ChefDK
       end
 
       def update_lock_and_install(cookbooks_to_update, exclude_deps)
-        ui.msg "Updating #{cookbooks_to_update.join(',')} cookbooks #{exclude_deps ? '(excluding dependencies)' : ''}"
+        ui.msg "Updating #{cookbooks_to_update.join(",")} cookbooks #{exclude_deps ? "(excluding dependencies)" : ""}"
         to_update = if exclude_deps
                       cookbooks_to_update
                     else
@@ -134,6 +135,7 @@ module ChefDK
 
         policyfile_lock.cookbook_locks.each do |ck_name, location_spec|
           next if to_update.include?(ck_name)
+
           # we need to feed policyfile_compiler.cookbook_location_spec_for with a CookbookLocationSpecification
           policyfile_compiler.dsl.cookbook_location_specs[ck_name] = Policyfile::CookbookLocationSpecification.new(
             ck_name,

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

@@ -52,8 +52,8 @@ module ChefDK
 
       def http_client
         @http_client ||= Chef::ServerAPI.new(config.chef_server_url,
-                                                       signing_key_filename: config.client_key,
-                                                       client_name: config.node_name)
+          signing_key_filename: config.client_key,
+          client_name: config.node_name)
       end
 
       def policy_data
@@ -64,9 +64,9 @@ module ChefDK
 
       def uploader
         ChefDK::Policyfile::Uploader.new(policyfile_lock, policy_group,
-                                         ui: ui,
-                                         http_client: http_client,
-                                         policy_document_native_api: config.policy_document_native_api)
+          ui: ui,
+          http_client: http_client,
+          policy_document_native_api: config.policy_document_native_api)
       end
 
       def run
@@ -99,6 +99,7 @@ module ChefDK
 
       def validate_lockfile
         return @policyfile_lock if @policyfile_lock
+
         @policyfile_lock = ChefDK::PolicyfileLock.new(storage_config).build_from_lock_data(policy_data)
         # TODO: enumerate any cookbook that have been updated
         @policyfile_lock.validate_cookbooks!

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

@@ -56,6 +56,7 @@ module ChefDK
         unless File.exist?(archive_file_path)
           raise InvalidPolicyArchive, "Archive file #{archive_file_path} not found"
         end
+
         stage_unpacked_archive do |staging_dir|
           read_policyfile_lock(staging_dir)
 
@@ -69,16 +70,16 @@ module ChefDK
       # @api private
       def uploader
         ChefDK::Policyfile::Uploader.new(policyfile_lock, policy_group,
-                                         ui: ui,
-                                         http_client: http_client,
-                                         policy_document_native_api: config.policy_document_native_api)
+          ui: ui,
+          http_client: http_client,
+          policy_document_native_api: config.policy_document_native_api)
       end
 
       # @api private
       def http_client
         @http_client ||= Chef::ServerAPI.new(config.chef_server_url,
-                                             signing_key_filename: config.client_key,
-                                             client_name: config.node_name)
+          signing_key_filename: config.client_key,
+          client_name: config.node_name)
       end
 
       private

data/lib/chef-dk/policyfile_services/rm_policy.rb

@@ -76,8 +76,8 @@ module ChefDK
       # server URL and credentials.
       def http_client
         @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
-                                             signing_key_filename: chef_config.client_key,
-                                             client_name: chef_config.node_name)
+          signing_key_filename: chef_config.client_key,
+          client_name: chef_config.node_name)
       end
 
       private
@@ -108,6 +108,7 @@ module ChefDK
           next unless group_info.key?("policies") && !group_info["policies"].empty?
           next unless group_info["policies"].key?(policy_name)
           next unless group_info["policies"][policy_name]["revision_id"] == revision_id
+
           groups << group_name if group_info
         end
         groups
@@ -119,12 +120,14 @@ module ChefDK
 
       def policy_exists?
         return true if @policy_exists
+
         fetch_policy_revision_data
         @policy_exists
       end
 
       def policy_revision_data
         return @policy_revision_data if @policy_exists
+
         fetch_policy_revision_data
       end
 
@@ -133,6 +136,7 @@ module ChefDK
         @policy_exists = true
       rescue Net::HTTPServerException => e
         raise unless e.response.code == "404"
+
         @policy_exists = false
       end
 

data/lib/chef-dk/policyfile_services/rm_policy_group.rb

@@ -77,8 +77,8 @@ module ChefDK
       # server URL and credentials.
       def http_client
         @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
-                                             signing_key_filename: chef_config.client_key,
-                                             client_name: chef_config.node_name)
+          signing_key_filename: chef_config.client_key,
+          client_name: chef_config.node_name)
       end
     end
   end

data/lib/chef-dk/policyfile_services/show_policy.rb

@@ -217,8 +217,8 @@ module ChefDK
 
       def http_client
         @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
-                                             signing_key_filename: chef_config.client_key,
-                                             client_name: chef_config.node_name)
+          signing_key_filename: chef_config.client_key,
+          client_name: chef_config.node_name)
       end
 
       private

data/lib/chef-dk/policyfile_services/undelete.rb

@@ -72,8 +72,8 @@ module ChefDK
 
       def http_client
         @http_client ||= Chef::ServerAPI.new(chef_config.chef_server_url,
-                                                       signing_key_filename: chef_config.client_key,
-                                                       client_name: chef_config.node_name)
+          signing_key_filename: chef_config.client_key,
+          client_name: chef_config.node_name)
       end
 
       private

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "4.1.7".freeze
+  VERSION = "4.2.0".freeze
 end

data/lib/kitchen/provisioner/policyfile_zero.rb

@@ -45,8 +45,7 @@ module Kitchen
       # issues since berks is not yet using Solve 2.x. See also
       # PolicyfileZero#load_needed_dependencies! which is stubbed to prevent
       # berks from loading.
-      def prepare_cookbooks
-      end
+      def prepare_cookbooks; end
 
     end
 
@@ -125,8 +124,7 @@ module Kitchen
 
       # We don't want to load Berkshelf or Librarian; Policyfile is managing
       # dependencies, so these can only cause trouble.
-      def load_needed_dependencies!
-      end
+      def load_needed_dependencies!; end
 
       private
 
@@ -134,8 +132,7 @@ module Kitchen
       # don't need it.
       #
       # @api private
-      def prepare_json
-      end
+      def prepare_json; end
 
       # Copies the policyfile's cookbooks to the sandbox.
       #

data/spec/unit/cli_spec.rb

@@ -354,12 +354,12 @@ describe ChefDK::CLI do
       before do
         allow(File).to receive(:exist?).with(chefdk_embedded_path).and_return(false)
 
-        [
-          :omnibus_root,
-          :omnibus_apps_dir,
-          :omnibus_bin_dir,
-          :omnibus_embedded_bin_dir,
-        ].each do |method_name|
+        %i{
+          omnibus_root
+          omnibus_apps_dir
+          omnibus_bin_dir
+          omnibus_embedded_bin_dir
+        }.each do |method_name|
           allow(cli).to receive(method_name).and_raise(ChefDK::OmnibusInstallNotFound.new)
         end
       end

data/spec/unit/command/base_spec.rb

@@ -41,7 +41,7 @@ describe ChefDK::Command::Base do
 
   let(:stderr_io) { StringIO.new }
   let(:stdout_io) { StringIO.new }
-  let(:command_instance) { TestCommand.new() }
+  let(:command_instance) { TestCommand.new }
   let(:enforce_license) { false }
 
   def stdout

data/spec/unit/command/env_spec.rb

@@ -21,7 +21,7 @@ require "chef-dk/command/env"
 
 describe ChefDK::Command::Env do
   let(:ui) { TestHelpers::TestUI.new }
-  let(:command_instance) { ChefDK::Command::Env.new() }
+  let(:command_instance) { ChefDK::Command::Env.new }
 
   let(:command_options) { [] }
 

data/spec/unit/command/exec_spec.rb

@@ -19,7 +19,7 @@ require "spec_helper"
 require "chef-dk/command/exec"
 
 describe ChefDK::Command::Exec do
-  let(:command_instance) { ChefDK::Command::Exec.new() }
+  let(:command_instance) { ChefDK::Command::Exec.new }
 
   let(:command_options) { [] }
 

data/spec/unit/command/export_spec.rb

@@ -35,7 +35,7 @@ describe ChefDK::Command::Export do
 
   let(:export_service) do
     instance_double(ChefDK::PolicyfileServices::ExportRepo,
-                    policyfile_lock: policyfile_lock)
+      policyfile_lock: policyfile_lock)
   end
 
   context "after evaluating params" do

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

@@ -29,7 +29,8 @@ describe ChefDK::Command::GeneratorCommands::Recipe do
                               "spec/spec_helper.rb",
                               "spec/unit/recipes/new_recipe_spec.rb",
                               "test/integration/default/new_recipe_test.rb",
-                            ] end
+                            ]
+    end
     let(:new_file_name) { "new_recipe" }
 
   end

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

@@ -186,7 +186,7 @@ describe ChefDK::Command::GeneratorCommands::Repo do
         let(:file) { "chefignore" }
 
         it "has the preamble" do
-          expect(file_contents).to match(/Put files\/directories that should be ignored in this file when uploading/)
+          expect(file_contents).to match(%r{Put files/directories that should be ignored in this file when uploading})
         end
       end
 
@@ -195,17 +195,17 @@ describe ChefDK::Command::GeneratorCommands::Repo do
 
         it "has the right contents" do
           expect(file_contents).to match(/\.rake_test_cache/)
-          expect(file_contents).to match(/\.chef\/\*\.pem/)
-          expect(file_contents).to match(/\.chef\/encrypted_data_bag_secret/)
-          expect(file_contents).to_not match(/cookbooks\/\*\*/)
+          expect(file_contents).to match(%r{\.chef/\*\.pem})
+          expect(file_contents).to match(%r{\.chef/encrypted_data_bag_secret})
+          expect(file_contents).to_not match(%r{cookbooks/\*\*})
         end
 
         context "with --policy-only" do
           let(:argv) { ["new_repo", "--policy-only" ] }
 
           it "blocks cookbooks" do
-            expect(file_contents).to match(/cookbooks\/\*\*/)
-            expect(file_contents).to match(/cookbooks\/README\.md/)
+            expect(file_contents).to match(%r{cookbooks/\*\*})
+            expect(file_contents).to match(%r{cookbooks/README\.md})
           end
         end
       end

data/spec/unit/command/verify_spec.rb

@@ -29,7 +29,7 @@ end
 
 describe ChefDK::Command::Verify do
 
-  let(:command_instance) { ChefDK::Command::Verify.new() }
+  let(:command_instance) { ChefDK::Command::Verify.new }
 
   let(:command_options) { [] }
 

data/spec/unit/policyfile/attribute_merge_checker_spec.rb

@@ -54,10 +54,11 @@ describe ChefDK::Policyfile::AttributeMergeChecker do
 
       it "raises an error" do
         expect { checker.check! }.to raise_error(
-          ChefDK::Policyfile::AttributeMergeChecker::ConflictError) do |e|
-            expect(e.attribute_path).to eq("[a]")
-            expect(e.provided_by).to include("foo", "bar")
-          end
+          ChefDK::Policyfile::AttributeMergeChecker::ConflictError
+        ) do |e|
+          expect(e.attribute_path).to eq("[a]")
+          expect(e.provided_by).to include("foo", "bar")
+        end
       end
     end
 
@@ -69,10 +70,11 @@ describe ChefDK::Policyfile::AttributeMergeChecker do
 
       it "raises an error" do
         expect { checker.check! }.to raise_error(
-          ChefDK::Policyfile::AttributeMergeChecker::ConflictError) do |e|
-            expect(e.attribute_path).to eq("[a][b]")
-            expect(e.provided_by).to include("foo", "bar")
-          end
+          ChefDK::Policyfile::AttributeMergeChecker::ConflictError
+        ) do |e|
+          expect(e.attribute_path).to eq("[a][b]")
+          expect(e.provided_by).to include("foo", "bar")
+        end
       end
     end
   end

data/spec/unit/policyfile/chef_server_lock_fetcher_spec.rb

@@ -146,7 +146,8 @@ describe ChefDK::Policyfile::ChefServerLockFetcher do
 
     it "includes the revision id in the source_options_for_lock" do
       allow(http_client).to receive(:get).with(
-        "policy_groups/#{policy_group}/policies/#{policy_name}").and_return(minimal_lockfile)
+        "policy_groups/#{policy_group}/policies/#{policy_name}"
+      ).and_return(minimal_lockfile)
 
       expect(fetcher.source_options_for_lock).to eq(source_options_for_lock)
     end
@@ -154,7 +155,8 @@ describe ChefDK::Policyfile::ChefServerLockFetcher do
     it "correctly applies source_options that were included in the lock" do
       fetcher.apply_locked_source_options(source_options_for_lock)
       expect(http_client).to receive(:get).with(
-        "policies/#{policy_name}/revisions/#{revision_id}").and_return(minimal_lockfile)
+        "policies/#{policy_name}/revisions/#{revision_id}"
+      ).and_return(minimal_lockfile)
       fetcher.lock_data
     end
   end

data/spec/unit/policyfile/cookbook_locks_spec.rb

@@ -221,9 +221,9 @@ describe ChefDK::Policyfile::LocalCookbook do
   describe "gathering identifier info" do
     let(:identifiers) do
       instance_double("ChefDK::CookbookProfiler::Identifiers",
-                     content_identifier: "abc123",
-                     dotted_decimal_identifier: "111.222.333",
-                     semver_version: "1.2.3")
+        content_identifier: "abc123",
+        dotted_decimal_identifier: "111.222.333",
+        semver_version: "1.2.3")
     end
 
     before do
@@ -364,9 +364,9 @@ describe ChefDK::Policyfile::LocalCookbook do
 
         let(:identifiers) do
           instance_double("ChefDK::CookbookProfiler::Identifiers",
-                         content_identifier: "abc123",
-                         dotted_decimal_identifier: "111.222.333",
-                         semver_version: "1.2.3")
+            content_identifier: "abc123",
+            dotted_decimal_identifier: "111.222.333",
+            semver_version: "1.2.3")
         end
 
         it "has the correct identifier" do
@@ -399,9 +399,9 @@ describe ChefDK::Policyfile::LocalCookbook do
         # represents the updated state of the cookbook
         let(:identifiers) do
           instance_double("ChefDK::CookbookProfiler::Identifiers",
-                         content_identifier: "def456",
-                         dotted_decimal_identifier: "777.888.999",
-                         semver_version: "7.8.9")
+            content_identifier: "def456",
+            dotted_decimal_identifier: "777.888.999",
+            semver_version: "7.8.9")
         end
 
         it "sets the content identifier to the new identifier" do