Enabling arbitrary interface names

Previously the app, indirection, and interface names
had to match exactly; now they can be arbitrary by
just defining an overriding 'indirection_name' class
method on the interface.

I also renamed the file_bucket_file classes accordingly.

Signed-off-by: Luke Kanies <luke@puppetlabs.com>

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/puppet/application/data_baseclass.rb b/lib/puppet/application/data_baseclass.rb
index 8da624c60..b7393f96c 100644
--- a/lib/puppet/application/data_baseclass.rb
+++ b/lib/puppet/application/data_baseclass.rb
@@ -65,7 +65,7 @@ class Puppet::Application::DataBaseclass < Puppet::Application
 
     validate
 
-    raise "Could not find data type #{type} for application #{self.class.name}" unless @indirection = Puppet::Indirector::Indirection.instance(type)
+    raise "Could not find data type #{type} for application #{self.class.name}" unless interface.indirection
 
     @interface.set_terminus(from) if from
   end
diff --git a/lib/puppet/application/file.rb b/lib/puppet/application/file.rb
new file mode 100644
index 000000000..2acedda86
--- /dev/null
+++ b/lib/puppet/application/file.rb
@@ -0,0 +1,4 @@
+require 'puppet/application/data_baseclass'
+
+class Puppet::Application::File < Puppet::Application::DataBaseclass
+end
diff --git a/lib/puppet/application/file_bucket_file.rb b/lib/puppet/application/file_bucket_file.rb
deleted file mode 100644
index f08a37f90..000000000
--- a/lib/puppet/application/file_bucket_file.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-require 'puppet/application/data_baseclass'
-
-class Puppet::Application::File_bucket_file < Puppet::Application::DataBaseclass
-end