grempe-amazon-ec2 0.5.1 → 0.5.2

data/lib/AWS/exceptions.rb

@@ -1,166 +1,122 @@
 #--
-# Amazon Web Services EC2 Query API Ruby library
-#
-# Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
-# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
-# License::   Distributes under the same terms as Ruby
-# Home::      http://github.com/grempe/amazon-ec2/tree/master
+# AWS EC2 CLIENT ERROR CODES
+# AWS EC2 can throw error exceptions that contain a '.' in them.
+# since we can't name an exception class with that '.' I compressed
+# each class name into the non-dot version.  This allows us to retain
+# the granularity of the exception.
 #++
 
 module AWS
-  # OUR CUSTOM ERROR CODES
 
-  # All of our errors are superclassed by Error < RuntimeError
-  class Error < RuntimeError #:nodoc:
-  end
+  # All AWS errors are superclassed by Error < RuntimeError
+  class Error < RuntimeError; end
 
-  # A client side only argument error
-  class ArgumentError < Error #:nodoc:
-  end
+  # CLIENT : A client side argument error
+  class ArgumentError < Error; end
 
+  # EC2 : User not authorized.
+  class AuthFailure < Error; end
 
-  # AWS EC2 CLIENT ERROR CODES
+  # EC2 : Invalid AWS Account
+  class InvalidClientTokenId < Error; end
 
-  # AWS EC2 can throw error exceptions that contain a '.' in them.
-  # since we can't name an exception class with that '.' I compressed
-  # each class name into the non-dot version.  This allows us to retain
-  # the granularity of the exception.
+  # EC2 : Invalid Parameters for Value
+  class InvalidParameterValue < Error; end
 
-  # User not authorized.
-  class AuthFailure < Error #:nodoc:
-  end
+  # EC2 : Specified AMI has an unparsable manifest.
+  class InvalidManifest < Error; end
 
-  # Invalid AWS Account
-  class InvalidClientTokenId < Error #:nodoc:
-  end
+  # EC2 : Specified AMI ID is not valid.
+  class InvalidAMIIDMalformed < Error; end
 
-  # Invalid Parameters for Value
-  class InvalidParameterValue < Error #:nodoc:
-  end
+  # EC2 : Specified AMI ID does not exist.
+  class InvalidAMIIDNotFound < Error; end
 
-  # Specified AMI has an unparsable manifest.
-  class InvalidManifest < Error #:nodoc:
-  end
+  # EC2 : Specified AMI ID has been deregistered and is no longer available.
+  class InvalidAMIIDUnavailable < Error; end
 
-  # Specified AMI ID is not valid.
-  class InvalidAMIIDMalformed < Error #:nodoc:
-  end
+  # EC2 : Specified instance ID is not valid.
+  class InvalidInstanceIDMalformed < Error; end
 
-  # Specified AMI ID does not exist.
-  class InvalidAMIIDNotFound < Error #:nodoc:
-  end
+  # EC2 : Specified instance ID does not exist.
+  class InvalidInstanceIDNotFound < Error; end
 
-  # Specified AMI ID has been deregistered and is no longer available.
-  class InvalidAMIIDUnavailable < Error #:nodoc:
-  end
+  # EC2 : Specified keypair name does not exist.
+  class InvalidKeyPairNotFound < Error; end
 
-  # Specified instance ID is not valid.
-  class InvalidInstanceIDMalformed < Error #:nodoc:
-  end
+  # EC2 : Attempt to create a duplicate keypair.
+  class InvalidKeyPairDuplicate < Error; end
 
-  # Specified instance ID does not exist.
-  class InvalidInstanceIDNotFound < Error #:nodoc:
-  end
+  # EC2 : Specified group name does not exist.
+  class InvalidGroupNotFound < Error; end
 
-  # Specified keypair name does not exist.
-  class InvalidKeyPairNotFound < Error #:nodoc:
-  end
+  # EC2 : Attempt to create a duplicate group.
+  class InvalidGroupDuplicate < Error; end
 
-  # Attempt to create a duplicate keypair.
-  class InvalidKeyPairDuplicate < Error #:nodoc:
-  end
+  # EC2 : Specified group can not be deleted because it is in use.
+  class InvalidGroupInUse < Error; end
 
-  # Specified group name does not exist.
-  class InvalidGroupNotFound < Error #:nodoc:
-  end
+  # EC2 : Specified group name is a reserved name.
+  class InvalidGroupReserved < Error; end
 
-  # Attempt to create a duplicate group.
-  class InvalidGroupDuplicate < Error #:nodoc:
-  end
+  # EC2 : Attempt to authorize a permission that has already been authorized.
+  class InvalidPermissionDuplicate < Error; end
 
-  # Specified group can not be deleted because it is in use.
-  class InvalidGroupInUse < Error #:nodoc:
-  end
+  # EC2 : Specified permission is invalid.
+  class InvalidPermissionMalformed < Error; end
 
-  # Specified group name is a reserved name.
-  class InvalidGroupReserved < Error #:nodoc:
-  end
+  # EC2 : Specified reservation ID is invalid.
+  class InvalidReservationIDMalformed < Error; end
 
-  # Attempt to authorize a permission that has already been authorized.
-  class InvalidPermissionDuplicate < Error #:nodoc:
-  end
+  # EC2 : Specified reservation ID does not exist.
+  class InvalidReservationIDNotFound < Error; end
 
-  # Specified permission is invalid.
-  class InvalidPermissionMalformed < Error #:nodoc:
-  end
+  # EC2 : User has reached max allowed concurrent running instances.
+  class InstanceLimitExceeded < Error; end
 
-  # Specified reservation ID is invalid.
-  class InvalidReservationIDMalformed < Error #:nodoc:
-  end
+  # EC2 : An invalid set of parameters were passed as arguments
+  class InvalidParameterCombination < Error; end
 
-  # Specified reservation ID does not exist.
-  class InvalidReservationIDNotFound < Error #:nodoc:
-  end
+  # EC2 : An unknown parameter was passed as an argument
+  class UnknownParameter < Error; end
 
-  # User has reached max allowed concurrent running instances.
-  class InstanceLimitExceeded < Error #:nodoc:
-  end
-
-  # An invalid set of parameters were passed as arguments
-  # e.g. RunInstances was called with minCount and maxCount set to 0 or minCount > maxCount.
-  class InvalidParameterCombination < Error #:nodoc:
-  end
-
-  # An unknown parameter was passed as an argument
-  class UnknownParameter < Error #:nodoc:
-  end
-
-  # The user ID is neither in the form of an AWS account ID or one
+  # EC2 : The user ID is neither in the form of an AWS account ID or one
   # of the special values accepted by the owner or executableBy flags
   # in the DescribeImages call.
-  class InvalidUserIDMalformed < Error #:nodoc:
-  end
+  class InvalidUserIDMalformed < Error; end
 
-  # The value of an item added to, or removed from, an image attribute is invalid.
-  class InvalidAMIAttributeItemValue < Error #:nodoc:
-  end
+  # EC2 : The value of an item added to, or removed from, an image attribute is invalid.
+  class InvalidAMIAttributeItemValue < Error; end
 
-  # ELB ERRORS
+  # ELB : The Load balancer specified was not found.
+  class LoadBalancerNotFound < Error; end
 
-  class LoadBalancerNotFound < Error #:nodoc:
-  end
+  # ELB :
+  class ValidationError < Error; end
 
-  class ValidationError < Error #:nodoc:
-  end
+  # ELB :
+  class DuplicateLoadBalancerName < Error; end
 
-  class DuplicateLoadBalancerName < Error #:nodoc:
-  end
+  # ELB :
+  class TooManyLoadBalancers < Error; end
 
-  class TooManyLoadBalancers < Error #:nodoc:
-  end
+  # ELB :
+  class InvalidInstance < Error; end
 
-  class InvalidInstance < Error #:nodoc:
-  end
+  # ELB :
+  class InvalidConfigurationRequest < Error; end
 
-  class InvalidConfigurationRequest < Error #:nodoc:
-  end
+  # Server : Internal AWS EC2 Error.
+  class InternalError < Error; end
 
-  # AWS EC2 SERVER ERROR CODES
+  # Server : There are not enough available instances to satisfy your minimum request.
+  class InsufficientInstanceCapacity < Error; end
 
-  # Internal AWS EC2 Error.
-  class InternalError < Error #:nodoc:
-  end
+  # Server : The server is overloaded and cannot handle the request.
+  class Unavailable < Error; end
 
-  # There are not enough available instances to satify your minimum request.
-  class InsufficientInstanceCapacity < Error #:nodoc:
-  end
-
-  # The server is overloaded and cannot handle request.
-  class Unavailable < Error #:nodoc:
-  end
-
-  class SignatureDoesNotMatch < Error #:nodoc:
-  end
+  # Server : The provided signature does not match.
+  class SignatureDoesNotMatch < Error; end
 
 end
+

data/lib/AWS/responses.rb

@@ -1,61 +1,21 @@
-#--
-# Amazon Web Services EC2 Query API Ruby library
-#
-# Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
-# Copyright:: Copyright (c) 2007-2008 Glenn Rempe
-# License::   Distributes under the same terms as Ruby
-# Home::      http://github.com/grempe/amazon-ec2/tree/master
-#++
-
-# This allows us to access hash values as if they were methods
-# e.g. foo[:bar] can be accessed as foo.bar
-
-class Hash
-  def method_missing(meth, *args, &block)
-    if args.size == 0
-      self[meth.to_s] || self[meth.to_sym]
-    end
-  end
-end
-
 module AWS
 
-  # The make_request() and aws_error? methods, which are shared by all, will raise any
-  # exceptions encountered along the way as it converses with EC2.
-  #
-  # Exception Handling: If for some reason an error occurrs when executing a method
-  # (e.g. its arguments were incorrect, or it simply failed) then an exception will
-  # be thrown.  The exceptions are defined in exceptions.rb as individual classes and should
-  # match the exceptions that Amazon has defined for EC2.  If the exception raised cannot be
-  # identified then a more generic exception class will be thrown.
-  #
-  # The implication of this is that you need to be prepared to handle any exceptions that
-  # may be raised by this library in YOUR code with a 'rescue' clauses.  It is up to you
-  # how gracefully you want to handle these exceptions that are raised.
-
-  begin
-    require 'xmlsimple' unless defined? XmlSimple
-  rescue Exception => e
-    require 'xml-simple' unless defined? XmlSimple
-  end
-
   class Response
 
+    # Parse the XML response from AWS
+    #
+    # @option options [String] :xml The XML response from AWS that we want to parse
+    # @option options [Hash] :parse_options Override the options for XmlSimple.
+    # @return [Hash] the input :xml converted to a custom Ruby Hash by XmlSimple.
     def self.parse(options = {})
       options = {
         :xml => "",
         :parse_options => { 'forcearray' => ['item', 'member'], 'suppressempty' => nil, 'keeproot' => false }
       }.merge(options)
-
-      # NOTE: Parsing the response as a nested set of Response objects was extremely
-      # memory intensive and appeared to leak (the memory was not freed on subsequent requests).
-      # It was changed to return the raw XmlSimple response.
       response = XmlSimple.xml_in(options[:xml], options[:parse_options])
-
-      return response
     end
 
   end  # class Response
 
 end  # module AWS
+

data/test/test_helper.rb

@@ -8,6 +8,9 @@
 # Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
+require 'rubygems'
+gem 'test-unit'
+
 %w[ test/unit test/spec mocha ].each { |f|
   begin
     require f
@@ -17,3 +20,4 @@
 }
 
 require File.dirname(__FILE__) + '/../lib/AWS'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grempe-amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -78,6 +78,7 @@ extra_rdoc_files:
 - README_dev.rdoc
 files: 
 - .gitignore
+- .yardopts
 - ChangeLog
 - LICENSE
 - README.rdoc
@@ -131,7 +132,7 @@ files:
 - wsdl/2008-02-01.ec2.wsdl
 - wsdl/2008-05-05.ec2.wsdl
 - wsdl/2008-12-01.ec2.wsdl
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/grempe/amazon-ec2
 licenses: 
 post_install_message: 
@@ -160,7 +161,7 @@ requirements: []
 rubyforge_project: amazon-ec2
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Amazon EC2 Ruby Gem
 test_files: 
 - test/test_EC2.rb