chef-dk 0.14.25 → 0.15.9

data/acceptance/trivial/.acceptance/acceptance-cookbook/.gitignore

@@ -1,2 +1,2 @@
-nodes/
-tmp/
+nodes/
+tmp/

data/acceptance/trivial/.acceptance/acceptance-cookbook/metadata.rb

@@ -1,2 +1,2 @@
-name "acceptance-cookbook"
-depends "kitchen_acceptance"
+name "acceptance-cookbook"
+depends "kitchen_acceptance"

data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/destroy.rb

@@ -1 +1 @@
-kitchen "destroy"
+kitchen "destroy"

data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/provision.rb

@@ -1 +1 @@
-kitchen "setup"
+kitchen "setup"

data/acceptance/trivial/.acceptance/acceptance-cookbook/recipes/verify.rb

@@ -1 +1 @@
-kitchen "verify"
+kitchen "verify"

data/acceptance/trivial/.kitchen.yml

@@ -1,7 +1,7 @@
-verifier:
-  name: inspec
-
-suites:
-  - name: chefdk-current-install
-    includes: [ubuntu-14.04]
-    run_list:
+verifier:
+  name: inspec
+
+suites:
+  - name: chefdk-current-install
+    includes: [ubuntu-14.04]
+    run_list:

data/acceptance/trivial/test/integration/chefdk-current-install/inspec/chef_client_spec.rb

@@ -1,5 +1,5 @@
-chef_version = ENV["KITCHEN_CHEF_VERSION"].split("+")[0]
-describe command("chef -v") do
-  its("exit_status") { should eq 0 }
-  its(:stdout) { should match /Chef Development Kit Version: #{chef_version}/ } if chef_version != "latest"
-end
+chef_version = ENV["KITCHEN_CHEF_VERSION"].split("+")[0]
+describe command("chef -v") do
+  its("exit_status") { should eq 0 }
+  its(:stdout) { should match /Chef Development Kit Version: #{chef_version}/ } if chef_version != "latest"
+end

data/bin/chef

@@ -1,25 +1,25 @@
-#!/usr/bin/env ruby
-#
-# 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.
-#
-
-# Set a trap for ctrl-C right away so we don't surface interrupt exceptions inside of rubygems or whatever.
-Kernel.trap(:INT) { print("\n"); exit 1 }
-
-$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
-require 'chef-dk/cli'
-
-ChefDK::CLI.new(ARGV.clone).run
+#!/usr/bin/env ruby
+#
+# 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.
+#
+
+# Set a trap for ctrl-C right away so we don't surface interrupt exceptions inside of rubygems or whatever.
+Kernel.trap(:INT) { print("\n"); exit 1 }
+
+$:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "lib")))
+require 'chef-dk/cli'
+
+ChefDK::CLI.new(ARGV.clone).run

data/chef-dk.gemspec

@@ -57,6 +57,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "chef-provisioning", "~> 1.2"
 
   gem.add_development_dependency "github_changelog_generator"
+  gem.add_development_dependency "rake"
 
   %w(rspec-core rspec-expectations rspec-mocks).each do |dev_gem|
     gem.add_development_dependency dev_gem, "~> 3.0"

data/lib/chef-dk.rb

@@ -1,19 +1,19 @@
-#
-# 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.
-#
-
-module ChefDK
-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.
+#
+
+module ChefDK
+end

data/lib/chef-dk/authenticated_http.rb

@@ -1,40 +1,40 @@
-#
-# 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/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
-
-    use JSONInput
-    use JSONOutput
-    use Decompressor
-    use Authenticator
-
-    # ValidateContentLength should come after Decompressor
-    # because the order of middlewares is reversed when handling
-    # responses.
-    use ValidateContentLength
-
-  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/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
+
+    use JSONInput
+    use JSONOutput
+    use Decompressor
+    use Authenticator
+
+    # ValidateContentLength should come after Decompressor
+    # because the order of middlewares is reversed when handling
+    # responses.
+    use ValidateContentLength
+
+  end
+end
+

data/lib/chef-dk/chef_runner.rb

@@ -67,7 +67,7 @@ module ChefDK
     end
 
     def configure
-      Chef::Config.solo = true
+      Chef::Config.solo_legacy_mode = true
       Chef::Config.cookbook_path = cookbook_path
       Chef::Config.color = true
       Chef::Config.diff_disabled = true

data/lib/chef-dk/cli.rb

@@ -97,12 +97,12 @@ BANNER
     def show_version
       msg("Chef Development Kit Version: #{ChefDK::VERSION}")
 
-      ["chef-client", "berks", "kitchen"].each do |component|
+      ["chef-client", "delivery", "berks", "kitchen"].each do |component|
         result = Bundler.with_clean_env { shell_out("#{component} --version") }
         if result.exitstatus != 0
           msg("#{component} version: ERROR")
         else
-          version = result.stdout.scan(/[\d+\.]+\S+/).join
+          version = result.stdout.scan(/(?:master\s)?[\d+\.\(\)]+\S+/).join("\s")
           msg("#{component} version: #{version}")
         end
       end

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

@@ -1,79 +1,79 @@
-#
-# 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 'mixlib/cli'
-require 'chef-dk/helpers'
-require 'chef-dk/version'
-require 'chef/exceptions'
-
-module ChefDK
-  module Command
-    class Base
-      include Mixlib::CLI
-      include ChefDK::Helpers
-
-      option :help,
-        :short        => "-h",
-        :long         => "--help",
-        :description  => "Show this message",
-        :boolean      => true
-
-      option :version,
-        :short        => "-v",
-        :long         => "--version",
-        :description  => "Show chef version",
-        :boolean      => true
-
-      def initialize
-        super
-      end
-
-      #
-      # optparser overwrites -h / --help options with its own.
-      # In order to control this behavior, make sure the default options are
-      # handled here.
-      #
-      def run_with_default_options(params = [ ])
-        if needs_help?(params)
-          msg(opt_parser.to_s)
-          0
-        elsif needs_version?(params)
-          msg("Chef Development Kit Version: #{ChefDK::VERSION}")
-          0
-        else
-          run(params)
-        end
-      rescue Chef::Exceptions::ConfigurationError => e
-        err("ERROR: #{e.message}\n")
-        1
-      rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
-        err("ERROR: #{e.message}\n")
-        msg(opt_parser)
-        1
-      end
-
-      def needs_help?(params)
-        params.include?("-h") || params.include?("--help")
-      end
-
-      def needs_version?(params)
-        params.include?("-v") || params.include?("--version")
-      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 'mixlib/cli'
+require 'chef-dk/helpers'
+require 'chef-dk/version'
+require 'chef/exceptions'
+
+module ChefDK
+  module Command
+    class Base
+      include Mixlib::CLI
+      include ChefDK::Helpers
+
+      option :help,
+        :short        => "-h",
+        :long         => "--help",
+        :description  => "Show this message",
+        :boolean      => true
+
+      option :version,
+        :short        => "-v",
+        :long         => "--version",
+        :description  => "Show chef version",
+        :boolean      => true
+
+      def initialize
+        super
+      end
+
+      #
+      # optparser overwrites -h / --help options with its own.
+      # In order to control this behavior, make sure the default options are
+      # handled here.
+      #
+      def run_with_default_options(params = [ ])
+        if needs_help?(params)
+          msg(opt_parser.to_s)
+          0
+        elsif needs_version?(params)
+          msg("Chef Development Kit Version: #{ChefDK::VERSION}")
+          0
+        else
+          run(params)
+        end
+      rescue Chef::Exceptions::ConfigurationError => e
+        err("ERROR: #{e.message}\n")
+        1
+      rescue OptionParser::InvalidOption, OptionParser::MissingArgument => e
+        err("ERROR: #{e.message}\n")
+        msg(opt_parser)
+        1
+      end
+
+      def needs_help?(params)
+        params.include?("-h") || params.include?("--help")
+      end
+
+      def needs_version?(params)
+        params.include?("-v") || params.include?("--version")
+      end
+
+    end
+  end
+end

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

@@ -1,116 +1,116 @@
-#
-# Copyright:: Copyright (c) 2015 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/base'
-require 'chef-dk/ui'
-require 'chef-dk/configurable'
-require 'chef-dk/policyfile_services/clean_policy_cookbooks'
-
-module ChefDK
-  module Command
-
-
-    class CleanPolicyCookbooks < Base
-
-      banner(<<-BANNER)
-Usage: chef clean-policy-cookbooks [options]
-
-`chef clean-policy-cookbooks` deletes unused policyfile cookbooks. Cookbooks
-are considered unused when they are not referenced by any policyfile revision
-on the server. Note that cookbooks which are referenced by "orphaned" policy
-revisions are not removed, so you may wish to run `chef clean-policy-revisions`
-to remove orphaned policies before running this command.
-
-See our detailed README for more information:
-
-https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
-
-Options:
-
-BANNER
-
-      option :config_file,
-        short:        "-c CONFIG_FILE",
-        long:         "--config CONFIG_FILE",
-        description:  "Path to configuration file"
-
-      option :debug,
-        short:        "-D",
-        long:         "--debug",
-        description:  "Enable stacktraces and other debug output",
-        default:      false
-
-      include Configurable
-
-      attr_accessor :ui
-
-      attr_reader :policy_name
-
-      attr_reader :policy_group
-
-      def initialize(*args)
-        super
-        @ui = UI.new
-
-        @clean_policy_cookbooks_service = nil
-      end
-
-      def run(params)
-        return 1 unless apply_params!(params)
-        clean_policy_cookbooks_service.run
-        0
-      rescue PolicyfileServiceError => e
-        handle_error(e)
-        1
-      end
-
-      def clean_policy_cookbooks_service
-        @clean_policy_cookbooks_service ||=
-          PolicyfileServices::CleanPolicyCookbooks.new(config: chef_config, ui: ui)
-      end
-
-      def debug?
-        !!config[:debug]
-      end
-
-      def handle_error(error)
-        ui.err("Error: #{error.message}")
-        if error.respond_to?(:reason)
-          ui.err("Reason: #{error.reason}")
-          ui.err("")
-          ui.err(error.extended_error_info) if debug?
-          ui.err(error.cause.backtrace.join("\n")) if debug?
-        end
-      end
-
-      def apply_params!(params)
-        remaining_args = parse_options(params)
-
-        if !remaining_args.empty?
-          ui.err("Too many arguments")
-          ui.err("")
-          ui.err(opt_parser)
-          false
-        else
-          true
-        end
-      end
-
-    end
-  end
-end
-
+#
+# Copyright:: Copyright (c) 2015 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/base'
+require 'chef-dk/ui'
+require 'chef-dk/configurable'
+require 'chef-dk/policyfile_services/clean_policy_cookbooks'
+
+module ChefDK
+  module Command
+
+
+    class CleanPolicyCookbooks < Base
+
+      banner(<<-BANNER)
+Usage: chef clean-policy-cookbooks [options]
+
+`chef clean-policy-cookbooks` deletes unused policyfile cookbooks. Cookbooks
+are considered unused when they are not referenced by any policyfile revision
+on the server. Note that cookbooks which are referenced by "orphaned" policy
+revisions are not removed, so you may wish to run `chef clean-policy-revisions`
+to remove orphaned policies before running this command.
+
+See our detailed README for more information:
+
+https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+
+Options:
+
+BANNER
+
+      option :config_file,
+        short:        "-c CONFIG_FILE",
+        long:         "--config CONFIG_FILE",
+        description:  "Path to configuration file"
+
+      option :debug,
+        short:        "-D",
+        long:         "--debug",
+        description:  "Enable stacktraces and other debug output",
+        default:      false
+
+      include Configurable
+
+      attr_accessor :ui
+
+      attr_reader :policy_name
+
+      attr_reader :policy_group
+
+      def initialize(*args)
+        super
+        @ui = UI.new
+
+        @clean_policy_cookbooks_service = nil
+      end
+
+      def run(params)
+        return 1 unless apply_params!(params)
+        clean_policy_cookbooks_service.run
+        0
+      rescue PolicyfileServiceError => e
+        handle_error(e)
+        1
+      end
+
+      def clean_policy_cookbooks_service
+        @clean_policy_cookbooks_service ||=
+          PolicyfileServices::CleanPolicyCookbooks.new(config: chef_config, ui: ui)
+      end
+
+      def debug?
+        !!config[:debug]
+      end
+
+      def handle_error(error)
+        ui.err("Error: #{error.message}")
+        if error.respond_to?(:reason)
+          ui.err("Reason: #{error.reason}")
+          ui.err("")
+          ui.err(error.extended_error_info) if debug?
+          ui.err(error.cause.backtrace.join("\n")) if debug?
+        end
+      end
+
+      def apply_params!(params)
+        remaining_args = parse_options(params)
+
+        if !remaining_args.empty?
+          ui.err("Too many arguments")
+          ui.err("")
+          ui.err(opt_parser)
+          false
+        else
+          true
+        end
+      end
+
+    end
+  end
+end
+