chef-dk 0.15.9 → 0.15.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1934245d86a0962fad1559b36dda54464d238807
-  data.tar.gz: dc43ac6e45012a8b3329fe8fedf4b80b11e06dd0
+  metadata.gz: e87089b35b30751ae9567f0080c2996c898f17b3
+  data.tar.gz: 2e05638bf24897d7283505439dad1d1c143a66c7
 SHA512:
-  metadata.gz: a6adddc3a11ed3eb2f0cb0f24bca5a4d8976fd98a5bbe3451c5840473dd8a9a4be0ebdcbbc631155c0cc7c7fc1eaad83054c4daa0b892616debd19e7254e7874
-  data.tar.gz: 7dc441bc1b4d522740c2ffaa119598c260e04c03d572f932c599b881e629c055dbceb0038e58313888d6b2fd50a218e907f0bbd4c0381c16409aae3ce3fea3d2
+  metadata.gz: a1f75f5bb375d4e6cdf30e0fbb5f812e03da223457db5a8fe02473b4b561c859be3d3ac1c315470bcf001557381bfdba6ce34ac5ba0cb777ba4c1b021c45f219
+  data.tar.gz: aa92306d5b471efc5aa59d2c2c09ae57ec2cf40928b0b3c191a24f5e1c5d0309f2a4d2e64005a43e8d2027e715590b9b0b6fedfccc94d08dd9adbb9c5b9e3978

data/Gemfile.lock

@@ -94,7 +94,7 @@ GIT
 PATH
   remote: .
   specs:
-    chef-dk (0.15.9)
+    chef-dk (0.15.15)
       chef (~> 12.5)
       chef-provisioning (~> 1.2)
       cookbook-omnifetch (~> 0.2, >= 0.2.2)
@@ -124,16 +124,16 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (2.3.13)
-      aws-sdk-resources (= 2.3.13)
-    aws-sdk-core (2.3.13)
+    aws-sdk (2.3.14)
+      aws-sdk-resources (= 2.3.14)
+    aws-sdk-core (2.3.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.13)
-      aws-sdk-core (= 2.3.13)
+    aws-sdk-resources (2.3.14)
+      aws-sdk-core (= 2.3.14)
     aws-sdk-v1 (1.66.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    berkshelf (4.3.3)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -145,6 +145,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -171,7 +172,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-provisioning (1.7.1)
+    chef-provisioning (1.8.0)
       cheffish (>= 1.3.1, < 3.0)
       inifile (>= 2.0.2)
       mixlib-install (~> 1.0)
@@ -179,7 +180,7 @@ GEM
       net-ssh (>= 2.9, < 4.0)
       net-ssh-gateway (~> 1.2.0)
       winrm (~> 1.3)
-    chef-provisioning-aws (1.9.0)
+    chef-provisioning-aws (1.10.0)
       aws-sdk (>= 2.1.26, < 3.0)
       aws-sdk-v1 (>= 1.59.0)
       chef-provisioning (~> 1.4)
@@ -349,7 +350,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (1.1.1)
+    fog-softlayer (1.1.2)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -364,7 +365,7 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (0.7.0)
+    fog-vsphere (0.8.0)
       fog-core
       rbvmomi (~> 1.8)
     fog-xenserver (0.2.3)
@@ -426,17 +427,17 @@ GEM
     inflecto (0.0.2)
     inifile (3.0.0)
     iniparse (1.4.2)
-    inspec (0.24.0)
+    inspec (0.26.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
       pry (~> 0)
-      r-train (~> 0.12)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
       thor (~> 0.19)
+      train (~> 0.13)
     ipaddress (0.8.3)
     jmespath (1.2.4)
       json_pure (>= 1.8.1)
@@ -456,7 +457,7 @@ GEM
       test-kitchen (~> 1.4)
     knife-push (1.0.1)
       chef (>= 11.10.4)
-    knife-spork (1.6.1)
+    knife-spork (1.6.2)
       app_conf (>= 0.4.0)
       chef (>= 11.0.0)
       diffy (>= 3.0.1)
@@ -484,6 +485,7 @@ GEM
     mini_portile2 (2.0.0)
     minitar (0.5.4)
     minitest (5.9.0)
+    mixlib-archive (0.1.0)
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-cli (1.6.0)
@@ -557,17 +559,9 @@ GEM
     pry-stack_explorer (0.4.9.2)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    r-train (0.12.1)
-      docker-api (~> 1.26)
-      json (~> 1.8)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
-      winrm (~> 1.6)
-      winrm-fs (~> 0.3)
     rack (1.6.4)
     rainbow (2.1.0)
-    rake (11.1.2)
+    rake (11.2.2)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -665,7 +659,7 @@ GEM
       uuid (~> 2.0)
     syslog-logger (1.6.8)
     systemu (2.6.5)
-    test-kitchen (1.9.2)
+    test-kitchen (1.10.0)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -676,6 +670,14 @@ GEM
     thread_safe (0.3.5)
     timers (4.0.4)
       hitimes
+    train (0.13.1)
+      docker-api (~> 1.26)
+      json (~> 1.8)
+      mixlib-shellout (~> 2.0)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 4.0)
+      winrm (~> 1.6)
+      winrm-fs (~> 0.3)
     treetop (1.6.5)
       polyglot (~> 0.3)
     trollop (2.1.2)

data/README.md

@@ -10,6 +10,8 @@ Chef Development Kit (ChefDK) brings Chef and the development tools developed by
 * [Test Kitchen][]
 * [ChefSpec][]
 * [Foodcritic][]
+* [Delivery CLI][]
+* [Push Jobs Client][]
 
 This repository contains the code for the `chef` command. The full
 package is built with omnibus. Project and component build definitions
@@ -48,7 +50,7 @@ To download a specific version, append the `-version` flag.  EG, `-version 0.9.0
 
 ## Usage
 
-For help with [Berkshelf][], [Test Kitchen][], [ChefSpec][] or [Foodcritic][],
+For help with [Berkshelf][], [Test Kitchen][], [ChefSpec][], [Foodcritic][], [Delivery CLI][] or [Push Jobs Client][],
 visit those projects' homepages for documentation and guides. For help with
 `chef-client` and `knife`, visit the [Chef documentation][]
 and [Learn Chef][].
@@ -319,3 +321,5 @@ packaging, and building works.
 [Foodcritic]: http://foodcritic.io "Foodcritic"
 [Learn Chef]: https://learn.chef.io "Learn Chef"
 [Test Kitchen]: http://kitchen.ci "Test Kitchen"
+[Delivery CLI]: https://docs.chef.io/ctl_delivery.html "Delivery CLI"
+[Push Jobs Client]: https://docs.chef.io/push_jobs.html#push-jobs-client "Push Jobs Client"

data/acceptance/Gemfile.lock

@@ -11,13 +11,13 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.3.2)
-    aws-sdk (2.3.12)
-      aws-sdk-resources (= 2.3.12)
-    aws-sdk-core (2.3.12)
+    aws-sdk (2.3.14)
+      aws-sdk-resources (= 2.3.14)
+    aws-sdk-core (2.3.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.3.12)
-      aws-sdk-core (= 2.3.12)
-    berkshelf (4.3.3)
+    aws-sdk-resources (2.3.14)
+      aws-sdk-core (= 2.3.14)
+    berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
       buff-config (~> 1.0)
@@ -29,6 +29,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
+      mixlib-archive (~> 0.1)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 4.5)
@@ -75,17 +76,17 @@ GEM
     hashie (3.4.4)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (0.24.0)
+    inspec (0.26.0)
       hashie (~> 3.4)
       json (~> 1.8)
       method_source (~> 0.8)
       pry (~> 0)
-      r-train (~> 0.12)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
       thor (~> 0.19)
+      train (~> 0.13)
     jmespath (1.2.4)
       json_pure (>= 1.8.1)
     json (1.8.3)
@@ -107,10 +108,11 @@ GEM
       multi_json (~> 1.10)
     method_source (0.8.2)
     minitar (0.5.4)
+    mixlib-archive (0.1.0)
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.1)
-    mixlib-install (1.0.12)
+    mixlib-install (1.0.13)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -131,14 +133,6 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    r-train (0.12.1)
-      docker-api (~> 1.26)
-      json (~> 1.8)
-      mixlib-shellout (~> 2.0)
-      net-scp (~> 1.2)
-      net-ssh (>= 2.9, < 4.0)
-      winrm (~> 1.6)
-      winrm-fs (~> 0.3)
     rainbow (2.1.0)
     retryable (2.0.3)
     ridley (4.5.1)
@@ -186,7 +180,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    test-kitchen (1.9.2)
+    test-kitchen (1.10.0)
       mixlib-install (~> 1.0, >= 1.0.4)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
@@ -196,6 +190,14 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
+    train (0.13.1)
+      docker-api (~> 1.26)
+      json (~> 1.8)
+      mixlib-shellout (~> 2.0)
+      net-scp (~> 1.2)
+      net-ssh (>= 2.9, < 4.0)
+      winrm (~> 1.6)
+      winrm-fs (~> 0.3)
     varia_model (0.4.1)
       buff-extensions (~> 1.0)
       hashie (>= 2.0.2, < 4.0.0)

data/lib/chef-dk/command/generator_commands/base.rb

@@ -1,148 +1,148 @@
-#
-# 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 'chef-dk/configurable'
-require 'chef-dk/command/generator_commands'
-
-module ChefDK
-  module Command
-    module GeneratorCommands
-      # ## Base
-      #
-      # Base class for `chef generate` subcommands. Contains basic behaviors
-      # for setting up the generator context, detecting git, and launching a
-      # chef converge.
-      #
-      # The behavior of the generators is largely delegated to a chef cookbook.
-      # The default implementation is the `code_generator` cookbook in
-      # chef-dk/skeletons/code_generator.
-      class Base < Command::Base
-
-        include Configurable
-
-        attr_reader :params
-
-        options.merge!(SharedGeneratorOptions.options)
-
-        def initialize(params)
-          super()
-          @params = params
-
-          @generator_cookbook_path = nil
-          @generator_cookbook_name = nil
-        end
-
-        # An instance of ChefRunner. Calling ChefRunner#converge will trigger
-        # convergence and generate the desired code.
-        def chef_runner
-          @chef_runner ||= ChefRunner.new(generator_cookbook_path, ["recipe[#{generator_cookbook_name}::#{recipe}]"])
-        end
-
-        # Path to the directory where the code_generator cookbook is located.
-        def generator_cookbook_path
-          detect_generator_cookbook_name_and_path! unless @generator_cookbook_path
-          @generator_cookbook_path
-        end
-
-        def generator_cookbook_name
-          detect_generator_cookbook_name_and_path! unless @generator_cookbook_name
-          @generator_cookbook_name
-        end
-
-        # Sets git related generator_context values.
-        def setup_context
-          apply_generator_values_from_config
-          Generator.add_attr_to_context(:have_git, have_git?)
-          Generator.add_attr_to_context(:skip_git_init, false)
-          config.each do |k,v|
-            Generator.add_attr_to_context(k, v)
-          end
-          # inject the arbitrary args supplied on cmdline, default = []
-          config[:generator_arg].each do |k,v|
-            Generator.add_attr_to_context(k, v)
-          end
-        end
-
-        # Checks the `PATH` for the presence of a `git` (or `git.exe`, on
-        # windows) executable.
-        def have_git?
-          path = ENV["PATH"] || ""
-          paths = path.split(File::PATH_SEPARATOR)
-          paths.any? {|bin_path| File.exist?(File.join(bin_path, "git#{RbConfig::CONFIG['EXEEXT']}"))}
-        end
-
-        private
-
-        # Inspects the `config[:generator_cookbook]` option to determine the
-        # generator_cookbook_name and generator_cookbook_path. There are two
-        # supported ways this can work:
-        #
-        # * `config[:generator_cookbook]` is the full path to the generator
-        # cookbook. In this case, the last path component is the cookbook name,
-        # and the parent directory is the cookbook path
-        # * `config[:generator_cookbook]` is the path to a directory that
-        # contains a cookbook named "code_generator" (DEPRECATED). This is how
-        # the `--generator-cookbook` feature was originally written, so we
-        # support this for backwards compatibility. This way has poor UX and
-        # we'd like to get rid of it, so a warning is printed in this case.
-        def detect_generator_cookbook_name_and_path!
-          given_path = generator_cookbook_option
-          code_generator_subdir = File.join(given_path, "code_generator")
-          if File.directory?(code_generator_subdir)
-            @generator_cookbook_name = "code_generator"
-            @generator_cookbook_path = given_path
-            err("WARN: Please configure the generator cookbook by giving the full path to the desired cookbook (like '#{code_generator_subdir}')")
-          else
-            @generator_cookbook_name = File.basename(given_path)
-            @generator_cookbook_path = File.dirname(given_path)
-          end
-        end
-
-        def generator_cookbook_option
-          config[:generator_cookbook] || chefdk_config.generator_cookbook
-        end
-
-        # Load any values that were not defined via cli switches from Chef
-        # configuration
-        #
-        def apply_generator_values_from_config
-          config[:copyright_holder] ||= coerce_generator_copyright_holder
-          config[:email] ||= coerce_generator_email
-          config[:license] ||= coerce_generator_license
-        end
-
-        def coerce_generator_copyright_holder
-          generator_config.copyright_holder ||
-          knife_config.cookbook_copyright ||
-          "The Authors"
-        end
-
-        def coerce_generator_email
-          generator_config.email ||
-          knife_config.cookbook_email ||
-          "you@example.com"
-        end
-
-        def coerce_generator_license
-          generator_config.license ||
-          knife_config.cookbook_license ||
-          "all_rights"
-        end
-      end
-    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 'chef-dk/configurable'
+require 'chef-dk/command/generator_commands'
+
+module ChefDK
+  module Command
+    module GeneratorCommands
+      # ## Base
+      #
+      # Base class for `chef generate` subcommands. Contains basic behaviors
+      # for setting up the generator context, detecting git, and launching a
+      # chef converge.
+      #
+      # The behavior of the generators is largely delegated to a chef cookbook.
+      # The default implementation is the `code_generator` cookbook in
+      # chef-dk/skeletons/code_generator.
+      class Base < Command::Base
+
+        include Configurable
+
+        attr_reader :params
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def initialize(params)
+          super()
+          @params = params
+
+          @generator_cookbook_path = nil
+          @generator_cookbook_name = nil
+        end
+
+        # An instance of ChefRunner. Calling ChefRunner#converge will trigger
+        # convergence and generate the desired code.
+        def chef_runner
+          @chef_runner ||= ChefRunner.new(generator_cookbook_path, ["recipe[#{generator_cookbook_name}::#{recipe}]"])
+        end
+
+        # Path to the directory where the code_generator cookbook is located.
+        def generator_cookbook_path
+          detect_generator_cookbook_name_and_path! unless @generator_cookbook_path
+          @generator_cookbook_path
+        end
+
+        def generator_cookbook_name
+          detect_generator_cookbook_name_and_path! unless @generator_cookbook_name
+          @generator_cookbook_name
+        end
+
+        # Sets git related generator_context values.
+        def setup_context
+          apply_generator_values_from_config
+          Generator.add_attr_to_context(:have_git, have_git?)
+          Generator.add_attr_to_context(:skip_git_init, false)
+          config.each do |k,v|
+            Generator.add_attr_to_context(k, v)
+          end
+          # inject the arbitrary args supplied on cmdline, default = []
+          config[:generator_arg].each do |k,v|
+            Generator.add_attr_to_context(k, v)
+          end
+        end
+
+        # Checks the `PATH` for the presence of a `git` (or `git.exe`, on
+        # windows) executable.
+        def have_git?
+          path = ENV["PATH"] || ""
+          paths = path.split(File::PATH_SEPARATOR)
+          paths.any? {|bin_path| File.exist?(File.join(bin_path, "git#{RbConfig::CONFIG['EXEEXT']}"))}
+        end
+
+        private
+
+        # Inspects the `config[:generator_cookbook]` option to determine the
+        # generator_cookbook_name and generator_cookbook_path. There are two
+        # supported ways this can work:
+        #
+        # * `config[:generator_cookbook]` is the full path to the generator
+        # cookbook. In this case, the last path component is the cookbook name,
+        # and the parent directory is the cookbook path
+        # * `config[:generator_cookbook]` is the path to a directory that
+        # contains a cookbook named "code_generator" (DEPRECATED). This is how
+        # the `--generator-cookbook` feature was originally written, so we
+        # support this for backwards compatibility. This way has poor UX and
+        # we'd like to get rid of it, so a warning is printed in this case.
+        def detect_generator_cookbook_name_and_path!
+          given_path = generator_cookbook_option
+          code_generator_subdir = File.join(given_path, "code_generator")
+          if File.directory?(code_generator_subdir)
+            @generator_cookbook_name = "code_generator"
+            @generator_cookbook_path = given_path
+            err("WARN: Please configure the generator cookbook by giving the full path to the desired cookbook (like '#{code_generator_subdir}')")
+          else
+            @generator_cookbook_name = File.basename(given_path)
+            @generator_cookbook_path = File.dirname(given_path)
+          end
+        end
+
+        def generator_cookbook_option
+          config[:generator_cookbook] || chefdk_config.generator_cookbook
+        end
+
+        # Load any values that were not defined via cli switches from Chef
+        # configuration
+        #
+        def apply_generator_values_from_config
+          config[:copyright_holder] ||= coerce_generator_copyright_holder
+          config[:email] ||= coerce_generator_email
+          config[:license] ||= coerce_generator_license
+        end
+
+        def coerce_generator_copyright_holder
+          generator_config.copyright_holder ||
+          knife_config.cookbook_copyright ||
+          "The Authors"
+        end
+
+        def coerce_generator_email
+          generator_config.email ||
+          knife_config.cookbook_email ||
+          "you@example.com"
+        end
+
+        def coerce_generator_license
+          generator_config.license ||
+          knife_config.cookbook_license ||
+          "all_rights"
+        end
+      end
+    end
+  end
+end