amazon-ec2 0.0.4 → 0.0.5

data/CHANGELOG.txt

@@ -1,7 +1,18 @@
 =CHANGELOG.txt : Amazon Elastic Compute Cloud (EC2) Ruby Gem
 
+===0.0.5 (12/21/2006)
+* Changes to home page documentation and example files to indicate that you 
+  should use 'require_gem' instead of a simple require.  Not sure if this 
+  is a result of something I am doing in the packaging of the gem that is 
+  incorrect or if this is right and proper.  I will investigate further.
+* Patched instances.rb run_instances method to allow for submission of 
+  user data with the command to start an instance.  Patch submitted 
+  anonymously on RubyForge.  This had not been functionally implemented
+  in the Amazon Web Services sample library prior to this patch.
+* Added simple framework for adding unit tests for the library under test dir.  
+  No functional unit tests exist yet.
 
-===0.0.4 (12/16/2006)
+===0.0.4 (12/21/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 

data/History.txt

@@ -1 +1,3 @@
 =History.txt : Amazon Elastic Compute Cloud (EC2) Ruby Gem
+
+* See CHANGELOG.txt for version and change information.

data/README.txt

@@ -51,9 +51,9 @@ as such the Query API Reference in the EC2 Developer Guide should be consulted.
 ===Example Code Usage (Stand-alone Ruby Application):
 
   #!/usr/bin/env ruby
-	require 'rubygems'
-	require 'ec2'
-	AWS_ACCESS_KEY_ID = '--YOUR AWS ACCESS KEY ID--'
+  require 'rubygems'
+  require_gem 'amazon-ec2'
+  AWS_ACCESS_KEY_ID = '--YOUR AWS ACCESS KEY ID--'
   AWS_SECRET_ACCESS_KEY = '--YOUR AWS SECRET ACCESS KEY--'
   conn = EC2::AWSAuthConnection.new(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)
   puts "----- listing images -----"
@@ -71,7 +71,7 @@ you may consult for a few more detailed usage examples.
   config/environment.rb:
   ...
   # Include Amazon Web Services EC2 library gem
-  require 'ec2'
+  require_gem 'amazon-ec2'
 
   app/controllers/your_controller.rb:
   conn = EC2::AWSAuthConnection.new(AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY)

data/examples/ec2-example.rb

@@ -10,7 +10,7 @@
 #  reserved.
 
 require 'rubygems'
-require 'ec2'
+require_gem 'amazon-ec2'
 
 AWS_ACCESS_KEY_ID = '--YOUR AWS ACCESS KEY ID--'
 AWS_SECRET_ACCESS_KEY = '--YOUR AWS SECRET ACCESS KEY--'

data/lib/EC2/instances.rb

@@ -45,10 +45,26 @@ module EC2
     # password-less access. As the need arises, other formats will 
     # also be considered.
     def run_instances(imageId, kwargs={})
+      
+      # setup the default input parameters hash
       in_params = { :minCount=>1, :maxCount=>1, :keyname=>nil, :groupIds=>[], :userData=>nil, :base64Encoded=>false }
+      
+      # Override or extend the default input params with any passed in kwargs
       in_params.merge!(kwargs)
-      userData = Base64.encode64(userData) if userData and not base64Encoded
       
+      # If userData is passed in then URL escape and Base64 encode it
+      # as needed.  Need for URL Escape + Base64 encoding is determined 
+      # by base64Encoded param.
+      if in_params[:userData]
+        if in_params[:base64Encoded]
+          userData = in_params[:userData]
+        else
+          userData = CGI::escape(Base64.encode64(in_params[:userData]).strip())
+        end
+      else
+        userData = nil
+      end
+
       params = {
         "ImageId"  => imageId,
         "MinCount" => in_params[:minCount].to_s,
@@ -56,7 +72,8 @@ module EC2
       }.merge(pathlist("SecurityGroup", in_params[:groupIds])) 
       
       params["KeyName"] = in_params[:keyname] unless in_params[:keyname].nil? 
-      
+      params["UserData"] = userData unless userData.nil?
+
       RunInstancesResponse.new(make_request("RunInstances", params))
     end
     

data/lib/EC2/version.rb

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

data/test/EC2_test.rb

@@ -1,11 +1,13 @@
 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
-  
-  def test_truth
-    assert true
-  end
+
 end

data/test/test_helper.rb

@@ -1,2 +1,15 @@
 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'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2006-12-21 00:00:00 -08:00
+  version: 0.0.5
+date: 2007-01-02 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