chef-dk 0.3.0 → 0.3.5

data/spec/unit/policyfile_services/push_spec.rb

@@ -20,6 +20,8 @@ require 'chef-dk/policyfile_services/push'
 
 describe ChefDK::PolicyfileServices::Push do
 
+  include ChefDK::Helpers
+
   let(:working_dir) do
     path = File.join(tempdir, "policyfile_services_test_working_dir")
     Dir.mkdir(path)
@@ -58,7 +60,7 @@ describe ChefDK::PolicyfileServices::Push do
   end
 
   it "infers the path to Policyfile.lock.json" do
-    expect(push_service.lockfile_path).to eq(policyfile_lock_path)
+    expect(push_service.policyfile_lock_expanded_path).to eq(policyfile_lock_path)
   end
 
   it "has a storage configuration" do
@@ -74,7 +76,7 @@ describe ChefDK::PolicyfileServices::Push do
     let(:policyfile_lock_name) { "MyPolicy.lock.json" }
 
     it "infers the path to the lockfile from the policyfile location" do
-      expect(push_service.lockfile_path).to eq(policyfile_lock_path)
+      expect(push_service.policyfile_lock_expanded_path).to eq(policyfile_lock_path)
     end
 
   end
@@ -90,7 +92,7 @@ describe ChefDK::PolicyfileServices::Push do
   context "when a lockfile is present" do
 
     before do
-      File.open(policyfile_lock_path, "w+") { |f| f.print(lockfile_content) }
+      with_file(policyfile_lock_path) { |f| f.print(lockfile_content) }
     end
 
     context "and the lockfile has invalid JSON" do
@@ -175,7 +177,7 @@ E
 
       it "validates the lockfile, writes any updates, and uploads the cookbooks" do
         allow(File).to receive(:open).and_call_original
-        expect(File).to receive(:open).with(policyfile_lock_path, "w+").and_yield(updated_lockfile_io)
+        expect(File).to receive(:open).with(policyfile_lock_path, "wb+").and_yield(updated_lockfile_io)
         expect(uploader).to receive(:upload)
 
         push_service.run
@@ -185,7 +187,7 @@ E
 
         before do
           allow(File).to receive(:open).and_call_original
-          expect(File).to receive(:open).with(policyfile_lock_path, "w+").and_yield(updated_lockfile_io)
+          expect(File).to receive(:open).with(policyfile_lock_path, "wb+").and_yield(updated_lockfile_io)
           expect(uploader).to receive(:upload).and_raise("an error")
         end
 

data/spec/unit/service_exception_inspectors/base_spec.rb

@@ -0,0 +1,43 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'chef-dk/service_exception_inspectors/base'
+
+
+describe ChefDK::ServiceExceptionInspectors::Base do
+
+  let(:message) { "something went wrong, oops" }
+
+  let(:exception) { StandardError.new(message) }
+
+  subject(:inspector) { described_class.new(exception) }
+
+  it "has an exception" do
+    expect(inspector.exception).to eq(exception)
+  end
+
+  it "gives the exception's message" do
+    expect(inspector.message).to eq(message)
+  end
+
+  it "has no extended error information" do
+    expect(inspector.extended_error_info).to eq("")
+  end
+
+end
+

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -0,0 +1,140 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+require 'net/http'
+require 'chef/monkey_patches/net_http'
+require 'chef-dk/service_exception_inspectors/http'
+
+describe ChefDK::ServiceExceptionInspectors::HTTP do
+
+  let(:message) { "something went wrong, oops" }
+
+  let(:response_body) { "" }
+
+  let(:request_headers) do
+    {
+      "content-type" => "application/json",
+      "accept" => "application/json"
+    }
+  end
+
+  let(:request_body) { "this is the request" }
+
+  let(:request) do
+    r = instance_double(Net::HTTP::Post,
+                        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
+  end
+
+  let(:response_headers) do
+    {
+      "server" => "ngx_openresty",
+      "date" => "Wed, 29 Oct 2014 22:27:47 GMT"
+    }
+  end
+
+  let(:response) do
+    r = instance_double(Net::HTTPClientError,
+                    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
+  end
+
+  let(:exception) do
+    Net::HTTPServerException.new(message, response).tap {|e| e.chef_rest_request = request }
+  end
+
+
+  subject(:inspector) { described_class.new(exception) }
+
+  it "has an exception" do
+    expect(inspector.exception).to eq(exception)
+  end
+
+  context "with a string response body" do
+
+    let(:response_body) { "No sir, I didn't like it" }
+
+    it "gives a customized exception message including the server response" do
+      expect(inspector.message).to eq("HTTP 400 Bad Request: No sir, I didn't like it")
+    end
+
+  end
+
+  context "with an empty response body" do
+
+    let(:response_body) { "" }
+
+    it "gives a customized exception message including the server response" do
+      expect(inspector.message).to eq("HTTP 400 Bad Request: (No explanation provided by server)")
+    end
+
+  end
+
+  context "with a JSON response body in the standard Chef Server format" do
+
+    let(:response_body) { %q[{"error":["Field 'name' invalid"]}] }
+
+    it "gives a customized exception message including the server response" do
+      expect(inspector.message).to eq("HTTP 400 Bad Request: Field 'name' invalid")
+    end
+
+  end
+
+  describe "showing the request and response in extended error info" do
+
+    let(:response_body) { "this is the response" }
+
+    it "shows the request in a format similar to HTTP messages" do
+      expected_request_string = <<-E
+--- REQUEST DATA ----
+POST /organizations/chef-oss-dev/cookbooks
+content-type: application/json
+accept: application/json
+
+this is the request
+
+E
+      expect(inspector.extended_error_info).to include(expected_request_string)
+    end
+
+    it "shows the response in a format similar to HTTP messages" do
+      expected_response_string = <<-E
+--- RESPONSE DATA ---
+400 Bad Request
+server: ngx_openresty
+date: Wed, 29 Oct 2014 22:27:47 GMT
+
+
+this is the response
+E
+      expect(inspector.extended_error_info).to include(expected_response_string)
+    end
+
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.5
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -176,6 +176,7 @@ files:
 - lib/chef-dk/command/generator_commands/cookbook_code_file.rb
 - lib/chef-dk/command/generator_commands/cookbook_file.rb
 - lib/chef-dk/command/generator_commands/lwrp.rb
+- lib/chef-dk/command/generator_commands/policyfile.rb
 - lib/chef-dk/command/generator_commands/recipe.rb
 - lib/chef-dk/command/generator_commands/repo.rb
 - lib/chef-dk/command/generator_commands/template.rb
@@ -211,6 +212,10 @@ files:
 - lib/chef-dk/policyfile_lock.rb
 - lib/chef-dk/policyfile_services/install.rb
 - lib/chef-dk/policyfile_services/push.rb
+- lib/chef-dk/service_exception_inspectors.rb
+- lib/chef-dk/service_exception_inspectors/base.rb
+- lib/chef-dk/service_exception_inspectors/http.rb
+- lib/chef-dk/service_exceptions.rb
 - lib/chef-dk/shell_out.rb
 - lib/chef-dk/skeletons/code_generator/files/default/Berksfile
 - lib/chef-dk/skeletons/code_generator/files/default/chefignore
@@ -231,6 +236,7 @@ files:
 - lib/chef-dk/skeletons/code_generator/recipes/cookbook.rb
 - lib/chef-dk/skeletons/code_generator/recipes/cookbook_file.rb
 - lib/chef-dk/skeletons/code_generator/recipes/lwrp.rb
+- lib/chef-dk/skeletons/code_generator/recipes/policyfile.rb
 - lib/chef-dk/skeletons/code_generator/recipes/recipe.rb
 - lib/chef-dk/skeletons/code_generator/recipes/repo.rb
 - lib/chef-dk/skeletons/code_generator/recipes/template.rb
@@ -239,6 +245,7 @@ files:
 - lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.gplv2.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.gplv3.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/LICENSE.mit.erb
+- lib/chef-dk/skeletons/code_generator/templates/default/Policyfile.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/README.md.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/attribute.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/cookbook_file.erb
@@ -269,6 +276,7 @@ files:
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
 - spec/unit/command/generator_commands/cookbook_spec.rb
 - spec/unit/command/generator_commands/lwrp_spec.rb
+- spec/unit/command/generator_commands/policyfile_spec.rb
 - spec/unit/command/generator_commands/recipe_spec.rb
 - spec/unit/command/generator_commands/repo_spec.rb
 - spec/unit/command/generator_commands/template_spec.rb
@@ -324,6 +332,19 @@ files:
 - spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/test-kitchen/verify_me
 - spec/unit/fixtures/eg_omnibus_dir/valid/embedded/bin/.keep
 - spec/unit/fixtures/example_app/Policyfile.rb
+- spec/unit/fixtures/example_cookbook/.git/HEAD
+- spec/unit/fixtures/example_cookbook/.git/config
+- spec/unit/fixtures/example_cookbook/.git/description
+- spec/unit/fixtures/example_cookbook/.git/hooks/applypatch-msg.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/commit-msg.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/post-update.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/pre-applypatch.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/pre-commit.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/pre-push.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/pre-rebase.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/prepare-commit-msg.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/update.sample
+- spec/unit/fixtures/example_cookbook/.git/info/exclude
 - spec/unit/fixtures/example_cookbook/.gitignore
 - spec/unit/fixtures/example_cookbook/.kitchen.yml
 - spec/unit/fixtures/example_cookbook/Berksfile
@@ -366,6 +387,8 @@ files:
 - spec/unit/policyfile_lock_validation_spec.rb
 - spec/unit/policyfile_services/install_spec.rb
 - spec/unit/policyfile_services/push_spec.rb
+- spec/unit/service_exception_inspectors/base_spec.rb
+- spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
 homepage: http://www.getchef.com/
 licenses: []
@@ -407,6 +430,7 @@ test_files:
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
 - spec/unit/command/generator_commands/cookbook_spec.rb
 - spec/unit/command/generator_commands/lwrp_spec.rb
+- spec/unit/command/generator_commands/policyfile_spec.rb
 - spec/unit/command/generator_commands/recipe_spec.rb
 - spec/unit/command/generator_commands/repo_spec.rb
 - spec/unit/command/generator_commands/template_spec.rb
@@ -462,6 +486,19 @@ test_files:
 - spec/unit/fixtures/eg_omnibus_dir/valid/embedded/apps/test-kitchen/verify_me
 - spec/unit/fixtures/eg_omnibus_dir/valid/embedded/bin/.keep
 - spec/unit/fixtures/example_app/Policyfile.rb
+- spec/unit/fixtures/example_cookbook/.git/HEAD
+- spec/unit/fixtures/example_cookbook/.git/config
+- spec/unit/fixtures/example_cookbook/.git/description
+- spec/unit/fixtures/example_cookbook/.git/hooks/applypatch-msg.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/commit-msg.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/post-update.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/pre-applypatch.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/pre-commit.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/pre-push.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/pre-rebase.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/prepare-commit-msg.sample
+- spec/unit/fixtures/example_cookbook/.git/hooks/update.sample
+- spec/unit/fixtures/example_cookbook/.git/info/exclude
 - spec/unit/fixtures/example_cookbook/.gitignore
 - spec/unit/fixtures/example_cookbook/.kitchen.yml
 - spec/unit/fixtures/example_cookbook/Berksfile
@@ -504,5 +541,7 @@ test_files:
 - spec/unit/policyfile_lock_validation_spec.rb
 - spec/unit/policyfile_services/install_spec.rb
 - spec/unit/policyfile_services/push_spec.rb
+- spec/unit/service_exception_inspectors/base_spec.rb
+- spec/unit/service_exception_inspectors/http_spec.rb
 - spec/unit/shell_out_spec.rb
 has_rdoc: