chef-dk 0.11.2 → 0.12.0

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

@@ -1,155 +1,155 @@
-#
-# 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/undelete'
-
-module ChefDK
-  module Command
-
-    class Undelete < Base
-
-      banner(<<-BANNER)
-Usage: chef undelete [--list | --id ID] [options]
-
-`chef undelete` helps you recover quickly if you've deleted a policy or policy
-group in error. When run with no arguements, it lists the available undo
-operations. To undo the last delete operation, use `chef undelete --last`.
-
-CAVEATS:
-`chef undelete` doesn't detect conflicts. If a deleted item has been recreated,
-running `chef undelete` will overwrite it.
-
-Undo information does not include cookbooks that might be referenced by
-policies. If you have cleaned the policy cookbooks after the delete operation
-you want to reverse, `chef undelete` may not be able to fully restore the
-previous state.
-
-The delete commands also do not store access control data, so you may have to
-manually reapply any ACL customizations you have made.
-
-See our detailed README for more information:
-
-https://github.com/opscode/chef-dk/blob/master/POLICYFILE_README.md
-
-Options:
-
-BANNER
-
-      option :undo_last,
-        short:        "-l",
-        long:         "--last",
-        description:  "Undo the most recent delete operation"
-
-      option :undo_record_id,
-        short:        "-i ID",
-        long:         "--id ID",
-        description:  "Undo the delete operation with the given ID"
-
-      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 :undo_record_id
-
-      def initialize(*args)
-        super
-        @list_undo_records = false
-        @undo_record_id = nil
-        @ui = UI.new
-      end
-
-      def run(params)
-        return 1 unless apply_params!(params)
-        if list_undo_records?
-          undelete_service.list
-        else
-          undelete_service.run
-        end
-        0
-      rescue PolicyfileServiceError => e
-        handle_error(e)
-        1
-      end
-
-      def undelete_service
-        @undelete_service ||=
-          PolicyfileServices::Undelete.new(config: chef_config,
-                                             ui: ui,
-                                             undo_record_id: undo_record_id)
-      end
-
-      def debug?
-        !!config[:debug]
-      end
-
-      def list_undo_records?
-        @list_undo_records
-      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
-        elsif config[:undo_record_id].nil? && config[:undo_last].nil?
-          @list_undo_records = true
-          true
-        elsif config[:undo_record_id] && config[:undo_last]
-          ui.err("Error: options --last and --id cannot both be given.")
-          ui.err("")
-          ui.err(opt_parser)
-          false
-        elsif config[:undo_record_id]
-          @undo_record_id = config[:undo_record_id]
-          true
-        elsif config[:undo_last]
-          @undo_record_id = nil
-          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/undelete'
+
+module ChefDK
+  module Command
+
+    class Undelete < Base
+
+      banner(<<-BANNER)
+Usage: chef undelete [--list | --id ID] [options]
+
+`chef undelete` helps you recover quickly if you've deleted a policy or policy
+group in error. When run with no arguements, it lists the available undo
+operations. To undo the last delete operation, use `chef undelete --last`.
+
+CAVEATS:
+`chef undelete` doesn't detect conflicts. If a deleted item has been recreated,
+running `chef undelete` will overwrite it.
+
+Undo information does not include cookbooks that might be referenced by
+policies. If you have cleaned the policy cookbooks after the delete operation
+you want to reverse, `chef undelete` may not be able to fully restore the
+previous state.
+
+The delete commands also do not store access control data, so you may have to
+manually reapply any ACL customizations you have made.
+
+See our detailed README for more information:
+
+https://github.com/chef/chef-dk/blob/master/POLICYFILE_README.md
+
+Options:
+
+BANNER
+
+      option :undo_last,
+        short:        "-l",
+        long:         "--last",
+        description:  "Undo the most recent delete operation"
+
+      option :undo_record_id,
+        short:        "-i ID",
+        long:         "--id ID",
+        description:  "Undo the delete operation with the given ID"
+
+      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 :undo_record_id
+
+      def initialize(*args)
+        super
+        @list_undo_records = false
+        @undo_record_id = nil
+        @ui = UI.new
+      end
+
+      def run(params)
+        return 1 unless apply_params!(params)
+        if list_undo_records?
+          undelete_service.list
+        else
+          undelete_service.run
+        end
+        0
+      rescue PolicyfileServiceError => e
+        handle_error(e)
+        1
+      end
+
+      def undelete_service
+        @undelete_service ||=
+          PolicyfileServices::Undelete.new(config: chef_config,
+                                             ui: ui,
+                                             undo_record_id: undo_record_id)
+      end
+
+      def debug?
+        !!config[:debug]
+      end
+
+      def list_undo_records?
+        @list_undo_records
+      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
+        elsif config[:undo_record_id].nil? && config[:undo_last].nil?
+          @list_undo_records = true
+          true
+        elsif config[:undo_record_id] && config[:undo_last]
+          ui.err("Error: options --last and --id cannot both be given.")
+          ui.err("")
+          ui.err(opt_parser)
+          false
+        elsif config[:undo_record_id]
+          @undo_record_id = config[:undo_record_id]
+          true
+        elsif config[:undo_last]
+          @undo_record_id = nil
+          true
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -1,148 +1,148 @@
-#
-# 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/base'
-require 'chef-dk/ui'
-require 'chef-dk/policyfile_services/install'
-require 'chef-dk/policyfile_services/update_attributes'
-require 'chef-dk/configurable'
-
-module ChefDK
-  module Command
-
-    class Update < Base
-
-      include Configurable
-
-      banner(<<-BANNER)
-Usage: chef update [ POLICY_FILE ] [options]
-
-`chef update` reads your `Policyfile.rb`, applies any changes, re-solves the
-dependencies and emits an updated `Policyfile.lock.json`. The new locked policy
-will reflect any changes to the `run_list` and pull in any cookbook updates
-that are compatible with the version constraints stated in your `Policyfile.rb`.
-
-NOTE: `chef update` does not yet support granular updates (e.g., just updating
-the `run_list` or a specific cookbook version). Support will be added in a
-future version.
-
-See our detailed README for more information:
-
-https://github.com/opscode/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,
-        boolean:      true
-
-      option :update_attributes,
-        short:        "-a",
-        long:         "--attributes",
-        description:  "Update attributes",
-        default:      false,
-        boolean:      true
-
-      attr_reader :policyfile_relative_path
-
-      attr_accessor :ui
-
-      def initialize(*args)
-        super
-        @ui = UI.new
-
-        @policyfile_relative_path = nil
-        @installer = nil
-        @attributes_updater = nil
-      end
-
-      def run(params = [])
-        return 1 unless apply_params!(params)
-
-        # Force config file to be loaded. We don't use the configuration
-        # directly, but the user may have SSL configuration options that they
-        # need to talk to a private supermarket (e.g., trusted_certs or
-        # ssl_verify_mode)
-        chef_config
-
-        if update_attributes?
-          attributes_updater.run
-        else
-          installer.run
-        end
-        0
-      rescue PolicyfileServiceError => e
-        handle_error(e)
-        1
-      end
-
-      def installer
-        @installer ||= PolicyfileServices::Install.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd, overwrite: true)
-      end
-
-      def attributes_updater
-        @attributes_updater ||=
-          PolicyfileServices::UpdateAttributes.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd)
-      end
-
-      def debug?
-        !!config[:debug]
-      end
-
-      def config_path
-        config[:config_file]
-      end
-
-      def update_attributes?
-        !!config[:update_attributes]
-      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.size > 1
-          ui.err(opt_parser)
-          false
-        else
-          @policyfile_relative_path = remaining_args.first
-          true
-        end
-      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 'chef-dk/command/base'
+require 'chef-dk/ui'
+require 'chef-dk/policyfile_services/install'
+require 'chef-dk/policyfile_services/update_attributes'
+require 'chef-dk/configurable'
+
+module ChefDK
+  module Command
+
+    class Update < Base
+
+      include Configurable
+
+      banner(<<-BANNER)
+Usage: chef update [ POLICY_FILE ] [options]
+
+`chef update` reads your `Policyfile.rb`, applies any changes, re-solves the
+dependencies and emits an updated `Policyfile.lock.json`. The new locked policy
+will reflect any changes to the `run_list` and pull in any cookbook updates
+that are compatible with the version constraints stated in your `Policyfile.rb`.
+
+NOTE: `chef update` does not yet support granular updates (e.g., just updating
+the `run_list` or a specific cookbook version). Support will be added in a
+future version.
+
+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,
+        boolean:      true
+
+      option :update_attributes,
+        short:        "-a",
+        long:         "--attributes",
+        description:  "Update attributes",
+        default:      false,
+        boolean:      true
+
+      attr_reader :policyfile_relative_path
+
+      attr_accessor :ui
+
+      def initialize(*args)
+        super
+        @ui = UI.new
+
+        @policyfile_relative_path = nil
+        @installer = nil
+        @attributes_updater = nil
+      end
+
+      def run(params = [])
+        return 1 unless apply_params!(params)
+
+        # Force config file to be loaded. We don't use the configuration
+        # directly, but the user may have SSL configuration options that they
+        # need to talk to a private supermarket (e.g., trusted_certs or
+        # ssl_verify_mode)
+        chef_config
+
+        if update_attributes?
+          attributes_updater.run
+        else
+          installer.run
+        end
+        0
+      rescue PolicyfileServiceError => e
+        handle_error(e)
+        1
+      end
+
+      def installer
+        @installer ||= PolicyfileServices::Install.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd, overwrite: true)
+      end
+
+      def attributes_updater
+        @attributes_updater ||=
+          PolicyfileServices::UpdateAttributes.new(policyfile: policyfile_relative_path, ui: ui, root_dir: Dir.pwd)
+      end
+
+      def debug?
+        !!config[:debug]
+      end
+
+      def config_path
+        config[:config_file]
+      end
+
+      def update_attributes?
+        !!config[:update_attributes]
+      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.size > 1
+          ui.err(opt_parser)
+          false
+        else
+          @policyfile_relative_path = remaining_args.first
+          true
+        end
+      end
+
+    end
+  end
+end
+