tunl 0.0.1 → 0.0.2

data/lib/tunl.rb

@@ -17,7 +17,7 @@ end
 
 
 # gem requirements
-require 'right_aws'
+require 'aws'
 
 # hack to supress annoying log messages from right_aws gem
 module Tunl
@@ -45,7 +45,7 @@ module Tunl
 		end
 		
 		def ec2
-			@ec2 ||= RightAws::Ec2.new(config['aws_access_key'],config['aws_secret_key'], :logger => SilentLogger)
+			@ec2 ||= Aws::Ec2.new(config['aws_access_key'],config['aws_secret_key'], :logger => SilentLogger)
 		end
 		
 		def key_pair_filepath(name)
@@ -58,7 +58,7 @@ module Tunl
 			key_pair = ec2.create_key_pair("tunl_#{name}")
 			File.open(filepath, 'w') { |f| f.write(key_pair[:aws_material]) }
 			FileUtils.chmod 0400, filepath
-		rescue RightAws::AwsError => e
+		rescue Aws::AwsError => e
 	    if e.message =~ /already exists/
 	      # WARNING : this could be dangerous.
 	      delete_key_pair(name)
@@ -88,7 +88,7 @@ module Tunl
 		def create_security_group(name)
 			log "create", "security group tunl_#{name}"
 			ec2.create_security_group("tunl_#{name}", 'created by tunl gem')
-		rescue RightAws::AwsError => e
+		rescue Aws::AwsError => e
 			if e.message =~ /already exists/
 				return true
 			else
@@ -100,7 +100,7 @@ module Tunl
 			[ 22, 80 ].each do |port|
 				begin
 					ec2.authorize_security_group_IP_ingress("tunl_#{name}", port, port)
-				rescue RightAws::AwsError => e
+				rescue Aws::AwsError => e
 					if e.message =~ /already been authorized/
 						# do nothing
 					else
@@ -140,7 +140,7 @@ module Tunl
 			log "launch", "instance ..."
 			instances = ec2.launch_instances('ami-ed46a784',
 				:key_name => "tunl_#{name}",
-				:group_ids => "tunl_#{name}",
+				:group_ids => ["tunl_#{name}"],
 				:instance_type => 'm1.small',
 				:availability_zone => 'us-east-1a',
 				:user_data => %Q{#!/bin/sh
@@ -179,7 +179,7 @@ module Tunl
 		def delete_instance(name)
 			instance = find_instance(name)
 		 	log "delete", "instance tunl_#{name} with id #{instance[:aws_instance_id]}"
-			ec2.terminate_instances(instance[:aws_instance_id])
+			ec2.terminate_instances([instance[:aws_instance_id]])
 		end
 		
 		def setup_instance(name)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Crockett
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -06:00
+date: 2010-03-07 00:00:00 -07:00
 default_executable: 
 dependencies: []