chef-dk 0.15.16 → 0.16.28

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -1,140 +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
-
+#
+# 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
+

data/spec/unit/shell_out_spec.rb

@@ -1,34 +1,34 @@
-#
-# 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/shell_out'
-
-describe ChefDK::ShellOut do
-
-  describe "providing the API expected by CookbookOmnifetch" do
-
-    it "provides a `shell_out` class method" do
-      expect(described_class).to respond_to(:shell_out)
-    end
-
-    it "responds to #success?" do
-      expect(described_class.new("echo 'foo'")).to respond_to(:success?)
-    end
-
-  end
-end
+#
+# 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/shell_out'
+
+describe ChefDK::ShellOut do
+
+  describe "providing the API expected by CookbookOmnifetch" do
+
+    it "provides a `shell_out` class method" do
+      expect(described_class).to respond_to(:shell_out)
+    end
+
+    it "responds to #success?" do
+      expect(described_class.new("echo 'foo'")).to respond_to(:success?)
+    end
+
+  end
+end

data/version_policy.rb

@@ -26,8 +26,8 @@ OMNIBUS_OVERRIDES = {
   ## according to comment in omnibus-sw, the very latest versions don't work on solaris
   # https://github.com/chef/omnibus-software/blob/aefb7e79d29ca746c3f843673ef5e317fa3cba54/config/software/libtool.rb#L23
   "libtool" => "2.4.2",
-  "libxml2" => "2.9.3",
-  "libxslt" => "1.1.28",
+  "libxml2" => "2.9.4",
+  "libxslt" => "1.1.29",
   "libyaml" => "0.1.6",
   "makedepend" => "1.0.5",
   "ncurses" => "5.9",
@@ -89,6 +89,7 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "unicode-display_width",
   "varia_model",
   "httpclient",
+  "molinillo",
   # We have a task called update_stable_channel_gems which scans and pins to the
   # latest released chef/chef-config/opscode-pushy-client but it pulls from the
   # chef repo instead of from rubygems. Bundler currently considers any git
@@ -100,7 +101,7 @@ ACCEPTABLE_OUTDATED_GEMS = [
   "chef",
   "chef-config",
   "opscode-pushy-client",
-  "nokogiri",
+  "mixlib-cli"
 ]
 
 #

data/warning.txt

@@ -1,9 +1,9 @@
-Thanks for installing chef-dk! Unfortunately, since Chef Development Kit is
-supposed to be installed as the omnibus binaries in order to support various
-platforms, this is not the official way to install chef-dk.
-
-Please download the latest version for your operating system from the URL below,
-and make sure you have uninstalled your chef-dk gem to avoid conflicts:
-
-https://downloads.chef.io/chef-dk/
-
+Thanks for installing chef-dk! Unfortunately, since Chef Development Kit is
+supposed to be installed as the omnibus binaries in order to support various
+platforms, this is not the official way to install chef-dk.
+
+Please download the latest version for your operating system from the URL below,
+and make sure you have uninstalled your chef-dk gem to avoid conflicts:
+
+https://downloads.chef.io/chef-dk/
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 0.15.16
+  version: 0.16.28
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -19,6 +19,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,6 +29,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -294,6 +300,9 @@ files:
 - lib/chef-dk/command/generator_commands/attribute.rb
 - lib/chef-dk/command/generator_commands/base.rb
 - lib/chef-dk/command/generator_commands/build_cookbook.rb
+- lib/chef-dk/command/generator_commands/chef_exts/generator_desc_resource.rb
+- lib/chef-dk/command/generator_commands/chef_exts/quieter_doc_formatter.rb
+- lib/chef-dk/command/generator_commands/chef_exts/recipe_dsl_ext.rb
 - lib/chef-dk/command/generator_commands/cookbook.rb
 - lib/chef-dk/command/generator_commands/cookbook_code_file.rb
 - lib/chef-dk/command/generator_commands/cookbook_file.rb
@@ -367,13 +376,14 @@ files:
 - 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/build-cookbook/.kitchen.yml
-- lib/chef-dk/skeletons/code_generator/files/default/build-cookbook/README.md
-- lib/chef-dk/skeletons/code_generator/files/default/build-cookbook/test-fixture-recipe.rb
+- lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/.kitchen.yml
+- lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/README.md
+- lib/chef-dk/skeletons/code_generator/files/default/build_cookbook/test-fixture-recipe.rb
 - lib/chef-dk/skeletons/code_generator/files/default/chefignore
 - lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md
 - lib/chef-dk/skeletons/code_generator/files/default/cookbook_readmes/README.md
 - lib/chef-dk/skeletons/code_generator/files/default/delivery-config.json
+- lib/chef-dk/skeletons/code_generator/files/default/delivery-project.toml
 - lib/chef-dk/skeletons/code_generator/files/default/gitignore
 - lib/chef-dk/skeletons/code_generator/files/default/repo/README.md
 - lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/README.md
@@ -388,7 +398,6 @@ files:
 - lib/chef-dk/skeletons/code_generator/files/default/repo/policies/README.md
 - lib/chef-dk/skeletons/code_generator/files/default/repo/roles/README.md
 - lib/chef-dk/skeletons/code_generator/files/default/repo/roles/example.json
-- lib/chef-dk/skeletons/code_generator/files/default/serverspec_spec_helper.rb
 - lib/chef-dk/skeletons/code_generator/files/default/spec_helper.rb
 - lib/chef-dk/skeletons/code_generator/files/default/spec_helper_policyfile.rb
 - lib/chef-dk/skeletons/code_generator/metadata.rb
@@ -410,10 +419,11 @@ files:
 - 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/build-cookbook/Berksfile.erb
-- lib/chef-dk/skeletons/code_generator/templates/default/build-cookbook/metadata.rb.erb
-- lib/chef-dk/skeletons/code_generator/templates/default/build-cookbook/recipe.rb.erb
+- lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/Berksfile.erb
+- lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/metadata.rb.erb
+- lib/chef-dk/skeletons/code_generator/templates/default/build_cookbook/recipe.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/cookbook_file.erb
+- lib/chef-dk/skeletons/code_generator/templates/default/inspec_default_test.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/kitchen.yml.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/metadata.rb.erb
@@ -422,7 +432,6 @@ files:
 - lib/chef-dk/skeletons/code_generator/templates/default/recipe_spec.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/repo/gitignore.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/resource.rb.erb
-- lib/chef-dk/skeletons/code_generator/templates/default/serverspec_default_spec.rb.erb
 - lib/chef-dk/skeletons/code_generator/templates/default/template.erb
 - lib/chef-dk/ui.rb
 - lib/chef-dk/version.rb
@@ -453,6 +462,8 @@ files:
 - spec/unit/command/generator_commands/attribute_spec.rb
 - spec/unit/command/generator_commands/base_spec.rb
 - spec/unit/command/generator_commands/build_cookbook_spec.rb
+- spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb
+- spec/unit/command/generator_commands/chef_exts/recipe_dsl_ext_spec.rb
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
 - spec/unit/command/generator_commands/cookbook_spec.rb
 - spec/unit/command/generator_commands/generator_generator_spec.rb
@@ -675,6 +686,8 @@ test_files:
 - spec/unit/command/generator_commands/attribute_spec.rb
 - spec/unit/command/generator_commands/base_spec.rb
 - spec/unit/command/generator_commands/build_cookbook_spec.rb
+- spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb
+- spec/unit/command/generator_commands/chef_exts/recipe_dsl_ext_spec.rb
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
 - spec/unit/command/generator_commands/cookbook_spec.rb
 - spec/unit/command/generator_commands/generator_generator_spec.rb