amazon-ec2 0.2.15 → 0.3.1

data/lib/EC2/availability_zones.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2
@@ -14,8 +14,8 @@ module EC2
 
     #Amazon Developer Guide Docs:
     #
-    # The DescribeAvailabilityZones operation describes availability zones that are currently 
-    # available to the account and their states. 
+    # The DescribeAvailabilityZones operation describes availability zones that are currently
+    # available to the account and their states.
     #
     # An optional list of zone names can be passed.
     #
@@ -39,4 +39,3 @@ module EC2
     end
   end
 end
-

data/lib/EC2/console.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2
@@ -41,4 +41,4 @@ module EC2
     end
   end
 
-end
+end

data/lib/EC2/elastic_ips.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2

data/lib/EC2/exceptions.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2

data/lib/EC2/image_attributes.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2

data/lib/EC2/images.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2

data/lib/EC2/instances.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2
@@ -64,6 +64,7 @@ module EC2
     # :user_data => String (default : nil)
     # :addressing_type => String (default : "public")
     # :instance_type => String (default : "m1.small")
+    # :kernel_id => String (default : nil)
     # :availability_zone => String (default : nil)
     # :base64_encoded => Boolean (default : false)
     #
@@ -77,6 +78,7 @@ module EC2
                   :user_data => nil,
                   :addressing_type => "public",
                   :instance_type => "m1.small",
+                  :kernel_id => nil,
                   :availability_zone => nil,
                   :base64_encoded => false }.merge(options)
 
@@ -111,6 +113,7 @@ module EC2
       params["UserData"] = user_data unless user_data.nil?
       params["AddressingType"] = options[:addressing_type]
       params["InstanceType"] = options[:instance_type]
+      params["KernelId"] = options[:kernel_id] unless options[:kernel_id].nil?
       params["Placement.AvailabilityZone"] = options[:availability_zone] unless options[:availability_zone].nil?
 
       return response_generator(:action => "RunInstances", :params => params)

data/lib/EC2/keypairs.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2

data/lib/EC2/products.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2
@@ -40,4 +40,4 @@ module EC2
     end
   end
 
-end
+end

data/lib/EC2/responses.rb

@@ -2,12 +2,23 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# 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 EC2
 
   # The make_request() and ec2_error? methods, which are shared by all, will raise any
@@ -23,14 +34,6 @@ module EC2
   # 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.
 
-  # Credits :
-  # I learned the magic of making an OpenStruct object able to respond as a fully Enumerable
-  # object (responds to .each, etc.) thanks to a great blog article on Struct and OpenStruct
-  # at http://errtheblog.com/post/30
-  #
-  # Thanks to Sean Knapp for the XmlSimple response patch which greatly simplified the response
-  # mechanism for the whole library while making it more accurate and much less brittle to boot!
-  #
 
   require 'rubygems'
   begin
@@ -39,137 +42,23 @@ module EC2
     require 'xml-simple' unless defined? XmlSimple
   end
 
-
-  class Response < OpenStruct
-
-    include Enumerable
-
+  class Response
 
     def self.parse(options = {})
       options = {
         :xml => "",
         :parse_options => { 'ForceArray' => ['item'], 'SuppressEmpty' => nil }
       }.merge(options)
-      response = Response.new(XmlSimple.xml_in(options[:xml], options[:parse_options]))
-
-      # set the xml attribute of the response object to contain the original XML that was
-      # returned by amazon.  This allows anyone to bypass our parsing if desired and just
-      # get right at the raw XML response.
-      response.xml = options[:xml]
-      return response
-    end
-
-
-    # Every member of an OpenStruct object has getters and setters, the latter of which
-    # has a method ending in "=". Find all of these methods, excluding those defined on
-    # parent classes.
-    def members
-      methods(false).sort.grep(/=/).map { |m| m[0...-1] }
-    end
 
+      # 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.
 
-    # Required by the Enumerable module. Iterate over each item in the members array
-    # and pass as a value the block passed to each using yield.
-    def each
-      members.each do |method|
-        yield send(method)
-      end
-      self
-    end
-
-
-    # Same as the each method, but with both key and value.
-    #
-    #Sample Use:
-    # obj.each_pair { |k,v| puts "key: #{k}, value: #{v}" }
-    def each_pair
-      members.each do |method|
-        yield method, send(method)
-      end
-      self
-    end
+      response = XmlSimple.xml_in(options[:xml], options[:parse_options])
 
-
-    # Alternative method for getting members.
-    def [](member)
-      send(member)
-    end
-
-
-    # Alternative method for setting members.
-    def []=(member, value)
-      send("#{member}=", value)
-    end
-
-
-    # Helper for converting to string which support a long and short version
-    # to avoid recursion problems with parents.
-    def to_string(short=false)
-      s = "#<#{self.class}:0x#{(2 ** 32 + object_id).to_s(16).upcase}"
-      if (short)
-        s += " ..."
-      else
-        each_pair { |k,v|
-          if (v == self.parent && v.kind_of?(Response))
-            v = v.to_string(true)
-          elsif (v.kind_of?(String))
-            v = "\"#{v.gsub("\"", "\\\"")}\""
-          elsif (v.kind_of?(NilClass))
-            v = "nil"
-          end
-          s += " #{k}=#{v}"
-        }
-      end
-      s += ">"
-      return s
-    end
-
-
-    # Override of to string method.
-    def to_s
-      return to_string
-    end
-
-
-    private
-
-    # Initialize the object by passing data to the OpenStruct initialize method
-    # and then converting ourself to guarantee we have top-to-bottom data
-    # representation as a Response object.
-    def initialize(data, parent=nil)
-      super(data)
-      self.parent = parent
-      Response.convert(self, parent)
-    end
-
-
-    # The "brains" of our Response class. This method takes an arbitray object and
-    # depending on its class attempts to convert it.
-    def self.convert(obj, parent)
-      if (obj.kind_of?(Response))
-        # Recursively convert the object.
-        obj.each_pair { |k,v|
-          if (v != obj.parent)
-            obj[k] = convert(v, obj)
-          end
-        }
-        return obj
-      elsif (obj.kind_of?(Hash))
-        # Hashes make good Responses already thanks to OpenStruct.
-        return Response.new(obj, parent)
-      elsif (obj.kind_of?(Array))
-        # With arrays, make sure each element is appropriately converted.
-        new_arr = []
-        obj.each { |elem|
-          new_arr << convert(elem, parent)
-        }
-        return new_arr
-      else
-        # At this point we're out of ideas, so let's hope it is a string.
-        return obj
-      end
+      return response
     end
 
-  end  # class Response < OpenStruct
+  end  # class Response
 
 end  # module EC2

data/lib/EC2/security_groups.rb

@@ -2,10 +2,10 @@
 # Amazon Web Services EC2 Query API Ruby library
 #
 # Ruby Gem Name::  amazon-ec2
-# Author::    Glenn Rempe  (mailto:grempe@rubyforge.org)
+# Author::    Glenn Rempe  (mailto:glenn@rempe.us)
 # Copyright:: Copyright (c) 2007-2008 Glenn Rempe
 # License::   Distributes under the same terms as Ruby
-# Home::      http://amazon-ec2.rubyforge.org
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
 #++
 
 module EC2

data/lib/EC2/snapshots.rb

@@ -0,0 +1,94 @@
+#--
+# Amazon Web Services EC2 Query API Ruby library, EBS snaphshots support
+#
+# Ruby Gem Name::  amazon-ec2
+# Author::    Yann Klis  (mailto:yann.klis@novelys.com)
+# Copyright:: Copyright (c) 2008 Yann Klis
+# License::   Distributes under the same terms as Ruby
+# Home::      http://github.com/grempe/amazon-ec2/tree/master
+#++
+
+module EC2
+
+  class Base
+
+    #Amazon Developer Guide Docs:
+    #
+    # The DescribeSnapshots operation describes the status of Amazon EBS snapshots.
+    #
+    #Required Arguments:
+    #
+    # none
+    #
+    #Optional Arguments:
+    #
+    # :snapshot_id => Array (default : [])
+    #
+
+    def describe_snapshots( options = {} )
+
+      options = { :snapshot_id => [] }.merge(options)
+
+      params = pathlist("SnapshotId", options[:snapshot_id] )
+
+      return response_generator(:action => "DescribeSnapshots", :params => params)
+
+    end
+
+    #Amazon Developer Guide Docs:
+    #
+    # The CreateSnapshot operation creates a snapshot of an Amazon EBS volume and stores it in Amazon S3. You can use snapshots for backups, to launch instances from identical snapshots, and to save data before shutting down an instance.
+    #
+    #Required Arguments:
+    #
+    # :volume_id => String (default : '')
+    #
+    #Optional Arguments:
+    #
+    # none
+    #
+
+    def create_snapshot( options = {} )
+
+      # defaults
+      options = { :volume_id => '' }.merge(options)
+
+      raise ArgumentError, "No :volume_id provided" if options[:volume_id].nil? || options[:volume_id].empty?
+
+      params = {
+        "VolumeId" => options[:volume_id]
+      }
+
+      return response_generator(:action => "CreateSnapshot", :params => params)
+
+    end
+
+    #Amazon Developer Guide Docs:
+    #
+    # The DeleteSnapshot operation deletes a snapshot of an Amazon EBS  volume that is stored in Amazon S3.
+    #
+    #Required Arguments:
+    #
+    # :snapshot_id => String (default : '')
+    #
+    #Optional Arguments:
+    #
+    # none
+    #
+
+    def delete_snapshot( options = {} )
+
+      options = { :snapshot_id => '' }.merge(options)
+
+      raise ArgumentError, "No :snapshot_id provided" if options[:snapshot_id].nil? || options[:snapshot_id].empty?
+
+      params = {
+        "SnapshotId" => options[:snapshot_id]
+      }
+
+      return response_generator(:action => "DeleteSnapshot", :params => params)
+
+    end
+
+  end
+end