auser-poolparty 1.2.7 → 1.2.8

data/README.txt

@@ -44,7 +44,7 @@ sudo gem install auser-poolparty
 
 (The MIT License)
 
-Copyright (c) 2008 Ari Lerner
+Copyright (c) 2008 Ari Lerner, CloudTeam
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 7
+:patch: 8
 :major: 1

data/bin/cloud-configure

@@ -25,7 +25,7 @@ EOS
           puts "No nodes to bootstrap"
         else
           if command[:inst_num]
-            vputs "\nConfiguring: #{nodes[o.inst_num]}\n--------------------"
+            vputs "\nConfiguring: #{cld.nodes[o.inst_num]}\n--------------------"
             address = cld.nodes(:status => "running")[ command[:inst_num] ]
             ::PoolParty::Provision::DrConfigure.new( address[:ip], :cloud => cld )
           else

data/bin/cloud-contract

@@ -17,7 +17,7 @@ EOS
   run do |command|    
     @loaded_clouds.each do |cld|
 
-      puts header("Contracting cloud #{cld.name}")
+      puts "Contracting cloud #{cld.name}"
       puts "#{cld.nodes(:status => "running").size} running instances (#{cld.minimum_instances} minimum instances)"
       puts testing ? "Not contracting (test mode)" : "Contracting the cloud if possible"
       

data/bin/cloud-expand

@@ -17,7 +17,7 @@ EOS
   run do |command|    
     @loaded_clouds.each do |cld|
 
-        vputs header("Expanding cloud #{cld.name}")
+        vputs "Expanding cloud #{cld.name}"
         vputs "#{cld.nodes(:status => "running").size} running instances of #{cld.maximum_instances} possible instances"
         vputs testing ? "Not expanding (test mode)" : "Expanding the cloud"
         

data/bin/cloud-list

@@ -23,12 +23,12 @@ EOS
         require 'pp'
         pp result = cld.describe_instance(:instance_id=>command[:instance_id])
       else
-        puts header("Listing cloud #{cld.name}")
-        puts subheader("Active instances")
+        puts "Listing cloud #{cld.name}"
+        puts "Active instances"
         puts cld.nodes(:status => "running").map{|a| "#{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" }.join("\n")
 
         if cld.nodes(:status => "pending").size > 0
-          puts subheader("Pending instances")
+          puts "Pending instances"
           puts cld.nodes(:status => "pending").map{|a| "#{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" }.join("\n")
         end
       end

data/bin/cloud-ssh

@@ -13,7 +13,7 @@ Usage: #{$0} #{all_options_string}
 EOS
 
   short_desc "ssh into an instance of the cloud"
-  opt :inst_num, "The number of the instance to run bootstrap on", :type => :int
+  opt :inst_num, "The number of the instance to ssh to, starts at 0.", :type => :int
   
   run do |command|    
     @cloud = @loaded_clouds.first

data/bin/cloud-start

@@ -19,7 +19,7 @@ EOS
     @loaded_clouds.each do |cld|
 
       if cld.nodes(:status => "running").size.zero?
-        puts header("Starting cloud #{cld.name} (#{cld.keypair})")
+        puts "Starting cloud #{cld.name} (#{cld.keypair})"
         puts "#{cld.nodes(:status => "running").size} running instances (#{cld.minimum_instances} - #{cld.maximum_instances})"
         
         cld.launch_instance!(:cloud_name => cld.name) do |node|

data/bin/server-cloud-elections

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
-require "poolparty/lite"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
@@ -10,28 +9,23 @@ end
 
 vote_for = o.unflagged_args.shift || "none"
 
-schema = ::PoolParty.load_cloud_from_json(o.unflagged_args.shift)  #TODO: smarter option parser
-remote_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
+cld = ::PoolParty::Cloud::Cloud.load_from_json(ENV['CLOUDS_JSON_FILE'] || '/etc/poolparty/clouds.json')  #TODO: smarter option parser
 
-o.loaded_clouds.each do |cld|
-  cld.update_from_schema(schema)
-  case vote_for
-  when "expand"
-    puts "Launching new instance"
-    `rm /etc/poolparty/neighborhood.json`
-    cld.send :launch_instance!, schema.options.merge(:cloud_name => cld.name) do |node|
-      dputs "Started node at #{node[:ip]}"
-      ::PoolParty::Provision::BootStrapper.new( node[:ip], :cloud => cld )
-      ::PoolParty::Provision::DrConfigure.new( node[:ip], :cloud => cld )
-    end  
-  
-  when "contract"
-    `rm /etc/poolparty/neighborhood.json`
-    last_instance_id = %x[server-list-active instance_id].split("\t").last
-    remote_base.terminate_instance! schema.options.merge(:instance_id => last_instance_id)    
-  else
-    puts "Unknown action: #{vote_for}"
-    remote_base.describe_instances
-  end
+case vote_for
+when "expand"
+  puts "Launching new instance"
+  cld.launch_instance! do |node|
+    dputs "Started node at #{node[:ip]}"
+    ::PoolParty::Provision::BootStrapper.new( node[:ip], :cloud => cld )
+    ::PoolParty::Provision::DrConfigure.new( node[:ip], :cloud => cld )
+  end  
 
+when "contract"
+  last_instance_id = %x[server-list-active instance_id].split("\t").last
+  cloud.terminate_instance!(:instance_id => last_instance_id)
+when 'none'
+  nil
+else
+  puts "Unknown action: #{vote_for}"
 end
+

data/bin/server-list-active

@@ -1,24 +1,32 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require "poolparty/lite"
-require "poolparty/core/array"
+# require "poolparty/lite"
+# require "poolparty/core/array"
+require 'poolparty'
 
 list_type = ARGV.shift || "ip"
 
-json_file = ARGV[0] || PoolParty::Default.properties_hash_file
+json_file = ARGV[0] || ENV['CLOUD_JSON_FILE'] || PoolParty::Default.properties_hash_file
 raise "ERROR: no json_file given" if !json_file
-schema = PoolParty::Schema.new( ::File.read(json_file) )
 
-inst_array = PoolParty::Neighborhoods.load_default.instances
+cld = Cloud.load_from_json(::File.read(json_file))
+conditions= {:status=>'running', :keypair=>cld.keypair_name}
+inst_array = cld.remote_base.describe_instances.select_with_hash(conditions)
+puts inst_array.collect{|n| n[list_type] || n[list_type.to_sym]}.join("\t")
 
-if !inst_array || inst_array.empty?
-  remote_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
-  instances = remote_base.send :describe_instances, schema.options
-  inst_array = instances.map {|inst| inst.send list_type.to_sym }.compact
-  if ['ip', 'public_id', 'internal_ip'].include? list_type
-    inst_array.delete_if{|n| !n.match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/) }
-  end
-  print inst_array.compact.join("\t")
-else
-  print inst_array.map {|inst| inst.send list_type.to_sym }.compact.join("\t")
-end
+
+# schema = PoolParty::Schema.new( ::File.read(json_file) )
+# 
+# inst_array = nil #PoolParty::Neighborhoods.load_default.instances
+# 
+# if !inst_array || inst_array.empty?
+#   remote_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
+#   instances = remote_base.send :describe_instances, schema.options.keypair_name
+#   inst_array = instances.map {|inst| inst.send list_type.to_sym }.compact
+#   if ['ip', 'public_id', 'internal_ip'].include? list_type
+#     inst_array.delete_if{|n| !n.match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/) }
+#   end
+#   print inst_array.compact.join("\t")
+# else
+#   print inst_array.map {|inst| inst.send list_type.to_sym }.compact.join("\t")
+# end

data/bin/server-manage-election

@@ -1,29 +1,23 @@
 #!/usr/bin/env ruby
-# Call server-list-active and get the neighborhood ips back
-# then call each of those at the port of butterfly and retain the json
-# From there, mash it up together and call server-handle-election
-# to handle the election process
-
-# Error codes
-# 1 -> clouds.json was not loaded
-# 2 -> server-list-active didn't run
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "rubygems"
 require 'net/http'
 require 'json'
-require "poolparty/lite"
+#require "poolparty/lite"
+require 'poolparty'
 
 status = ARGV.shift || "running" # or pending or terminated
-schema = ::PoolParty.load_cloud_from_json(ARGV.shift)  #TODO: smarter option parser
+schema = ::PoolParty::Cloud::Cloud.load_from_json(ENV['CLOUDS_JSON_FILE'] || '/etc/poolparty/clouds.json')
 
 def get_json_stats_from(ip, port)
-  Net::HTTP.start(ip, port) {|http| http.get('/stats.json') }.body rescue "{}"
+  Net::HTTP.start(ip, port) {|http| http.get('/stats') }.body rescue "{}"
 end
- 
-ips = %x[server-list-active internal_ip].split("\t")
 
-minimum_instances = schema.options.minimum_instances
-maximum_instances = schema.options.maximum_instances
+#ips = %x[server-list-active internal_ip].split("\t")
+ips = schema.describe_instances.select_with_hash(:status=>'running').collect{|n| n.ip} #TODO: needs to filter to only this cloud
+
+minimum_instances = schema.dsl_options.minimum_instances
+maximum_instances = schema.dsl_options.maximum_instances
 
 if ips.size < minimum_instances
   puts "Cloud is too small, need to expand"
@@ -31,7 +25,7 @@ if ips.size < minimum_instances
   exit(0)
 elsif ips.size > maximum_instances
   puts "Cloud is too big, need to contract"
- %x[n/server-cloud-elections contract]
+ %x[server-cloud-elections contract]
   exit(0)
 end
 
@@ -49,17 +43,15 @@ candidates.each do |action, ballots|
   end
 end
 
-puts total_json_hash.inspect
-puts candidates.inspect
-
 # Expand the cloud if 50+% of the votes are for expansion
 # Contract the cloud if 51+% of the votes are for contraction
 @elected_action = candidates[:elected_action] || "none"
+puts "checking nominations"
 if (candidates[:expand] - candidates[:contract])/total_json_hash.size > 0.5
-  %x[/usr/bin/server-cloud-elections expand] unless @elected_action == "expand"
+  %x[server-cloud-elections expand] unless @elected_action == "expand"
   @elected_action = "expand"
 elsif (candidates[:contract] - candidates[:expand])/total_json_hash.size > 0.5
-  %x[/usr/bin/server-cloud-elections contract] unless @elected_action == "contract"
+  %x[server-cloud-elections contract] unless @elected_action == "contract"
   @elected_action = "contract"
 end      
 

data/bin/server-show-stats

@@ -10,7 +10,7 @@ end
 o.loaded_clouds.each do |cloud|
   
   with_cloud(cloud) do    
-    puts header("Stats")
+    puts "Stats"
     puts rules_values
   end  
   

data/examples/metavirt_cloud.rb

@@ -1,18 +1,22 @@
-require File.dirname(__FILE__)+"/../lib/poolparty"
+require 'rubygems'
+$:.unshift File.dirname(__FILE__)+'/../lib/'
+require "poolparty"
 
-pool :poolparty do
+pool :multiverse do
   
-  cloud :metavirt do
+  cloud :vv do
     keypair "front"
-    instances 1
+    instances 2
+    has_file "/etc/motd", :content => "Welcome to your poolparty instance!"
     using :metavirt do
+      server_config({:host=>"172.16.68.1", :port=>3000})
       authorized_keys 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTppECfx7Tb0zoviRfqFaePyAek6+ZktKkHiTHu/jkhG1s4q1oHEe89no21xLxuReyJrDlNe8rLxxZzoYCaAWRdhcqMR3BNqb2w2jpF4pH+bFj0557KrwWP6HSNpRRkyYhxLqZbuH/2t3TzkPevZbcfSYa09jIzqnmTruh9l1s+n5E3cNr/RDdDn7tv3Ok7mKN7GEjkK7F83Pt9xviHevg22xqzm99nS+hg6Kl/fQUTO6pOmC5x+9V47RJz1+9WdhGJ7M83zijX9rMnAwrR5LFoL6aZyyU0G71SpoIL5e8XD/jt1WNKFJOfG8YMLb3i03UABm/Q5Q30+R7UoRxSWRX'
-      server_config = {:host=>'localhost', :port=>3000}
       using :vmrun do
+        # vmx_files Dir[::File.expand_path("~/Documents/Virtual Machines.localized/metavirts/*/*.vmx")]
         vmx_files [
-          ::File.expand_path("~/Documents/Virtual\ Machines.localized/Ubuntu-jaunty.vmwarevm/Ubuntu-jaunty.vmx")
-        ]
-        puts "i am in the vmrun block"
+          "/Users/mfairchild/Documents/Virtual\ Machines.localized/Ubuntu-jaunty.vmwarevm/Ubuntu-jaunty.vmx",
+          "/Users/mfairchild/Documents/Virtual\ Machines.localized/metavirts/Ubuntu32bitVM copy.vmwarevm/Ubuntu32bitVM.vmx"
+          ]
       end
     end
   end

data/examples/vmrun_cloud.rb

@@ -0,0 +1,20 @@
+require 'rubygems'
+$:.unshift File.dirname(__FILE__)+'/../lib/'
+require "poolparty"
+
+pool :multiverse do
+  
+  cloud :vv do
+    keypair "front"
+    instances 2
+    has_file "/etc/motd", :content => "Welcome to your poolparty instance!"
+    using :vmrun do
+      vmx_files [
+        "/Users/mfairchild/Documents/Virtual\ Machines.localized/Ubuntu-jaunty.vmwarevm/Ubuntu-jaunty.vmx",
+        "/Users/mfairchild/Documents/Virtual\ Machines.localized/metavirts/Ubuntu32bitVM copy.vmwarevm/Ubuntu32bitVM.vmx"
+        ]
+    end
+  end
+  
+end
+

data/lib/poolparty/core/proc.rb

@@ -1,7 +0,0 @@
-require 'ruby2ruby' 
-
-class Proc
-  def to_ruby(opts={})
-    Ruby2Ruby.new.process(self.to_sexp).gsub(/proc \{/, "do \n#{opts.map {|k,v| "#{k} \"#{v}\""}.join("\n")}\n").sub(/\}/, "\nend")
-  end
-end

data/lib/poolparty/dependency_resolver/chef_resolver.rb

@@ -20,7 +20,7 @@
 =end
 module PoolParty
   
-  class ChefResolver< DependencyResolver
+  class ChefResolver < DependencyResolver
     
     # Compile and add to the zipper
     def compile(props=@properties_hash, tabs=0, default_namespace="poolparty")

data/lib/poolparty/dependency_resolver/puppet.rb

@@ -30,7 +30,6 @@ module PoolParty
         
         returning Array.new do |output|
           unless cancelled?
-            output << @prestring || ""
 
             if resources && !resources.empty? 
               output << resources_string_from_resources(resources, pre)

data/lib/poolparty/helpers/console.rb

@@ -1,10 +1,5 @@
-require File.dirname(__FILE__) + "/display"
-
 module PoolParty
   module Console
-    
-    include Display
-    
     # Print help commands for the console
     # level 0 - Basic help
     # level 1 - Commands

data/lib/poolparty/modules/callbacks.rb

@@ -22,6 +22,13 @@ module PoolParty
       end
       
       # Callbacks on bootstrap and configuration
+      # Defines the callback accessors:
+      #   call_before/after_bootstrap/configure_callbacks
+      # 
+      # When called, this method will first check to see if there 
+      # are plugins and call those plugin's callbacks when called
+      # The method (before/after_bootstrap/configure) is called
+      # on self if the callback method is defined on self
       def setup_callbacks
         defined_callbacks.each do |meth|
           unless respond_to?("call_#{meth}_callbacks".to_sym)

data/lib/poolparty/modules/cloud_dsl.rb

@@ -11,12 +11,6 @@ module PoolParty
     #   has_directory(:name => loc)
     # end
     
-    def set_dependency_resolver(name='chef')
-      klass = name.preserved_class_constant("Resolver")
-      raise DependencyResolverException.new("Unknown resolver") unless klass
-      self.dependency_resolver = klass unless dsl_options[:dependency_resolver]
-    end
-    
     # Enable a service package
     def enable(*services)
       services.each do |service|

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -59,35 +59,53 @@ module PoolParty
     # Check to make sure the available_bases is available, otherwise raise
     # Give access to the cloud the remote_base and instantiate a new
     # instance of the remote base
-    def using(t, &block)
+    def using(t, o={}, &block)
       return self.send(t) if self.respond_to?(t)
-      if self.class.available_bases.include?(t.to_sym)
+      if ::PoolParty::Remote::RemoterBase.available_bases.include?(t.to_sym)
         klass_string = "#{t}".classify
         remote_base_klass = "::PoolParty::Remote::#{klass_string}".constantize      
         set_default_options(remote_base_klass.default_options)
-        self.remote_base = remote_base_klass.send(:new, dsl_options, &block)
-        self.remoter_base t.to_sym        
-        instance_eval "def #{t};remote_base;end"
+
+        @remote_base = remote_base_klass.send(:new, o.merge(:cloud=>self), &block)
+        self.remoter_base t.to_sym
+        instance_eval "def #{t};@remote_base;end"
+        
+        # instance_eval "def launch_new_instance!(o={}); remote_base.launch_new_instance!;end"
+        # instance_eval "def terminate_instance!(o={}); remote_base.terminate_instance!(o);end"
+        # instance_eval "def describe_instances(o={}); remote_base.describe_instances;end"
+        # instance_eval "def describe_instance(o={}); remote_base.describe_instance(o);end"
       else
         raise "Unknown remote base: #{t}"
       end
     end
-    
-    def update_from_schema(schema)
-      self.dsl_options.merge! schema.options.to_hash
-      self.dependency_resolver = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
-      keypair schema.options.keypair_name
-      remote_base_class = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
-      self.remote_base = remote_base_class.new  schema.options.remote_base.to_hash
-      
-      # self.keypair = PoolParty::Key.new schema.options.keypair.basename
-      # keypair = schema.options.delete(:keypairs).map {|a| PoolParty::Key.new(a.basename) }
-      # options.merge! schema.options.to_hash
-      # dsl_options[:keypairs] = keypairs
-      # 
-      # dsl_options[:dependency_resolver] = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
-      
+
+    def dependency_resolver(name=nil)
+      if !name.nil?
+        ext = name=~/Resolver$/  ? nil : 'Resolver'
+        klass = ::PoolParty.module_eval("#{name.camelcase}#{ext}")
+        raise DependencyResolverException.new("Unknown resolver") unless klass
+        dsl_options[:dependency_resolver] = "#{name.camelcase}#{ext}"
+        @dependency_resolver = klass
+      else
+        @dependency_resolver
+      end
     end
+        
+    # def update_from_schema(schema)
+    #   self.dsl_options.merge! schema.options.to_hash
+    #   self.dependency_resolver = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
+    #   keypair schema.options.keypair_name
+    #   remote_base_class = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
+    #   self.remote_base = remote_base_class.new  schema.options.remote_base.to_hash
+    #   
+    #   # self.keypair = PoolParty::Key.new schema.options.keypair.basename
+    #   # keypair = schema.options.delete(:keypairs).map {|a| PoolParty::Key.new(a.basename) }
+    #   # options.merge! schema.options.to_hash
+    #   # dsl_options[:keypairs] = keypairs
+    #   # 
+    #   # dsl_options[:dependency_resolver] = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
+    #   
+    # end
     
   end
 end

data/lib/poolparty/modules/searchable_paths.rb

@@ -73,8 +73,12 @@ module PoolParty
       # in the searchable_paths.
       # 
       # Returns +nil+ if the file cannot be found.
-      def search_in_known_locations(filepath)
+      def search_in_known_locations(filepath, additional_search_paths=[])
         return filepath if ::File.exists?(filepath) # return the file if its an absolute path
+        additional_search_paths.each do |path|
+          full_path = ::File.expand_path(path / filepath)
+          return full_path if ::File.exists?(full_path)
+        end
         self.class.searchable_paths.each do |path|
           self.class.searchable_paths_dirs.each do |dir|
             full_path = ::File.expand_path(path / dir / filepath)

data/lib/poolparty/net/init.rb

@@ -1,10 +1,23 @@
+class Object
+  #TODO: deprecate. use RemoterBase.available_bases instead
+  def remote_bases
+    $remote_bases ||= []
+  end
+end
+
 # Load the core net libraries.  These are neccessary for any of the remoter_bases to function.
-%w(remote_instance remote_bases remoter_base).each do |file|
+%w(remote_instance remoter_base).each do |file|
   require File.join(::File.dirname(__FILE__),file+'.rb')
 end
+# 
+# # Register available remoter_bases
+# Dir["#{::File.dirname(__FILE__)}/remoter_bases/*/*.rb"].each do |base| 
+#   name = File.join(::File.basename(base, ::File.extname(base)))
+#   require base
+# end
+
 
-# Register available remoter_bases
-Dir["#{::File.dirname(__FILE__)}/remoter_bases/*/*.rb"].each do |base| 
-  name = File.join(::File.basename(base, ::File.extname(base)))
+Dir["#{::File.dirname(__FILE__)}/remoter_bases/*/*.rb"].each do |base|
+  name = ::File.basename(base, ::File.extname(base))
   require base
 end

data/lib/poolparty/net/remoter/interactive.rb

@@ -12,7 +12,7 @@ module PoolParty
     def list_of_instances(with_neighborhood_default=true)
       return @list_of_instances if @list_of_instances
       @containing_cloud = self
-      n = with_neighborhood_default ? Neighborhoods.load_default : nil
+      n = false ? Neighborhoods.load_default : nil
       @list_of_instances = ((n.nil? || n.instances.empty?) ? _list_of_instances : n.instances)
     end
 

data/lib/poolparty/net/remoter_base.rb

@@ -26,8 +26,7 @@ module PoolParty
       include           ::PoolParty::Remote
       include           ::PoolParty::Pinger
       
-      dsl_methods :cloud,                # The cloud this remoter_base is a part of
-                  :keypair,
+      dsl_methods :keypair,
                   :image_id,
                   :keypair_name
         
@@ -37,6 +36,14 @@ module PoolParty
         instance_eval &block if block
       end
       
+      def cloud(n=nil)
+        if n.nil?
+          @cloud
+        else
+          @cloud = n
+        end
+      end
+      
       # def evaluate_proc_options(opts)
       #   if opts.respond_to?(:call)
       #     opts.call
@@ -50,8 +57,12 @@ module PoolParty
       #   opts
       # end
       
+      def self.available_bases
+        @available_bases ||= []        
+      end
       def self.inherited(arg)
         base_name = "#{arg}".downcase.top_level_class.to_sym
+        (available_bases << base_name) unless available_bases.include?(base_name)
         (remote_bases << base_name) unless remote_bases.include?(base_name)
       end
 
@@ -105,11 +116,11 @@ module PoolParty
       # TODO: Rename and modularize the @inst.status =~ /pending/ so that it works on all 
       # remoter_bases
       def launch_instance!(o={}, &block)
-        @cloud = clouds[o[:cloud_name]]
+        @cloud = clouds[o[:cloud_name] || o[:name]]
         @inst = launch_new_instance!( dsl_options.merge(o) )
         sleep(2)
         
-        @cloud.dputs "#{@cloud.name} launched instance checking for ip..."
+        dputs "#{@cloud.name} launched instance checking for ip..."
         
         # Wait for 10 minutes for the instance to gain an ip if it doesn't already have one
         500.times do |i|
@@ -118,10 +129,10 @@ module PoolParty
             break if @inst[:public_ip] && @inst[:public_ip] =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/            
             sleep(2)
             @inst = describe_instance(@inst)
-            @cloud.dprint "."
+            dprint "."
           else
             @inst = describe_instances.last
-            @cloud.dprint "."
+            dprint "."
           end
         end        
         dputs "Found an ip"
@@ -130,9 +141,9 @@ module PoolParty
         
         # Try for 10 minutes to pint port 22 
         500.times do |i|
-          @cloud.dprint "."
+          dprint "."
           if ping_port(@inst[:ip], 22)
-            @cloud.dputs ""
+            dputs ""
             @cloud.started_instance = @inst
             
             @cloud.call_after_launch_instance_callbacks(@inst)
@@ -153,6 +164,16 @@ module PoolParty
       def after_launch_instance(instance=nil)
         puts "after_launch_instance in remoter_base"
       end
+      
+      def remoter_base_options(n=nil)
+        if n.nil?
+          dsl_options[:remoter_base_options]
+        else
+          dsl_options[:remoter_base_options] = remote_base.dsl_options.choose do |k,v|
+            v && (v.respond_to?(:empty) ? !v.empty?: true)
+          end
+        end
+      end
 
       #TODO: Remove
       # def self.when_instance_is_responding(inst, &block)
@@ -165,17 +186,17 @@ module PoolParty
       # def when_instance_is_responding(inst, &block);self.class.when_instance_is_responding;end
       
       # TODO: BAD FORM, already defined in connections.rb. Fix this, ASAP
-      def self.ping_port(host, port=22, retry_times=400)
-        connected = false
-        retry_times.times do |i|
-          begin
-            break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
-          rescue Exception => e
-            sleep(2)
-          end
-        end
-        connected
-      end
+      # def self.ping_port(host, port=22, retry_times=400)
+      #   connected = false
+      #   retry_times.times do |i|
+      #     begin
+      #       break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
+      #     rescue Exception => e
+      #       sleep(2)
+      #     end
+      #   end
+      #   connected
+      # end
       
       # After launch callback
       # This is called after a new instance is launched