chef-dk 1.2.22 → 1.3.40

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status Master](https://travis-ci.org/chef/chef-dk.svg?branch=master)](https://travis-ci.org/chef/chef-dk)
 [![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef-dk?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef-dk/branch/master)
+[![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef-rfc/blob/master/rfc086-chef-oss-project-policies.md#cadence-release)
 
 Chef Development Kit (ChefDK) brings Chef and the development tools developed by the Chef Community together and acts as the consistent interface to this awesomeness. This awesomeness is composed of:
 
@@ -30,7 +31,7 @@ system bin directory, ready to use.
 
 ### Pre-release Candidates
 
-The following commands will download the latest ChefDK package from the `current` channel.  The `current` channel holds builds that have passed testing and are candidates for release.  
+The following commands will download the latest ChefDK package from the `current` channel.  The `current` channel holds builds that have passed testing and are candidates for release.
 More information about flags supported by install.sh available here: https://docs.chef.io/api_omnitruck.html
 
 #### Linux and OS/X:
@@ -318,11 +319,11 @@ packaging, and building works.
 
 - - -
 
-[Berkshelf]: http://berkshelf.com "Berkshelf"
+[Berkshelf]: https://docs.chef.io/berkshelf.html "Berkshelf"
 [Chef]: https://www.chef.io "Chef"
 [ChefDK]: https://downloads.chef.io/chef-dk "Chef Development Kit"
 [Chef Documentation]: https://docs.chef.io "Chef Documentation"
-[ChefSpec]: http://chefspec.org "ChefSpec"
+[ChefSpec]: http://sethvargo.github.io/chefspec/ "ChefSpec"
 [Foodcritic]: http://foodcritic.io "Foodcritic"
 [Learn Chef]: https://learn.chef.io "Learn Chef"
 [Test Kitchen]: http://kitchen.ci "Test Kitchen"

data/Rakefile

@@ -30,3 +30,57 @@ task :update_dockerfile do
   new_text = text.gsub(/^ARG VERSION=[\d\.]+$/, "ARG VERSION=#{latest_stable_version}")
   File.open("Dockerfile", "w+") { |f| f.write(new_text) }
 end
+
+namespace :style do
+  begin
+    require "rubocop/rake_task"
+
+    desc "Run Cookbook Ruby style checks"
+    RuboCop::RakeTask.new(:cookstyle) do |t|
+      t.requires = ["cookstyle"]
+      t.patterns = ["lib/chef-dk/skeletons/code_generator"]
+      t.options = ["--display-cop-names"]
+    end
+  rescue LoadError => e
+    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
+  end
+
+  begin
+    require "rubocop/rake_task"
+
+    ignore_dirs = Regexp.union(%w{
+      lib/chef-dk/skeletons/code_generator
+      spec/unit/fixtures/chef-runner-cookbooks
+      spec/unit/fixtures/cookbook_cache
+      spec/unit/fixtures/example_cookbook
+      spec/unit/fixtures/example_cookbook_metadata_json_only
+      spec/unit/fixtures/example_cookbook_no_metadata
+      spec/unit/fixtures/local_path_cookbooks
+    })
+
+    desc "Run Chef Ruby style checks"
+    RuboCop::RakeTask.new(:chefstyle) do |t|
+      t.requires = ["chefstyle"]
+      t.patterns = `rubocop --list-target-files`.split("\n").reject { |f| f =~ ignore_dirs }
+      t.options = ["--display-cop-names"]
+    end
+  rescue LoadError => e
+    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
+  end
+
+  begin
+    require "foodcritic"
+
+    desc "Run Chef Cookbook (Foodcritic) style checks"
+    FoodCritic::Rake::LintTask.new(:foodcritic) do |t|
+      t.options = {
+        fail_tags: ["any"],
+        tags: ["~FC011", "~FC066", "~supermarket"],
+        cookbook_paths: ["lib/chef-dk/skeletons/code_generator"],
+        progress: true,
+      }
+    end
+  rescue LoadError => e
+    puts ">>> Gem load error: #{e}, omitting #{task.name}" unless ENV["CI"]
+  end
+end

data/acceptance/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chef/chef-acceptance.git
-  revision: e92ddae46d2126864698b9c8e4fc4ec2dcc46c55
+  revision: 3877c344098021ac66134e8edb5eb805d14d4643
   specs:
     chef-acceptance (0.2.0)
       mixlib-shellout (~> 2.0)
@@ -9,18 +9,18 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    artifactory (2.6.0)
-    aws-sdk (2.7.3)
-      aws-sdk-resources (= 2.7.3)
-    aws-sdk-core (2.7.3)
+    artifactory (2.8.1)
+    aws-sdk (2.9.3)
+      aws-sdk-resources (= 2.9.3)
+    aws-sdk-core (2.9.3)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.3)
-      aws-sdk-core (= 2.7.3)
+    aws-sdk-resources (2.9.3)
+      aws-sdk-core (= 2.9.3)
     aws-sigv4 (1.0.0)
-    berkshelf (5.6.0)
+    berkshelf (5.6.4)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -40,6 +40,7 @@ GEM
       faraday (~> 0.9)
       httpclient (~> 2.7)
       ridley (>= 4.5, < 6.0)
+    blankslate (2.1.2.4)
     buff-config (2.0.0)
       buff-extensions (~> 2.0)
       varia_model (~> 0.6)
@@ -54,7 +55,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.18.31)
+    chef-config (12.19.36)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -62,36 +63,26 @@ GEM
     cleanroom (1.0.0)
     coderay (1.1.1)
     diff-lcs (1.3)
-    docker-api (1.33.2)
+    docker-api (1.33.3)
       excon (>= 0.38.0)
       json
-    domain_name (0.5.20161129)
-      unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    excon (0.54.0)
+    excon (0.55.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.17)
+    ffi (1.9.18)
     fuzzyurl (0.9.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashie (3.5.1)
+    hashie (3.5.5)
     hitimes (1.2.4)
-    http (2.1.0)
-      addressable (~> 2.3)
-      http-cookie (~> 1.0)
-      http-form_data (~> 1.0.1)
-      http_parser.rb (~> 0.6.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    http-form_data (1.0.1)
-    http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    inspec (1.11.0)
+    inspec (1.19.1)
+      addressable (~> 2.4)
+      faraday (>= 0.9.0)
       hashie (~> 3.4)
-      http (~> 2.1.0)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
       mixlib-log
@@ -100,14 +91,14 @@ GEM
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
-      rspec_junit_formatter (~> 0.2.3)
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
+      toml (~> 0.1)
       train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
     json (2.0.3)
-    kitchen-ec2 (1.2.0)
+    kitchen-ec2 (1.3.2)
       aws-sdk (~> 2)
       excon
       multi_json
@@ -117,14 +108,14 @@ GEM
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
-    kitchen-vagrant (1.0.0)
+    kitchen-vagrant (1.1.0)
       test-kitchen (~> 1.4)
     little-plugger (1.1.4)
-    logging (2.1.0)
+    logging (2.2.0)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.8.2)
-    minitar (0.5.4)
+    minitar (0.6.1)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
@@ -137,19 +128,21 @@ GEM
     mixlib-log (1.7.1)
     mixlib-shellout (2.2.7)
     mixlib-versioning (1.1.0)
-    molinillo (0.5.5)
+    molinillo (0.5.7)
     multi_json (1.12.1)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (4.0.1)
+    net-ssh (4.1.0)
     net-ssh-gateway (1.3.0)
       net-ssh (>= 2.6.5)
     nio4r (2.0.0)
     nori (2.6.0)
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.10.0)
+    parallel (1.11.1)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -191,11 +184,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rspec_junit_formatter (0.2.3)
-      builder (< 4)
-      rspec-core (>= 2, < 4, != 2.12.0)
     rubyntlm (0.6.1)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -205,19 +195,21 @@ GEM
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    sslshake (1.0.13)
-    test-kitchen (1.15.0)
+    sslshake (1.1.0)
+    test-kitchen (1.16.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.9, < 5.0)
       net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
-      thor (~> 0.18)
+      thor (~> 0.19, < 0.19.2)
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.22.1)
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    train (0.23.0)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -225,15 +217,12 @@ GEM
       net-ssh (>= 2.9, < 5.0)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.2)
     varia_model (0.6.0)
       buff-extensions (~> 2.0)
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.1.2)
+    winrm (2.2.1)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)

data/bin/chef

@@ -20,6 +20,6 @@
 Kernel.trap(:INT) { print("\n"); exit 1 }
 
 $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
-require 'chef-dk/cli'
+require "chef-dk/cli"
 
 ChefDK::CLI.new(ARGV.clone).run

data/chef-dk.gemspec

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'chef-dk/version'
+require "chef-dk/version"
 
 Gem::Specification.new do |gem|
   gem.name          = "chef-dk"
@@ -28,14 +28,14 @@ Gem::Specification.new do |gem|
   gem.summary       = gem.description
   gem.homepage      = "https://www.chef.io/"
 
-  gem.required_ruby_version = '>= 2.2'
+  gem.required_ruby_version = ">= 2.2"
 
   gem.files = %w{Rakefile LICENSE README.md warning.txt} +
-      %w{version_policy.rb omnibus_overrides.rb} +
-      Dir.glob("Gemfile*") + # Includes Gemfile and locks
-      Dir.glob("*.gemspec") +
-      Dir.glob("{lib,spec,acceptance,tasks}/**/*", File::FNM_DOTMATCH).reject { |f|  File.directory?(f) }
-  gem.executables   = %w( chef )
+    %w{version_policy.rb omnibus_overrides.rb} +
+    Dir.glob("Gemfile*") + # Includes Gemfile and locks
+    Dir.glob("*.gemspec") +
+    Dir.glob("{lib,spec,acceptance,tasks}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) }
+  gem.executables   = %w{ chef }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
@@ -53,7 +53,7 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
 
-  %w(rspec-core rspec-expectations rspec-mocks).each do |dev_gem|
+  %w{rspec-core rspec-expectations rspec-mocks}.each do |dev_gem|
     gem.add_development_dependency dev_gem, "~> 3.0"
   end
 

data/lib/chef-dk/authenticated_http.rb

@@ -15,12 +15,12 @@
 # limitations under the License.
 #
 
-require 'chef/http'
-require 'chef/http/authenticator'
-require 'chef/http/json_input'
-require 'chef/http/json_output'
-require 'chef/http/decompressor'
-require 'chef/http/validate_content_length'
+require "chef/http"
+require "chef/http/authenticator"
+require "chef/http/json_input"
+require "chef/http/json_output"
+require "chef/http/decompressor"
+require "chef/http/validate_content_length"
 
 module ChefDK
   class AuthenticatedHTTP < Chef::HTTP
@@ -37,4 +37,3 @@ module ChefDK
 
   end
 end
-

data/lib/chef-dk/builtin_commands.rb

@@ -15,16 +15,15 @@
 # limitations under the License.
 #
 
-
 ChefDK.commands do |c|
   c.builtin "exec", :Exec, require_path: "chef-dk/command/exec",
-    desc: "Runs the command in context of the embedded ruby"
+                           desc: "Runs the command in context of the embedded ruby"
 
   c.builtin "env", :Env, require_path: "chef-dk/command/env",
-    desc: "Prints environment variables used by ChefDK"
+                         desc: "Prints environment variables used by ChefDK"
 
   c.builtin "gem", :GemForwarder, require_path: "chef-dk/command/gem",
-    desc: "Runs the `gem` command in context of the embedded ruby"
+                                  desc: "Runs the `gem` command in context of the embedded ruby"
 
   c.builtin "generate", :Generate, desc: "Generate a new app, cookbook, or component"
 

data/lib/chef-dk/chef_runner.rb

@@ -15,13 +15,13 @@
 # limitations under the License.
 #
 
-require 'chef-dk/exceptions'
-require 'chef-dk/service_exceptions'
-require 'chef/policy_builder/dynamic'
-require 'chef'
+require "chef-dk/exceptions"
+require "chef-dk/service_exceptions"
+require "chef/policy_builder/dynamic"
+require "chef"
 
-require 'chef-dk/command/generator_commands/chef_exts/quieter_doc_formatter'
-require 'chef-dk/command/generator_commands/chef_exts/recipe_dsl_ext'
+require "chef-dk/command/generator_commands/chef_exts/quieter_doc_formatter"
+require "chef-dk/command/generator_commands/chef_exts/recipe_dsl_ext"
 
 module ChefDK
 
@@ -98,7 +98,7 @@ module ChefDK
       return @ohai if @ohai
 
       @ohai = Ohai::System.new
-      @ohai.all_plugins(["platform", "platform_version"])
+      @ohai.all_plugins(%w{platform platform_version})
       @ohai
     end
 
@@ -112,4 +112,3 @@ module ChefDK
 
   end
 end
-

data/lib/chef-dk/cli.rb

@@ -15,15 +15,15 @@
 # limitations under the License.
 #
 
-require 'mixlib/cli'
-require 'chef-dk/version'
-require 'chef-dk/commands_map'
-require 'chef-dk/builtin_commands'
-require 'chef-dk/helpers'
-require 'chef-dk/ui'
-require 'chef/util/path_helper'
-require 'chef/mixin/shell_out'
-require 'bundler'
+require "mixlib/cli"
+require "chef-dk/version"
+require "chef-dk/commands_map"
+require "chef-dk/builtin_commands"
+require "chef-dk/helpers"
+require "chef-dk/ui"
+require "chef/util/path_helper"
+require "chef/mixin/shell_out"
+require "bundler"
 
 module ChefDK
   class CLI
@@ -149,7 +149,7 @@ BANNER
     private
 
     def normalized_exit_code(maybe_integer)
-      if maybe_integer.kind_of?(Integer) and (0..255).include?(maybe_integer)
+      if maybe_integer.kind_of?(Integer) && (0..255).cover?(maybe_integer)
         maybe_integer
       else
         0
@@ -163,7 +163,7 @@ BANNER
 
     # upcase drive letters for comparison since ruby has a String#capitalize function
     def drive_upcase(path)
-      if Chef::Platform.windows? && path[0] =~ /^[A-Za-z]$/ && path[1,2] == ":\\"
+      if Chef::Platform.windows? && path[0] =~ /^[A-Za-z]$/ && path[1, 2] == ":\\"
         path.capitalize
       else
         path