(#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

15 files changed, 19 insertions, 19 deletions

diff --git a/lib/puppet/interface/v0.0.1/catalog.rb b/lib/puppet/interface/v0.0.1/catalog.rb
index 647206251..7d61528bc 100644
--- a/lib/puppet/interface/v0.0.1/catalog.rb
+++ b/lib/puppet/interface/v0.0.1/catalog.rb
@@ -1,6 +1,6 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:catalog, '0.0.1') do
+Puppet::Interface::Indirector.define(:catalog, '0.0.1') do
   action(:apply) do
     invoke do |catalog|
       report = Puppet::Transaction::Report.new("apply")
@@ -28,7 +28,7 @@ Puppet::Interface::Indirector.interface(:catalog, '0.0.1') do
       facts_to_upload = {:facts_format => :b64_zlib_yaml, :facts => CGI.escape(facts.render(:b64_zlib_yaml))}
       catalog = nil
       retrieval_duration = thinmark do
-        catalog = Puppet::Interface.interface(:catalog, '0.0.1').find(certname, facts_to_upload)
+        catalog = Puppet::Interface[:catalog, '0.0.1'].find(certname, facts_to_upload)
       end
       catalog = catalog.to_ral
       catalog.finalize
diff --git a/lib/puppet/interface/v0.0.1/catalog/select.rb b/lib/puppet/interface/v0.0.1/catalog/select.rb
index bc65069b8..35f1a1e0b 100644
--- a/lib/puppet/interface/v0.0.1/catalog/select.rb
+++ b/lib/puppet/interface/v0.0.1/catalog/select.rb
@@ -1,5 +1,5 @@
 # Select and show a list of resources of a given type.
-Puppet::Interface.interface(:catalog, '0.0.1') do
+Puppet::Interface.define(:catalog, '0.0.1') do
   action :select do
     invoke do |host,type|
       catalog = Puppet::Resource::Catalog.indirection.find(host)
diff --git a/lib/puppet/interface/v0.0.1/certificate.rb b/lib/puppet/interface/v0.0.1/certificate.rb
index aee123aa6..52019fddd 100644
--- a/lib/puppet/interface/v0.0.1/certificate.rb
+++ b/lib/puppet/interface/v0.0.1/certificate.rb
@@ -1,4 +1,4 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:certificate, '0.0.1') do
+Puppet::Interface::Indirector.define(:certificate, '0.0.1') do
 end
diff --git a/lib/puppet/interface/v0.0.1/certificate_request.rb b/lib/puppet/interface/v0.0.1/certificate_request.rb
index 169d6e500..e5ed1b51e 100644
--- a/lib/puppet/interface/v0.0.1/certificate_request.rb
+++ b/lib/puppet/interface/v0.0.1/certificate_request.rb
@@ -1,4 +1,4 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:certificate_request, '0.0.1') do
+Puppet::Interface::Indirector.define(:certificate_request, '0.0.1') do
 end
diff --git a/lib/puppet/interface/v0.0.1/certificate_revocation_list.rb b/lib/puppet/interface/v0.0.1/certificate_revocation_list.rb
index 7f4f5176b..f6d8a3d6d 100644
--- a/lib/puppet/interface/v0.0.1/certificate_revocation_list.rb
+++ b/lib/puppet/interface/v0.0.1/certificate_revocation_list.rb
@@ -1,4 +1,4 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:certificate_revocation_list, '0.0.1') do
+Puppet::Interface::Indirector.define(:certificate_revocation_list, '0.0.1') do
 end
diff --git a/lib/puppet/interface/v0.0.1/config.rb b/lib/puppet/interface/v0.0.1/config.rb
index 2437712ca..b33e19bb4 100644
--- a/lib/puppet/interface/v0.0.1/config.rb
+++ b/lib/puppet/interface/v0.0.1/config.rb
@@ -1,6 +1,6 @@
 require 'puppet/interface'
 
-Puppet::Interface.interface(:config, '0.0.1') do
+Puppet::Interface.define(:config, '0.0.1') do
   action(:print) do
     invoke do |*args|
       Puppet.settings[:configprint] = args.join(",")
diff --git a/lib/puppet/interface/v0.0.1/configurer.rb b/lib/puppet/interface/v0.0.1/configurer.rb
index 0ab71c47a..38536b684 100644
--- a/lib/puppet/interface/v0.0.1/configurer.rb
+++ b/lib/puppet/interface/v0.0.1/configurer.rb
@@ -1,11 +1,11 @@
 require 'puppet/interface'
 
-Puppet::Interface.interface(:configurer, '0.0.1') do
+Puppet::Interface.define(:configurer, '0.0.1') do
   action(:synchronize) do
     invoke do |certname|
-      facts = Puppet::Interface.interface(:facts, '0.0.1').find(certname)
-      catalog = Puppet::Interface.interface(:catalog, '0.0.1').download(certname, facts)
-      report = Puppet::Interface.interface(:catalog, '0.0.1').apply(catalog)
+      facts = Puppet::Interface[:facts, '0.0.1'].find(certname)
+      catalog = Puppet::Interface[:catalog, '0.0.1'].download(certname, facts)
+      report = Puppet::Interface[:catalog, '0.0.1'].apply(catalog)
       report
     end
   end
diff --git a/lib/puppet/interface/v0.0.1/facts.rb b/lib/puppet/interface/v0.0.1/facts.rb
index e987d0740..c4bbad845 100644
--- a/lib/puppet/interface/v0.0.1/facts.rb
+++ b/lib/puppet/interface/v0.0.1/facts.rb
@@ -1,7 +1,7 @@
 require 'puppet/interface/indirector'
 require 'puppet/node/facts'
 
-Puppet::Interface::Indirector.interface(:facts, '0.0.1') do
+Puppet::Interface::Indirector.define(:facts, '0.0.1') do
   set_default_format :yaml
 
   # Upload our facts to the server
diff --git a/lib/puppet/interface/v0.0.1/file.rb b/lib/puppet/interface/v0.0.1/file.rb
index 2f27e434f..91904e8e0 100644
--- a/lib/puppet/interface/v0.0.1/file.rb
+++ b/lib/puppet/interface/v0.0.1/file.rb
@@ -1,5 +1,5 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:file, '0.0.1') do
+Puppet::Interface::Indirector.define(:file, '0.0.1') do
   set_indirection_name :file_bucket_file
 end
diff --git a/lib/puppet/interface/v0.0.1/key.rb b/lib/puppet/interface/v0.0.1/key.rb
index ddd3a6ea8..fbc9b67b1 100644
--- a/lib/puppet/interface/v0.0.1/key.rb
+++ b/lib/puppet/interface/v0.0.1/key.rb
@@ -1,4 +1,4 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:key, '0.0.1') do
+Puppet::Interface::Indirector.define(:key, '0.0.1') do
 end
diff --git a/lib/puppet/interface/v0.0.1/node.rb b/lib/puppet/interface/v0.0.1/node.rb
index 898426846..4ecec1478 100644
--- a/lib/puppet/interface/v0.0.1/node.rb
+++ b/lib/puppet/interface/v0.0.1/node.rb
@@ -1,5 +1,5 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:node, '0.0.1') do
+Puppet::Interface::Indirector.define(:node, '0.0.1') do
   set_default_format :yaml
 end
diff --git a/lib/puppet/interface/v0.0.1/report.rb b/lib/puppet/interface/v0.0.1/report.rb
index 3f4e17310..bacb46e70 100644
--- a/lib/puppet/interface/v0.0.1/report.rb
+++ b/lib/puppet/interface/v0.0.1/report.rb
@@ -1,6 +1,6 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:report, '0.0.1') do
+Puppet::Interface::Indirector.define(:report, '0.0.1') do
   action(:submit) do
     invoke do |report|
       begin
diff --git a/lib/puppet/interface/v0.0.1/resource.rb b/lib/puppet/interface/v0.0.1/resource.rb
index 61c90cc85..1a6f3b69d 100644
--- a/lib/puppet/interface/v0.0.1/resource.rb
+++ b/lib/puppet/interface/v0.0.1/resource.rb
@@ -1,4 +1,4 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:resource, '0.0.1') do
+Puppet::Interface::Indirector.define(:resource, '0.0.1') do
 end
diff --git a/lib/puppet/interface/v0.0.1/resource_type.rb b/lib/puppet/interface/v0.0.1/resource_type.rb
index 9cc4bef28..6f5547c4d 100644
--- a/lib/puppet/interface/v0.0.1/resource_type.rb
+++ b/lib/puppet/interface/v0.0.1/resource_type.rb
@@ -1,4 +1,4 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:resource_type, '0.0.1') do
+Puppet::Interface::Indirector.define(:resource_type, '0.0.1') do
 end
diff --git a/lib/puppet/interface/v0.0.1/status.rb b/lib/puppet/interface/v0.0.1/status.rb
index d8cded899..7f4b56a2b 100644
--- a/lib/puppet/interface/v0.0.1/status.rb
+++ b/lib/puppet/interface/v0.0.1/status.rb
@@ -1,4 +1,4 @@
 require 'puppet/interface/indirector'
 
-Puppet::Interface::Indirector.interface(:status, '0.0.1') do
+Puppet::Interface::Indirector.define(:status, '0.0.1') do
 end