judo 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/judo.rb

@@ -12,6 +12,7 @@ require 'tempfile'
 class JudoError < RuntimeError ; end
 class JudoInvalid < RuntimeError ; end
 
+require File.dirname(__File__) + '/judo/util'
 require File.dirname(__FILE__) + '/judo/base'
 require File.dirname(__FILE__) + '/judo/group'
 require File.dirname(__FILE__) + '/judo/server'

data/lib/judo/cli_helpers.rb

@@ -137,7 +137,7 @@ module Judo
           printf "    %-24s: %s\n",k, i[k]
         end
       end
-      sub_info("METADATA", server.metadata.keys) do |key|
+      sub_info("METADATA", (server.metadata || {}).keys) do |key|
         printf("    %-24s: %s\n", key, server.metadata[key] )
       end
       sub_info("VOLUMES", server.ec2_volumes) do |v|

data/lib/judo/group.rb

@@ -54,7 +54,7 @@ module Judo
         userdata = File.read("#{name}/userdata.erb")
         tar = tar_file(@version)
         puts ""
-        system "tar czvf #{tar} #{name}"
+        Util.system_comfirmed "tar czvf #{tar} #{name}"
         puts "Uploading config to s3..."
         @base.s3_put(version_config_file(@version), conf.to_json)
         puts "Uploading userdata.erb to s3..."

data/lib/judo/server.rb

@@ -18,7 +18,7 @@ module Judo
       metadata      = options[:metadata]
       ip            = options[:elastic_ip]
       clone         = options[:clone]
-      instance_type = options[:instance_type]
+      instance_type = options[:instance_type] || 'm1.small'
       version       = options[:version] || group.version
 
       task("Creating server #{name}") do
@@ -202,7 +202,7 @@ module Judo
     def clone_snapshots(snapshots)
       snapshots.each do |device,snap_id|
         task("Creating EC2 Volume #{device} from #{snap_id}") do
-          volume_id = @base.ec2.create_volume(snap_id, nil, config["availability_zone"])[:aws_id]
+          volume_id = @base.ec2.create_volume(snap_id, nil, ec2_availability_zone)[:aws_id]
           add_volume(volume_id, device)
         end
       end
@@ -216,7 +216,7 @@ module Judo
             size = volume_config["size"]
             if not volumes[device]
               task("Creating EC2 Volume #{device} #{size}") do
-                volume_id = @base.ec2.create_volume(nil, size, config["availability_zone"])[:aws_id]
+                volume_id = @base.ec2.create_volume(nil, size, ec2_availability_zone)[:aws_id]
                 add_volume(volume_id, device)
               end
             else
@@ -287,12 +287,16 @@ module Judo
       task("Destroying server #{name}") { delete }
     end
 
+    def ec2_instance
+      @base.ec2_instances.detect { |e| e[:aws_instance_id] == instance_id } or {}
+    end
+
     def ec2_state
       ec2_instance[:aws_state]
     end
 
-    def ec2_instance
-      @base.ec2_instances.detect { |e| e[:aws_instance_id] == instance_id } or {}
+    def ec2_availability_zone
+      ec2_instance[:aws_availability_zone]
     end
 
     def running?
@@ -499,7 +503,7 @@ module Judo
     def ssh_command(cmd)
       wait_for_ssh
       @base.keypair_file do |file|
-        system "ssh -q -i #{file} #{config["user"]}@#{hostname} '#{cmd}'"
+        Util.system_confirmed "ssh -q -i #{file} #{config["user"]}@#{hostname} '#{cmd}'"
       end
     end
 

data/lib/judo/util.rb

@@ -0,0 +1,8 @@
+module Judo
+  module Util
+    def self.system_confirmed(cmd)
+      system cmd
+      raise "Command #{cmd} failed with exit code #{$?.to_i}" unless $?.success?
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Orion Henry
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 -07:00
+date: 2010-06-15 00:00:00 -07:00
 default_executable: judo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - lib/judo/patch.rb
 - lib/judo/server.rb
 - lib/judo/snapshot.rb
+- lib/judo/util.rb
 has_rdoc: true
 homepage: http://github.com/orionz/judo
 licenses: []