amazon-ec2 0.0.3 → 0.0.4

data/CHANGELOG.txt

@@ -1,5 +1,21 @@
 =CHANGELOG.txt : Amazon Elastic Compute Cloud (EC2) Ruby Gem
 
+
+===0.0.4 (12/16/2006)
+* Applied patch from Kevin Clark to svn version 7.  Thanks for the 
+  patch and the description Kevin!  Please report if you 
+  encounter any issues with this patched version.  Here is Kevin's 
+  description which I requested :  "It helps me to think of modules as boxes full of classes and 
+  methods.  REXML is a module which holds various classes related to parsing XML
+  including REXML::Node, REXML::Document and REXML::XPath. When you
+  include a module it takes everything out of the box and places it in
+  the local context.  So, when you include REXML in the global namespace 
+  on line 27 of EC2.rb, it includes classes called Node, Document and XPath in the
+  global object space. This means that I can't have a class called Node
+  in my own project (which I do). The library would be a much better
+  neighbor if it instead accessed the REXML::Document and REXML::XPath
+  classes explicitly through the module."
+
 ===0.0.3 (12/16/2006)
 * API CHANGE : Changed method name 'authorize' to 'authorize_security_group_ingress' to ensure consistent 
   naming of Ruby library methods to match AWS EC2 API actions. Alias to 'authorize' for backwards compatibility.

data/History.txt

@@ -1,3 +1 @@
 =History.txt : Amazon Elastic Compute Cloud (EC2) Ruby Gem
-
-==Version History

data/lib/EC2.rb

@@ -24,8 +24,6 @@ require 'net/https'
 require 'rexml/document'
 require 'time'
 
-include REXML
-
 # Require any lib files that we have bundled with this Ruby Gem in the lib/EC2 directory.
 # Parts of the EC2 module and AWSAuthConnection class are broken out into separate
 # files for maintainability and are organized by the functional groupings defined 

data/lib/EC2/responses.rb

@@ -32,11 +32,11 @@ module EC2
     end
     
     def parse_error
-      doc = Document.new(@http_xml)
-      element = XPath.first(doc, ERROR_XPATH)
+      doc = REXML::Document.new(@http_xml)
+      element = REXML::XPath.first(doc, ERROR_XPATH)
       
-      errorCode = XPath.first(element, "Code").text
-      errorMessage = XPath.first(element, "Message").text
+      errorCode = REXML::XPath.first(element, "Code").text
+      errorMessage = REXML::XPath.first(element, "Message").text
       
       [["#{errorCode}: #{errorMessage}"]]
     end
@@ -58,15 +58,15 @@ module EC2
   class DescribeImagesResponse < Response
     ELEMENT_XPATH = "DescribeImagesResponse/imagesSet/item"
     def parse
-      doc = Document.new(@http_xml)
+      doc = REXML::Document.new(@http_xml)
       lines = []
       
       doc.elements.each(ELEMENT_XPATH) do |element|
-        imageId = XPath.first(element, "imageId").text
-        imageLocation = XPath.first(element, "imageLocation").text
-        imageOwnerId = XPath.first(element, "imageOwnerId").text
-        imageState = XPath.first(element, "imageState").text
-        isPublic = XPath.first(element, "isPublic").text
+        imageId = REXML::XPath.first(element, "imageId").text
+        imageLocation = REXML::XPath.first(element, "imageLocation").text
+        imageOwnerId = REXML::XPath.first(element, "imageOwnerId").text
+        imageState = REXML::XPath.first(element, "imageState").text
+        isPublic = REXML::XPath.first(element, "isPublic").text
         lines << ["IMAGE", imageId, imageLocation, imageOwnerId, imageState, isPublic]
       end
       lines
@@ -77,8 +77,8 @@ module EC2
   class RegisterImageResponse < Response
     ELEMENT_XPATH = "RegisterImageResponse/imageId"
     def parse
-      doc = Document.new(@http_xml)
-      lines = [["IMAGE", XPath.first(doc, ELEMENT_XPATH).text]]
+      doc = REXML::Document.new(@http_xml)
+      lines = [["IMAGE", REXML::XPath.first(doc, ELEMENT_XPATH).text]]
     end
   end
   
@@ -94,12 +94,12 @@ module EC2
   class CreateKeyPairResponse < Response
     ELEMENT_XPATH = "CreateKeyPairResponse"
     def parse
-      doc = Document.new(@http_xml)
-      element = XPath.first(doc, ELEMENT_XPATH)
+      doc = REXML::Document.new(@http_xml)
+      element = REXML::XPath.first(doc, ELEMENT_XPATH)
       
-      keyName = XPath.first(element, "keyName").text
-      keyFingerprint = XPath.first(element, "keyFingerprint").text
-      keyMaterial = XPath.first(element, "keyMaterial").text
+      keyName = REXML::XPath.first(element, "keyName").text
+      keyFingerprint = REXML::XPath.first(element, "keyFingerprint").text
+      keyMaterial = REXML::XPath.first(element, "keyMaterial").text
       
       line = [["KEYPAIR", keyName, keyFingerprint], [keyMaterial]]
     end
@@ -109,12 +109,12 @@ module EC2
   class DescribeKeyPairsResponse < Response
     ELEMENT_XPATH = "DescribeKeyPairsResponse/keySet/item"
     def parse
-      doc = Document.new(@http_xml)
+      doc = REXML::Document.new(@http_xml)
       lines = []
   
       doc.elements.each(ELEMENT_XPATH) do |element|
-        keyName = XPath.first(element, "keyName").text
-        keyFingerprint = XPath.first(element, "keyFingerprint").text
+        keyName = REXML::XPath.first(element, "keyName").text
+        keyFingerprint = REXML::XPath.first(element, "keyFingerprint").text
         lines << ["KEYPAIR", keyName, keyFingerprint]
       end
       lines
@@ -133,13 +133,13 @@ module EC2
   class RunInstancesResponse < Response
     ELEMENT_XPATH = "RunInstancesResponse"
     def parse
-      doc = Document.new(@http_xml)
+      doc = REXML::Document.new(@http_xml)
       lines = []
       
-      rootelement = XPath.first(doc, ELEMENT_XPATH)
+      rootelement = REXML::XPath.first(doc, ELEMENT_XPATH)
       
-      reservationId = XPath.first(rootelement, "reservationId").text
-      ownerId = XPath.first(rootelement, "ownerId").text
+      reservationId = REXML::XPath.first(rootelement, "reservationId").text
+      ownerId = REXML::XPath.first(rootelement, "ownerId").text
       groups = nil
       rootelement.elements.each("groupSet/item/groupId") do |element|
         if not groups
@@ -150,16 +150,16 @@ module EC2
       end
       lines << ["RESERVATION", reservationId, ownerId, groups]
       
-      #    rootelement = XPath.first(doc, ELEMENT_XPATH)
+      #    rootelement = REXML::XPath.first(doc, ELEMENT_XPATH)
       rootelement.elements.each("instancesSet/item") do |element|
-        instanceId = XPath.first(element, "instanceId").text
-        imageId = XPath.first(element, "imageId").text
-        instanceState = XPath.first(element, "instanceState/name").text
+        instanceId = REXML::XPath.first(element, "instanceId").text
+        imageId = REXML::XPath.first(element, "imageId").text
+        instanceState = REXML::XPath.first(element, "instanceState/name").text
         # Only for debug mode, which we don't support yet:
-        instanceStateCode = XPath.first(element, "instanceState/code").text
-        dnsName = XPath.first(element, "dnsName").text
+        instanceStateCode = REXML::XPath.first(element, "instanceState/code").text
+        dnsName = REXML::XPath.first(element, "dnsName").text
         # We don't return this, but still:
-        reason = XPath.first(element, "reason").text
+        reason = REXML::XPath.first(element, "reason").text
         lines << ["INSTANCE", instanceId, imageId, dnsName, instanceState]
       end
       lines
@@ -170,12 +170,12 @@ module EC2
   class DescribeInstancesResponse < Response
     ELEMENT_XPATH = "DescribeInstancesResponse/reservationSet/item"
     def parse
-      doc = Document.new(@http_xml)
+      doc = REXML::Document.new(@http_xml)
       lines = []
       
       doc.elements.each(ELEMENT_XPATH) do |rootelement|
-        reservationId = XPath.first(rootelement, "reservationId").text
-        ownerId = XPath.first(rootelement, "ownerId").text
+        reservationId = REXML::XPath.first(rootelement, "reservationId").text
+        ownerId = REXML::XPath.first(rootelement, "ownerId").text
         groups = nil
         rootelement.elements.each("groupSet/item/groupId") do |element|
           if not groups
@@ -187,14 +187,14 @@ module EC2
         lines << ["RESERVATION", reservationId, ownerId, groups]
         
         rootelement.elements.each("instancesSet/item") do |element|
-          instanceId = XPath.first(element, "instanceId").text
-          imageId = XPath.first(element, "imageId").text
-          instanceState = XPath.first(element, "instanceState/name").text
+          instanceId = REXML::XPath.first(element, "instanceId").text
+          imageId = REXML::XPath.first(element, "imageId").text
+          instanceState = REXML::XPath.first(element, "instanceState/name").text
           # Only for debug mode, which we don't support yet:
-          instanceStateCode = XPath.first(element, "instanceState/code").text
-          dnsName = XPath.first(element, "dnsName").text
+          instanceStateCode = REXML::XPath.first(element, "instanceState/code").text
+          dnsName = REXML::XPath.first(element, "dnsName").text
           # We don't return this, but still:
-          reason = XPath.first(element, "reason").text
+          reason = REXML::XPath.first(element, "reason").text
           lines << ["INSTANCE", instanceId, imageId, dnsName, instanceState]
         end
       end
@@ -206,17 +206,17 @@ module EC2
   class TerminateInstancesResponse < Response
     ELEMENT_XPATH = "TerminateInstancesResponse/instancesSet/item"
     def parse
-      doc = Document.new(@http_xml)
+      doc = REXML::Document.new(@http_xml)
       lines = []
       
       doc.elements.each(ELEMENT_XPATH) do |element|
-        instanceId = XPath.first(element, "instanceId").text
-        shutdownState = XPath.first(element, "shutdownState/name").text
+        instanceId = REXML::XPath.first(element, "instanceId").text
+        shutdownState = REXML::XPath.first(element, "shutdownState/name").text
         # Only for debug mode, which we don't support yet:
-        shutdownStateCode = XPath.first(element, "shutdownState/code").text
-        previousState = XPath.first(element, "previousState/name").text
+        shutdownStateCode = REXML::XPath.first(element, "shutdownState/code").text
+        previousState = REXML::XPath.first(element, "previousState/name").text
         # Only for debug mode, which we don't support yet:
-        previousStateCode = XPath.first(element, "previousState/code").text
+        previousStateCode = REXML::XPath.first(element, "previousState/code").text
         lines << ["INSTANCE", instanceId, previousState, shutdownState]
       end
       lines
@@ -235,18 +235,18 @@ module EC2
   class DescribeSecurityGroupsResponse < Response
     ELEMENT_XPATH = "DescribeSecurityGroupsResponse/securityGroupInfo/item"
     def parse
-      doc = Document.new(@http_xml)
+      doc = REXML::Document.new(@http_xml)
       lines = []
       
       doc.elements.each(ELEMENT_XPATH) do |rootelement|
-        groupName = XPath.first(rootelement, "groupName").text
-        ownerId = XPath.first(rootelement, "ownerId").text
-        groupDescription = XPath.first(rootelement, "groupDescription").text
+        groupName = REXML::XPath.first(rootelement, "groupName").text
+        ownerId = REXML::XPath.first(rootelement, "ownerId").text
+        groupDescription = REXML::XPath.first(rootelement, "groupDescription").text
         lines << ["GROUP", ownerId, groupName, groupDescription]
         rootelement.elements.each("ipPermissions/item") do |element|
-          ipProtocol = XPath.first(element, "ipProtocol").text
-          fromPort = XPath.first(element, "fromPort").text
-          toPort = XPath.first(element, "toPort").text
+          ipProtocol = REXML::XPath.first(element, "ipProtocol").text
+          fromPort = REXML::XPath.first(element, "fromPort").text
+          toPort = REXML::XPath.first(element, "toPort").text
           permArr = [
                      "PERMISSION",
                      ownerId,
@@ -258,12 +258,12 @@ module EC2
                      "FROM"
                     ]
           element.elements.each("groups/item") do |subelement|
-            userId = XPath.first(subelement, "userId").text
-            targetGroupName = XPath.first(subelement, "groupName").text
+            userId = REXML::XPath.first(subelement, "userId").text
+            targetGroupName = REXML::XPath.first(subelement, "groupName").text
             lines << permArr + ["USER", userId, "GRPNAME", targetGroupName]
           end
           element.elements.each("ipRanges/item") do |subelement|
-            cidrIp = XPath.first(subelement, "cidrIp").text
+            cidrIp = REXML::XPath.first(subelement, "cidrIp").text
             lines << permArr + ["CIDR", cidrIp]
           end
         end
@@ -316,11 +316,11 @@ module EC2
   class DescribeImageAttributeResponse < Response
     ELEMENT_XPATH = "DescribeImageAttributeResponse"
     def parse
-      doc = Document.new(@http_xml)
+      doc = REXML::Document.new(@http_xml)
       lines = []
       
-      rootelement = XPath.first(doc, ELEMENT_XPATH)
-      imageId = XPath.first(rootelement, "imageId").text
+      rootelement = REXML::XPath.first(doc, ELEMENT_XPATH)
+      imageId = REXML::XPath.first(rootelement, "imageId").text
       
       # Handle launchPermission attributes:
       rootelement.elements.each("launchPermission/item/*") do |element|

data/lib/EC2/version.rb

@@ -2,7 +2,7 @@ module EC2 #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
-date: 2006-12-16 00:00:00 -08:00
+  version: 0.0.4
+date: 2006-12-21 00:00:00 -08:00
 summary: An interface library that allows Ruby or Ruby on Rails applications to easily connect to the HTTP 'Query API' for the Amazon Web Services Elastic Compute Cloud (EC2) and manipulate server instances.
 require_paths: 
 - lib