From 0cbdbce0f518d43f0d0160a58dd5ec7253a5af87 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@puppetlabs.com>
Date: Tue, 22 Feb 2011 09:25:21 -0800
Subject: Renaming 'data_baseclass' to 'interface_base'

Signed-off-by: Luke Kanies <luke@puppetlabs.com>
---
 lib/puppet/application/catalog.rb                  |  4 +-
 lib/puppet/application/certificate.rb              |  4 +-
 lib/puppet/application/certificate_request.rb      |  4 +-
 .../application/certificate_revocation_list.rb     |  4 +-
 lib/puppet/application/data_baseclass.rb           | 90 ----------------------
 lib/puppet/application/facts.rb                    |  4 +-
 lib/puppet/application/file.rb                     |  4 +-
 lib/puppet/application/interface_base.rb           | 90 ++++++++++++++++++++++
 lib/puppet/application/inventory.rb                |  4 +-
 lib/puppet/application/key.rb                      |  4 +-
 lib/puppet/application/node.rb                     |  4 +-
 lib/puppet/application/report.rb                   |  4 +-
 lib/puppet/application/resource_type.rb            |  4 +-
 lib/puppet/application/status.rb                   |  4 +-
 14 files changed, 114 insertions(+), 114 deletions(-)
 delete mode 100644 lib/puppet/application/data_baseclass.rb
 create mode 100644 lib/puppet/application/interface_base.rb

(limited to 'lib/puppet')

diff --git a/lib/puppet/application/catalog.rb b/lib/puppet/application/catalog.rb
index 536d79c29..0151781a4 100644
--- a/lib/puppet/application/catalog.rb
+++ b/lib/puppet/application/catalog.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Catalog < Puppet::Application::DataBaseclass
+class Puppet::Application::Catalog < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/certificate.rb b/lib/puppet/application/certificate.rb
index 708de07bb..5033372eb 100644
--- a/lib/puppet/application/certificate.rb
+++ b/lib/puppet/application/certificate.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Certificate < Puppet::Application::DataBaseclass
+class Puppet::Application::Certificate < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/certificate_request.rb b/lib/puppet/application/certificate_request.rb
index 4363fc1ae..f92876e95 100644
--- a/lib/puppet/application/certificate_request.rb
+++ b/lib/puppet/application/certificate_request.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Certificate_request < Puppet::Application::DataBaseclass
+class Puppet::Application::Certificate_request < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/certificate_revocation_list.rb b/lib/puppet/application/certificate_revocation_list.rb
index 158ed7b20..9dd3bbba4 100644
--- a/lib/puppet/application/certificate_revocation_list.rb
+++ b/lib/puppet/application/certificate_revocation_list.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Certificate_revocation_list < Puppet::Application::DataBaseclass
+class Puppet::Application::Certificate_revocation_list < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/data_baseclass.rb b/lib/puppet/application/data_baseclass.rb
deleted file mode 100644
index 599a217e9..000000000
--- a/lib/puppet/application/data_baseclass.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-require 'puppet/application'
-require 'puppet/interface'
-
-class Puppet::Application::DataBaseclass < Puppet::Application
-  should_parse_config
-  run_mode :agent
-
-  def preinit
-    super
-    trap(:INT) do
-      $stderr.puts "Cancelling Interface"
-      exit(0)
-    end
-  end
-
-  option("--debug", "-d") do |arg|
-    Puppet::Util::Log.level = :debug
-  end
-
-  option("--verbose", "-v") do
-    Puppet::Util::Log.level = :info
-  end
-
-  option("--from TERMINUS", "-f") do |arg|
-    @from = arg
-  end
-
-  option("--format FORMAT") do |arg|
-    @format = arg.to_sym
-  end
-
-  # XXX this doesn't work, I think
-  option("--list") do
-    indirections.each do |ind|
-      begin
-        classes = terminus_classes(ind.to_sym)
-      rescue => detail
-        $stderr.puts "Could not load terminuses for #{ind}: #{detail}"
-        next
-      end
-      puts "%-30s: #{classes.join(", ")}" % ind
-    end
-    exit(0)
-  end
-
-  option("--mode RUNMODE", "-r") do |arg|
-    raise "Invalid run mode #{arg}; supported modes are user, agent, master" unless %w{user agent master}.include?(arg)
-    self.class.run_mode(arg.to_sym)
-    set_run_mode self.class.run_mode
-  end
-
-
-  attr_accessor :interface, :from, :type, :verb, :name, :arguments, :indirection, :format
-
-  def main
-    # Call the method associated with the provided action (e.g., 'find').
-    result = interface.send(verb, name, *arguments)
-    render_method = Puppet::Network::FormatHandler.format(format).render_method
-    puts result.send(render_method) if result
-  end
-
-  def setup
-
-    Puppet::Util::Log.newdestination :console
-
-    @verb, @name, @arguments = command_line.args
-    @arguments ||= []
-
-    @type = self.class.name.to_s.sub(/.+:/, '').downcase.to_sym
-
-    @interface = Puppet::Interface.interface(@type).new
-    @format ||= @interface.class.default_format || :pson
-
-    validate
-
-    raise "Could not find data type #{type} for application #{self.class.name}" unless interface.indirection
-
-    @interface.set_terminus(from) if from
-  end
-
-  def validate
-    unless verb
-      raise "You must specify #{interface.actions.join(", ")} as a verb; 'save' probably does not work right now"
-    end
-
-    unless interface.action?(verb)
-      raise "Command '#{verb}' not found for #{type}"
-    end
-  end
-end
diff --git a/lib/puppet/application/facts.rb b/lib/puppet/application/facts.rb
index dd79a00d9..dfded58f7 100644
--- a/lib/puppet/application/facts.rb
+++ b/lib/puppet/application/facts.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Facts < Puppet::Application::DataBaseclass
+class Puppet::Application::Facts < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/file.rb b/lib/puppet/application/file.rb
index 2acedda86..abf6230a3 100644
--- a/lib/puppet/application/file.rb
+++ b/lib/puppet/application/file.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::File < Puppet::Application::DataBaseclass
+class Puppet::Application::File < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/interface_base.rb b/lib/puppet/application/interface_base.rb
new file mode 100644
index 000000000..1dd1f76c2
--- /dev/null
+++ b/lib/puppet/application/interface_base.rb
@@ -0,0 +1,90 @@
+require 'puppet/application'
+require 'puppet/interface'
+
+class Puppet::Application::InterfaceBase < Puppet::Application
+  should_parse_config
+  run_mode :agent
+
+  def preinit
+    super
+    trap(:INT) do
+      $stderr.puts "Cancelling Interface"
+      exit(0)
+    end
+  end
+
+  option("--debug", "-d") do |arg|
+    Puppet::Util::Log.level = :debug
+  end
+
+  option("--verbose", "-v") do
+    Puppet::Util::Log.level = :info
+  end
+
+  option("--from TERMINUS", "-f") do |arg|
+    @from = arg
+  end
+
+  option("--format FORMAT") do |arg|
+    @format = arg.to_sym
+  end
+
+  # XXX this doesn't work, I think
+  option("--list") do
+    indirections.each do |ind|
+      begin
+        classes = terminus_classes(ind.to_sym)
+      rescue => detail
+        $stderr.puts "Could not load terminuses for #{ind}: #{detail}"
+        next
+      end
+      puts "%-30s: #{classes.join(", ")}" % ind
+    end
+    exit(0)
+  end
+
+  option("--mode RUNMODE", "-r") do |arg|
+    raise "Invalid run mode #{arg}; supported modes are user, agent, master" unless %w{user agent master}.include?(arg)
+    self.class.run_mode(arg.to_sym)
+    set_run_mode self.class.run_mode
+  end
+
+
+  attr_accessor :interface, :from, :type, :verb, :name, :arguments, :indirection, :format
+
+  def main
+    # Call the method associated with the provided action (e.g., 'find').
+    result = interface.send(verb, name, *arguments)
+    render_method = Puppet::Network::FormatHandler.format(format).render_method
+    puts result.send(render_method) if result
+  end
+
+  def setup
+
+    Puppet::Util::Log.newdestination :console
+
+    @verb, @name, @arguments = command_line.args
+    @arguments ||= []
+
+    @type = self.class.name.to_s.sub(/.+:/, '').downcase.to_sym
+
+    @interface = Puppet::Interface.interface(@type).new
+    @format ||= @interface.class.default_format || :pson
+
+    validate
+
+    raise "Could not find data type #{type} for application #{self.class.name}" unless interface.indirection
+
+    @interface.set_terminus(from) if from
+  end
+
+  def validate
+    unless verb
+      raise "You must specify #{interface.actions.join(", ")} as a verb; 'save' probably does not work right now"
+    end
+
+    unless interface.action?(verb)
+      raise "Command '#{verb}' not found for #{type}"
+    end
+  end
+end
diff --git a/lib/puppet/application/inventory.rb b/lib/puppet/application/inventory.rb
index f54708f24..8a7e466df 100644
--- a/lib/puppet/application/inventory.rb
+++ b/lib/puppet/application/inventory.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Inventory < Puppet::Application::DataBaseclass
+class Puppet::Application::Inventory < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/key.rb b/lib/puppet/application/key.rb
index 1197ae026..1458b9466 100644
--- a/lib/puppet/application/key.rb
+++ b/lib/puppet/application/key.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Key < Puppet::Application::DataBaseclass
+class Puppet::Application::Key < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/node.rb b/lib/puppet/application/node.rb
index 4d7de1ab2..b5f566efc 100644
--- a/lib/puppet/application/node.rb
+++ b/lib/puppet/application/node.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Node < Puppet::Application::DataBaseclass
+class Puppet::Application::Node < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/report.rb b/lib/puppet/application/report.rb
index e4b5cf440..994bc9ef1 100644
--- a/lib/puppet/application/report.rb
+++ b/lib/puppet/application/report.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Report < Puppet::Application::DataBaseclass
+class Puppet::Application::Report < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/resource_type.rb b/lib/puppet/application/resource_type.rb
index 5bd001e88..ecc9f11f6 100644
--- a/lib/puppet/application/resource_type.rb
+++ b/lib/puppet/application/resource_type.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Resource_type < Puppet::Application::DataBaseclass
+class Puppet::Application::Resource_type < Puppet::Application::InterfaceBase
 end
diff --git a/lib/puppet/application/status.rb b/lib/puppet/application/status.rb
index 382532f7f..c34b89013 100644
--- a/lib/puppet/application/status.rb
+++ b/lib/puppet/application/status.rb
@@ -1,4 +1,4 @@
-require 'puppet/application/data_baseclass'
+require 'puppet/application/interface_base'
 
-class Puppet::Application::Status < Puppet::Application::DataBaseclass
+class Puppet::Application::Status < Puppet::Application::InterfaceBase
 end
-- 
cgit