amazon-ec2 0.7.0 → 0.7.1

data/README.rdoc

@@ -10,7 +10,8 @@ More recently, support has been added for the following EC2 related AWS API's as
 
 * Autoscaling
 * Cloudwatch
-* Elastic Load Balancing
+* Elastic Load Balancing (ELB)
+* Relational Database Service (RDS)
 
 For the most complete and up-to date README information please visit the project homepage at:
 
@@ -87,10 +88,9 @@ The 'ec2sh' and 'ec2-gem-example.rb' scripts which will be introduced to you sho
 
 Edit the file ~/.bash_login and add the following to the existing contents:
 
+  # OPTIONAL : Why 'export RUBYOPT'? Because we leave loading libs up to you... See : http://gist.github.com/54177
   export RUBYOPT="rubygems"
 
-  Why 'export RUBYOPT'? Because we leave loading libs up to you... See : http://gist.github.com/54177
-
   # For amazon-ec2 and amazon s3 ruby gems
   export AMAZON_ACCESS_KEY_ID="YOUR_ACCESS_KEY_ID"
   export AMAZON_SECRET_ACCESS_KEY="YOUR_SECRET_ACCESS_KEY_ID"
@@ -200,8 +200,7 @@ Try out the following bit of code. This should walk through each image returned
 
   Rails::Initializer.run do |config|
    ...
-   # INSERT THIS LINE IN YOUR CONFIG
-   config.gem "amazon-ec2", :lib => "EC2"
+   config.gem "amazon-ec2", :lib => "AWS", :source => "http://gemcutter.org/"
    ...
   end
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/amazon-ec2.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{amazon-ec2}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Glenn Rempe"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-11-14}
   s.description = %q{A Ruby library for accessing the Amazon Web Services Elastic Compute Cloud (EC2), Elastic Load Balancer (ELB), Cloudwatch, and Autoscaling API's.}
   s.email = %q{glenn@rempe.us}
   s.executables = ["ec2-gem-example.rb", "ec2-gem-profile.rb", "ec2sh", "setup.rb"]
@@ -136,3 +136,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<perftools.rb>, ["= 0.1.6"])
   end
 end
+

data/lib/AWS/EC2/instances.rb

@@ -70,9 +70,9 @@ module AWS
         raise ArgumentError, ":image_id must be provided" if options[:image_id].nil? || options[:image_id].empty?
         raise ArgumentError, ":min_count is not valid" unless options[:min_count].to_i > 0
         raise ArgumentError, ":max_count is not valid" unless options[:max_count].to_i > 0
-        raise ArgumentError, ":addressing_type must be 'direct' or 'public'" unless options[:addressing_type] == "public" || options[:addressing_type] == "direct"
-        raise ArgumentError, ":instance_type must be 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', or 'c1.xlarge'" unless options[:instance_type] == "m1.small" || options[:instance_type] == "m1.large" || options[:instance_type] == "m1.xlarge" || options[:instance_type] == "c1.medium" || options[:instance_type] == "c1.xlarge"
-        raise ArgumentError, ":base64_encoded must be 'true' or 'false'" unless options[:base64_encoded] == true || options[:base64_encoded] == false
+        raise ArgumentError, ":addressing_type must be 'direct' or 'public'" unless ["public", "direct"].include?(options[:addressing_type])
+        raise ArgumentError, ":instance_type must specify a valid instance size" unless ["m1.small", "m1.large", "m1.xlarge", "c1.medium", "c1.xlarge", "m2.2xlarge", "m2.4xlarge"].include?(options[:instance_type])
+        raise ArgumentError, ":base64_encoded must be 'true' or 'false'" unless [true, false].include?(options[:base64_encoded])
 
         user_data = extract_user_data(options)
 
@@ -209,4 +209,5 @@ module AWS
     end
 
   end
-end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amazon-ec2
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Glenn Rempe
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -07:00
+date: 2009-11-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency