chef-dk 1.6.11 → 2.0.26

data/README.md

@@ -11,6 +11,7 @@ Chef Development Kit (ChefDK) brings Chef and the development tools developed by
 * [Test Kitchen][]
 * [ChefSpec][]
 * [Foodcritic][]
+* [Cookstyle][]
 * [Delivery CLI][]
 * [Push Jobs Client][]
 
@@ -22,7 +23,7 @@ are in the omnibus directory in this repository.
 
 You can get the [latest release of ChefDK from the downloads page][ChefDK].
 
-On Mac OS X, you can also use [homebrew-cask](http://caskroom.io)
+On Mac OS X, you can also use [homebrew-cask](https://caskroom.github.io/)
 to `brew cask install chefdk`.
 
 Once you install the package, the `chef-client` suite, `berks`,
@@ -321,9 +322,10 @@ packaging, and building works.
 
 [Berkshelf]: https://docs.chef.io/berkshelf.html "Berkshelf"
 [Chef]: https://www.chef.io "Chef"
-[ChefDK]: https://downloads.chef.io/chef-dk "Chef Development Kit"
+[ChefDK]: https://downloads.chef.io/chefdk "Chef Development Kit"
 [Chef Documentation]: https://docs.chef.io "Chef Documentation"
 [ChefSpec]: http://sethvargo.github.io/chefspec/ "ChefSpec"
+[Cookstyle]: https://docs.chef.io/cookstyle.html "Cookstyle"
 [Foodcritic]: http://foodcritic.io "Foodcritic"
 [Learn Chef]: https://learn.chef.io "Learn Chef"
 [Test Kitchen]: http://kitchen.ci "Test Kitchen"

data/Rakefile

@@ -17,7 +17,6 @@
 
 require "bundler/gem_tasks"
 require_relative "tasks/version"
-require_relative "tasks/bundle"
 require_relative "tasks/dependencies"
 require_relative "tasks/github_changelog_generator"
 require_relative "tasks/announce"
@@ -75,7 +74,7 @@ namespace :style do
     FoodCritic::Rake::LintTask.new(:foodcritic) do |t|
       t.options = {
         fail_tags: ["any"],
-        tags: ["~FC011", "~FC066", "~supermarket"],
+        tags: ["~FC011", "~FC071", "~supermarket"],
         cookbook_paths: ["lib/chef-dk/skeletons/code_generator"],
         progress: true,
       }

data/acceptance/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "chef-acceptance", github: "chef/chef-acceptance"
+gem "chef-acceptance", git: "https://github.com/chef/chef-acceptance"
 gem "test-kitchen"
 gem "kitchen-ec2"
 gem "kitchen-inspec"

data/acceptance/Gemfile.lock

@@ -1,5 +1,5 @@
 GIT
-  remote: git://github.com/chef/chef-acceptance.git
+  remote: https://github.com/chef/chef-acceptance
   revision: 3877c344098021ac66134e8edb5eb805d14d4643
   specs:
     chef-acceptance (0.2.0)
@@ -12,15 +12,15 @@ GEM
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     artifactory (2.8.1)
-    aws-sdk (2.9.3)
-      aws-sdk-resources (= 2.9.3)
-    aws-sdk-core (2.9.3)
+    aws-sdk (2.9.25)
+      aws-sdk-resources (= 2.9.25)
+    aws-sdk-core (2.9.25)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.3)
-      aws-sdk-core (= 2.9.3)
+    aws-sdk-resources (2.9.25)
+      aws-sdk-core (= 2.9.25)
     aws-sigv4 (1.0.0)
-    berkshelf (5.6.4)
+    berkshelf (6.0.1)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -55,7 +55,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.19.36)
+    chef-config (13.0.118)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -63,7 +63,7 @@ GEM
     cleanroom (1.0.0)
     coderay (1.1.1)
     diff-lcs (1.3)
-    docker-api (1.33.3)
+    docker-api (1.33.4)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
@@ -77,9 +77,9 @@ GEM
     gyoku (1.3.1)
       builder (>= 2.1.2)
     hashie (3.5.5)
-    hitimes (1.2.4)
+    hitimes (1.2.5)
     httpclient (2.8.3)
-    inspec (1.19.1)
+    inspec (1.25.1)
       addressable (~> 2.4)
       faraday (>= 0.9.0)
       hashie (~> 3.4)
@@ -87,31 +87,33 @@ GEM
       method_source (~> 0.8)
       mixlib-log
       parallel (~> 1.9)
+      parslet (~> 1.5)
       pry (~> 0)
       rainbow (~> 2)
       rspec (~> 3)
       rspec-its (~> 1.2)
       rubyzip (~> 1.1)
-      sslshake (~> 1)
+      semverse
+      sslshake (~> 1.2)
       thor (~> 0.19)
       toml (~> 0.1)
       train (>= 0.22.0, < 1.0)
     jmespath (1.3.1)
-    json (2.0.3)
+    json (2.1.0)
     kitchen-ec2 (1.3.2)
       aws-sdk (~> 2)
       excon
       multi_json
       retryable (~> 2.0)
       test-kitchen (~> 1.4, >= 1.4.1)
-    kitchen-inspec (0.17.0)
+    kitchen-inspec (0.19.0)
       hashie (~> 3.4)
       inspec (>= 0.34.0, < 2.0.0)
       test-kitchen (~> 1.6)
     kitchen-vagrant (1.1.0)
       test-kitchen (~> 1.4)
     little-plugger (1.1.4)
-    logging (2.2.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     method_source (0.8.2)
@@ -138,9 +140,9 @@ GEM
       net-ssh (>= 2.6.5)
     nio4r (2.0.0)
     nori (2.6.0)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.11.1)
+    parallel (1.11.2)
     parslet (1.5.0)
       blankslate (~> 2.0)
     pry (0.10.4)
@@ -184,7 +186,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    rubyntlm (0.6.1)
+    rubyntlm (0.6.2)
     rubyzip (1.2.1)
     safe_yaml (1.0.4)
     sawyer (0.8.1)
@@ -195,7 +197,7 @@ GEM
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    sslshake (1.1.0)
+    sslshake (1.2.0)
     test-kitchen (1.16.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
@@ -222,7 +224,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.2.1)
+    winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -258,4 +260,4 @@ DEPENDENCIES
   winrm-fs
 
 BUNDLED WITH
-   1.12.5
+   1.15.0

data/chef-dk.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,10 +28,10 @@ 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.3"
 
   gem.files = %w{Rakefile LICENSE README.md warning.txt} +
-    %w{version_policy.rb omnibus_overrides.rb} +
+    %w{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) }
@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-shellout", "~> 2.0"
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
   gem.add_dependency "minitar", "~> 0.5.4"
-  gem.add_dependency "chef", "~> 12.5"
+  gem.add_dependency "chef", "~> 13.0"
   gem.add_dependency "solve", "< 4.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.6"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"
@@ -51,8 +51,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "paint", "~> 1.0"
   gem.add_dependency "chef-provisioning", "~> 2.0"
 
-  gem.add_development_dependency "rake"
-
   %w{rspec-core rspec-expectations rspec-mocks}.each do |dev_gem|
     gem.add_development_dependency dev_gem, "~> 3.0"
   end

data/lib/chef-dk/builtin_commands.rb

@@ -55,5 +55,5 @@ ChefDK.commands do |c|
 
   c.builtin "undelete", :Undelete, desc: "Undo a delete command"
 
-  c.builtin "verify", :Verify, desc: "Test the embedded ChefDK applications"
+  c.builtin "verify", :Verify, desc: "Test the embedded ChefDK applications", hidden: true
 end

data/lib/chef-dk/chef_runner.rb

@@ -45,7 +45,7 @@ module ChefDK
       message = "Could not find cookbook(s) to satisfy run list #{run_list.inspect} in #{cookbook_path}"
       raise CookbookNotFound.new(message, e)
     rescue => e
-      raise ChefConvergeError.new("Chef failed to converge: #{e}", e)
+      raise ChefConvergeError.new("Chef failed to converge: #{e} from file #{e.backtrace.first}", e)
     end
 
     def run_context

data/lib/chef-dk/cli.rb

@@ -114,6 +114,7 @@ BANNER
 
       justify_length = subcommands.map(&:length).max + 2
       subcommand_specs.each do |name, spec|
+        next if spec.hidden
         msg("    #{"#{name}".ljust(justify_length)}#{spec.description}")
       end
     end

data/lib/chef-dk/command/generate.rb

@@ -23,7 +23,8 @@ require "chef-dk/command/generator_commands/cookbook"
 require "chef-dk/command/generator_commands/app"
 require "chef-dk/command/generator_commands/attribute"
 require "chef-dk/command/generator_commands/cookbook_file"
-require "chef-dk/command/generator_commands/lwrp"
+require 'chef-dk/command/generator_commands/helpers'
+require "chef-dk/command/generator_commands/resource"
 require "chef-dk/command/generator_commands/recipe"
 require "chef-dk/command/generator_commands/template"
 require "chef-dk/command/generator_commands/repo"
@@ -51,7 +52,9 @@ module ChefDK
       generator(:attribute, :Attribute, "Generate an attributes file")
       generator(:template, :Template, "Generate a file template")
       generator(:file, :CookbookFile, "Generate a cookbook file")
-      generator(:lwrp, :LWRP, "Generate a lightweight resource/provider")
+      generator(:helpers, :Helpers, "Generate a cookbook helper file in libraries")
+      generator(:lwrp, :Resource, "Generate a custom resource")
+      generator(:resource, :Resource, "Generate a custom resource")
       generator(:repo, :Repo, "Generate a Chef code repository")
       generator(:policyfile, :Policyfile, "Generate a Policyfile for use with the install/push commands")
       generator(:generator, :GeneratorGenerator, "Copy ChefDK's generator cookbook so you can customize it")

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

@@ -0,0 +1,36 @@
+#
+# 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/command/generator_commands/cookbook_code_file'
+
+module ChefDK
+  module Command
+    module GeneratorCommands
+      # chef generate helpers [path/to/cookbook_root] NAME
+      class Helpers < CookbookCodeFile
+
+        banner "Usage: chef generate helpers [path/to/cookbook] NAME [options]"
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def recipe
+          'helpers'
+        end
+      end
+    end
+  end
+end

data/lib/chef-dk/command/generator_commands/{lwrp.rb → resource.rb}

@@ -20,15 +20,15 @@ require "chef-dk/command/generator_commands/cookbook_code_file"
 module ChefDK
   module Command
     module GeneratorCommands
-      # chef generate lwrp [path/to/cookbook_root] NAME
-      class LWRP < CookbookCodeFile
+      # chef generate resource [path/to/cookbook_root] NAME
+      class Resource < CookbookCodeFile
 
-        banner "Usage: chef generate lwrp [path/to/cookbook] NAME [options]"
+        banner "Usage: chef generate resource [path/to/cookbook] NAME [options]"
 
         options.merge!(SharedGeneratorOptions.options)
 
         def recipe
-          "lwrp"
+          "resource"
         end
       end
     end

data/lib/chef-dk/command/update.rb

@@ -60,10 +60,10 @@ BANNER
         default:      false,
         boolean:      true
 
-      option :update_attributes,
+      option :update_attributes_only,
         short:        "-a",
         long:         "--attributes",
-        description:  "Update attributes",
+        description:  "Only update attributes (not cookbooks)",
         default:      false,
         boolean:      true
 
@@ -78,6 +78,7 @@ BANNER
         @policyfile_relative_path = nil
         @installer = nil
         @attributes_updater = nil
+        @cookbooks_to_update = []
       end
 
       def run(params = [])
@@ -89,11 +90,8 @@ BANNER
         # ssl_verify_mode)
         chef_config
 
-        if update_attributes?
-          attributes_updater.run
-        else
-          installer.run
-        end
+        attributes_updater.run
+        installer.run(@cookbooks_to_update) unless update_attributes_only?
         0
       rescue PolicyfileServiceError => e
         handle_error(e)
@@ -101,7 +99,7 @@ BANNER
       end
 
       def installer
-        @installer ||= PolicyfileServices::Install.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd, overwrite: true)
+        @installer ||= PolicyfileServices::Install.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd, config: chef_config, overwrite: true)
       end
 
       def attributes_updater
@@ -117,8 +115,8 @@ BANNER
         config[:config_file]
       end
 
-      def update_attributes?
-        !!config[:update_attributes]
+      def update_attributes_only?
+        !!config[:update_attributes_only]
       end
 
       def handle_error(error)
@@ -133,15 +131,10 @@ BANNER
 
       def apply_params!(params)
         remaining_args = parse_options(params)
-        if remaining_args.size > 1
-          ui.err(opt_parser)
-          false
-        else
-          @policyfile_relative_path = remaining_args.first
-          true
-        end
+        @policyfile_relative_path = remaining_args.shift
+        @cookbooks_to_update += remaining_args
+        true
       end
-
     end
   end
 end

data/lib/chef-dk/command/verify.rb

@@ -324,22 +324,6 @@ require 'spec_helper'
         end
       end
 
-      add_component "rubocop" do |c|
-        c.gem_base_dir = "rubocop"
-        c.smoke_test do
-          tmpdir do |cwd|
-            with_file(File.join(cwd, "foo.rb")) do |f|
-              f.write <<-EOF
-def foo
-  puts 'foo'
-end
-              EOF
-            end
-            sh("#{bin("rubocop")} foo.rb -l", cwd: cwd)
-          end
-        end
-      end
-
       add_component "fauxhai" do |c|
         c.gem_base_dir = "fauxhai"
         c.smoke_test { sh("#{embedded_bin("gem")} list fauxhai") }
@@ -544,6 +528,7 @@ end
       end
 
       def run(params = [ ])
+        err("[WARN] This is an internal command used by the ChefDK development team. If you are a ChefDK user, please do not run it.")
         @components_filter = parse_options(params)
 
         validate_components!

data/lib/chef-dk/commands_map.rb

@@ -54,7 +54,7 @@ module ChefDK
   class CommandsMap
     NULL_ARG = Object.new
 
-    CommandSpec = Struct.new(:name, :constant_name, :require_path, :description)
+    CommandSpec = Struct.new(:name, :constant_name, :require_path, :description, :hidden)
 
     class CommandSpec
 
@@ -72,12 +72,12 @@ module ChefDK
       @command_specs = {}
     end
 
-    def builtin(name, constant_name, require_path: NULL_ARG, desc: "")
+    def builtin(name, constant_name, require_path: NULL_ARG, desc: "", hidden: false)
       if null?(require_path)
         snake_case_path = name.tr("-", "_")
         require_path = "chef-dk/command/#{snake_case_path}"
       end
-      command_specs[name] = CommandSpec.new(name, constant_name, require_path, desc)
+      command_specs[name] = CommandSpec.new(name, constant_name, require_path, desc, hidden)
     end
 
     def instantiate(name)