chef-cli 1.0.3 → 1.0.6

data/spec/unit/policyfile_includes_spec.rb

@@ -247,7 +247,8 @@ describe ChefCLI::PolicyfileCompiler, "including upstream policy locks" do
 
       it "emits a lockfile where cookbooks pulled from the upstream are at identical versions" do
         expect(policyfile_lock.to_lock["solution_dependencies"]["dependencies"]).to(
-          have_key("cookbookC (2.0.0)"))
+          have_key("cookbookC (2.0.0)")
+        )
       end
     end
 
@@ -266,7 +267,8 @@ describe ChefCLI::PolicyfileCompiler, "including upstream policy locks" do
         let(:run_list) { [] }
         it "it defaults to those provided in the included policy lock" do
           expect(policyfile_lock.to_lock["solution_dependencies"]["dependencies"]).to(
-            have_key("cookbookC (2.0.0)"))
+            have_key("cookbookC (2.0.0)")
+          )
         end
       end
 
@@ -309,7 +311,8 @@ describe ChefCLI::PolicyfileCompiler, "including upstream policy locks" do
 
         it "solves the dependencies added by the top-level policyfile and emits them in the lockfile" do
           expect(policyfile_lock.to_lock["solution_dependencies"]["dependencies"]).to(
-            have_key("cookbookC (2.0.0)"))
+            have_key("cookbookC (2.0.0)")
+          )
         end
 
       end
@@ -375,7 +378,8 @@ describe ChefCLI::PolicyfileCompiler, "including upstream policy locks" do
         it "raises an error describing all attribute conflicts" do
           expect { policyfile_lock.to_lock }.to raise_error(
             ChefCLI::Policyfile::AttributeMergeChecker::ConflictError,
-            "Attribute '[shared][foo]' provided conflicting values by the following sources [\"user-specified\", \"included\"]")
+            "Attribute '[shared][foo]' provided conflicting values by the following sources [\"user-specified\", \"included\"]"
+          )
         end
       end
     end
@@ -425,7 +429,8 @@ describe ChefCLI::PolicyfileCompiler, "including upstream policy locks" do
         it "raises an error describing all attribute conflicts" do
           expect { policyfile_lock.to_lock }.to raise_error(
             ChefCLI::Policyfile::AttributeMergeChecker::ConflictError,
-            "Attribute '[shared][foo]' provided conflicting values by the following sources [\"user-specified\", \"included\"]")
+            "Attribute '[shared][foo]' provided conflicting values by the following sources [\"user-specified\", \"included\"]"
+          )
         end
       end
     end
@@ -652,7 +657,8 @@ describe ChefCLI::PolicyfileCompiler, "including upstream policy locks" do
         it "raises an error describing the conflict" do
           expect { policyfile_lock }.to raise_error(
             ChefCLI::Policyfile::AttributeMergeChecker::ConflictError,
-            "Attribute '[conflict][foo]' provided conflicting values by the following sources [\"included\", \"included2\"]")
+            "Attribute '[conflict][foo]' provided conflicting values by the following sources [\"included\", \"included2\"]"
+          )
         end
       end
     end
@@ -711,7 +717,8 @@ describe ChefCLI::PolicyfileCompiler, "including upstream policy locks" do
         it "raises an error describing the conflict" do
           expect { policyfile_lock }.to raise_error(
             ChefCLI::Policyfile::AttributeMergeChecker::ConflictError,
-            "Attribute '[conflict][foo]' provided conflicting values by the following sources [\"included\", \"included2\"]")
+            "Attribute '[conflict][foo]' provided conflicting values by the following sources [\"included\", \"included2\"]"
+          )
         end
       end
     end

data/spec/unit/policyfile_install_with_includes_spec.rb

@@ -162,10 +162,10 @@ describe ChefCLI::PolicyfileLock, "installing cookbooks from included policies"
 
     allow(ChefCLI::Policyfile::CookbookLocationSpecification).to receive(:new) do |cookbook_name, version_constraint, source_opts, storage_config|
       double = instance_double("ChefCLI::Policyfile::CookbookLocationSpecification",
-                      name: cookbook_name,
-                      version_constraint: Semverse::Constraint.new(version_constraint),
-                      ensure_cached: nil,
-                      to_s: "#{cookbook_name} #{version_constraint}")
+        name: cookbook_name,
+        version_constraint: Semverse::Constraint.new(version_constraint),
+        ensure_cached: nil,
+        to_s: "#{cookbook_name} #{version_constraint}")
       allow(double).to receive(:cookbook_has_recipe?).and_return(true)
       allow(double).to receive(:installed?).and_return(true)
       allow(double).to receive(:mirrors_canonical_upstream?).and_return(true)
@@ -207,8 +207,8 @@ describe ChefCLI::PolicyfileLock, "installing cookbooks from included policies"
         allow(mock).to receive(:validate!)
         allow(mock).to receive(:cookbook_version) do
           instance_double("Chef::CookbookVersion",
-                          version: mock.source_options[:version],
-                          manifest_records_by_path: [])
+            version: mock.source_options[:version],
+            manifest_records_by_path: [])
         end
         mock
       end
@@ -226,7 +226,8 @@ describe ChefCLI::PolicyfileLock, "installing cookbooks from included policies"
             "revision_id" => "myrevisionid",
             "source_options" => lock_source_options,
           },
-        ])
+        ]
+      )
     end
   end
 end

data/spec/unit/policyfile_lock_build_spec.rb

@@ -30,7 +30,7 @@ describe ChefCLI::PolicyfileLock, "building a lockfile" do
   def expect_hash_equal(actual, expected)
     expected.each do |key, expected_value|
       expect(actual).to have_key(key)
-      if expected_value.kind_of?(Hash)
+      if expected_value.is_a?(Hash)
         expect_hash_equal(actual[key], expected_value)
       else
         expect(actual[key]).to eq(expected_value)
@@ -876,18 +876,18 @@ describe ChefCLI::PolicyfileLock, "building a lockfile" do
 
     let(:cached_location_spec) do
       double( "ChefCLI::Policyfile::CookbookLocationSpecification",
-              mirrors_canonical_upstream?: true,
-              cache_key: "foo-1.0.0",
-              uri: cached_cookbook_uri,
-              source_options_for_lock: { "artifactserver" => cached_cookbook_uri, "version" => "1.0.0" })
+        mirrors_canonical_upstream?: true,
+        cache_key: "foo-1.0.0",
+        uri: cached_cookbook_uri,
+        source_options_for_lock: { "artifactserver" => cached_cookbook_uri, "version" => "1.0.0" })
     end
 
     let(:local_location_spec) do
       double( "ChefCLI::Policyfile::CookbookLocationSpecification",
-              mirrors_canonical_upstream?: false,
-              relative_paths_root: relative_paths_root,
-              relative_path: "bar",
-              source_options_for_lock: { "path" => "bar" })
+        mirrors_canonical_upstream?: false,
+        relative_paths_root: relative_paths_root,
+        relative_path: "bar",
+        source_options_for_lock: { "path" => "bar" })
     end
 
     let(:policyfile_solution_dependencies) do
@@ -933,15 +933,14 @@ describe ChefCLI::PolicyfileLock, "building a lockfile" do
 
     let(:policyfile_compiler) do
       double( "ChefCLI::PolicyfileCompiler",
-              name: "my-policyfile",
-              normalized_run_list: %w{recipe[foo::default] recipe[bar::default]},
-              normalized_named_run_lists: { "rl2" => %w{recipe[bar::default]} },
-              all_cookbook_location_specs: { "foo" => cached_location_spec, "bar" => local_location_spec },
-              solution_dependencies: policyfile_solution_dependencies,
-              default_attributes: policyfile_default_attrs,
-              override_attributes: policyfile_override_attrs,
-              included_policies: []
-            )
+        name: "my-policyfile",
+        normalized_run_list: %w{recipe[foo::default] recipe[bar::default]},
+        normalized_named_run_lists: { "rl2" => %w{recipe[bar::default]} },
+        all_cookbook_location_specs: { "foo" => cached_location_spec, "bar" => local_location_spec },
+        solution_dependencies: policyfile_solution_dependencies,
+        default_attributes: policyfile_default_attrs,
+        override_attributes: policyfile_override_attrs,
+        included_policies: [])
     end
 
     let(:policyfile_lock) do

data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb

@@ -78,9 +78,9 @@ describe ChefCLI::PolicyfileServices::CleanPolicyCookbooks do
 
   let(:chef_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
 
   subject(:clean_policy_cookbooks_service) do
@@ -89,8 +89,8 @@ describe ChefCLI::PolicyfileServices::CleanPolicyCookbooks do
 
   it "configures an HTTP client with the user's credentials" 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")
     clean_policy_cookbooks_service.http_client
   end
 

data/spec/unit/policyfile_services/push_archive_spec.rb

@@ -98,10 +98,10 @@ describe ChefCLI::PolicyfileServices::PushArchive do
 
   let(:config) do
     double("Chef::Config",
-           chef_server_url: "https://localhost:10443",
-           client_key: "/path/to/client/key.pem",
-           node_name: "deuce",
-           policy_document_native_api: true)
+      chef_server_url: "https://localhost:10443",
+      client_key: "/path/to/client/key.pem",
+      node_name: "deuce",
+      policy_document_native_api: true)
   end
 
   let(:ui) { TestHelpers::TestUI.new }
@@ -121,8 +121,8 @@ describe ChefCLI::PolicyfileServices::PushArchive 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")
     push_archive_service.http_client
   end
 

data/spec/unit/policyfile_services/push_spec.rb

@@ -48,10 +48,10 @@ describe ChefCLI::PolicyfileServices::Push do
 
   let(:config) do
     double("Chef::Config",
-           chef_server_url: "https://localhost:10443",
-           client_key: "/path/to/client/key.pem",
-           node_name: "deuce",
-           policy_document_native_api: policy_document_native_api)
+      chef_server_url: "https://localhost:10443",
+      client_key: "/path/to/client/key.pem",
+      node_name: "deuce",
+      policy_document_native_api: policy_document_native_api)
   end
 
   let(:ui) { TestHelpers::TestUI.new }
@@ -60,8 +60,8 @@ describe ChefCLI::PolicyfileServices::Push 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")
     push_service.http_client
   end
 
@@ -190,8 +190,8 @@ describe ChefCLI::PolicyfileServices::Push do
         expect(push_service).to receive(:http_client).and_return(http_client)
 
         expect(ChefCLI::Policyfile::Uploader).to receive(:new)
-               .with(push_service.policyfile_lock, policy_group, http_client: http_client, ui: ui, policy_document_native_api: policy_document_native_api)
-               .and_return(uploader)
+          .with(push_service.policyfile_lock, policy_group, http_client: http_client, ui: ui, policy_document_native_api: policy_document_native_api)
+          .and_return(uploader)
       end
 
       context "when the policy document native API is disabled" do

data/spec/unit/policyfile_services/rm_policy_group_spec.rb

@@ -60,9 +60,9 @@ describe ChefCLI::PolicyfileServices::RmPolicyGroup do
 
   let(:chef_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
 
   subject(:rm_policy_group_service) do
@@ -79,8 +79,8 @@ describe ChefCLI::PolicyfileServices::RmPolicyGroup 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")
     rm_policy_group_service.http_client
   end
 

data/spec/unit/policyfile_services/rm_policy_spec.rb

@@ -36,9 +36,9 @@ describe ChefCLI::PolicyfileServices::RmPolicy do
 
   let(:chef_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
 
   subject(:rm_policy_service) do
@@ -55,8 +55,8 @@ describe ChefCLI::PolicyfileServices::RmPolicy 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")
     rm_policy_service.http_client
   end
 

data/spec/unit/policyfile_services/update_attributes_spec.rb

@@ -174,7 +174,8 @@ describe ChefCLI::PolicyfileServices::UpdateAttributes do
 
         it "locks the included policyfile" do
           expect(ChefCLI::Policyfile::LockApplier).to receive(:new).with(
-            update_attrs_service.policyfile_lock, update_attrs_service.policyfile_compiler).and_return(lock_applier)
+            update_attrs_service.policyfile_lock, update_attrs_service.policyfile_compiler
+          ).and_return(lock_applier)
           expect(lock_applier).not_to receive(:with_unlocked_policies)
           expect(lock_applier).to receive(:apply!)
 

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -37,10 +37,10 @@ describe ChefCLI::ServiceExceptionInspectors::HTTP do
 
   let(:request) do
     r = instance_double(Net::HTTP::Post,
-                        method: "POST",
-                        uri: nil,
-                        path: "/organizations/chef-oss-dev/cookbooks",
-                        body: request_body)
+      method: "POST",
+      uri: nil,
+      path: "/organizations/chef-oss-dev/cookbooks",
+      body: request_body)
     stub = allow(r).to(receive(:each_header))
     request_headers.each { |k, v| stub.and_yield(k, v) }
     r
@@ -55,9 +55,9 @@ describe ChefCLI::ServiceExceptionInspectors::HTTP do
 
   let(:response) do
     r = instance_double(Net::HTTPClientError,
-                    code: "400",
-                    message: "Bad Request",
-                    body: response_body)
+      code: "400",
+      message: "Bad Request",
+      body: response_body)
     stub = allow(r).to(receive(:each_header))
     response_headers.each { |k, v| stub.and_yield(k, v) }
     r

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.6
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -88,16 +88,16 @@ dependencies:
   name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '14.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '15.0'
+        version: '14.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -590,7 +590,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="