sumo 0.1.1 → 0.1.2

data/README.rdoc

@@ -49,11 +49,17 @@ 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:
+
+    user: root
     ami: ami-ed46a784
     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
 
 Launch, ssh to, and terminate instances.
@@ -75,6 +81,8 @@ 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
+
 Released under the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 http://github.com/adamwiggins/sumo

data/Rakefile

@@ -14,3 +14,10 @@ end
 
 Jeweler::RubyforgeTasks.new
 
+desc 'Run specs'
+task :spec do
+	sh 'bacon -s spec/*_spec.rb'
+end
+
+task :default => :spec
+

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/sumo

@@ -95,6 +95,10 @@ class CLI < Thor
 			@sumo ||= Sumo.new
 		end
 
+		def config
+			sumo.config
+		end
+
 		def task(msg, &block)
 			printf "---> %-24s ", "#{msg}..."
 			start = Time.now
@@ -107,8 +111,7 @@ class CLI < Thor
 
 		def connect_ssh(hostname)
 			sumo.wait_for_ssh(hostname)
-
-			system "ssh -i #{sumo.keypair_file} root@#{hostname}"
+			system "ssh -i #{sumo.keypair_file} #{config['user']}@#{hostname}"
 			if $?.success?
 				puts "\nType 'sumo terminate' if you're done with this instance."
 			end

data/lib/sumo.rb

@@ -116,7 +116,7 @@ class Sumo
 	end
 
 	def ssh(hostname, cmds)
-		IO.popen("ssh -i #{keypair_file} root@#{hostname} > ~/.sumo/ssh.log 2>&1", "w") do |pipe|
+		IO.popen("ssh -i #{keypair_file} #{config['user']}@#{hostname} > ~/.sumo/ssh.log 2>&1", "w") do |pipe|
 			pipe.puts cmds.join(' && ')
 		end
 		unless $?.success?
@@ -130,7 +130,7 @@ class Sumo
 	end
 
 	def fetch_resources(hostname)
-		cmd = "ssh -i #{keypair_file} root@#{hostname} 'cat /root/resources' 2>&1"
+		cmd = "ssh -i #{keypair_file} #{config['user']}@#{hostname} 'cat /root/resources' 2>&1"
 		out = IO.popen(cmd, 'r') { |pipe| pipe.read }
 		abort "failed to read resources, output:\n#{out}" unless $?.success?
 		parse_resources(out, hostname)
@@ -147,7 +147,11 @@ class Sumo
 	end
 
 	def config
-		@config ||= read_config
+		@config ||= default_config.merge read_config
+	end
+
+	def default_config
+		{ 'user' => 'root', 'ami' => 'ami-ed46a784' }
 	end
 
 	def sumo_dir
@@ -172,7 +176,7 @@ class Sumo
 
 	def create_security_group
 		ec2.create_security_group(:group_name => 'sumo', :group_description => 'Sumo')
-	rescue AWS::EC2::InvalidGroupDuplicate
+	rescue AWS::InvalidGroupDuplicate
 	end
 
 	def open_firewall(port)
@@ -183,7 +187,7 @@ class Sumo
 			:to_port => port,
 			:cidr_ip => '0.0.0.0/0'
 		)
-	rescue AWS::EC2::InvalidPermissionDuplicate
+	rescue AWS::InvalidPermissionDuplicate
 	end
 
 	def ec2

data/spec/base.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../lib/sumo'
+
+require 'bacon'
+require 'mocha/standalone'
+require 'mocha/object'
+
+class Bacon::Context
+	include Mocha::API
+
+	def initialize(name, &block)
+		@name = name
+		@before, @after = [
+			[lambda { mocha_setup }],
+			[lambda { mocha_verify ; mocha_teardown }]
+		]
+		@block = block
+	end
+
+	def xit(desc, &bk)
+	end
+end

data/spec/sumo_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/base'
+
+require 'fileutils'
+
+describe Sumo do
+	before do
+		@work_path = "/tmp/spec_#{Process.pid}/"
+		FileUtils.mkdir_p(@work_path)
+		File.open("#{@work_path}/config.yml", "w") do |f|
+			f.write YAML.dump({})
+		end
+
+		@sumo = Sumo.new
+		@sumo.stubs(:sumo_dir).returns(@work_path)
+	end
+
+	after do
+		FileUtils.rm_rf(@work_path)
+	end
+
+	it "defaults to user root if none is specified in the config" do
+		@sumo.config['user'].should == 'root'
+	end
+
+	it "uses specified user if one is in the config" do
+		File.open("#{@work_path}/config.yml", "w") do |f|
+			f.write YAML.dump('user' => 'joe')
+		end
+		@sumo.config['user'].should == 'joe'
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sumo
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Adam Wiggins
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-31 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: sumo
 dependencies: []
 
@@ -27,6 +27,8 @@ files:
 - VERSION
 - bin/sumo
 - lib/sumo.rb
+- spec/base.rb
+- spec/sumo_spec.rb
 has_rdoc: true
 homepage: http://github.com/adamwiggins/sumo
 post_install_message: 
@@ -53,5 +55,6 @@ rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A no-hassle way to launch one-off EC2 instances from the command line
-test_files: []
-
+test_files: 
+- spec/base.rb
+- spec/sumo_spec.rb