1 files changed, 58 insertions, 58 deletions
diff --git a/lib/puppet/util/instance_loader.rb b/lib/puppet/util/instance_loader.rb
index 56d75b698..5e16bd7fa 100755
--- a/lib/puppet/util/instance_loader.rb
+++ b/lib/puppet/util/instance_loader.rb
@@ -4,78 +4,78 @@ require 'puppet/util'
 # A module that can easily autoload things for us.  Uses an instance
 # of Puppet::Util::Autoload
 module Puppet::Util::InstanceLoader
-    include Puppet::Util
+  include Puppet::Util
 
-    # Are we instance-loading this type?
-    def instance_loading?(type)
-        defined?(@autoloaders) and @autoloaders.include?(symbolize(type))
-    end
-
-    # Define a new type of autoloading.
-    def instance_load(type, path, options = {})
-        @autoloaders ||= {}
-        @instances ||= {}
-        type = symbolize(type)
-        @instances[type] = {}
-        @autoloaders[type] = Puppet::Util::Autoload.new(self, path, options)
+  # Are we instance-loading this type?
+  def instance_loading?(type)
+    defined?(@autoloaders) and @autoloaders.include?(symbolize(type))
+  end
 
-        # Now define our new simple methods
-        unless respond_to?(type)
-            meta_def(type) do |name|
-                loaded_instance(type, name)
-            end
-        end
-    end
+  # Define a new type of autoloading.
+  def instance_load(type, path, options = {})
+    @autoloaders ||= {}
+    @instances ||= {}
+    type = symbolize(type)
+    @instances[type] = {}
+    @autoloaders[type] = Puppet::Util::Autoload.new(self, path, options)
 
-    # Return a list of the names of all instances
-    def loaded_instances(type)
-        @instances[type].keys
+    # Now define our new simple methods
+    unless respond_to?(type)
+      meta_def(type) do |name|
+        loaded_instance(type, name)
+      end
     end
+  end
 
-    # Collect the docs for all of our instances.
-    def instance_docs(type)
-        docs = ""
+  # Return a list of the names of all instances
+  def loaded_instances(type)
+    @instances[type].keys
+  end
 
-        # Load all instances.
-        instance_loader(type).loadall
+  # Collect the docs for all of our instances.
+  def instance_docs(type)
+    docs = ""
 
-        # Use this method so they all get loaded
-        loaded_instances(type).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
-            mod = self.loaded_instance(name)
-            docs += "#{name}\n#{"-" * name.to_s.length}\n"
+    # Load all instances.
+    instance_loader(type).loadall
 
-            docs += Puppet::Util::Docs.scrub(mod.doc) + "\n\n"
-        end
+    # Use this method so they all get loaded
+    loaded_instances(type).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
+      mod = self.loaded_instance(name)
+      docs += "#{name}\n#{"-" * name.to_s.length}\n"
 
-        docs
+      docs += Puppet::Util::Docs.scrub(mod.doc) + "\n\n"
     end
 
-    # Return the instance hash for our type.
-    def instance_hash(type)
-        @instances[symbolize(type)]
-    end
+    docs
+  end
 
-    # Return the Autoload object for a given type.
-    def instance_loader(type)
-        @autoloaders[symbolize(type)]
-    end
+  # Return the instance hash for our type.
+  def instance_hash(type)
+    @instances[symbolize(type)]
+  end
+
+  # Return the Autoload object for a given type.
+  def instance_loader(type)
+    @autoloaders[symbolize(type)]
+  end
 
-    # Retrieve an alread-loaded instance, or attempt to load our instance.
-    def loaded_instance(type, name)
-        name = symbolize(name)
-        return nil unless instances = instance_hash(type)
+  # Retrieve an alread-loaded instance, or attempt to load our instance.
+  def loaded_instance(type, name)
+    name = symbolize(name)
+    return nil unless instances = instance_hash(type)
+    unless instances.include? name
+      if instance_loader(type).load(name)
         unless instances.include? name
-            if instance_loader(type).load(name)
-                unless instances.include? name
-                    Puppet.warning(
-                        "Loaded #{type} file for #{name} but #{type} was not defined"
-                    )
-                    return nil
-                end
-            else
-                return nil
-            end
+          Puppet.warning(
+            "Loaded #{type} file for #{name} but #{type} was not defined"
+          )
+          return nil
         end
-        instances[name]
+      else
+        return nil
+      end
     end
+    instances[name]
+  end
 end