chef-provisioning 2.0.1 → 2.0.2

data/lib/chef/provisioning/action_handler.rb

@@ -1,68 +1,68 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Douglas Triggs (<doug@chef.io>)
-#
-# Copyright (C) 2014, Chef, Inc.
-#
-# 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.
-
-# This is the generic action handler
-class Chef
-module Provisioning
-  class ActionHandler
-
-    # This should be replaced with whatever records the update; by default it
-    # essentially does nothing here.
-    def updated!
-      @updated = true
-    end
-
-    def should_perform_actions
-      true
-    end
-
-    def report_progress(description)
-      Array(description).each { |d| puts d }
-    end
-
-    def performed_action(description)
-      Array(description).each { |d| puts d }
-    end
-
-    # This should perform the actual action (e.g., converge) if there is an
-    # action that needs to be done.
-    def perform_action(description)
-      if should_perform_actions
-        result = yield
-      else
-        result = nil
-      end
-      performed_action(description)
-      result
-    end
-
-    # Open a stream which can be printed to and closed
-    def open_stream(name)
-      if block_given?
-        yield STDOUT
-      else
-        STDOUT
-      end
-    end
-
-    # A URL identifying the host node. nil if no such node.
-    def host_node
-    end
-  end
-end
-end
+# -*- encoding: utf-8 -*-
+#
+# Author:: Douglas Triggs (<doug@chef.io>)
+#
+# Copyright (C) 2014, Chef, Inc.
+#
+# 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.
+
+# This is the generic action handler
+class Chef
+module Provisioning
+  class ActionHandler
+
+    # This should be replaced with whatever records the update; by default it
+    # essentially does nothing here.
+    def updated!
+      @updated = true
+    end
+
+    def should_perform_actions
+      true
+    end
+
+    def report_progress(description)
+      Array(description).each { |d| puts d }
+    end
+
+    def performed_action(description)
+      Array(description).each { |d| puts d }
+    end
+
+    # This should perform the actual action (e.g., converge) if there is an
+    # action that needs to be done.
+    def perform_action(description)
+      if should_perform_actions
+        result = yield
+      else
+        result = nil
+      end
+      performed_action(description)
+      result
+    end
+
+    # Open a stream which can be printed to and closed
+    def open_stream(name)
+      if block_given?
+        yield STDOUT
+      else
+        STDOUT
+      end
+    end
+
+    # A URL identifying the host node. nil if no such node.
+    def host_node
+    end
+  end
+end
+end

data/lib/chef/provisioning/add_prefix_action_handler.rb

@@ -1,35 +1,35 @@
-require 'chef/provisioning/action_handler'
-
-class Chef
-module Provisioning
-  class AddPrefixActionHandler
-    extend Forwardable
-
-    def initialize(action_handler, prefix)
-      @action_handler = action_handler
-      @prefix = prefix
-    end
-
-    attr_reader :action_handler
-    attr_reader :prefix
-    attr_reader :locally_updated
-
-    def_delegators :@action_handler, :should_perform_actions, :updated!, :open_stream, :host_node
-
-    def report_progress(description)
-      @locally_updated = true
-      action_handler.report_progress(Array(description).flatten.map { |d| "#{prefix}#{d}" })
-    end
-
-    def performed_action(description)
-      @locally_updated = true
-      action_handler.performed_action(Array(description).flatten.map { |d| "#{prefix}#{d}" })
-    end
-
-    def perform_action(description, &block)
-      @locally_updated = true
-      action_handler.perform_action(Array(description).flatten.map { |d| "#{prefix}#{d}" }, &block)
-    end
-  end
-end
-end
+require 'chef/provisioning/action_handler'
+
+class Chef
+module Provisioning
+  class AddPrefixActionHandler
+    extend Forwardable
+
+    def initialize(action_handler, prefix)
+      @action_handler = action_handler
+      @prefix = prefix
+    end
+
+    attr_reader :action_handler
+    attr_reader :prefix
+    attr_reader :locally_updated
+
+    def_delegators :@action_handler, :should_perform_actions, :updated!, :open_stream, :host_node
+
+    def report_progress(description)
+      @locally_updated = true
+      action_handler.report_progress(Array(description).flatten.map { |d| "#{prefix}#{d}" })
+    end
+
+    def performed_action(description)
+      @locally_updated = true
+      action_handler.performed_action(Array(description).flatten.map { |d| "#{prefix}#{d}" })
+    end
+
+    def perform_action(description, &block)
+      @locally_updated = true
+      action_handler.perform_action(Array(description).flatten.map { |d| "#{prefix}#{d}" }, &block)
+    end
+  end
+end
+end

data/lib/chef/provisioning/chef_managed_entry_store.rb

@@ -1,128 +1,128 @@
-require 'chef/provisioning/managed_entry_store'
-require 'cheffish'
-
-class Chef
-  module Provisioning
-    class ChefManagedEntryStore < ManagedEntryStore
-      def initialize(chef_server = Cheffish.default_chef_server)
-        @chef_server = chef_server
-      end
-
-      attr_reader :chef_server
-
-      def chef_api
-        @chef_api ||= Cheffish.chef_server_api(chef_server)
-      end
-
-      #
-      # Get the given data
-      #
-      # @param resource_type [Symbol] The type of thing to retrieve (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet, ...)
-      # @param name [String] The unique identifier of the thing to retrieve
-      #
-      # @return [Hash,Array] The data, or `nil` if the data does not exist.  Will be JSON- and YAML-compatible (Hash, Array, String, Integer, Boolean, Nil)
-      #
-      def get_data(resource_type, name)
-        begin
-          if resource_type == :machine
-            chef_api.get("nodes/#{name}")
-          else
-            chef_api.get("data/#{resource_type}/#{name}")
-          end
-        rescue Net::HTTPServerException => e
-          if e.response.code == '404'
-            backcompat_type = ChefManagedEntryStore.type_names_for_backcompat[resource_type]
-            if backcompat_type && backcompat_type != resource_type
-              get_data(backcompat_type, name)
-            else
-              nil
-            end
-          else
-            raise
-          end
-        end
-      end
-
-      #
-      # Save the given data
-      #
-      # @param resource_type [Symbol] The type of thing to save (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet ...)
-      # @param name [String] The unique identifier of the thing to save
-      # @param data [Hash,Array] The data to save.  Must be JSON- and YAML-compatible (Hash, Array, String, Integer, Boolean, Nil)
-      #
-      def save_data(resource_type, name, data, action_handler)
-        _chef_server = self.chef_server
-        Chef::Provisioning.inline_resource(action_handler) do
-          if resource_type == :machine
-            chef_node name do
-              chef_server _chef_server
-              raw_json data
-            end
-          else
-            chef_data_bag resource_type.to_s do
-              chef_server _chef_server
-            end
-            chef_data_bag_item name do
-              chef_server _chef_server
-              data_bag resource_type.to_s
-              raw_data data
-            end
-          end
-        end
-
-        backcompat_type = ChefManagedEntryStore.type_names_for_backcompat[resource_type]
-        if backcompat_type && backcompat_type != resource_type
-          delete_data(backcompat_type, name, action_handler)
-        end
-      end
-
-      #
-      # Delete the given data
-      #
-      # @param resource_type [Symbol] The type of thing to delete (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet, ...)
-      # @param name [String] The unique identifier of the thing to delete
-      #
-      # @return [Boolean] Whether anything was deleted or not.
-      #
-      def delete_data(resource_type, name, action_handler)
-        _chef_server = self.chef_server
-        Chef::Provisioning.inline_resource(action_handler) do
-          if resource_type == :machine
-            chef_node name do
-              chef_server _chef_server
-              action :delete
-            end
-          else
-            chef_data_bag_item name do
-              chef_server _chef_server
-              data_bag resource_type.to_s
-              action :delete
-            end
-          end
-        end
-
-        backcompat_type = ChefManagedEntryStore.type_names_for_backcompat[resource_type]
-        if backcompat_type && backcompat_type != resource_type
-          delete_data(backcompat_type, name, action_handler)
-        end
-      end
-
-      def identifier(resource_type, name)
-        if resource_type == :machine
-          File.join(chef_server[:chef_server_url], "nodes", name)
-        else
-          File.join(chef_server[:chef_server_url], "data", resource_type.to_s, name)
-        end
-      end
-
-      #
-      # A list of the name that we used to use to store a given type before we
-      # standardized on "just use the resource name so we don't create collisions."
-      # Will be used to look up the old data.
-      #
-      def self.type_names_for_backcompat
-        @@type_names_for_backcompat ||= {}
-      end
-    end
-  end
-end
+require 'chef/provisioning/managed_entry_store'
+require 'cheffish'
+
+class Chef
+  module Provisioning
+    class ChefManagedEntryStore < ManagedEntryStore
+      def initialize(chef_server = Cheffish.default_chef_server)
+        @chef_server = chef_server
+      end
+
+      attr_reader :chef_server
+
+      def chef_api
+        @chef_api ||= Cheffish.chef_server_api(chef_server)
+      end
+
+      #
+      # Get the given data
+      #
+      # @param resource_type [Symbol] The type of thing to retrieve (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet, ...)
+      # @param name [String] The unique identifier of the thing to retrieve
+      #
+      # @return [Hash,Array] The data, or `nil` if the data does not exist.  Will be JSON- and YAML-compatible (Hash, Array, String, Integer, Boolean, Nil)
+      #
+      def get_data(resource_type, name)
+        begin
+          if resource_type == :machine
+            chef_api.get("nodes/#{name}")
+          else
+            chef_api.get("data/#{resource_type}/#{name}")
+          end
+        rescue Net::HTTPServerException => e
+          if e.response.code == '404'
+            backcompat_type = ChefManagedEntryStore.type_names_for_backcompat[resource_type]
+            if backcompat_type && backcompat_type != resource_type
+              get_data(backcompat_type, name)
+            else
+              nil
+            end
+          else
+            raise
+          end
+        end
+      end
+
+      #
+      # Save the given data
+      #
+      # @param resource_type [Symbol] The type of thing to save (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet ...)
+      # @param name [String] The unique identifier of the thing to save
+      # @param data [Hash,Array] The data to save.  Must be JSON- and YAML-compatible (Hash, Array, String, Integer, Boolean, Nil)
+      #
+      def save_data(resource_type, name, data, action_handler)
+        _chef_server = self.chef_server
+        Chef::Provisioning.inline_resource(action_handler) do
+          if resource_type == :machine
+            chef_node name do
+              chef_server _chef_server
+              raw_json data
+            end
+          else
+            chef_data_bag resource_type.to_s do
+              chef_server _chef_server
+            end
+            chef_data_bag_item name do
+              chef_server _chef_server
+              data_bag resource_type.to_s
+              raw_data data
+            end
+          end
+        end
+
+        backcompat_type = ChefManagedEntryStore.type_names_for_backcompat[resource_type]
+        if backcompat_type && backcompat_type != resource_type
+          delete_data(backcompat_type, name, action_handler)
+        end
+      end
+
+      #
+      # Delete the given data
+      #
+      # @param resource_type [Symbol] The type of thing to delete (:machine, :machine_image, :load_balancer, :aws_vpc, :aws_subnet, ...)
+      # @param name [String] The unique identifier of the thing to delete
+      #
+      # @return [Boolean] Whether anything was deleted or not.
+      #
+      def delete_data(resource_type, name, action_handler)
+        _chef_server = self.chef_server
+        Chef::Provisioning.inline_resource(action_handler) do
+          if resource_type == :machine
+            chef_node name do
+              chef_server _chef_server
+              action :delete
+            end
+          else
+            chef_data_bag_item name do
+              chef_server _chef_server
+              data_bag resource_type.to_s
+              action :delete
+            end
+          end
+        end
+
+        backcompat_type = ChefManagedEntryStore.type_names_for_backcompat[resource_type]
+        if backcompat_type && backcompat_type != resource_type
+          delete_data(backcompat_type, name, action_handler)
+        end
+      end
+
+      def identifier(resource_type, name)
+        if resource_type == :machine
+          File.join(chef_server[:chef_server_url], "nodes", name)
+        else
+          File.join(chef_server[:chef_server_url], "data", resource_type.to_s, name)
+        end
+      end
+
+      #
+      # A list of the name that we used to use to store a given type before we
+      # standardized on "just use the resource name so we don't create collisions."
+      # Will be used to look up the old data.
+      #
+      def self.type_names_for_backcompat
+        @@type_names_for_backcompat ||= {}
+      end
+    end
+  end
+end