auser-poolparty 0.2.44 → 0.2.45

data/bin/pool

@@ -3,19 +3,18 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-# Get the git-style program action
-# o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-#   opts.on('-n [name]','--name [name]', 'Binary to run')    { |o| optioner.name o }
-# end
+name = ARGV.select {|arg| arg if Binary.available_binaries_for("pool").include?(arg) }.first
+# If the options include -h and they don't include a valid command, then we can just pass the 
+# original options back, but if they do contain a binary, we don't want -h getting through to 
+# these options, so we'll strip it if it's included
+DUP_ARG = ARGV.dup
+new_args = DUP_ARG.reject {|arg| Binary.available_binaries_for("pool").include?(arg) }.empty? ? ARGV : (name ? (DUP_ARG.delete("-h"); DUP_ARG) : DUP_ARG)
 
-name = ARGV.shift
+# Let's make sure if no command is passed in that we show the help message
+new_args.push("-h") unless name
 
-# If there was no program action given
-if !name || name == "-h" || name == "--help"
-  puts "Usage: pool <specfile> <action> <options>"
-  puts "Pool actions:"
-  puts Binary.list_binaries_for("pool")
-  exit
+o = PoolParty::Optioner.new(new_args, {:extra_help => "\nPool actions\n#{Binary.list_binaries_for("pool")}\n\n", :abstract => true}) do |opts, optioner|  
+  opts.on('-n poolname', '--name name', 'Address this pool')    { |c| optioner.poolname c }
 end
 
 program_name = "#{File.basename($0)}-#{name}"
@@ -27,5 +26,5 @@ command_line = "#{program_location}"
 if Binary.available_binaries_for("pool").include?(name)
   system command_line, *ARGV
 else
-  puts "Unknown poolparty binary: #{program_name}"
+  puts "Unknown poolparty binary: #{name}"
 end

data/bin/pool-describe

@@ -4,6 +4,5 @@ require "poolparty"
 require "poolpartycl"
 
 o = PoolParty::Optioner.new(ARGV)
-load_pool(o.spec || Binary.get_existing_spec_location)
 
 puts pool_describe

data/bin/pool-list

@@ -2,22 +2,16 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-f [remote|local]', '--from [remote|local]', 'Remote or local (default: local)')    { |o| optioner.location o }
   opts.on('-r', '--remote', 'Remote listing')    { optioner.location "remote" }
   opts.on('-l', '--local', 'Local listing')    { optioner.location "local" }
   opts.on('-n name', '--name name', 'Listing for pool name')    { |p| optioner.poolname p }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@location = o.location ? o.location : "remote"
-
-include Remote
-
-@pools = o.poolname ? [pool(o.poolname.downcase.to_sym)] : pools
 
-@pools.each do |name, pool|
-  with_pool(pool, {:location => @location}) do
+o.loaded_pools.each do |pool|
+  with_pool(pool) do
     puts header("Listing pool #{name}")
     clouds.each do |name, cloud|
       puts subheader("Cloud: #{name}")

data/bin/pool-start

@@ -2,21 +2,14 @@
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
+
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|  
   opts.on('-p poolname', '--pool name', 'Start pool by this name')    { |p| optioner.poolname p }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-@testing = o.testing
-
-include Remote
-
-@pools = o.poolname ? [pool(o.poolname.downcase.to_sym)] : pools
-
-@pools.each do |name, pl|
+o.loaded_pools.each do |pl|
   
-  with_pool(pl, {:testing => @testing}) do
+  with_pool(pl) do
     
     puts header("Starting pool")
     clouds.each do |name, cloud|

data/generators/poolspec/USAGE

@@ -1,5 +1,5 @@
 Description:
-  
+  Create a basic pool.spec template
   
 Usage:
-  
+  pool spec [name]

data/generators/poolspec/poolspec_generator.rb

@@ -21,7 +21,7 @@ class PoolspecGenerator < RubiGen::Base
       m.directory ''
       BASEDIRS.each { |path| m.directory path }
       
-      m.template "pool_spec_template.erb", "#{@name}.rb"
+      m.template "pool_spec_template.erb", "pool.spec"
       # Create stubs
       # m.template "template.rb",  "some_file_after_erb.rb"
       # m.template_copy_each ["template.rb", "template2.rb"]
@@ -61,5 +61,6 @@ EOS
     # Installation skeleton.  Intermediate directories are automatically
     # created so don't sweat their absence here.
     BASEDIRS = %w(
+      plugins
     )
 end

data/generators/poolspec/templates/pool_spec_template.erb

@@ -1,9 +1,10 @@
 # Basic poolparty template
 
 pool :<%= name -%> do
-
-  cloud :app do
+  plugin_directory "#{File.dirname(__FILE__)}/plugins"
   
+  cloud :app do
+    instances 2..5
   end
 
 end

data/lib/erlang/messenger/useful_snippets

@@ -6,10 +6,10 @@
 % erl -pa ./ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -setcookie poolparty -boot pm_node_rel-0.1 -sname node1
 
 % Starting the client on the master
-% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.42/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
+% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.44/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start
 
 % Get the load
-% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.42/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start -run pm_client get_load cpu -run erlang init stop
+% erl -pa /var/lib/gems/1.8/gems/poolparty-0.2.44/lib/erlang/messenger/ebin -kernel inet_dist_listen_min 7000 inet_dist_listen_max 7050 -sname client -setcookie poolparty -run pm_client start -run pm_client get_load cpu -run erlang init stop
 
 % cd /var/poolparty && gem uninstall poolparty && wget http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty-latest.gem?raw=true -O poolparty-latest.gem 2>&1 && gem install --no-ri --no-rdoc poolparty-latest.gem
 

data/lib/poolparty/aska/aska.rb

@@ -54,7 +54,7 @@ module Aska
     def valid_rules?(name=:rules)
       self.class.look_up_rules(name).reject {|rule| valid_rule?(rule) }.empty?
     end
-    def __aska_aska_stuff(m)
+    def __aska_send_value(m)
       if respond_to?(m.to_sym)
         self.send(m.to_sym)
       else
@@ -63,9 +63,8 @@ module Aska
     end
     def valid_rule?(rule)
       rule.each do |key,value|
-        begin
-          # puts "#{aska(key)} #{value[0].to_sym} #{get_var(value[1])} (#{attr_accessor?(value[1])})"
-          return __aska_aska_stuff(key).send(value[0].to_sym, __aska_get_var(value[1]))
+        begin          
+          return __aska_send_value(key).send(value[0].to_sym, __aska_get_var(value[1]))
         rescue Exception => e
           return false
         end
@@ -74,10 +73,10 @@ module Aska
     def rules_values
       returning Array.new do |arr|
         self.class.defined_rules.each do |name,rule_array|
-          arr << "#{name} : #{valid_rule?(rule_array)}"
+          arr << "#{name} : #{valid_rules?(name.to_sym)}"
           rule_array.each do |rule|
             rule.map do |k,v|
-              arr << "  #{k} -> #{__aska_aska_stuff(k)} (#{v[0]} #{v[1]})"
+              arr << "  #{k} -> #{__aska_send_value(k)} (#{v[0]} #{v[1]})"
             end
           end
         end

data/lib/poolparty/base_packages/haproxy.rb

@@ -12,7 +12,7 @@ module PoolParty
           end
           
           # Template variables
-          has_variable(:name => "name_haproxy", :value => "#{cloud.name}")          
+          has_variable(:name => "name_haproxy", :value => "#{cloud.name}")
           has_variable(:name => "nodenames_haproxy", :value => "generate('/usr/bin/env', '/var/lib/gems/1.8/bin/server-list-active', '-c', 'name')")
           has_variable(:name => "node_ips_haproxy",  :value => "generate('/usr/bin/env', '/var/lib/gems/1.8/bin/server-list-active', '-c', 'ip')")
           
@@ -34,7 +34,7 @@ module PoolParty
           has_remotefile(:name => "/etc/haproxy.cfg") do
             mode 644
             requires get_package("haproxy")
-            notify get_exec("reloadhaproxy")
+            notify get_service("haproxy")
             template File.join(File.dirname(__FILE__), "..", "templates/haproxy.conf")
           end
         end

data/lib/poolparty/core/string.rb

@@ -25,7 +25,7 @@ class String
     self.split("::")[-1].downcase rescue self
   end
   def sanitize
-    self.gsub(/[ \.\/]*/, '')
+    self.gsub(/[ \.\/\-]*/, '')
   end
   def nice_runnable(quite=true)
     self.split(/ && /).join("\n")

data/lib/poolparty/exceptions/CloudNotFoundException.rb

@@ -0,0 +1,7 @@
+class CloudNotFoundException < Exception
+  attr_reader :message
+  
+  def initialize(msg="Cloud not found")
+    @message = "Cloud not found: #{msg}"
+  end
+end

data/lib/poolparty/helpers/binary.rb

@@ -21,7 +21,7 @@ module PoolParty
             "#{Base.default_specfile_name}",
             "#{Base.storage_directory}/#{Base.default_specfile_name}",            
         ].reject {|a| a.nil?}.reject do |f|
-          f unless ::File.file?(f)
+          f unless ::File.readable?(f)
         end.first
       end
       

data/lib/poolparty/helpers/optioner.rb

@@ -1,4 +1,6 @@
 require 'optparse' 
+require "poolparty"
+require "poolpartycl"
 require 'rdoc/usage'
 require 'ostruct'
 require 'date'
@@ -11,9 +13,12 @@ module PoolParty
     def initialize(args=[], opts={}, &block)
       @arguments = parse_args(args)
       @parse_options = opts[:parse_options] ? opts[:parse_options] : true
+      @extra_help = opts.has_key?(:extra_help) ? opts[:extra_help] : ""
+      @abstract = opts[:abstract] ? opts[:abstract] : false
+      @command = opts[:command] ? opts[:command] : false
       
-      set_default_options
       parse_options(&block) if @parse_options
+      set_default_options
       self
     end
     
@@ -26,38 +31,55 @@ module PoolParty
     end
     
     def set_default_options
-      @options = {}
-      @options[:verbose] = false
-      @options[:quiet] = false
-      @options[:version] = PoolParty::VERSION::STRING
+      self.verbose false
+      self.quiet false
+      self.version PoolParty::VERSION::STRING
     end
     
     def parse_options(&blk)
+      progname = $0.include?("-") ? "#{::File.basename($0[/(\w+)-/, 1])} #{::File.basename($0[/-(.*)/, 1])}" : ::File.basename($0)
       opts = OptionParser.new 
-      opts.banner = "Usage: pool [command] [options]"
+      opts.banner = "Usage: #{progname} #{@abstract ? "[command] " : ""}[options]"
 
       opts.separator ""
       opts.separator "Options:"
       
       opts.on('-V', '--version', 'Display the version')    { output_version ; exit 0 }
-      opts.on('-v', '--verbose', 'Be verbose')    { @options[:verbose] = true }  
+      opts.on('-v', '--verbose', 'Be verbose')    { self.verbose true }  
       opts.on('-s [file]', '--spec-file [file]', 'Set the spec file')      { |file| self.spec file }
       opts.on('-t', '--test', 'Testing mode')    { self.testing true }
                   
       blk.call(opts, self) if blk
       
-      opts.on_tail("-h", "--help", "Show this message") do
-        puts opts
-        exit
+      unless @abstract
+        opts.on_tail("-h", "--help", "Show this message") do
+          puts opts
+          puts @extra_help
+          exit
+        end
       end
       
       opts.parse(@arguments.dup)
       
-      process_options      
+      process_options
       output_options if verbose
+      self.loaded_pool load_pool(self.spec || Binary.get_existing_spec_location)
+      
+      self.loaded_clouds extract_cloud_from_options(self)
+      self.loaded_pools extract_pool_from_options(self)
+      
+      reject_junk_options!
+      raise CloudNotFoundException.new("Please specify your cloud with -s, move it to ./pool.spec or in your POOL_SPEC environment variable") unless loaded_clouds && !loaded_clouds.empty?
+      loaded_clouds.each do |cl|
+        cl.configure(self.options)
+      end
+    end
+    def reject_junk_options!
+      %w(loaded_pool cloudname).each do |opt|
+        @options.delete(opt.to_sym)
+      end
     end
     def process_options
-      @options[:verbose] = false if @options[:quiet]
     end
         
     def output_version

data/lib/poolparty/modules/cloud_dsl.rb

@@ -0,0 +1,13 @@
+module PoolParty
+  module CloudDsl
+    
+    def mount_ebs_volume_at(id="", loc="/data")
+      ebs_volume_id id
+      ebs_volume_mount_point loc
+      ebs_volume_device "/dev/#{id.sanitize}"
+      has_directory(:name => loc)
+      has_mount(:name => loc, :device => ebs_volume_device)
+    end
+    
+  end
+end

data/lib/poolparty/net/messenger.rb

@@ -16,7 +16,7 @@ module PoolParty
     end
     
     def self.messenger_send!(cmd="", testing=false)
-      command = Messenger.erl_command("client#{Time.now.to_i}", "-s pm_client -run pm_client #{cmd} -s erlang halt -noshell")
+      command = Messenger.erl_command("client#{Time.now.to_i}", "-hidden -s pm_client -run pm_client #{cmd} -s erlang halt -noshell")
       testing ? command : %x[#{command}]
     end
     

data/lib/poolparty/net/remote_bases/ec2.rb

@@ -1,160 +1,177 @@
-require 'rubygems'
-require 'EC2'
-
-class String
-  def convert_from_ec2_to_ip
-    self.gsub(/.compute-1.amazonaws.com*/, '').gsub(/ec2-/, '').gsub(/-/, '.')
+begin
+  require 'EC2'
+  class String
+    def convert_from_ec2_to_ip
+      self.gsub(/.compute-1.amazonaws.com*/, '').gsub(/ec2-/, '').gsub(/-/, '.')
+    end
   end
-end
-module PoolParty
-  module Ec2
-    def launch_new_instance!(num=1)
-      instance = ec2.run_instances(
-        :image_id => (ami || Base.ami),
-        :user_data => "",
-        :minCount => 1,
-        :maxCount => num,
-        :key_name => (keypair || Base.keypair),
-        :availability_zone => nil,
-        :size => "#{size || Base.size}")
-      begin
-        h = EC2ResponseObject.get_hash_from_response(instance)
-        h = instance.instancesSet.item.first
-      rescue Exception => e
-        h = instance
+  module PoolParty
+    module Ec2
+      def launch_new_instance!(num=1)
+        instance = ec2.run_instances(
+          :image_id => (ami || Base.ami),
+          :user_data => "",
+          :minCount => 1,
+          :maxCount => num,
+          :key_name => (keypair || Base.keypair),
+          :availability_zone => nil,
+          :size => "#{size || Base.size}")
+        begin
+          h = EC2ResponseObject.get_hash_from_response(instance)
+          h = instance.instancesSet.item.first
+        rescue Exception => e
+          h = instance
+        end
+        h
       end
-      h
-    end
-    # Terminate an instance by id
-    def terminate_instance!(instance_id=nil)
-      ec2.terminate_instances(:instance_id => instance_id)
-    end
-    # Describe an instance's status
-    def describe_instance(id=nil)
-      describe_instances.select {|a| a[:name] == id}[0] rescue nil
-    end
-    def describe_instances
-      @id = 0
-      get_instances_description.each_with_index do |h,i|
-        if h[:status] == "running"
-          @name = @id == 0 ? "master" : "node#{@id}"
-          @id += 1
-        else
-          @name = "#{h[:status]}_node#{i}"
+      # Terminate an instance by id
+      def terminate_instance!(instance_id=nil)
+        ec2.terminate_instances(:instance_id => instance_id)
+      end
+      # Describe an instance's status
+      def describe_instance(id=nil)
+        describe_instances.select {|a| a[:name] == id}[0] rescue nil
+      end
+      def describe_instances
+        @id = 0
+        get_instances_description.each_with_index do |h,i|
+          if h[:status] == "running"
+            @name = @id == 0 ? "master" : "node#{@id}"
+            @id += 1
+          else
+            @name = "#{h[:status]}_node#{i}"
+          end
+          h.merge!({
+            :name => @name,
+            :hostname => h[:ip],
+            :ip => h[:ip].convert_from_ec2_to_ip
+          })
         end
-        h.merge!({
-          :name => @name,
-          :hostname => h[:ip],
-          :ip => h[:ip].convert_from_ec2_to_ip
-        })
       end
-    end
-    # Get the s3 description for the response in a hash format
-    def get_instances_description
-      EC2ResponseObject.get_descriptions(ec2.describe_instances).sort_by {|a| a[:launching_time]}
-    end
-        
-    def after_launch_master(instance=nil)
-      begin
-        when_no_pending_instances do
-          ec2.associate_address(:instance_id => instance.instanceId, :public_ip => set_master_ip_to) if set_master_ip_to && instance
+      # Get the s3 description for the response in a hash format
+      def get_instances_description
+        EC2ResponseObject.get_descriptions(ec2.describe_instances).sort_by {|a| a[:launching_time]}
+      end
+
+      def after_launch_master(instance=nil)
+        begin
+          when_no_pending_instances do
+            if instance
+              ec2.associate_address(:instance_id => instance.instanceId, :public_ip => set_master_ip_to) if set_master_ip_to
+              ec2.attach_volume(:volume_id => ebs_volume_id, :instance_id => instance.instanceId, :device => ebs_volume_device) if ebs_volume_id && ebs_volume_mount_point
+            end
+          end
+        rescue Exception => e        
         end
-      rescue Exception => e        
+        reset_remoter_base!
+        when_all_assigned_ips {wait "2.seconds"}
       end
-      reset_remoter_base!
-      when_all_assigned_ips {wait "2.seconds"}
-    end
-    
-    # Help create a keypair for the cloud
-    # This is a helper to create the keypair and add them to the cloud for you
-    def create_keypair
-      return false unless keypair
-      unless ::File.exists?( new_keypair_path )
-        FileUtils.mkdir_p ::File.dirname( new_keypair_path )
-        Kernel.system "ec2-add-keypair #{keypair} > #{new_keypair_path} && chmod 600 #{new_keypair_path}"
+
+      # Help create a keypair for the cloud
+      # This is a helper to create the keypair and add them to the cloud for you
+      def create_keypair
+        return false unless keypair
+        unless ::File.exists?( new_keypair_path )
+          FileUtils.mkdir_p ::File.dirname( new_keypair_path )
+          vputs "Creating keypair: #{keypair} in #{new_keypair_path}"
+          Kernel.system "ec2-add-keypair #{keypair} > #{new_keypair_path} && chmod 600 #{new_keypair_path}"
+        end
+      end
+      # EC2 connections
+      def ec2
+        @ec2 ||= EC2::Base.new( :access_key_id => (access_key || Base.access_key), 
+                                :secret_access_key => (secret_access_key || Base.secret_access_key)
+                              )
+      end
+
+      # Callback
+      def custom_install_tasks_for(o)
+        [
+          "# ec2 installation tasks",
+          "# Set hostname",
+          # "if [ -z $(grep -v '#' /etc/hosts | grep '#{o.name}') ]; then echo \"$(curl http://169.254.169.254/latest/meta-data/public-ipv4) #{o.name}\" >> /etc/hosts; fi",
+          "if [ -z \"$(grep -v '#' /etc/hosts | grep '#{o.name}')\" ]; then echo '127.0.0.1 #{o.name}' >> /etc/hosts; fi",
+          "hostname #{o.name}",
+          "echo #{o.name} > /etc/hostname",
+          "cd /var/poolparty && wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-ec2.gem 2>&1 && gem install -y --no-ri --no-rdoc amazon-ec2.gem 2>&1"
+        ]
+      end
+
+      def custom_configure_tasks_for(o)
+        [
+          "# ec2 configuration"
+        ]
+      end
+
+      def reset_base!
+        @describe_instances = @cached_descriptions = nil
       end
     end
-    # EC2 connections
-    def ec2
-      @ec2 ||= EC2::Base.new( :access_key_id => (access_key || Base.access_key), 
-                              :secret_access_key => (secret_access_key || Base.secret_access_key)
-                            )
-    end
-    
-    # Callback
-    def custom_install_tasks_for(o)
-      [
-        "# ec2 installation tasks",
-        "# Set hostname",
-        # "if [ -z $(grep -v '#' /etc/hosts | grep '#{o.name}') ]; then echo \"$(curl http://169.254.169.254/latest/meta-data/public-ipv4) #{o.name}\" >> /etc/hosts; fi",
-        "if [ -z \"$(grep -v '#' /etc/hosts | grep '#{o.name}')\" ]; then echo '127.0.0.1 #{o.name}' >> /etc/hosts; fi",
-        "hostname #{o.name}",
-        "echo #{o.name} > /etc/hostname",
-        "cd /var/poolparty && wget http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem -O amazon-ec2.gem 2>&1 && gem install -y --no-ri --no-rdoc amazon-ec2.gem 2>&1"
-      ]
-    end
-    
-    def custom_configure_tasks_for(o)
-      [
-        "# ec2 configuration"
-      ]
-    end
-    
-    def reset_base!
-      @describe_instances = @cached_descriptions = nil
-    end
+    register_remote_base :Ec2
   end
-  register_remote_base :Ec2
-end
 
-# Provides a simple class to wrap around the amazon responses
-class EC2ResponseObject
-  def self.get_descriptions(resp)      
-    rs = get_response_from(resp)
-    
-    # puts rs.methods.sort - rs.ancestors.methods
-    out = begin
-      if rs.respond_to?(:instancesSet)
-        [EC2ResponseObject.get_hash_from_response(rs.instancesSet.item)]
-      else
-        rs.collect {|r| 
-          if r.instancesSet.item.class == Array
-            r.instancesSet.item.map {|t| EC2ResponseObject.get_hash_from_response(t)}
-          else
-            [EC2ResponseObject.get_hash_from_response(r.instancesSet.item)]
-          end            
-        }.flatten.reject {|a| a.nil? }
+  # Provides a simple class to wrap around the amazon responses
+  class EC2ResponseObject
+    def self.get_descriptions(resp)      
+      rs = get_response_from(resp)
+
+      # puts rs.methods.sort - rs.ancestors.methods
+      out = begin
+        if rs.respond_to?(:instancesSet)
+          [EC2ResponseObject.get_hash_from_response(rs.instancesSet.item)]
+        else
+          rs.collect {|r| 
+            if r.instancesSet.item.class == Array
+              r.instancesSet.item.map {|t| EC2ResponseObject.get_hash_from_response(t)}
+            else
+              [EC2ResponseObject.get_hash_from_response(r.instancesSet.item)]
+            end            
+          }.flatten.reject {|a| a.nil? }
+        end
+      rescue Exception => e
+        # Really weird bug with amazon's ec2 gem
+        rs.collect {|r| EC2ResponseObject.get_hash_from_response(r)}.reject {|a| a.nil? } rescue []
+      end
+
+      out
+    end
+    def self.get_response_from(resp)
+      begin
+        rs = resp.reservationSet.item unless resp.reservationSet.nil?
+        rs ||= resp.DescribeInstancesResponse.reservationSet.item
+        rs ||= rs.respond_to?(:instancesSet) ? rs.instancesSet : rs
+        rs.reject! {|a| a.nil? || a.empty? }
+      rescue Exception => e
+        resp
       end
-    rescue Exception => e
-      # Really weird bug with amazon's ec2 gem
-      rs.collect {|r| EC2ResponseObject.get_hash_from_response(r)}.reject {|a| a.nil? } rescue []
+      rs
     end
-    
-    out
-  end
-  def self.get_response_from(resp)
-    begin
-      rs = resp.reservationSet.item unless resp.reservationSet.nil?
-      rs ||= resp.DescribeInstancesResponse.reservationSet.item
-      rs ||= rs.respond_to?(:instancesSet) ? rs.instancesSet : rs
-      rs.reject! {|a| a.nil? || a.empty? }
-    rescue Exception => e
-      resp
+    def self.get_hash_from_response(resp)
+      begin
+        {
+          :instance_id => resp.instanceId,
+          :name => resp.instanceId, 
+          :ip => resp.dnsName || "not-assigned",
+          :status => resp.instanceState.name,
+          :launching_time => resp.launchTime,
+          :keypair => resp.keyName
+        }        
+      rescue Exception => e
+        nil
+      end      
     end
-    rs
-  end
-  def self.get_hash_from_response(resp)
-    begin
-      {
-        :instance_id => resp.instanceId,
-        :name => resp.instanceId, 
-        :ip => resp.dnsName || "not-assigned",
-        :status => resp.instanceState.name,
-        :launching_time => resp.launchTime,
-        :keypair => resp.keyName
-      }        
-    rescue Exception => e
-      nil
-    end      
   end
+rescue LoadError
+  puts <<-EOM
+Error: In order to use ec2, you need to install the amazon-ec2 gem
+
+Ec2 is the default remoter base for PoolParty. If you intend on using
+a different remoter base, specify it with:
+
+using :remoter_name
+
+in your config file, otherwise, to continue install amazon-ec2 with
+
+gem install amazon-ec2
+EOM
 end