cheffish 1.4.1 → 1.4.2

data/lib/chef/provider/chef_role.rb

@@ -1,84 +1,84 @@
-require 'cheffish/chef_provider_base'
-require 'chef/resource/chef_role'
-require 'chef/chef_fs/data_handler/role_data_handler'
-
-class Chef
-  class Provider
-    class ChefRole < Cheffish::ChefProviderBase
-      provides :chef_role
-
-      def whyrun_supported?
-        true
-      end
-
-      action :create do
-        differences = json_differences(current_json, new_json)
-
-        if current_resource_exists?
-          if differences.size > 0
-            description = [ "update role #{new_resource.name} at #{rest.url}" ] + differences
-            converge_by description do
-              rest.put("roles/#{new_resource.name}", normalize_for_put(new_json))
-            end
-          end
-        else
-          description = [ "create role #{new_resource.name} at #{rest.url}" ] + differences
-          converge_by description do
-            rest.post("roles", normalize_for_post(new_json))
-          end
-        end
-      end
-
-      action :delete do
-        if current_resource_exists?
-          converge_by "delete role #{new_resource.name} at #{rest.url}" do
-            rest.delete("roles/#{new_resource.name}")
-          end
-        end
-      end
-
-      def load_current_resource
-        begin
-          @current_resource = json_to_resource(rest.get("roles/#{new_resource.name}"))
-        rescue Net::HTTPServerException => e
-          if e.response.code == "404"
-            @current_resource = not_found_resource
-          else
-            raise
-          end
-        end
-      end
-
-      def augment_new_json(json)
-        # Apply modifiers
-        json['run_list'] = apply_run_list_modifiers(new_resource.run_list_modifiers, new_resource.run_list_removers, json['run_list'])
-        json['default_attributes'] = apply_modifiers(new_resource.default_attribute_modifiers, json['default_attributes'])
-        json['override_attributes'] = apply_modifiers(new_resource.override_attribute_modifiers, json['override_attributes'])
-        json
-      end
-
-      #
-      # Helpers
-      #
-
-      def resource_class
-        Chef::Resource::ChefRole
-      end
-
-      def data_handler
-        Chef::ChefFS::DataHandler::RoleDataHandler.new
-      end
-
-      def keys
-        {
-          'name' => :name,
-          'description' => :description,
-          'run_list' => :run_list,
-          'env_run_lists' => :env_run_lists,
-          'default_attributes' => :default_attributes,
-          'override_attributes' => :override_attributes
-        }
-      end
-    end
-  end
-end
+require 'cheffish/chef_provider_base'
+require 'chef/resource/chef_role'
+require 'chef/chef_fs/data_handler/role_data_handler'
+
+class Chef
+  class Provider
+    class ChefRole < Cheffish::ChefProviderBase
+      provides :chef_role
+
+      def whyrun_supported?
+        true
+      end
+
+      action :create do
+        differences = json_differences(current_json, new_json)
+
+        if current_resource_exists?
+          if differences.size > 0
+            description = [ "update role #{new_resource.name} at #{rest.url}" ] + differences
+            converge_by description do
+              rest.put("roles/#{new_resource.name}", normalize_for_put(new_json))
+            end
+          end
+        else
+          description = [ "create role #{new_resource.name} at #{rest.url}" ] + differences
+          converge_by description do
+            rest.post("roles", normalize_for_post(new_json))
+          end
+        end
+      end
+
+      action :delete do
+        if current_resource_exists?
+          converge_by "delete role #{new_resource.name} at #{rest.url}" do
+            rest.delete("roles/#{new_resource.name}")
+          end
+        end
+      end
+
+      def load_current_resource
+        begin
+          @current_resource = json_to_resource(rest.get("roles/#{new_resource.name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
+          end
+        end
+      end
+
+      def augment_new_json(json)
+        # Apply modifiers
+        json['run_list'] = apply_run_list_modifiers(new_resource.run_list_modifiers, new_resource.run_list_removers, json['run_list'])
+        json['default_attributes'] = apply_modifiers(new_resource.default_attribute_modifiers, json['default_attributes'])
+        json['override_attributes'] = apply_modifiers(new_resource.override_attribute_modifiers, json['override_attributes'])
+        json
+      end
+
+      #
+      # Helpers
+      #
+
+      def resource_class
+        Chef::Resource::ChefRole
+      end
+
+      def data_handler
+        Chef::ChefFS::DataHandler::RoleDataHandler.new
+      end
+
+      def keys
+        {
+          'name' => :name,
+          'description' => :description,
+          'run_list' => :run_list,
+          'env_run_lists' => :env_run_lists,
+          'default_attributes' => :default_attributes,
+          'override_attributes' => :override_attributes
+        }
+      end
+    end
+  end
+end

data/lib/chef/provider/chef_user.rb

@@ -1,59 +1,59 @@
-require 'cheffish/actor_provider_base'
-require 'chef/resource/chef_user'
-require 'chef/chef_fs/data_handler/user_data_handler'
-
-class Chef
-  class Provider
-    class ChefUser < Cheffish::ActorProviderBase
-      provides :chef_user
-
-      def whyrun_supported?
-        true
-      end
-
-      action :create do
-        create_actor
-      end
-
-      action :delete do
-        delete_actor
-      end
-
-      #
-      # Helpers
-      #
-      # Gives us new_json, current_json, not_found_json, etc.
-
-      def actor_type
-        'user'
-      end
-
-      def actor_path
-        "#{rest.root_url}/users"
-      end
-
-      def resource_class
-        Chef::Resource::ChefUser
-      end
-
-      def data_handler
-        Chef::ChefFS::DataHandler::UserDataHandler.new
-      end
-
-      def keys
-        {
-          'name' => :name,
-          'username' => :name,
-          'display_name' => :display_name,
-          'admin' => :admin,
-          'email' => :email,
-          'password' => :password,
-          'external_authentication_uid' => :external_authentication_uid,
-          'recovery_authentication_enabled' => :recovery_authentication_enabled,
-          'public_key' => :source_key
-        }
-      end
-
-    end
-  end
-end
+require 'cheffish/actor_provider_base'
+require 'chef/resource/chef_user'
+require 'chef/chef_fs/data_handler/user_data_handler'
+
+class Chef
+  class Provider
+    class ChefUser < Cheffish::ActorProviderBase
+      provides :chef_user
+
+      def whyrun_supported?
+        true
+      end
+
+      action :create do
+        create_actor
+      end
+
+      action :delete do
+        delete_actor
+      end
+
+      #
+      # Helpers
+      #
+      # Gives us new_json, current_json, not_found_json, etc.
+
+      def actor_type
+        'user'
+      end
+
+      def actor_path
+        "#{rest.root_url}/users"
+      end
+
+      def resource_class
+        Chef::Resource::ChefUser
+      end
+
+      def data_handler
+        Chef::ChefFS::DataHandler::UserDataHandler.new
+      end
+
+      def keys
+        {
+          'name' => :name,
+          'username' => :name,
+          'display_name' => :display_name,
+          'admin' => :admin,
+          'email' => :email,
+          'password' => :password,
+          'external_authentication_uid' => :external_authentication_uid,
+          'recovery_authentication_enabled' => :recovery_authentication_enabled,
+          'public_key' => :source_key
+        }
+      end
+
+    end
+  end
+end