rudy 0.8.5 → 0.9.0

data/lib/rudy/aws.rb

@@ -1,17 +1,17 @@
 
 
-require 'EC2'       # Motley
-require 'aws/s3'    # crew
+require 'EC2'       # amazon-ec2 gem
+
 
 module Rudy
   module AWS
     extend self
     
     unless defined?(Rudy::AWS::VALID_REGIONS)
-      VALID_REGIONS = ['eu-west-1', 'us-east-1'].freeze
+      VALID_REGIONS = [:'eu-west-1', :'us-east-1'].freeze
     end
     
-    def valid_region?(r); VALID_REGIONS.member?(r.to_s || ''); end
+    def valid_region?(r); VALID_REGIONS.member?(r.to_sym || ''); end
     
     # Modifies +str+ by removing <tt>[\0\n\r\032\\\\]</tt> and escaping <tt>[\'\"]</tt>
     def escape(str)
@@ -20,48 +20,7 @@ module Rudy
     def escape!(str)
       str.to_s.tr!("[\0\n\r\032\\\\]", '').gsub!(/([\'\"])/, '\\1\\1')
     end
-    
-    module ObjectBase
-      include Rudy::Huxtable
-      
-    protected
-
-      # Execute AWS requests safely. This will trap errors and return
-      # a default value (if specified).
-      # * +default+ A default response value
-      # * +request+ A block which contains the AWS request
-      # Returns the return value from the request is returned untouched
-      # or the default value on error or if the request returned nil. 
-      def execute_request(default=nil, timeout=nil, &request)
-        timeout ||= 30
-        raise "No block provided" unless request
-        response = nil
-        begin
-          Timeout::timeout(timeout) do
-            response = request.call
-          end
-        # Raise the EC2 exceptions
-        rescue ::EC2::Error, ::EC2::InvalidInstanceIDMalformed => ex  
-          raise Rudy::AWS::Error, ex.message
         
-        # NOTE: The InternalError is returned for non-existent volume IDs. 
-        # It's probably a bug so we're ignoring it -- Dave. 
-        rescue ::EC2::InternalError => ex
-          raise Rudy::AWS::Error, ex.message
-          
-        rescue Timeout::Error => ex
-          STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
-        rescue SocketError => ex
-          #STDERR.puts ex.message
-          #STDERR.puts ex.backtrace
-          raise SocketError, "Check your Internets!" unless @@global.offline
-        ensure
-          response ||= default
-        end
-        response
-      end
-    end
-    
     require 'rudy/aws/sdb'
     require 'rudy/aws/ec2'
     require 'rudy/aws/s3'

data/lib/rudy/aws/ec2.rb

@@ -1,23 +1,59 @@
 
 module Rudy; module AWS
   module EC2
-    module Base
-      attr_accessor :ec2
-      def initialize(access_key=nil, secret_key=nil, region=nil, logger=nil)
-        
-        if region
-          raise InvalidRegion, region unless Rudy::AWS.valid_region?(region)
-          host = "#{region}.ec2.amazonaws.com"
-        elsif ENV['EC2_URL']
-          host = URL.parse(ENV['EC2_URL']).host
+#    include Rudy::Huxtable
+    
+    def self.connect(access_key=nil, secret_key=nil, region=nil, logger=nil)
+
+      if region
+        raise InvalidRegion, region unless Rudy::AWS.valid_region?(region)
+        host = "#{region}.ec2.amazonaws.com"
+      elsif ENV['EC2_URL']
+        host = URL.parse(ENV['EC2_URL']).host
+      end
+      
+      host ||= DEFAULT_EC2_HOST
+      port ||= DEFAULT_EC2_PORT
+      
+      @@ec2 = ::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
+      @@logger = logger
+    end
+    
+  protected
+  
+    # Execute AWS requests safely. This will trap errors and return
+    # a default value (if specified).
+    # * +default+ A default response value
+    # * +request+ A block which contains the AWS request
+    # Returns the return value from the request is returned untouched
+    # or the default value on error or if the request returned nil. 
+    def self.execute_request(default=nil, timeout=nil, &request)
+      timeout ||= 15
+      raise "No block provided" unless request
+      response = nil
+      begin
+        Timeout::timeout(timeout) do
+          response = request.call
         end
+      # Raise the EC2 exceptions
+      rescue ::EC2::Error, ::EC2::InvalidInstanceIDMalformed => ex  
+        raise Rudy::AWS::Error, ex.message
+      
+      # NOTE: The InternalError is returned for non-existent volume IDs. 
+      # It's probably a bug so we're ignoring it -- Dave. 
+      rescue ::EC2::InternalError => ex
+        raise Rudy::AWS::Error, ex.message
         
-        host ||= DEFAULT_EC2_HOST
-        port ||= DEFAULT_EC2_PORT
-        
-        @ec2 = ::EC2::Base.new(:port => port, :server=> host, :access_key_id => access_key, :secret_access_key => secret_key)
-        @logger = logger
+      rescue Timeout::Error => ex
+        STDERR.puts "Timeout (#{timeout}): #{ex.message}!"
+      rescue SocketError => ex
+        #STDERR.puts ex.message
+        #STDERR.puts ex.backtrace
+        raise SocketError, "Check your Internets!" unless @@global.offline
+      ensure
+        response ||= default
       end
+      response
     end
     
     class NoRunningInstances < Rudy::Error; end
@@ -25,7 +61,7 @@ module Rudy; module AWS
     class InvalidRegion < Rudy::Error; end
     class UnknownState < Rudy::Error; end
     class NoGroup < Rudy::Error; end
-    class NoKeyPair < Rudy::Error; end
+    class NoKeypair < Rudy::Error; end
     class NoAMI < Rudy::Error; end
     
     class NoAddress < Rudy::Error; end
@@ -34,13 +70,13 @@ module Rudy; module AWS
     class AddressAssociated < Rudy::Error; end
     class ErrorCreatingAddress < Rudy::Error; end
     class AddressNotAssociated < Rudy::Error; end
-    class InsecureKeyPairPermissions < Rudy::Error; end
+    class InsecureKeypairPermissions < Rudy::Error; end
     
-    class InsecureKeyPairPermissions < Rudy::Error; end
-    class ErrorCreatingKeyPair < Rudy::Error; end
+    class InsecureKeypairPermissions < Rudy::Error; end
+    class ErrorCreatingKeypair < Rudy::Error; end
     class NoPrivateKeyFile < Rudy::Error; end
-    class KeyPairExists < Rudy::Error; end
-    class KeyPairAlreadyDefined < Rudy::Error
+    class KeypairExists < Rudy::Error; end
+    class KeypairAlreadyDefined < Rudy::Error
       def message
         "A keypair is defined for #{@obj}. Check your Rudy config."
       end
@@ -49,6 +85,7 @@ module Rudy; module AWS
     class VolumeAlreadyAttached < Rudy::Error; end
     class VolumeNotAvailable < Rudy::Error; end
     class VolumeNotAttached < Rudy::Error; end
+    class UnknownVolume < Rudy::Error; end
     class NoInstanceID < Rudy::Error; end
     class NoVolumeID < Rudy::Error; end
     class UnknownState < Rudy::Error; end

data/lib/rudy/aws/ec2/address.rb

@@ -22,13 +22,12 @@ module Rudy::AWS
       end
     end
   
-    class Addresses
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
-    
-      
+    module Addresses
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
+  
       def create
-        ret = @ec2.allocate_address
+        ret = @@ec2.allocate_address
         return false unless ret && ret['publicIp']
         address = Rudy::AWS::EC2::Address.new
         address.ipaddress = ret['publicIp']
@@ -42,7 +41,7 @@ module Rudy::AWS
         opts ={
           :public_ip => address || raise("No public IP address supplied")
         }
-        ret = @ec2.release_address(opts)
+        ret = @@ec2.release_address(opts)
         (ret && ret['return'] == 'true')
       end
 
@@ -61,7 +60,7 @@ module Rudy::AWS
           :instance_id => instance,
           :public_ip => address
         }
-        ret = @ec2.associate_address(opts)
+        ret = @@ec2.associate_address(opts)
         (ret && ret['return'] == 'true')
       end
 
@@ -76,7 +75,7 @@ module Rudy::AWS
         opts ={
           :public_ip => address
         }
-        ret = @ec2.disassociate_address(opts)
+        ret = @@ec2.disassociate_address(opts)
         (ret && ret['return'] == 'true')
       end
 
@@ -93,7 +92,7 @@ module Rudy::AWS
       def list_as_hash(addresses=[])
         addresses ||= []
         addresses = [addresses].flatten.compact
-        alist = @ec2.describe_addresses(:addresses=> addresses)
+        alist = @@ec2.describe_addresses(:addresses=> addresses)
         
         return nil unless alist['addressesSet'].is_a?(Hash)
       
@@ -102,7 +101,7 @@ module Rudy::AWS
           address = Addresses.from_hash(address)
           addresses[address.ipaddress] = address
         end
-        
+        addresses = nil if addresses.empty?
         addresses
       end
     

data/lib/rudy/aws/ec2/group.rb

@@ -42,7 +42,7 @@ module Rudy::AWS
       lines.join($/)
     end
     
-    def inspect
+    def pretty
       lines = [@name.bright]
       field_names.each do |key|
         next unless self.respond_to?(key)
@@ -84,15 +84,15 @@ module Rudy::AWS
   
   
   module EC2
-    class Groups
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+    module Groups
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
   
       # Create a new EC2 security group
       # Returns list of created groups
       def create(name, desc=nil, addresses=[], ports=[], protocols=[], &each_group)
         desc ||= "Security Group #{name}"
-        ret = @ec2.create_security_group(:group_name => name, :group_description => desc)
+        ret = @@ec2.create_security_group(:group_name => name, :group_description => desc)
         return false unless (ret && ret['return'] == 'true')
         authorize(name, addresses, ports, protocols)
         get(name, &each_group)
@@ -102,7 +102,7 @@ module Rudy::AWS
       # Returns true/false whether successful
       def destroy(name, &each_group)
         list(name, &each_group) if each_group
-        ret = @ec2.delete_security_group(:group_name => name)
+        ret = @@ec2.delete_security_group(:group_name => name)
         (ret && ret['return'] == 'true')
       end
       
@@ -140,7 +140,7 @@ module Rudy::AWS
       # Returns an Array of Rudy::AWS::EC2::Group objects
       def list_as_hash(group_names=[], &each_group)
         group_names = [group_names].flatten.compact
-        glist = @ec2.describe_security_groups(:group_name => group_names) || {}
+        glist = @@ec2.describe_security_groups(:group_name => group_names) || {}
         return unless glist['securityGroupInfo'].is_a?(Hash)
         groups = {}
         glist['securityGroupInfo']['item'].each do |oldg| 
@@ -148,6 +148,7 @@ module Rudy::AWS
           groups[g.name] = g
         end
         groups.each_value { |g| each_group.call(g) } if each_group
+        groups = nil if groups.empty?
         groups
       end
       
@@ -274,7 +275,7 @@ module Rudy::AWS
           :to_port => to_port,
           :cidr_ip => ipa
         }
-        ret = @ec2.send("#{meth}_security_group_ingress", opts)
+        ret = @@ec2.send("#{meth}_security_group_ingress", opts)
         (ret && ret['return'] == 'true')
       end
       
@@ -289,7 +290,7 @@ module Rudy::AWS
           :source_security_group_name => gname,
           :source_security_group_owner_id => gowner
         }
-        ret = @ec2.send("#{meth}_security_group_ingress", opts)
+        ret = @@ec2.send("#{meth}_security_group_ingress", opts)
         (ret && ret['return'] == 'true')
       end
 

data/lib/rudy/aws/ec2/image.rb

@@ -52,11 +52,11 @@ module Rudy::AWS
     
   end
   
-  module EC2
-    
-    class Images
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+  module EC2    
+    module Images
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
+
       
       def list(owner=[], image_ids=[], executable_by=[], &each_image)
         images = list_as_hash(owner, image_ids, executable_by)
@@ -81,7 +81,7 @@ module Rudy::AWS
           :executable_by => executable_by || []
         }
         
-        response = execute_request({}) { @ec2.describe_images(opts) }
+        response = Rudy::AWS::EC2.execute_request({}) { @@ec2.describe_images(opts) }
         
         return nil unless response['imagesSet'].is_a?(Hash)  # No instances 
       
@@ -105,7 +105,7 @@ module Rudy::AWS
         opts = {
           :image_id => id
         }
-        ret = @ec2.deregister_image(opts)
+        ret = @@ec2.deregister_image(opts)
         return false unless ret && ret.is_a?(Hash)
         true
       end
@@ -116,7 +116,7 @@ module Rudy::AWS
         opts = {
           :image_location => path
         }
-        ret = @ec2.register_image(opts)
+        ret = @@ec2.register_image(opts)
         return nil unless ret && ret.is_a?(Hash)
         ret['imageId']
       end

data/lib/rudy/aws/ec2/instance.rb

@@ -7,7 +7,7 @@ module Rudy::AWS
     field :aki
     field :ari
     field :launch_index => Time
-    field :launch_time
+    field :created
     field :keyname
     field :size
     field :ami
@@ -46,7 +46,7 @@ module Rudy::AWS
       lines.join($/)
     end
     
-    def inspect
+    def pretty
       lines = []
       lines << liner_note
       field_names.each do |key|
@@ -67,9 +67,9 @@ module Rudy::AWS
   
   
   module EC2
-    class Instances
-      include Rudy::AWS::ObjectBase
-      include Rudy::AWS::EC2::Base
+    module Instances
+      include Rudy::AWS::EC2  # important! include,
+      extend self             # then extend
       
       unless defined?(KNOWN_STATES)
         KNOWN_STATES = [:running, :pending, :shutting_down, :terminated, :degraded].freeze 
@@ -81,6 +81,7 @@ module Rudy::AWS
       #
       # +opts+ supports the following parameters:
       #
+      # * +:zone+
       # * +:ami+          
       # * +:group+        
       # * +:size+          
@@ -112,13 +113,11 @@ module Rudy::AWS
           :instance_type => opts[:size].to_s,
           :kernel_id => nil
         }
-        #p opts[:machine_data]
-        #exit
         
-        response = execute_request({}) { @ec2.run_instances(old_opts) }
+        response = Rudy::AWS::EC2.execute_request({}) { @@ec2.run_instances(old_opts) }
         return nil unless response['instancesSet'].is_a?(Hash)
         instances = response['instancesSet']['item'].collect do |inst|
-          self.class.from_hash(inst)
+          self.from_hash(inst)
         end
         instances.each { |inst| 
           each_inst.call(inst) 
@@ -130,8 +129,8 @@ module Rudy::AWS
         instances = list(:running, inst_ids, &each_inst) || []
         raise NoRunningInstances if instances.empty?
         inst_ids = objects_to_instance_ids(inst_ids)
-        response = execute_request({}) {
-          @ec2.reboot_instances(:instance_id => inst_ids)
+        response = Rudy::AWS::EC2.execute_request({}) {
+          @@ec2.reboot_instances(:instance_id => inst_ids)
         }
         response['return'] == 'true'
       end
@@ -142,8 +141,8 @@ module Rudy::AWS
       
         inst_ids = objects_to_instance_ids(inst_ids)
             
-        response = execute_request({}) {
-          @ec2.terminate_instances(:instance_id => inst_ids)
+        response = Rudy::AWS::EC2.execute_request({}) {
+          @@ec2.terminate_instances(:instance_id => inst_ids)
         }
       
         #instancesSet: 
@@ -228,8 +227,8 @@ module Rudy::AWS
         # This method always returns an Array.
         inst_ids = objects_to_instance_ids(inst_ids)
       
-        response = execute_request({}) {
-          @ec2.describe_instances(:instance_id => inst_ids)
+        response = Rudy::AWS::EC2.execute_request({}) {
+          @@ec2.describe_instances(:instance_id => inst_ids)
         }
       
         # requestId: c16878ac-28e4-4859-9878-ef93af45789c
@@ -264,7 +263,7 @@ module Rudy::AWS
         instances = nil if instances.empty? # Don't return an empty hash
         instances
       end
-    
+
       # System console output. 
       #
       # * +inst_id+ instance ID (String) or Instance object.
@@ -280,8 +279,8 @@ module Rudy::AWS
       #
       def console(inst_id, &each_inst)
         inst_ids = objects_to_instance_ids([inst_id])
-        response = execute_request({}) { 
-          @ec2.get_console_output(:instance_id => inst_ids.first)
+        response = Rudy::AWS::EC2.execute_request({}) { 
+          @@ec2.get_console_output(:instance_id => inst_ids.first)
         }
         response['output']
       end
@@ -375,7 +374,7 @@ module Rudy::AWS
         inst = Rudy::AWS::EC2::Instance.new
         inst.aki = h['kernelId']
         inst.ami = h['imageId']
-        inst.launch_time = h['launchTime']
+        inst.created = h['launchTime']
         inst.keyname = h['keyName']
         inst.launch_index = h['amiLaunchIndex']
         inst.size = h['instanceType']