amazon-ec2 0.0.6 → 0.0.7

data/CHANGELOG.txt

@@ -1,5 +1,18 @@
 =CHANGELOG.txt : Amazon Elastic Compute Cloud (EC2) Ruby Gem
 
+
+===0.0.7 (03/15/2007)
+* Applied patch from Kevin Clark which does the following:
+  * New method to the instances.rb to allow for issuing a reboot command to an EC2 instance.
+  * New Mocha based tests (Mocha test suite must be installed to run tests.  'sudo gem install mocha')
+  * Cleanup of the test directory.
+* Applied patch from Randy Bias related to CGI escaping error.  From his notes:
+
+I finally figured out what was going on.  It was a compound problem.  The first being that you can't CGI::encode the UserData early.  You have to just Base64 encode it.  Unfortunately, when you Base64 encode it, it means that some encodings will be padded with extra chars, specifically the '=', but &, ? and = get stripped by EC2.canonial_string.  So if a Base64 encoding has trailing ='s for padding, these get stripped and then you sign the UserData Base64 payload sans the padding.  But it looks like Amazon's side is doing the right thing and is signing the padding.  So, the signatures mis-match.
+
+I've got the complete patch here and it's about as elegant/clean as I could make it in a short period of time.  It's a little tough to strip those equal signs when there are so many in the URI.  I think this works pretty well, though.  I'm splitting the URI on '&', then for each field ripping out all '&' and '?' and only the first '='.  Then stitching it back together.
+
+
 ===0.0.6 (03/02/2007)
 * Patched instances.rb with a bugfix and patch provided by Randy Bias (Thanks Randy!).
 Only minimally tested so please let me know if this causes any problems for anyone.

data/Manifest.txt

@@ -13,7 +13,8 @@ lib/EC2/keypairs.rb
 lib/EC2/image_attributes.rb
 lib/EC2/security_groups.rb
 
+test/test_ec2.rb
 test/test_helper.rb
-test/EC2_test.rb
+test/test_responses.rb
 
 examples/ec2-example.rb

data/lib/EC2.rb

@@ -39,7 +39,7 @@ module EC2
   PORTS_BY_SECURITY = { true => 443, false => 80 }
   
   # This is the version of the API as defined by Amazon Web Services
-  API_VERSION = '2006-10-01'
+  API_VERSION = '2007-01-03'
   
   # This release version is passed in with each request as part
   # of the HTTP 'User-Agent' header.  Set this be the same value 
@@ -53,7 +53,11 @@ module EC2
   #   Note:  The parameters in the path passed in must already be sorted in
   #   case-insensitive alphabetical order and must not be url encoded.
   def EC2.canonical_string(path)
-    buf = path.gsub(/\&|\?|=/,"")
+    buf = ""
+    path.split('&').each { |field|
+      buf << field.gsub(/\&|\?/,"").sub(/=/,"")
+    }
+    return buf
   end
   
   # Encodes the given string with the aws_secret_access_key, by taking the

data/lib/EC2/instances.rb

@@ -59,7 +59,7 @@ module EC2
         if in_params[:base64Encoded]
           userData = in_params[:userData]
         else
-          userData = CGI::escape(Base64.encode64(in_params[:userData]).gsub(/\n/,"").strip())
+          userData = Base64.encode64(in_params[:userData]).gsub(/\n/,"").strip()
         end
       else
         userData = nil
@@ -107,6 +107,15 @@ module EC2
       TerminateInstancesResponse.new(make_request("TerminateInstances", params))
     end
     
+    # The RebootInstances operation requests a reboot of one or more instances. 
+    # This operation is asynchronous; it only queues a request to reboot the specified 
+    # instance(s). The operation will succeed provided the instances are valid and 
+    # belong to the user. Terminated instances will be ignored.
+    def reboot_instances(*instance_ids)
+      raise "No instance ids given" if instance_ids.empty?
+      params = pathlist("InstanceId", instance_ids)
+      ResetInstancesResponse.new(make_request("RebootInstances", params))
+    end
   end
   
 end

data/lib/EC2/responses.rb

@@ -223,6 +223,14 @@ module EC2
     end
   end
   
+  class ResetInstancesResponse < Response
+    def parse
+      doc = REXML::Document.new(@http_xml)
+      # Let's use the tag they're actually returning since it doesn't match the docs -- Kevin Clark 2/26/07
+      REXML::XPath.match( doc, "//return").first.text == "true" ? true : false 
+    end
+  end
+  
   
   class CreateSecurityGroupResponse < Response
     def parse

data/lib/EC2/version.rb

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

data/test/test_ec2.rb

@@ -0,0 +1,19 @@
+require "test_helper"
+
+class TestEC2 < Test::Unit::TestCase
+  def setup
+    @conn = EC2::AWSAuthConnection.new('not a key', 'not a secret')
+  end
+  
+  def test_reboot_instances
+    body = <<-RESPONSE
+    <RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-03/">
+        <return>true</return>
+    </RebootInstancesResponse>
+    RESPONSE
+    
+    @conn.expects(:make_request).with('RebootInstances', {"InstanceId.1"=>"i-2ea64347", "InstanceId.2"=>"i-21a64348"}).
+          returns stub(:body => body, :is_a? => true)
+    assert_equal true, @conn.reboot_instances('i-2ea64347', 'i-21a64348').parse
+  end
+end

data/test/test_helper.rb

@@ -1,15 +1,10 @@
-require 'test/unit'
-
-# include the test cases that are part of this suite.
-# these are broken out into the same functional groups
-# as the module components in the lib/EC2 dir.
-require 'tc_ec2_base'
-require 'tc_images'
-require 'tc_image_attributes'
-require 'tc_keypairs'
-require 'tc_instances'
-require 'tc_responses'
-require 'tc_security_groups'
-require 'tc_version'
-
-require File.dirname(__FILE__) + '/../lib/EC2'
+$:.unshift File.expand_path('../lib')
+require "test/unit"
+begin
+  require 'rubygems'
+  require 'mocha'
+  require 'stubba'
+rescue LoadError
+  abort "You need mocha installed to run tests"
+end
+require "EC2"

data/test/test_responses.rb

@@ -0,0 +1,16 @@
+require "test_helper"
+
+class TestResetResponse < Test::Unit::TestCase
+  def setup
+    body = <<-RESPONSE
+    <RebootInstancesResponse xmlns="http://ec2.amazonaws.com/doc/2007-01-03/">
+        <return>true</return>
+    </RebootInstancesResponse>
+    RESPONSE
+    @response = EC2::ResetInstancesResponse.new(stub(:body => body, :is_a? => true))
+  end
+  
+  def test_parse
+    assert_equal true, @response.parse
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2007-03-02 00:00:00 -08:00
+  version: 0.0.7
+date: 2007-03-15 00:00:00 -07: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
@@ -44,11 +44,12 @@ files:
 - lib/EC2/keypairs.rb
 - lib/EC2/image_attributes.rb
 - lib/EC2/security_groups.rb
+- test/test_ec2.rb
 - test/test_helper.rb
-- test/EC2_test.rb
+- test/test_responses.rb
 - examples/ec2-example.rb
-test_files: 
-- test/EC2_test.rb
+test_files: []
+
 rdoc_options: 
 - --quiet
 - --title
@@ -77,5 +78,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.7
+        version: 1.2.0
     version: 

data/test/EC2_test.rb

@@ -1,13 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-# This is the top of the test suite.  This file is what is 
-# automatically run when 'rake test' is run.  Individual test
-# cases are found in the tc_* files.  Do any setup for
-# all of the test cases in the setup method of this file.
-
-class EC2Test < Test::Unit::TestCase
-
-  def setup
-  end
-
-end