judo 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/bin/judo

@@ -12,6 +12,13 @@ class CLI < Thor
 		end
 	end
 
+	desc "dump", "start one or more servers"
+	def dump
+		require 'pp'
+      pp Judo::Config.sdb.select("SELECT * FROM judo_servers")[:items]
+      pp Judo::Config.sdb.select("SELECT * FROM judo_config")[:items]
+	end
+
 	desc "ssh [NAMES]", "ssh to a specified server or first available"
 	def ssh(*names)
 		servers(*names) do |server|
@@ -123,11 +130,7 @@ class CLI < Thor
 	desc "console [NAMES]", "get console output for server or first available"
 	def console(*names)
 		servers(*names) do |server|
-			if server.running?
-				puts "Not running: #{server.name}"
-			else
-				puts server.console_output if server.running?
-			end
+			puts server.console_output
 		end
 	end
 

data/lib/config.rb

@@ -15,7 +15,7 @@ module Judo
 		end
 
 		def check_version
-			fail "judo db is newer than the current gem - upgrade judo and try again" if get_db_version > db_version
+			abort "judo db is newer than the current gem - upgrade judo and try again" if get_db_version > db_version
 		end
 
 		def repo_dir
@@ -77,13 +77,12 @@ module Judo
 		end
 
 		def get_sdb(aws_id, aws_key)
-			puts "GET SDB #{aws_id} #{aws_key}"
 			Aws::SdbInterface.new(aws_id, aws_key, :logger => Logger.new(nil))
 		end
 
 		def sdb
 			@sdb ||= get_sdb(access_id, access_secret)
-			@version_ok ||= check_version
+#			@version_ok ||= check_version
 			@sdb
 		end
 
@@ -92,7 +91,7 @@ module Judo
 		end
 
 		def s3_url(k)
-			s3.get_object_url(judo_config["s3_bucket"], k,Time.now.to_i + 100_000_000)
+			s3.get_object_url(judo_config["s3_bucket"], k, Time.now.to_i + 100_000_000)
 		end
 
 		def s3_put(k, file)

data/lib/group.rb

@@ -54,7 +54,6 @@ module Judo
 
 		def version
 			@version ||= (Judo::Config.sdb.get_attributes("judo_config", "group_versions")[:attributes][@name] || ["0"]).first.to_i
-			@version ||= (Judo::Config.sdb.get_attributes("judo_config", "group_versions")[:attributes][@name] || ["0"]).first.to_i
 		end
 
 		def set_version(new_version)
@@ -132,7 +131,7 @@ module Judo
 		end
 
 		def keypair_file
-			(attachments.select { |a| File.basename(config["keypair"]) }) || fail("no keypair_file specified")
+			extract_file(:keypair, config["key_name"] + ".pem" , {}).first
 		end
 
 		def attachments

data/lib/server.rb

@@ -10,8 +10,8 @@
 ###     [X] compile and put in s3
 ###     [X] attach and increment version number
 ###     [X] list version number on "judo list"
-###     [ ] update kuzushi to pull down a compiled tar.gz
-###     [ ] error if version is blank
+###     [X] update kuzushi to pull down a compiled tar.gz
+###     [X] error if version is blank
 ### [ ] two phase delete (1 hr)
 ### [-] refactor availability_zone (2 hrs)
 ###     [ ] pick availability zone from config "X":"Y" or  "X":["Y","Z"]
@@ -24,6 +24,10 @@
 ### [ ] user a logger service (1 hr)
 ### [ ] write specs (5 hr)
 
+### Error Handling
+### [ ] no availability zone before making disks
+### [ ] security group does not exists
+
 ### Do Later
 ### [ ] use amazon's new conditional write tools so we never have problems from concurrent updates
 ### [ ] is thor really what we want to use here?
@@ -46,33 +50,6 @@ module Judo
 			@group = group
 		end
 
-### Getting things in and out of SimpleDB - would be nice if it were a plugin so we could use another store if need db (couchdb/mongo/sql)
-
-		def self.migrate
-			require 'pp'
-			x = {}
-			Judo::Config.sdb.delete_domain("judo_servers")
-			Judo::Config.sdb.create_domain("judo_servers")
-			Judo::Config.sdb.delete_domain("judo_config")
-			Judo::Config.sdb.create_domain("judo_config")
-			Judo::Config.sdb.select("SELECT * FROM sumo_server").items.each do |chunk|
-				chunk.each do |uid,item|
-					name = item["name"] || "missing_#{rand(2**32).to_s(36)}"
-					group = (item["group"] || "default")
-					data = {
-						"group" => (item["group"] || "default" ), "name" => name,
-						"secret" => item["secret"], "elastic_ip" => item["elastic_ip"],
-						"volumes" => (item["volumes_flat"] || JSON.parse(item["volumes_json"] || "[]").map { |k,v| "#{k}:#{v}" }),
-						"instance_id" => item["instance_id"], "virgin" => item["virgin"]
-					}.delete_if { |k,v| v == [] or v == nil or v == [nil] }
-					pp data
-					Judo::Config.sdb.put_attributes("judo_servers", name, data, :replace)
-					Judo::Config.sdb.put_attributes("judo_config", "groups", group => name)
-				end
-			end
-			"ok"
-		end
-
 		def domain
 			"judo_servers"
 		end
@@ -106,7 +83,8 @@ module Judo
 		end
 
 		def version_desc
-			if version.to_i == group.version.to_i
+			return "" unless running?
+			if version == group.version
 				"v#{version}"
 			else
 				"v#{version}/#{group.version}"
@@ -114,7 +92,7 @@ module Judo
 		end
 
 		def version
-			get "version"
+			get("version").to_i
 		end
 
 		def virgin?
@@ -192,7 +170,7 @@ module Judo
 			begin
 				if config["elastic_ip"] and not elastic_ip
 					### EC2 allocate_address
-					task("Adding an elastic ip") do 
+					task("Adding an elastic ip") do
 						ip = Judo::Config.ec2.allocate_address
 						add_ip(ip)
 					end
@@ -265,6 +243,7 @@ module Judo
 
 		def start
 			abort "Already running" if running?
+			abort "No config has been commited yet, type 'judo commit'" unless group.version > 0
 			task("Starting server #{name}")      { launch_ec2 }
 			task("Acquire hostname")             { wait_for_hostname }
 			task("Wait for ssh")                 { wait_for_ssh }
@@ -290,7 +269,7 @@ module Judo
 			## EC2 terminate_isntaces
 			task("Terminating instance") { Config.ec2.terminate_instances([ instance_id ]) }
 			task("Wait for volumes to detach") { wait_for_volumes_detached } if volumes.size > 0
-			remove "instance_id" 
+			remove "instance_id"
 		end
 
 		def launch_ec2
@@ -305,7 +284,6 @@ module Judo
 				:user_data => user_data).first
 
 			update "instance_id" => result[:aws_instance_id], "virgin" => false, "version" => group.version
-#			remove "virgin"
 		end
 
 		def security_groups
@@ -313,7 +291,7 @@ module Judo
 		end
 
 		def console_output
-			### EC2 get_console_output
+			abort "not running" unless running?
 			Config.ec2.get_console_output(instance_id)[:aws_output]
 		end
 
@@ -458,12 +436,13 @@ apt-get update
 apt-get install ruby rubygems ruby-dev irb libopenssl-ruby libreadline-ruby -y
 gem install kuzushi --no-rdoc --no-ri
 GEM_BIN=`ruby -r rubygems -e "puts Gem.bindir"`
-$GEM_BIN/kuzushi #{virgin? && "init" || "start"} #{url}
+echo "$GEM_BIN/kuzushi #{virgin? && "init" || "start"} '#{url}'" > /var/log/kuzushi.log
+$GEM_BIN/kuzushi #{virgin? && "init" || "start"} '#{url}' >> /var/log/kuzushi.log 2>&1
 USER_DATA
 		end
 
 		def url
-			group.s3_url
+			@url ||= group.s3_url
 		end
 
 		def validate

data/lib/setup.rb

@@ -27,14 +27,9 @@ DEFAULT
 			input.empty? and default or input 
 		end
 
-		def failure(msg)
-			puts msg
-			exit 1
-		end
-
 		def check_setup
-			failure "you are already inside a judo repository" if Judo::Config.find_judo_dir(Dir.pwd)
-			failure "./.git not found - judo configurations must be kept in a git repo.  type 'git init' to setup the git repo." unless File.exists? "./.git"
+			abort "you are already inside a judo repository" if Judo::Config.find_judo_dir(Dir.pwd)
+			abort "./.git not found - judo configurations must be kept in a git repo.  type 'git init' to setup the git repo." unless File.exists? "./.git"
 		end
 
 		def init
@@ -71,7 +66,7 @@ DEFAULT
 			sdb.create_domain("judo_servers")
 			sdb.create_domain("judo_config")
       olddb = sdb.get_attributes("judo_config", "judo")[:attributes]["dbversion"]
-			failure "There is an existing judo database of a newer version - upgrade judo and try again" if olddb and olddb.first.to_i > Judo::Config.db_version
+			abort "There is an existing judo database of a newer version - upgrade judo and try again" if olddb and olddb.first.to_i > Judo::Config.db_version
 			sdb.put_attributes("judo_config", "judo", { "dbversion" => Judo::Config.db_version }, :replace)
 		end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Orion Henry
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -08:00
+date: 2010-03-11 00:00:00 -05:00
 default_executable: judo
 dependencies: 
 - !ruby/object:Gem::Dependency