some 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/some

@@ -61,6 +61,7 @@ class CLI < Thor
 			end
 		end
 		some.terminate(inst[:instance_id])
+		some.wait_to_terminate(inst[:instance_id])
 		puts "#{inst[:hostname] || inst[:instance_id]} scheduled for termination"
 	end
 
@@ -78,6 +79,15 @@ class CLI < Thor
 		puts "port #{port} scheduled for open"
 	end
 
+	desc "reset", "delete all the resources created by some (instances, security group, key pair)"
+	def reset
+		some.list.each do |inst|
+			terminate(inst[:instance_id])
+		end
+		task("Delete security group") { some.delete_security_group }
+		task("Delete key pair") { some.delete_keypair }
+	end
+
 	no_tasks do
 		def some
 			@some ||= Some.new

data/lib/some.rb

@@ -11,6 +11,7 @@ class Some
 		create_keypair unless File.exists? keypair_file
 
 		create_security_group
+		wait_for_security_group
 		open_firewall(22)
 
 		result = api.run_instances(
@@ -89,6 +90,7 @@ class Some
 
 		instances = []
 		result.reservationSet.item.each do |r|
+			next unless r.groupSet.nil? || r.groupSet.item.first.groupId == 'something'
 			r.instancesSet.item.each do |item|
 				instances << {
 					:instance_id => item.instanceId,
@@ -161,6 +163,16 @@ class Some
 		end
 	end
 
+	def wait_to_terminate(instance_id)
+		raise ArgumentError unless instance_id
+		loop do
+			unless inst = instance_info(instance_id)
+				break
+			end
+			sleep 5
+		end
+	end
+
 	def wait_for_ssh(hostname)
 		raise ArgumentError unless hostname
 		loop do
@@ -240,6 +252,16 @@ class Some
 		File.chmod 0600, keypair_file
 	end
 
+	def delete_keypair
+		api.delete_key_pair(:key_name => "something") if find_keypair
+		File.unlink(keypair_file) if File.exists? keypair_file
+		"done"
+	end
+
+	def find_keypair
+		api.describe_key_pairs.keySet.item.find {|keypair| keypair.keyName == 'something' }
+	end
+
 	def create_security_group
 		api.create_security_group(:group_name => 'something', :group_description => 'Something')
 	rescue NIFTY::ResponseError => e
@@ -248,6 +270,34 @@ class Some
 		end
 	end
 
+	def wait_for_security_group
+		loop do
+			if security_group = find_security_group
+				if security_group.groupStatus == 'applied'
+					break
+				end
+			end
+			sleep 5
+		end
+	end
+
+	def delete_security_group
+		return unless find_security_group
+		api.delete_security_group(:group_name => 'something')
+		"done"
+	end
+
+	def find_security_group
+		group_info = api.describe_security_groups(:group_name => 'something').securityGroupInfo
+		if group_info
+			group_info.item.find {|group| group.groupName }
+		else
+			nil
+		end
+	rescue NIFTY::ResponseError => e
+		nil
+	end
+
 	def open_firewall(port)
 		target = {
 			:group_name => 'something',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: some
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-04-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nifty-cloud-sdk
-  requirement: &75338600 !ruby/object:Gem::Requirement
+  requirement: &197055520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.11.beta1
   type: :runtime
   prerelease: false
-  version_requirements: *75338600
+  version_requirements: *197055520
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &75337980 !ruby/object:Gem::Requirement
+  requirement: &197055000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75337980
+  version_requirements: *197055000
 description: sumo clone for NIFTY Cloud
 email: tidnlyam@gmail.com
 executables: