chef-dk 0.9.0 → 0.10.0

data/Rakefile

@@ -1,18 +1,18 @@
-#
-# 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 "bundler/gem_tasks"
+#
+# 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 "bundler/gem_tasks"

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

@@ -0,0 +1,62 @@
+#
+# 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.
+#
+
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'chef-dk/version'
+
+Gem::Specification.new do |gem|
+  gem.name          = "chef-dk"
+  gem.version       = ChefDK::VERSION
+  gem.authors       = [ "Daniel DeLeo", "Lamont Granquist", "Serdar Sutay" ]
+  gem.email         = [ "dan@chef.io", "lamont@chef.io", "serdar@chef.io"]
+  gem.description   = "A streamlined development and deployment workflow for Chef platform."
+  gem.summary       = gem.description
+  gem.homepage      = "https://www.chef.io/"
+
+  gem.required_ruby_version = '>= 2.0'
+
+  gem.files = %w(Gemfile Rakefile LICENSE README.md CONTRIBUTING.md warning.txt) + Dir.glob("*.gemspec") +
+      Dir.glob("{lib,spec}/**/*", 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"]
+
+  gem.add_dependency "mixlib-cli", "~> 1.5"
+  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.0", ">= 12.2.1"
+
+  gem.add_dependency "solve", "~> 2.0", ">= 2.0.1"
+
+  gem.add_dependency "cookbook-omnifetch", "~> 0.2", ">= 0.2.2"
+
+  gem.add_dependency "diff-lcs", "~> 1.0"
+  gem.add_dependency "paint", "~> 1.0"
+
+  gem.add_dependency "chef-provisioning", "~> 1.2"
+
+  %w(rspec-core rspec-expectations rspec-mocks).each do |dev_gem|
+    gem.add_development_dependency dev_gem, "~> 3.0"
+  end
+
+  gem.post_install_message = File.read(File.join(__dir__, 'warning.txt'))
+
+end

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/builtin_commands.rb

@@ -1,60 +1,60 @@
-#
-# 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.
-#
-
-
-ChefDK.commands do |c|
-  c.builtin "exec", :Exec, require_path: "chef-dk/command/exec",
-    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"
-
-  c.builtin "gem", :GemForwarder, require_path: "chef-dk/command/gem",
-    desc: "Runs the `gem` command in context of the embedded ruby"
-
-  c.builtin "generate", :Generate, desc: "Generate a new app, cookbook, or component"
-
-  c.builtin "shell-init", :ShellInit, desc: "Initialize your shell to use ChefDK as your primary ruby"
-
-  c.builtin "install", :Install, desc: "Install cookbooks from a Policyfile and generate a locked cookbook set"
-
-  c.builtin "update", :Update, desc: "Updates a Policyfile.lock.json with latest run_list and cookbooks"
-
-  c.builtin "push", :Push, desc: "Push a local policy lock to a policy group on the server"
-
-  c.builtin "push-archive", :PushArchive, desc: "Push a policy archive to a policy group on the server"
-
-  c.builtin "show-policy", :ShowPolicy, desc: "Show policyfile objects on you Chef Server"
-
-  c.builtin "diff", :Diff, desc: "Generate an itemized diff of two Policyfile lock documents"
-
-  c.builtin "provision", :Provision, desc: "Provision VMs and clusters via cookbook"
-
-  c.builtin "export", :Export, desc: "Export a policy lock as a Chef Zero code repo"
-
-  c.builtin "clean-policy-revisions", :CleanPolicyRevisions, desc: "Delete unused policy revisions on the server"
-
-  c.builtin "clean-policy-cookbooks", :CleanPolicyCookbooks, desc: "Delete unused policyfile cookbooks on the server"
-
-  c.builtin "delete-policy-group", :DeletePolicyGroup, desc: "Delete a policy group on the server"
-
-  c.builtin "delete-policy", :DeletePolicy, desc: "Delete all revisions of a policy on the server"
-
-  c.builtin "undelete", :Undelete, desc: "Undo a delete command"
-
-  c.builtin "verify", :Verify, desc: "Test the embedded ChefDK applications"
-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.
+#
+
+
+ChefDK.commands do |c|
+  c.builtin "exec", :Exec, require_path: "chef-dk/command/exec",
+    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"
+
+  c.builtin "gem", :GemForwarder, require_path: "chef-dk/command/gem",
+    desc: "Runs the `gem` command in context of the embedded ruby"
+
+  c.builtin "generate", :Generate, desc: "Generate a new app, cookbook, or component"
+
+  c.builtin "shell-init", :ShellInit, desc: "Initialize your shell to use ChefDK as your primary ruby"
+
+  c.builtin "install", :Install, desc: "Install cookbooks from a Policyfile and generate a locked cookbook set"
+
+  c.builtin "update", :Update, desc: "Updates a Policyfile.lock.json with latest run_list and cookbooks"
+
+  c.builtin "push", :Push, desc: "Push a local policy lock to a policy group on the server"
+
+  c.builtin "push-archive", :PushArchive, desc: "Push a policy archive to a policy group on the server"
+
+  c.builtin "show-policy", :ShowPolicy, desc: "Show policyfile objects on you Chef Server"
+
+  c.builtin "diff", :Diff, desc: "Generate an itemized diff of two Policyfile lock documents"
+
+  c.builtin "provision", :Provision, desc: "Provision VMs and clusters via cookbook"
+
+  c.builtin "export", :Export, desc: "Export a policy lock as a Chef Zero code repo"
+
+  c.builtin "clean-policy-revisions", :CleanPolicyRevisions, desc: "Delete unused policy revisions on the server"
+
+  c.builtin "clean-policy-cookbooks", :CleanPolicyCookbooks, desc: "Delete unused policyfile cookbooks on the server"
+
+  c.builtin "delete-policy-group", :DeletePolicyGroup, desc: "Delete a policy group on the server"
+
+  c.builtin "delete-policy", :DeletePolicy, desc: "Delete all revisions of a policy on the server"
+
+  c.builtin "undelete", :Undelete, desc: "Undo a delete command"
+
+  c.builtin "verify", :Verify, desc: "Test the embedded ChefDK applications"
+end

data/lib/chef-dk/chef_runner.rb

@@ -1,98 +1,98 @@
-#
-# 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/exceptions'
-require 'chef-dk/service_exceptions'
-require 'chef'
-
-module ChefDK
-  # An adapter to chef's APIs to kick off a chef-client run.
-  class ChefRunner
-
-    attr_reader :cookbook_path
-    attr_reader :run_list
-
-    def initialize(cookbook_path, run_list)
-      @cookbook_path = File.expand_path(cookbook_path)
-      @run_list = run_list
-      @formatter = nil
-      @ohai = nil
-    end
-
-    def converge
-      configure
-      Chef::Runner.new(run_context).converge
-    rescue Chef::Exceptions::CookbookNotFound => e
-      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)
-    end
-
-    def run_context
-      @run_context ||= policy.setup_run_context
-    end
-
-    def policy
-      return @policy_builder if @policy_builder
-
-      @policy_builder = Chef::PolicyBuilder::ExpandNodeObject.new("chef-dk", ohai.data, {}, nil, formatter)
-      @policy_builder.load_node
-      @policy_builder.build_node
-      @policy_builder.node.run_list(*run_list)
-      @policy_builder.expand_run_list
-      @policy_builder
-    end
-
-    def formatter
-      @formatter ||=
-        Chef::EventDispatch::Dispatcher.new.tap do |d|
-          d.register(Chef::Formatters.new(:doc, stdout, stderr))
-        end
-    end
-
-    def configure
-      Chef::Config.solo = true
-      Chef::Config.cookbook_path = cookbook_path
-      Chef::Config.color = true
-      Chef::Config.diff_disabled = true
-
-      # atomic file operations on Windows require Administrator privileges to be able to read the SACL from a file
-      # Using file_staging_uses_destdir(true) will get us inherited permissions indirectly on tempfile creation
-      Chef::Config.file_atomic_update = false if Chef::Platform.windows?
-      Chef::Config.file_staging_uses_destdir = true # Default in Chef 12+
-    end
-
-    def ohai
-      return @ohai if @ohai
-
-      @ohai = Ohai::System.new
-      @ohai.all_plugins(["platform", "platform_version"])
-      @ohai
-    end
-
-    def stdout
-      $stdout
-    end
-
-    def stderr
-      $stderr
-    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/exceptions'
+require 'chef-dk/service_exceptions'
+require 'chef'
+
+module ChefDK
+  # An adapter to chef's APIs to kick off a chef-client run.
+  class ChefRunner
+
+    attr_reader :cookbook_path
+    attr_reader :run_list
+
+    def initialize(cookbook_path, run_list)
+      @cookbook_path = File.expand_path(cookbook_path)
+      @run_list = run_list
+      @formatter = nil
+      @ohai = nil
+    end
+
+    def converge
+      configure
+      Chef::Runner.new(run_context).converge
+    rescue Chef::Exceptions::CookbookNotFound => e
+      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)
+    end
+
+    def run_context
+      @run_context ||= policy.setup_run_context
+    end
+
+    def policy
+      return @policy_builder if @policy_builder
+
+      @policy_builder = Chef::PolicyBuilder::Dynamic.new("chef-dk", ohai.data, {}, nil, formatter)
+      @policy_builder.load_node
+      @policy_builder.build_node
+      @policy_builder.node.run_list(*run_list)
+      @policy_builder.expand_run_list
+      @policy_builder
+    end
+
+    def formatter
+      @formatter ||=
+        Chef::EventDispatch::Dispatcher.new.tap do |d|
+          d.register(Chef::Formatters.new(:doc, stdout, stderr))
+        end
+    end
+
+    def configure
+      Chef::Config.solo = true
+      Chef::Config.cookbook_path = cookbook_path
+      Chef::Config.color = true
+      Chef::Config.diff_disabled = true
+
+      # atomic file operations on Windows require Administrator privileges to be able to read the SACL from a file
+      # Using file_staging_uses_destdir(true) will get us inherited permissions indirectly on tempfile creation
+      Chef::Config.file_atomic_update = false if Chef::Platform.windows?
+      Chef::Config.file_staging_uses_destdir = true # Default in Chef 12+
+    end
+
+    def ohai
+      return @ohai if @ohai
+
+      @ohai = Ohai::System.new
+      @ohai.all_plugins(["platform", "platform_version"])
+      @ohai
+    end
+
+    def stdout
+      $stdout
+    end
+
+    def stderr
+      $stderr
+    end
+
+  end
+end
+