chef-dk 0.11.2 → 0.12.0

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

@@ -1,108 +1,108 @@
-#
-# 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/authenticated_http'
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile/undo_stack'
-
-module ChefDK
-  module PolicyfileServices
-    class Undelete
-
-      attr_reader :ui
-
-      attr_reader :chef_config
-
-      attr_reader :undo_record_id
-
-      def initialize(undo_record_id: nil, config: nil, ui: nil)
-        @chef_config = config
-        @ui = ui
-        @undo_record_id = undo_record_id
-
-        @http_client = nil
-        @undo_stack = nil
-      end
-
-      # In addition to the #run method, this class also has #list as a public
-      # entry point. This prints the list of undoable items, with descriptions.
-      def list
-        if undo_stack.empty?
-          ui.err("Nothing to undo.")
-        else
-          messages = []
-          undo_stack.each_with_id do |timestamp, undo_record|
-            messages.unshift("#{timestamp}: #{undo_record.description}")
-          end
-          messages.each { |m| ui.msg(m) }
-        end
-      end
-
-      def run
-        if undo_record_id
-          if undo_stack.has_id?(undo_record_id)
-            undo_stack.delete(undo_record_id) { |undo_record| restore(undo_record) }
-          else
-            ui.err("No undo record with id '#{undo_record_id}' exists")
-          end
-        else
-          undo_stack.pop { |undo_record| restore(undo_record) }
-        end
-      rescue => e
-        raise UndeleteError.new("Failed to undelete.", e)
-      end
-
-      def undo_stack
-        @undo_stack ||= Policyfile::UndoStack.new
-      end
-
-      def http_client
-        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
-                                                       signing_key_filename: chef_config.client_key,
-                                                       client_name: chef_config.node_name)
-      end
-
-      private
-
-      def restore(undo_record)
-        undo_record.policy_revisions.each do |policy_info|
-          if policy_info.policy_group.nil?
-            recreate_as_orphan(policy_info)
-          else
-            recreate_and_associate_to_group(policy_info)
-          end
-        end
-        if ( restored_policy_group = undo_record.policy_groups.first )
-          ui.msg("Restored policy group '#{restored_policy_group}'")
-        end
-      end
-
-      def recreate_as_orphan(policy_info)
-        rel_uri = "/policies/#{policy_info.policy_name}/revisions"
-        http_client.post(rel_uri, policy_info.data)
-        ui.msg("Restored policy '#{policy_info.policy_name}'")
-      end
-
-      def recreate_and_associate_to_group(policy_info)
-        rel_uri = "/policy_groups/#{policy_info.policy_group}/policies/#{policy_info.policy_name}"
-        http_client.put(rel_uri, policy_info.data)
-        ui.msg("Restored policy '#{policy_info.policy_name}'")
-      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/authenticated_http'
+require 'chef-dk/service_exceptions'
+require 'chef-dk/policyfile/undo_stack'
+
+module ChefDK
+  module PolicyfileServices
+    class Undelete
+
+      attr_reader :ui
+
+      attr_reader :chef_config
+
+      attr_reader :undo_record_id
+
+      def initialize(undo_record_id: nil, config: nil, ui: nil)
+        @chef_config = config
+        @ui = ui
+        @undo_record_id = undo_record_id
+
+        @http_client = nil
+        @undo_stack = nil
+      end
+
+      # In addition to the #run method, this class also has #list as a public
+      # entry point. This prints the list of undoable items, with descriptions.
+      def list
+        if undo_stack.empty?
+          ui.err("Nothing to undo.")
+        else
+          messages = []
+          undo_stack.each_with_id do |timestamp, undo_record|
+            messages.unshift("#{timestamp}: #{undo_record.description}")
+          end
+          messages.each { |m| ui.msg(m) }
+        end
+      end
+
+      def run
+        if undo_record_id
+          if undo_stack.has_id?(undo_record_id)
+            undo_stack.delete(undo_record_id) { |undo_record| restore(undo_record) }
+          else
+            ui.err("No undo record with id '#{undo_record_id}' exists")
+          end
+        else
+          undo_stack.pop { |undo_record| restore(undo_record) }
+        end
+      rescue => e
+        raise UndeleteError.new("Failed to undelete.", e)
+      end
+
+      def undo_stack
+        @undo_stack ||= Policyfile::UndoStack.new
+      end
+
+      def http_client
+        @http_client ||= ChefDK::AuthenticatedHTTP.new(chef_config.chef_server_url,
+                                                       signing_key_filename: chef_config.client_key,
+                                                       client_name: chef_config.node_name)
+      end
+
+      private
+
+      def restore(undo_record)
+        undo_record.policy_revisions.each do |policy_info|
+          if policy_info.policy_group.nil?
+            recreate_as_orphan(policy_info)
+          else
+            recreate_and_associate_to_group(policy_info)
+          end
+        end
+        if ( restored_policy_group = undo_record.policy_groups.first )
+          ui.msg("Restored policy group '#{restored_policy_group}'")
+        end
+      end
+
+      def recreate_as_orphan(policy_info)
+        rel_uri = "/policies/#{policy_info.policy_name}/revisions"
+        http_client.post(rel_uri, policy_info.data)
+        ui.msg("Restored policy '#{policy_info.policy_name}'")
+      end
+
+      def recreate_and_associate_to_group(policy_info)
+        rel_uri = "/policy_groups/#{policy_info.policy_group}/policies/#{policy_info.policy_name}"
+        http_client.put(rel_uri, policy_info.data)
+        ui.msg("Restored policy '#{policy_info.policy_name}'")
+      end
+
+    end
+  end
+end

data/lib/chef-dk/policyfile_services/update_attributes.rb

@@ -1,104 +1,104 @@
-#
-# 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/helpers'
-require 'chef-dk/policyfile/storage_config'
-require 'chef-dk/service_exceptions'
-require 'chef-dk/policyfile_compiler'
-
-module ChefDK
-  module PolicyfileServices
-
-    class UpdateAttributes
-
-      include Policyfile::StorageConfigDelegation
-      include ChefDK::Helpers
-
-      attr_reader :ui
-      attr_reader :storage_config
-
-      def initialize(policyfile: nil, ui: nil, root_dir: nil)
-        @ui = ui
-
-        policyfile_rel_path = policyfile || "Policyfile.rb"
-        policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
-        @storage_config = Policyfile::StorageConfig.new.use_policyfile(policyfile_full_path)
-        @updated = false
-      end
-
-      def run
-        assert_policy_and_lock_present!
-
-        if policyfile_compiler.default_attributes != policyfile_lock.default_attributes
-          policyfile_lock.default_attributes = policyfile_compiler.default_attributes
-          @updated = true
-        end
-
-        if policyfile_compiler.override_attributes != policyfile_lock.override_attributes
-          policyfile_lock.override_attributes = policyfile_compiler.override_attributes
-          @updated = true
-        end
-
-        if updated_lock?
-          with_file(policyfile_lock_expanded_path) do |f|
-            f.print(FFI_Yajl::Encoder.encode(policyfile_lock.to_lock, pretty: true ))
-          end
-          ui.msg("Updated attributes in #{policyfile_lock_expanded_path}")
-        else
-          ui.msg("Attributes already up to date")
-        end
-      rescue => error
-        raise PolicyfileUpdateError.new("Failed to update Policyfile lock", error)
-      end
-
-      def updated_lock?
-        @updated
-      end
-
-      def policyfile_content
-        @policyfile_content ||= IO.read(policyfile_expanded_path)
-      end
-
-      def policyfile_compiler
-        @policyfile_compiler ||= ChefDK::PolicyfileCompiler.evaluate(policyfile_content, policyfile_expanded_path, ui: ui)
-      end
-
-      def policyfile_lock_content
-        @policyfile_lock_content ||= IO.read(policyfile_lock_expanded_path)
-      end
-
-      def policyfile_lock
-        @policyfile_lock ||= begin
-          lock_data = FFI_Yajl::Parser.new.parse(policyfile_lock_content)
-          PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(lock_data)
-        end
-      end
-
-
-      def assert_policy_and_lock_present!
-        unless File.exist?(policyfile_expanded_path)
-          raise PolicyfileNotFound, "Policyfile not found at path #{policyfile_expanded_path}"
-        end
-        unless File.exist?(policyfile_lock_expanded_path)
-          raise LockfileNotFound, "Policyfile lock not found at path #{policyfile_lock_expanded_path}"
-        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/helpers'
+require 'chef-dk/policyfile/storage_config'
+require 'chef-dk/service_exceptions'
+require 'chef-dk/policyfile_compiler'
+
+module ChefDK
+  module PolicyfileServices
+
+    class UpdateAttributes
+
+      include Policyfile::StorageConfigDelegation
+      include ChefDK::Helpers
+
+      attr_reader :ui
+      attr_reader :storage_config
+
+      def initialize(policyfile: nil, ui: nil, root_dir: nil)
+        @ui = ui
+
+        policyfile_rel_path = policyfile || "Policyfile.rb"
+        policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
+        @storage_config = Policyfile::StorageConfig.new.use_policyfile(policyfile_full_path)
+        @updated = false
+      end
+
+      def run
+        assert_policy_and_lock_present!
+
+        if policyfile_compiler.default_attributes != policyfile_lock.default_attributes
+          policyfile_lock.default_attributes = policyfile_compiler.default_attributes
+          @updated = true
+        end
+
+        if policyfile_compiler.override_attributes != policyfile_lock.override_attributes
+          policyfile_lock.override_attributes = policyfile_compiler.override_attributes
+          @updated = true
+        end
+
+        if updated_lock?
+          with_file(policyfile_lock_expanded_path) do |f|
+            f.print(FFI_Yajl::Encoder.encode(policyfile_lock.to_lock, pretty: true ))
+          end
+          ui.msg("Updated attributes in #{policyfile_lock_expanded_path}")
+        else
+          ui.msg("Attributes already up to date")
+        end
+      rescue => error
+        raise PolicyfileUpdateError.new("Failed to update Policyfile lock", error)
+      end
+
+      def updated_lock?
+        @updated
+      end
+
+      def policyfile_content
+        @policyfile_content ||= IO.read(policyfile_expanded_path)
+      end
+
+      def policyfile_compiler
+        @policyfile_compiler ||= ChefDK::PolicyfileCompiler.evaluate(policyfile_content, policyfile_expanded_path, ui: ui)
+      end
+
+      def policyfile_lock_content
+        @policyfile_lock_content ||= IO.read(policyfile_lock_expanded_path)
+      end
+
+      def policyfile_lock
+        @policyfile_lock ||= begin
+          lock_data = FFI_Yajl::Parser.new.parse(policyfile_lock_content)
+          PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(lock_data)
+        end
+      end
+
+
+      def assert_policy_and_lock_present!
+        unless File.exist?(policyfile_expanded_path)
+          raise PolicyfileNotFound, "Policyfile not found at path #{policyfile_expanded_path}"
+        end
+        unless File.exist?(policyfile_lock_expanded_path)
+          raise LockfileNotFound, "Policyfile lock not found at path #{policyfile_lock_expanded_path}"
+        end
+      end
+
+    end
+  end
+end
+

data/lib/chef-dk/service_exception_inspectors.rb

@@ -1,25 +1,25 @@
-#
-# 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/service_exception_inspectors/base'
-require 'chef-dk/service_exception_inspectors/http'
-
-module ChefDK
-  module ServiceExceptionInspectors
-  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/service_exception_inspectors/base'
+require 'chef-dk/service_exception_inspectors/http'
+
+module ChefDK
+  module ServiceExceptionInspectors
+  end
+end
+