chef-dk 2.4.17 → 2.5.3

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,22 +1,22 @@
-#
-# 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/server_api"
-
-module ChefDK
-  AuthenticatedHTTP = Chef::ServerAPI
-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/server_api"
+
+module ChefDK
+  AuthenticatedHTTP = Chef::ServerAPI
+end

data/lib/chef-dk/builtin_commands.rb

@@ -1,59 +1,59 @@
-#
-# Copyright:: Copyright (c) 2016 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 your 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", hidden: true
-end
+#
+# Copyright:: Copyright (c) 2016 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 your 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", hidden: true
+end

data/lib/chef-dk/chef_runner.rb

@@ -1,114 +1,114 @@
-#
-# 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/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"
-
-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} from file #{e.backtrace.first}", 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, event_dispatcher)
-      @policy_builder.load_node
-      @policy_builder.build_node
-      @policy_builder.node.run_list(*run_list)
-      @policy_builder.expand_run_list
-      @policy_builder
-    end
-
-    def event_dispatcher
-      @event_dispatcher ||=
-        Chef::EventDispatch::Dispatcher.new.tap do |d|
-          d.register(doc_formatter)
-        end
-    end
-
-    def doc_formatter
-      Chef::Formatters.new(:chefdk_doc, stdout, stderr)
-    end
-
-    def configure
-      Chef::Config.solo_legacy_mode = true
-      Chef::Config.cookbook_path = cookbook_path
-      Chef::Config.color = true
-      Chef::Config.diff_disabled = true
-
-      # If the user has set policyfile configuration in the workstation config
-      # file, the underlying chef-client code may enable policyfile mode and
-      # then fail because chef-solo doesn't support policyfiles.
-      Chef::Config.use_policyfile = false
-      Chef::Config.policy_name = nil
-      Chef::Config.policy_group = nil
-      Chef::Config.deployment_group = nil
-
-      # 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(%w{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/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"
+
+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} from file #{e.backtrace.first}", 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, event_dispatcher)
+      @policy_builder.load_node
+      @policy_builder.build_node
+      @policy_builder.node.run_list(*run_list)
+      @policy_builder.expand_run_list
+      @policy_builder
+    end
+
+    def event_dispatcher
+      @event_dispatcher ||=
+        Chef::EventDispatch::Dispatcher.new.tap do |d|
+          d.register(doc_formatter)
+        end
+    end
+
+    def doc_formatter
+      Chef::Formatters.new(:chefdk_doc, stdout, stderr)
+    end
+
+    def configure
+      Chef::Config.solo_legacy_mode = true
+      Chef::Config.cookbook_path = cookbook_path
+      Chef::Config.color = true
+      Chef::Config.diff_disabled = true
+
+      # If the user has set policyfile configuration in the workstation config
+      # file, the underlying chef-client code may enable policyfile mode and
+      # then fail because chef-solo doesn't support policyfiles.
+      Chef::Config.use_policyfile = false
+      Chef::Config.policy_name = nil
+      Chef::Config.policy_group = nil
+      Chef::Config.deployment_group = nil
+
+      # 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(%w{platform platform_version})
+      @ohai
+    end
+
+    def stdout
+      $stdout
+    end
+
+    def stderr
+      $stderr
+    end
+
+  end
+end

data/lib/chef-dk/chef_server_api_multi.rb

@@ -1,73 +1,73 @@
-#
-# Copyright:: Copyright (c) 2017 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/server_api"
-
-module ChefDK
-
-  # A wrapper for `Chef::ServerAPI` that supports multi-threading by creating a
-  # `Chef::ServerAPI` object per-thread.
-  #
-  # This is intended to be used for downloading cookbooks from the Chef Server,
-  # where the API of the Chef Server requires each file to be downloaded
-  # individually.
-  #
-  # It also configures `Chef::ServerAPI` to enable keepalives by default. To
-  # disable them, `keepalives: false` must be set in the options to the
-  # constructor.
-  class ChefServerAPIMulti
-
-    KEEPALIVES_TRUE = { keepalives: true }.freeze
-
-    attr_reader :url
-    attr_reader :opts
-
-    def initialize(url, opts)
-      @url = url
-      @opts = KEEPALIVES_TRUE.merge(opts)
-    end
-
-    def head(*args)
-      client_for_thread.head(*args)
-    end
-
-    def get(*args)
-      client_for_thread.get(*args)
-    end
-
-    def put(*args)
-      client_for_thread.put(*args)
-    end
-
-    def post(*args)
-      client_for_thread.post(*args)
-    end
-
-    def delete(*args)
-      client_for_thread.delete(*args)
-    end
-
-    def streaming_request(*args, &block)
-      client_for_thread.streaming_request(*args, &block)
-    end
-
-    def client_for_thread
-      Thread.current[:chef_server_api_multi] ||= Chef::ServerAPI.new(@url, @opts)
-    end
-
-  end
-end
+#
+# Copyright:: Copyright (c) 2017 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/server_api"
+
+module ChefDK
+
+  # A wrapper for `Chef::ServerAPI` that supports multi-threading by creating a
+  # `Chef::ServerAPI` object per-thread.
+  #
+  # This is intended to be used for downloading cookbooks from the Chef Server,
+  # where the API of the Chef Server requires each file to be downloaded
+  # individually.
+  #
+  # It also configures `Chef::ServerAPI` to enable keepalives by default. To
+  # disable them, `keepalives: false` must be set in the options to the
+  # constructor.
+  class ChefServerAPIMulti
+
+    KEEPALIVES_TRUE = { keepalives: true }.freeze
+
+    attr_reader :url
+    attr_reader :opts
+
+    def initialize(url, opts)
+      @url = url
+      @opts = KEEPALIVES_TRUE.merge(opts)
+    end
+
+    def head(*args)
+      client_for_thread.head(*args)
+    end
+
+    def get(*args)
+      client_for_thread.get(*args)
+    end
+
+    def put(*args)
+      client_for_thread.put(*args)
+    end
+
+    def post(*args)
+      client_for_thread.post(*args)
+    end
+
+    def delete(*args)
+      client_for_thread.delete(*args)
+    end
+
+    def streaming_request(*args, &block)
+      client_for_thread.streaming_request(*args, &block)
+    end
+
+    def client_for_thread
+      Thread.current[:chef_server_api_multi] ||= Chef::ServerAPI.new(@url, @opts)
+    end
+
+  end
+end