(#6770) Rename Puppet::Interface::interface method.

Puppet::Interface::interface is now Puppet::Interface::define, also aliased to
Puppet::Interface::[] for convenience.

Paired-With: Nick Lewis

1 files changed, 28 insertions, 24 deletions

diff --git a/lib/puppet/interface.rb b/lib/puppet/interface.rb
index 7f208f56c..64f1bfe49 100644
--- a/lib/puppet/interface.rb
+++ b/lib/puppet/interface.rb
@@ -10,35 +10,39 @@ class Puppet::Interface
 
   include Puppet::Util
 
-  # This is just so we can search for actions.  We only use its
-  # list of directories to search.
-  # Can't we utilize an external autoloader, or simply use the $LOAD_PATH? -pvb
-  def self.autoloader
-    @autoloader ||= Puppet::Util::Autoload.new(:application, "puppet/interface")
-  end
+  class << self
+    # This is just so we can search for actions.  We only use its
+    # list of directories to search.
+    # Can't we utilize an external autoloader, or simply use the $LOAD_PATH? -pvb
+    def autoloader
+      @autoloader ||= Puppet::Util::Autoload.new(:application, "puppet/interface")
+    end
 
-  def self.interfaces
-    Puppet::Interface::InterfaceCollection.interfaces
-  end
+    def interfaces
+      Puppet::Interface::InterfaceCollection.interfaces
+    end
 
-  def self.interface?(name, version)
-    Puppet::Interface::InterfaceCollection.interface?(name, version)
-  end
+    def interface?(name, version)
+      Puppet::Interface::InterfaceCollection.interface?(name, version)
+    end
 
-  def self.register(instance)
-    Puppet::Interface::InterfaceCollection.register(instance)
-  end
+    def register(instance)
+      Puppet::Interface::InterfaceCollection.register(instance)
+    end
 
-  def self.interface(name, version, &blk)
-    if interface?(name, version)
-      interface = Puppet::Interface::InterfaceCollection[name, version]
-      interface.instance_eval(&blk) if blk
-    else
-      interface = self.new(name, :version => version, &blk)
-      Puppet::Interface::InterfaceCollection.register(interface)
-      interface.load_actions
+    def define(name, version, &blk)
+      if interface?(name, version)
+        interface = Puppet::Interface::InterfaceCollection[name, version]
+        interface.instance_eval(&blk) if blk
+      else
+        interface = self.new(name, :version => version, &blk)
+        Puppet::Interface::InterfaceCollection.register(interface)
+        interface.load_actions
+      end
+      return interface
     end
-    return interface
+
+    alias :[] :define
   end
 
   attr_accessor :default_format