remoter_base.rb in auser-poolparty-1.2.7

- old
+ new

@@ -14,11 +14,10 @@
   After your remote base is written, make sure to register the base outside the context
   of the remote base, like so:
     register_remote_base :remote_base_name
   
 =end
-require "#{::File.dirname(__FILE__)}/../modules/pinger.rb"  #FIXME should not need this here
 module PoolParty
 
   module Remote    
     # This class is the base class for all remote types, such as ec2
     # Everything remoting-wise is derived from this class
@@ -27,11 +26,12 @@
       include           ::PoolParty::Remote
       include           ::PoolParty::Pinger
       
       dsl_methods :cloud,                # The cloud this remoter_base is a part of
                   :keypair,
-                  :image_id
+                  :image_id,
+                  :keypair_name
         
       def initialize(opts={}, &block)
         opts.each {|k,v| opts[k] = v.call if v.respond_to?(:call) }
         set_vars_from_options opts
         instance_eval &block if block
@@ -183,9 +183,17 @@
       end
       
       # Before shutdown callback
       # This is called before the cloud is contracted
       def before_shutdown
+      end
+      
+      def to_s
+        self.class.name
+      end
+      
+      def to_hash
+        dsl_options
       end
       
     end
     
   end
\ No newline at end of file