chef-cli 1.0.3 → 1.0.6

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

@@ -84,6 +84,7 @@ module ChefCLI
 
       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 ChefCLI
       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 ChefCLI
 
         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-cli/policyfile_services/push.rb

@@ -52,8 +52,8 @@ module ChefCLI
 
       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 ChefCLI
 
       def uploader
         ChefCLI::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 ChefCLI
 
       def validate_lockfile
         return @policyfile_lock if @policyfile_lock
+
         @policyfile_lock = ChefCLI::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-cli/policyfile_services/push_archive.rb

@@ -55,6 +55,7 @@ module ChefCLI
         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)
 
@@ -68,16 +69,16 @@ module ChefCLI
       # @api private
       def uploader
         ChefCLI::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-cli/policyfile_services/rm_policy.rb

@@ -76,8 +76,8 @@ module ChefCLI
       # 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 ChefCLI
           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 ChefCLI
 
       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 ChefCLI
         @policy_exists = true
       rescue Net::HTTPServerException => e
         raise unless e.response.code == "404"
+
         @policy_exists = false
       end
 

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

@@ -77,8 +77,8 @@ module ChefCLI
       # 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-cli/policyfile_services/show_policy.rb

@@ -217,8 +217,8 @@ module ChefCLI
 
       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-cli/policyfile_services/undelete.rb

@@ -72,8 +72,8 @@ module ChefCLI
 
       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-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "1.0.3".freeze
+  VERSION = "1.0.6".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

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

data/spec/unit/command/base_spec.rb

@@ -41,7 +41,7 @@ describe ChefCLI::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-cli/command/env"
 
 describe ChefCLI::Command::Env do
   let(:ui) { TestHelpers::TestUI.new }
-  let(:command_instance) { ChefCLI::Command::Env.new() }
+  let(:command_instance) { ChefCLI::Command::Env.new }
 
   let(:command_options) { [] }
 

data/spec/unit/command/exec_spec.rb

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

data/spec/unit/command/export_spec.rb

@@ -35,7 +35,7 @@ describe ChefCLI::Command::Export do
 
   let(:export_service) do
     instance_double(ChefCLI::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 ChefCLI::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 ChefCLI::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 ChefCLI::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 ChefCLI::Command::Verify do
 
-  let(:command_instance) { ChefCLI::Command::Verify.new() }
+  let(:command_instance) { ChefCLI::Command::Verify.new }
 
   let(:command_options) { [] }
 

data/spec/unit/policyfile/attribute_merge_checker_spec.rb

@@ -54,10 +54,11 @@ describe ChefCLI::Policyfile::AttributeMergeChecker do
 
       it "raises an error" do
         expect { checker.check! }.to raise_error(
-          ChefCLI::Policyfile::AttributeMergeChecker::ConflictError) do |e|
-            expect(e.attribute_path).to eq("[a]")
-            expect(e.provided_by).to include("foo", "bar")
-          end
+          ChefCLI::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 ChefCLI::Policyfile::AttributeMergeChecker do
 
       it "raises an error" do
         expect { checker.check! }.to raise_error(
-          ChefCLI::Policyfile::AttributeMergeChecker::ConflictError) do |e|
-            expect(e.attribute_path).to eq("[a][b]")
-            expect(e.provided_by).to include("foo", "bar")
-          end
+          ChefCLI::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 ChefCLI::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 ChefCLI::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 ChefCLI::Policyfile::LocalCookbook do
   describe "gathering identifier info" do
     let(:identifiers) do
       instance_double("ChefCLI::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 ChefCLI::Policyfile::LocalCookbook do
 
         let(:identifiers) do
           instance_double("ChefCLI::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 ChefCLI::Policyfile::LocalCookbook do
         # represents the updated state of the cookbook
         let(:identifiers) do
           instance_double("ChefCLI::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

data/spec/unit/policyfile/git_lock_fetcher_spec.rb

@@ -141,11 +141,11 @@ describe ChefCLI::Policyfile::GitLockFetcher do
         expect(
           relative_path_fetcher.lock_data["cookbook_locks"][cookbook_name]["source_options"]
         ).to match(
-               {
-                 "git" => repo,
-                 "revision" => git_revision,
-               }
-             )
+          {
+            "git" => repo,
+            "revision" => git_revision,
+          }
+        )
         expect(
           relative_path_fetcher.lock_data["cookbook_locks"][cookbook_name]["source_options"]
         ).not_to match(source_options_rel)

data/spec/unit/policyfile/included_policies_cookbook_source_spec.rb

@@ -69,7 +69,7 @@ describe ChefCLI::Policyfile::IncludedPoliciesCookbookSource do
         "cache_key" => "#{cookbook_info[:name]}-#{cookbook_info[:version]}",
         "origin" => "uri",
         "source_options" => { "version" => cookbook_info[:version] }.tap do |so|
-          so["nonce"] = nonce if !nonce.nil?
+          so["nonce"] = nonce unless nonce.nil?
         end,
       }
       acc
@@ -222,7 +222,8 @@ describe ChefCLI::Policyfile::IncludedPoliciesCookbookSource do
 
       it "raises an error when check_for_conflicts! is called" do
         expect { cookbook_source.check_for_conflicts! }.to raise_error(
-          ChefCLI::Policyfile::IncludedPoliciesCookbookSource::ConflictingCookbookSources)
+          ChefCLI::Policyfile::IncludedPoliciesCookbookSource::ConflictingCookbookSources
+        )
       end
     end
 
@@ -231,7 +232,8 @@ describe ChefCLI::Policyfile::IncludedPoliciesCookbookSource do
 
       it "raises an error when check_for_conflicts! is called" do
         expect { cookbook_source.check_for_conflicts! }.to raise_error(
-          ChefCLI::Policyfile::IncludedPoliciesCookbookSource::ConflictingCookbookVersions)
+          ChefCLI::Policyfile::IncludedPoliciesCookbookSource::ConflictingCookbookVersions
+        )
       end
     end
 

data/spec/unit/policyfile/lister_spec.rb

@@ -26,9 +26,9 @@ describe ChefCLI::Policyfile::Lister do
 
   let(:config) do
     double("Chef::Config",
-           chef_server_url: "https://localhost:10443",
-           client_key: "/path/to/client/key.pem",
-           node_name: "deuce")
+      chef_server_url: "https://localhost:10443",
+      client_key: "/path/to/client/key.pem",
+      node_name: "deuce")
   end
 
   let(:http_client) { instance_double(Chef::ServerAPI) }
@@ -39,8 +39,8 @@ describe ChefCLI::Policyfile::Lister do
 
   it "configures an HTTP client" do
     expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
-                                                       signing_key_filename: "/path/to/client/key.pem",
-                                                       client_name: "deuce")
+      signing_key_filename: "/path/to/client/key.pem",
+      client_name: "deuce")
     info_fetcher.http_client
   end
 

data/spec/unit/policyfile/local_lock_fetcher_spec.rb

@@ -70,7 +70,7 @@ describe ChefCLI::Policyfile::LocalLockFetcher do
     end
   end
 
-  [:relative, :absolute].each do |mode|
+  %i{relative absolute}.each do |mode|
     context "When path is #{mode}" do
       let(:path) { "foo/bar/baz/foo.lock.json" }
       let(:lock_file_path_abs) { "#{tempdir}/#{path}" }

data/spec/unit/policyfile/lock_applier_spec.rb

@@ -27,12 +27,12 @@ describe ChefCLI::Policyfile::LockApplier do
 
   let(:included_policy_1) do
     instance_double("ChefCLI::Policyfile::PolicyfileLocationSpec",
-                    name: "policy1")
+      name: "policy1")
   end
 
   let(:included_policy_2) do
     instance_double("ChefCLI::Policyfile::PolicyfileLocationSpec",
-                    name: "policy2")
+      name: "policy2")
   end
 
   let(:included_policy_lock_1) do

data/spec/unit/policyfile/reports/install_spec.rb

@@ -42,18 +42,18 @@ describe ChefCLI::Policyfile::Reports::Install do
 
     let(:fixed_version_cookbook_one) do
       instance_double("ChefCLI::Policyfile::CookbookLocationSpecification",
-                      installed?: false,
-                      name: "short-name",
-                      version_constraint: ">= 0.0.0",
-                      source_type: :git)
+        installed?: false,
+        name: "short-name",
+        version_constraint: ">= 0.0.0",
+        source_type: :git)
     end
 
     let(:fixed_version_cookbook_two) do
       instance_double("ChefCLI::Policyfile::CookbookLocationSpecification",
-                      installed?: true,
-                      name: "this-name-is-longer",
-                      version_constraint: "~> 10.0.0",
-                      source_type: :path)
+        installed?: true,
+        name: "this-name-is-longer",
+        version_constraint: "~> 10.0.0",
+        source_type: :path)
     end
 
     let(:fixed_version_cookbooks) do
@@ -80,16 +80,16 @@ describe ChefCLI::Policyfile::Reports::Install do
 
     let(:cookbook_one) do
       instance_double("ChefCLI::Policyfile::CookbookLocationSpecification",
-                      installed?: false,
-                      name: "short-name",
-                      version_constraint: Semverse::Constraint.new("= 10.0.4"))
+        installed?: false,
+        name: "short-name",
+        version_constraint: Semverse::Constraint.new("= 10.0.4"))
     end
 
     let(:cookbook_two) do
       instance_double("ChefCLI::Policyfile::CookbookLocationSpecification",
-                      installed?: true,
-                      name: "this-name-is-longer",
-                      version_constraint: Semverse::Constraint.new("= 1.2.3"))
+        installed?: true,
+        name: "this-name-is-longer",
+        version_constraint: Semverse::Constraint.new("= 1.2.3"))
     end
 
     let(:graph_solution_cookbooks) do

data/spec/unit/policyfile/reports/upload_spec.rb

@@ -50,9 +50,9 @@ describe ChefCLI::Policyfile::Reports::Upload do
 
     def cb_with_lock(name, version, identifier)
       lock = instance_double("ChefCLI::Policyfile::CookbookLock",
-                             name: name,
-                             version: version,
-                             identifier: identifier)
+        name: name,
+        version: version,
+        identifier: identifier)
 
       ChefCLI::Policyfile::Uploader::LockedCookbookForUpload.new(nil, lock)
     end

data/spec/unit/policyfile/uploader_spec.rb

@@ -48,7 +48,8 @@ describe ChefCLI::Policyfile::Uploader do
 
   let(:policyfile_lock) do
     instance_double("ChefCLI::PolicyfileLock", name: "example",
-                                              to_lock: policyfile_lock_data) end
+                                              to_lock: policyfile_lock_data)
+  end
 
   let(:policy_group) { "unit-test" }
 
@@ -58,9 +59,9 @@ describe ChefCLI::Policyfile::Uploader do
 
   let(:uploader) do
     described_class.new(policyfile_lock,
-                        policy_group,
-                        http_client: http_client,
-                        policy_document_native_api: policy_document_native_api)
+      policy_group,
+      http_client: http_client,
+      policy_document_native_api: policy_document_native_api)
   end
 
   let(:policyfile_as_data_bag_item) do
@@ -101,16 +102,16 @@ describe ChefCLI::Policyfile::Uploader do
       cache_path = "/home/user/cache_path/#{name}"
 
       lock = instance_double("ChefCLI::Policyfile::CookbookLock",
-                             name: name,
-                             version: "1.0.0",
-                             identifier: identifier,
-                             dotted_decimal_identifier: dotted_decimal_id,
-                             cookbook_path: cache_path)
+        name: name,
+        version: "1.0.0",
+        identifier: identifier,
+        dotted_decimal_identifier: dotted_decimal_id,
+        cookbook_path: cache_path)
 
       cookbook_version = instance_double("Chef::CookbookVersion",
-                                         name: name,
-                                         identifier: lock.identifier,
-                                         version: dotted_decimal_id)
+        name: name,
+        identifier: lock.identifier,
+        version: dotted_decimal_id)
 
       allow(cookbook_version).to receive(:identifier=).with(lock.identifier)
 

data/spec/unit/policyfile_demands_spec.rb

@@ -208,10 +208,10 @@ describe ChefCLI::PolicyfileCompiler, "when expressing the Policyfile graph dema
       s << " #{remote_cb_source_opts}"
 
       instance_double("ChefCLI::Policyfile::CookbookLocationSpecification",
-                      name: "remote-cb",
-                      version_constraint: Semverse::Constraint.new("= 1.1.1"),
-                      ensure_cached: nil,
-                      to_s: s)
+        name: "remote-cb",
+        version_constraint: Semverse::Constraint.new("= 1.1.1"),
+        ensure_cached: nil,
+        to_s: s)
     end
 
     before do