chef-dk 0.15.15 → 0.15.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e87089b35b30751ae9567f0080c2996c898f17b3
-  data.tar.gz: 2e05638bf24897d7283505439dad1d1c143a66c7
+  metadata.gz: fb142ee9ea0cda2c706a1db0c397605745ae2fa1
+  data.tar.gz: 9146a5b8e321da01bdd48c28c489e592be4338a8
 SHA512:
-  metadata.gz: a1f75f5bb375d4e6cdf30e0fbb5f812e03da223457db5a8fe02473b4b561c859be3d3ac1c315470bcf001557381bfdba6ce34ac5ba0cb777ba4c1b021c45f219
-  data.tar.gz: aa92306d5b471efc5aa59d2c2c09ae57ec2cf40928b0b3c191a24f5e1c5d0309f2a4d2e64005a43e8d2027e715590b9b0b6fedfccc94d08dd9adbb9c5b9e3978
+  metadata.gz: b91caf2b14bd0f6e433833c715f83a3e0906d2f7295d18c5c611354db1055ee31535cbd068f8b561e8718c2534e4bb76fe7c22ffd8007da7266823a433f71293
+  data.tar.gz: 10a81f1ff20674a506bf7923327d105bb0261b8e58b958ae31abce5d61d0968651c4576c1a6cc1d6a808494b438ac02f792c375934139b33bb6b2fd6b3551e6e

data/Gemfile.lock

@@ -94,7 +94,7 @@ GIT
 PATH
   remote: .
   specs:
-    chef-dk (0.15.15)
+    chef-dk (0.15.16)
       chef (~> 12.5)
       chef-provisioning (~> 1.2)
       cookbook-omnifetch (~> 0.2, >= 0.2.2)
@@ -684,7 +684,7 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     ubuntu_ami (0.4.1)
-    unicode-display_width (1.0.5)
+    unicode-display_width (1.1.0)
     uuid (2.3.8)
       macaddr (~> 1.0)
     uuidtools (2.1.5)

data/lib/chef-dk/skeletons/code_generator/files/default/repo/README.md

@@ -1,28 +1,28 @@
-Overview
-========
-
-Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code.
-
-While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code.
-
-Repository Directories
-======================
-
-This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef.
-
-* `cookbooks/` - Cookbooks you download or create.
-* `data_bags/` - Store data bags and items in .json in the repository.
-* `roles/` - Store roles in .rb or .json in the repository.
-* `environments/` - Store environments in .rb or .json in the repository.
-
-Configuration
-=============
-
-The config file, `.chef/knife.rb` is a repository specific configuration file for knife. If you're using the Chef Platform, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation.
-
-https://docs.chef.io/knife.html
-
-Next Steps
-==========
-
-Read the README file in each of the subdirectories for more information about what goes in those directories.
+Overview
+========
+
+Every Chef installation needs a Chef Repository. This is the place where cookbooks, roles, config files and other artifacts for managing systems with Chef will live. We strongly recommend storing this repository in a version control system such as Git and treat it like source code.
+
+While we prefer Git, and make this repository available via GitHub, you are welcome to download a tar or zip archive and use your favorite version control system to manage the code.
+
+Repository Directories
+======================
+
+This repository contains several directories, and each directory contains a README file that describes what it is for in greater detail, and how to use it for managing your systems with Chef.
+
+* `cookbooks/` - Cookbooks you download or create.
+* `data_bags/` - Store data bags and items in .json in the repository.
+* `roles/` - Store roles in .rb or .json in the repository.
+* `environments/` - Store environments in .rb or .json in the repository.
+
+Configuration
+=============
+
+The config file, `.chef/knife.rb` is a repository specific configuration file for knife. If you're using the Chef Platform, you can download one for your organization from the management console. If you're using the Open Source Chef Server, you can generate a new one with `knife configure`. For more information about configuring Knife, see the Knife documentation.
+
+https://docs.chef.io/knife.html
+
+Next Steps
+==========
+
+Read the README file in each of the subdirectories for more information about what goes in those directories.

data/lib/chef-dk/skeletons/code_generator/files/default/repo/cookbooks/example/README.md

@@ -1,27 +1,27 @@
-# Example
-
-An example cookbook
-
-## Requirements
-
-### Platform:
-
-*No platforms defined*
-
-### Cookbooks:
-
-*No dependencies defined*
-
-## Attributes
-
-* `node['example']['name']` -  Defaults to `Sam Doe`.
-
-## Recipes
-
-* example::default
-
-## License and Maintainer
-
-Maintainer::  (<>)
-
-License:: All rights reserved
+# Example
+
+An example cookbook
+
+## Requirements
+
+### Platform:
+
+*No platforms defined*
+
+### Cookbooks:
+
+*No dependencies defined*
+
+## Attributes
+
+* `node['example']['name']` -  Defaults to `Sam Doe`.
+
+## Recipes
+
+* example::default
+
+## License and Maintainer
+
+Maintainer::  (<>)
+
+License:: All rights reserved

data/lib/chef-dk/skeletons/code_generator/files/default/repo/data_bags/README.md

@@ -1,58 +1,58 @@
-Data Bags
----------
-
-This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag.
-
-For example, in this directory you'll find an example data bag directory called `example`, which contains an item definition called `example_item.json`
-
-Before uploading this item to the server, we must first create the data bag on the Chef Server.
-
-    knife data bag create example
-
-Then we can upload the items in the data bag's directory to the Chef Server.
-
-    knife data bag from file example example_item.json
-
-For more information on data bags, see the Chef wiki page:
-
-https://docs.chef.io/essentials_data_bags.html
-
-Encrypted Data Bags
--------------------
-
-Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key.
-
-    openssl rand -base64 512 > secret_key
-
-You may use this secret_key to add items to a data bag during a create.
-
-    knife data bag create --secret-file secret_key passwords mysql
-
-You may also use it when adding ITEMs from files,
-
-    knife data bag create passwords
-    knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key
-
-The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example,
-
-    {
-      "id": "mysql",
-      "password": "abc123"
-    }
-
-Without the secret_key, the contents are encrypted.
-
-    knife data bag show passwords mysql
-    id:        mysql
-    password:  2I0XUUve1TXEojEyeGsjhw==
-
-Use the secret_key to view the contents.
-
-    knife data bag show passwords mysql --secret-file secret_key
-    id:        mysql
-    password:  abc123
-
-
-For more information on encrypted data bags, see the Chef wiki page:
-
-https://docs.chef.io/essentials_data_bags.html
+Data Bags
+---------
+
+This directory contains directories of the various data bags you create for your infrastructure. Each subdirectory corresponds to a data bag on the Chef Server, and contains JSON files of the items that go in the bag.
+
+For example, in this directory you'll find an example data bag directory called `example`, which contains an item definition called `example_item.json`
+
+Before uploading this item to the server, we must first create the data bag on the Chef Server.
+
+    knife data bag create example
+
+Then we can upload the items in the data bag's directory to the Chef Server.
+
+    knife data bag from file example example_item.json
+
+For more information on data bags, see the Chef wiki page:
+
+https://docs.chef.io/essentials_data_bags.html
+
+Encrypted Data Bags
+-------------------
+
+Added in Chef 0.10, encrypted data bags allow you to encrypt the contents of your data bags. The content of attributes will no longer be searchable. To use encrypted data bags, first you must have or create a secret key.
+
+    openssl rand -base64 512 > secret_key
+
+You may use this secret_key to add items to a data bag during a create.
+
+    knife data bag create --secret-file secret_key passwords mysql
+
+You may also use it when adding ITEMs from files,
+
+    knife data bag create passwords
+    knife data bag from file passwords data_bags/passwords/mysql.json --secret-file secret_key
+
+The JSON for the ITEM must contain a key named "id" with a value equal to "ITEM" and the contents will be encrypted when uploaded. For example,
+
+    {
+      "id": "mysql",
+      "password": "abc123"
+    }
+
+Without the secret_key, the contents are encrypted.
+
+    knife data bag show passwords mysql
+    id:        mysql
+    password:  2I0XUUve1TXEojEyeGsjhw==
+
+Use the secret_key to view the contents.
+
+    knife data bag show passwords mysql --secret-file secret_key
+    id:        mysql
+    password:  abc123
+
+
+For more information on encrypted data bags, see the Chef wiki page:
+
+https://docs.chef.io/essentials_data_bags.html

data/lib/chef-dk/skeletons/code_generator/recipes/template.rb

@@ -1,32 +1,32 @@
-
-context = ChefDK::Generator.context
-cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
-template_dir = File.join(cookbook_dir, "templates", "default")
-template_filename = context.new_file_basename
-
-unless File.extname(template_filename) == ".erb"
-  # new_file_basename is a frozen string, so we have to create an entirely
-  # new string here instead of using concat.
-  template_filename = "#{template_filename}.erb"
-end
-
-template_path = File.join(cookbook_dir, "templates", "default", template_filename)
-
-directory template_dir do
-  recursive true
-end
-
-if source_file = context.content_source
-
-  file template_path do
-    content(IO.read(source_file))
-  end
-
-else
-
-  template template_path do
-    source "template.erb"
-    helpers(ChefDK::Generator::TemplateHelper)
-  end
-
-end
+
+context = ChefDK::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+template_dir = File.join(cookbook_dir, "templates", "default")
+template_filename = context.new_file_basename
+
+unless File.extname(template_filename) == ".erb"
+  # new_file_basename is a frozen string, so we have to create an entirely
+  # new string here instead of using concat.
+  template_filename = "#{template_filename}.erb"
+end
+
+template_path = File.join(cookbook_dir, "templates", "default", template_filename)
+
+directory template_dir do
+  recursive true
+end
+
+if source_file = context.content_source
+
+  file template_path do
+    content(IO.read(source_file))
+  end
+
+else
+
+  template template_path do
+    source "template.erb"
+    helpers(ChefDK::Generator::TemplateHelper)
+  end
+
+end

data/lib/chef-dk/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefDK
-  VERSION = "0.15.15"
+  VERSION = "0.15.16"
 end

data/omnibus_overrides.rb

@@ -17,4 +17,3 @@ override "util-macros", version: "1.19.0"
 override "xproto", version: "7.0.28"
 override "zlib", version: "1.2.8"
 override "libzmq", version: "4.0.5"
-override "delivery-cli", version: "0.0.23"

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

@@ -1,32 +1,32 @@
-#
-# 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 'shared/a_file_generator'
-require 'chef-dk/command/generator_commands/template'
-
-describe ChefDK::Command::GeneratorCommands::Template do
-
-  include_examples "a file generator" do
-
-    let(:generator_name) { "template" }
-    let(:generated_files) { [ "templates/default/new_template.txt.erb" ] }
-    let(:new_file_name) { "new_template.txt" }
-
-  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 'shared/a_file_generator'
+require 'chef-dk/command/generator_commands/template'
+
+describe ChefDK::Command::GeneratorCommands::Template do
+
+  include_examples "a file generator" do
+
+    let(:generator_name) { "template" }
+    let(:generated_files) { [ "templates/default/new_template.txt.erb" ] }
+    let(:new_file_name) { "new_template.txt" }
+
+  end
+end
+

data/version_policy.rb

@@ -48,13 +48,6 @@ OMNIBUS_OVERRIDES = {
   ## These can float as they are frequently updated in a way that works for us
   #override "cacerts" =>"???",
   #override "openssl" =>"???",
-
-  # We manually pin Delivery CLI right now. In the future we should have the bump
-  # bot automatically update this to the latest delivered version. We cannot look
-  # in Artifactory because in the future we will only be building Delivery CLI
-  # from the ChefDK. We cannot look at the Github tags because those are committed
-  # in the Build phase, and we only want to send customers Delivered changes.
-  "delivery-cli" => "0.0.23",
 }
 
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-dk
 version: !ruby/object:Gem::Version
-  version: 0.15.15
+  version: 0.15.16
 platform: ruby
 authors:
 - Daniel DeLeo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli