sumo 0.1.2 → 0.2.1

data/README.rdoc

@@ -50,24 +50,57 @@ Then create ~/.sumo/config.yml containing:
     access_id: <your amazon access key id>
     access_secret: <your amazon secret access key>
 
-Optional config you can include in config.yml:
+Optional config you can include any of the following in your config.yml:
 
     user: root
     ami: ami-ed46a784
+     availability_zone: us-east-1b
     cookbooks_url: git://github.com/adamwiggins/chef-cookbooks.git
 
-If you run any production machines from your EC2 account, I recommend setting up a separate account for use with Sumo.  It does not prompt for confirmation when terminating an instance or differentiate between instances started by it vs. instances started by other tools.
-
 You'll need Bacon and Mocha if you want to run the specs, and Jewler if you want to create gems.
 
-== Features
+== Managing volumes
+
+Create and attach a volume to your running instance:
+
+   $ sumo create_volume
+   ---> Create 5MB volume...     vol-8a9c6ae3 (1.1s)
+   $ sumo volumes
+   vol-8a9c6ae3    5MB  available
+   $ sumo attach
+   ---> Attach vol-8a9c6ae3 to i-bc32cbd4 as /dev/sdc1... done (0.6s)
+
+Log in to format and mount the volume:
+
+   $ sumo ssh
+   root@ip-10-251-122-175:~# mkfs.ext3 /dev/sdc1
+   mke2fs 1.41.4 (27-Jan-2009)
+   Filesystem label=
+   OS type: Linux
+   Block size=4096 (log=2)
+   ...
+   $ mkdir /myvol
+   $ mount /dev/sdc1 /myvol
+   $ echo "I'm going to persist to a volume" > /myvol/hello.txt
 
-Launch, ssh to, and terminate instances.
+To detach from a running instance (perhaps so you can attach elsewhere):
+
+   $ sumo detatch
+   ---> Detach vol-8a9c6ae3...   done (0.6s)
+
+Destroy it if you no longer want the data stored on it:
+
+   $ sumo destroy_volume
+   ---> Destroy volume...        done (0.8s)
+
+== Some details you might want to know
 
 Sumo creates its own keypair named sumo, which is stored in ~/.ssh/keypair.pem.  Amazon doesn't let you upload your own ssh public key, which is lame, so this is the best option for making the launch-and-connect process a single step.
 
 It will also create an Amazon security group called sumo, so that it can lower the firewall for services you configure via cookbook roles.
 
+If you run any production machines from your EC2 account, I recommend setting up a separate account for use with Sumo.  It does not prompt for confirmation when terminating an instance or differentiate between instances started by it vs. instances started by other tools.
+
 == Anti-features
 
 Sumo is not a cloud management tool, a monitor tool, or anything more than a way to get an instance up right quick.  If you're looking for a way to manage a cluster of production instances, try one of these fine tools.
@@ -81,7 +114,7 @@ Sumo is not a cloud management tool, a monitor tool, or anything more than a way
 
 Created by Adam Wiggins
 
-Patches contributed by Blake Mizerany and Jesse Newland
+Patches contributed by Orion Henry, Blake Mizerany, Jesse Newland, and Gert Goet
 
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.1

data/bin/sumo

@@ -19,7 +19,7 @@ class CLI < Thor
 
 			resources = sumo.resources(host)
 			unless resources.empty?
-				task("Opening firewall") do
+				task("Open firewall") do
 					ports = resources.map { |r| r.match(/:(\d+)\//)[1] }
 					ports.each { |port| sumo.open_firewall(port) }
 					"ports " + ports.join(", ")
@@ -72,6 +72,13 @@ class CLI < Thor
 		end
 	end
 
+	desc "console [<instance_id or hostname>]", "get console output for instance or first available"
+	def console(id=nil)
+		inst = sumo.find(id) || (sumo.running | sumo.pending).first || abort("No running or pending instances")
+
+		puts sumo.console_output(inst[:instance_id]).inspect
+	end
+
 	desc "terminate [<instance_id or hostname>]", "terminate specified instance or first available"
 	def terminate(id=nil)
 		inst = sumo.find(id) || (sumo.running | sumo.pending).first || abort("No running or pending instances")
@@ -90,6 +97,40 @@ class CLI < Thor
 		end
 	end
 
+	desc "volumes", "list all volumes"
+	def volumes
+		sumo.volumes.each do |v|
+			printf "%-10s %4sGB %10s %15s %15s\n", v[:volume_id], v[:size], v[:status], v[:instance], v[:device]
+		end
+	end
+
+	desc "create_volume [<megabytes>]", "create a volume"
+	def create_volume(size=5)
+		task("Create #{size}GB volume") { sumo.create_volume(size) }
+	end
+
+	desc "destroy_volume [<volume_id>]", "destroy a volume"
+	def destroy_volume(volume=nil)
+		vol_id = (sumo.find_volume(volume) || sumo.nondestroyed_volumes.first || abort("No volumes"))[:volume_id]
+		task("Destroy volume") { sumo.destroy_volume(vol_id) }
+	end
+
+	desc "attach [<volume_id>] [<instance_id or hostname>] [<device>]", "attach volume to running instance"
+	def attach(volume=nil, inst_id=nil, device=nil)
+		vol_id = (sumo.find_volume(volume) || sumo.available_volumes.first || abort("No available volumes"))[:volume_id]
+		inst_id = (sumo.find(inst_id) || sumo.running.first || abort("No running instances"))[:instance_id]
+		device ||= '/dev/sdc1'
+		task("Attach #{vol_id} to #{inst_id} as #{device}") do
+			sumo.attach(vol_id, inst_id, device)
+		end
+	end
+
+	desc "detach [<volume_id>]", "detach volume from instance"
+	def detach(volume=nil)
+		vol_id = (sumo.find_volume(volume) || sumo.attached_volumes.first || abort("No attached volumes"))[:volume_id]
+		task("Detach #{vol_id}") { sumo.detach(vol_id) }
+	end
+
 	no_tasks do
 		def sumo
 			@sumo ||= Sumo.new

data/lib/sumo.rb

@@ -16,7 +16,8 @@ class Sumo
 			:image_id => ami,
 			:instance_type => config['instance_size'] || 'm1.small',
 			:key_name => 'sumo',
-			:group_id => [ 'sumo' ]
+			:group_id => [ 'sumo' ],
+			:availability_zone => config['availability_zone']
 		)
 		result.instancesSet.item[0].instanceId
 	end
@@ -25,6 +26,60 @@ class Sumo
 		@list ||= fetch_list
 	end
 
+	def volumes
+		result = ec2.describe_volumes
+		return [] unless result.volumeSet
+
+		result.volumeSet.item.map do |row|
+			{
+				:volume_id => row["volumeId"],
+				:size => row["size"],
+				:status => row["status"],
+				:device => (row["attachmentSet"]["item"].first["device"] rescue ""),
+				:instance_id => (row["attachmentSet"]["item"].first["instanceId"] rescue ""),
+			}
+		end
+	end
+
+	def available_volumes
+		volumes.select { |vol| vol[:status] == 'available' }
+	end
+
+	def attached_volumes
+		volumes.select { |vol| vol[:status] == 'in-use' }
+	end
+
+	def nondestroyed_volumes
+		volumes.select { |vol| vol[:status] != 'deleting' }
+	end
+
+	def attach(volume, instance, device)
+		result = ec2.attach_volume(
+			:volume_id => volume,
+			:instance_id => instance,
+			:device => device
+		)
+		"done"
+	end
+
+	def detach(volume)
+		result = ec2.detach_volume(:volume_id => volume, :force => "true")
+		"done"
+	end
+
+	def create_volume(size)
+		result = ec2.create_volume(
+			:availability_zone => config['availability_zone'],
+			:size => size.to_s
+		)
+		result["volumeId"]
+	end
+
+	def destroy_volume(volume)
+		ec2.delete_volume(:volume_id => volume)
+		"done"
+	end
+
 	def fetch_list
 		result = ec2.describe_instances
 		return [] unless result.reservationSet
@@ -52,6 +107,15 @@ class Sumo
 		end
 	end
 
+	def find_volume(volume_id)
+		return unless volume_id
+		volume_id = volume_id.strip.downcase
+		volumes.detect do |volume|
+			volume[:volume_id] == volume_id or
+			volume[:volume_id].gsub(/^vol-/, '') == volume_id
+		end
+	end
+
 	def running
 		list_by_status('running')
 	end
@@ -146,12 +210,20 @@ class Sumo
 		ec2.terminate_instances(:instance_id => [ instance_id ])
 	end
 
+	def console_output(instance_id)
+		ec2.get_console_output(:instance_id => instance_id)["output"]
+	end
+
 	def config
 		@config ||= default_config.merge read_config
 	end
 
 	def default_config
-		{ 'user' => 'root', 'ami' => 'ami-ed46a784' }
+		{
+			'user' => 'root',
+			'ami' => 'ami-ed46a784',
+			'availability_zone' => 'us-east-1b'
+		}
 	end
 
 	def sumo_dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sumo
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: sumo
 dependencies: []