judo 0.1.4 → 0.2.0

data/TODO

@@ -1,10 +1,6 @@
 ### NEEDED for new gem launch
 
-### [ ] judo snapshots
-### [ ] judo snapshot foo bar
-### [ ] judo clone foo bar2
 ### [ ] snapshots/init/virgin
-### [ ] judo stop --force
 ### [ ] judo swap (x) (y) -> swaps elastic IP's and name
 ### [ ] judo swap_ip (x) (y) -> swaps elastic IP's and name
 

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/bin/judo

@@ -103,8 +103,8 @@ begin
     when "start" then find_servers(judo, ARGV)        { |s| s.start(options[:version]) }
     when "restart" then find_servers(judo, ARGV)      { |s| s.restart(options[:force]) }
     when "stop" then find_servers(judo, ARGV)         { |s| s.stop(options[:force]) }
-    when "create" then mk_servers(judo, ARGV)         { |s| s.create(options[:version]) }
-    when "launch" then mk_servers(judo, ARGV)         { |s| s.create(options[:version]); s.start }
+    when "create" then mk_servers(judo, ARGV)         { |s| s.create( :version => options[:version]) }
+    when "launch" then mk_servers(judo, ARGV)         { |s| s.create( :version => options[:version]); s.start }
     when "snapshots" then do_snapshots(judo, ARGV)
     when "erase" then
       raise JudoError, "usage: judo erase SNAPSHOT" unless ARGV.size == 1

data/lib/judo/commandline_helpers.rb

@@ -123,10 +123,9 @@ module JudoCommandLineHelpers
     servers = find_servers(judo, args)
     printf "  SNAPSHOTS\n"
     printf "%s\n", ("-" * 80)
-    ## FIXME - listing snapshots for deleted servers?
     judo.snapshots.each do |snapshot|
-#      next if args and not servers.map { |s| s.name }.include?(snapshot.server_name)
-      printf "%-15s %-25s %-15s %-10s %s\n", snapshot.name, snapshot.server_name, snapshot.group_name, snapshot.version_desc, "#{snapshot.num_ec2_snapshots}v"
+      next if args and not servers.detect { |s| s == snapshot.server }
+      printf "%-15s %-25s %-15s %-10s %s\n", snapshot.name, snapshot.server_name, snapshot.group_name, snapshot.version_desc, "#{snapshot.ec2_ids.size}v"
     end
   end
 
@@ -139,17 +138,29 @@ module JudoCommandLineHelpers
     end
   end
 
+  def sub_info(header, data, &block)
+    return if data == []
+    return if data == {}
+    return if data.nil?
+    puts "  [ #{header} ]"
+    [ data ].flatten.each do |d|
+      block.call(d)
+    end
+  end
+
   def do_info(judo, server)
-    puts "#{server}"
-    if server.ec2_instance and not server.ec2_instance.empty?
-      puts "\t[ EC2 ]"
+    puts "[ #{server} ]"
+    printf "    %-24s: %s\n", "Group", server.group.name
+    printf "    %-24s: %s\n", "Note", server.note if server.note
+    printf "    %-24s: %s\n", "Clone Of", server.clone if server.clone
+    printf "    %-24s: %s\n", "Elastic Ip", server.elastic_ip if server.elastic_ip
+    sub_info("EC2", server.ec2_instance) do |i|
       [:aws_instance_id, :ssh_key_name, :aws_availability_zone, :aws_state, :aws_image_id, :dns_name, :aws_instance_type, :private_dns_name, :aws_launch_time, :aws_groups ].each do |k|
-        printf "\t %-24s: %s\n",k, server.ec2_instance[k]
+        printf "    %-24s: %s\n",k, i[k]
       end
     end
-    puts "\t[ VOLUMES ]"
-    server.ec2_volumes.each do |v|
-      printf "\t %-13s %-10s %-10s %4d  %-10s %-8s\n",
+    sub_info("VOLUMES", server.ec2_volumes) do |v|
+      printf "    %-13s %-10s %-10s %4d  %-10s %-8s\n",
       v[:aws_id],
       v[:aws_status],
       v[:zone],
@@ -157,5 +168,8 @@ module JudoCommandLineHelpers
       v[:aws_attachment_status],
       v[:aws_device]
     end
+    sub_info("SNAPSHOTS", server.snapshots) do |s|
+      printf "    %-10s %-15s %-8s %-5s\n", s.name, s.group_name, s.version_desc, "#{s.ec2_ids.size}v"
+    end
   end
 end

data/lib/judo/server.rb

@@ -8,9 +8,15 @@ module Judo
       @group_name = group
     end
 
-    def create(version = group.version, snapshots = nil)
+    def create(options)
       raise JudoError, "no group specified" unless @group_name
 
+      snapshots = options[:snapshots]
+      note = options[:note]
+
+      version = options[:version]
+      version ||= group.version
+
       if @name.nil?
         index = @base.servers.map { |s| (s.name =~ /^#{s.group.name}.(\d*)$/); $1.to_i }.sort.last.to_i + 1
         @name = "#{group.name}.#{index}"
@@ -19,7 +25,7 @@ module Judo
       raise JudoError, "there is already a server named #{name}" if @base.servers.detect { |s| s.name == @name and s != self}
 
       task("Creating server #{name}") do
-        update "name" => name, "group" => @group_name, "virgin" => true, "secret" => rand(2 ** 128).to_s(36), "version" => version
+        update "name" => name, "group" => @group_name, "note" => note, "virgin" => true, "secret" => rand(2 ** 128).to_s(36), "version" => version
         @base.sdb.put_attributes("judo_config", "groups", @group_name => name)
       end
 
@@ -85,6 +91,10 @@ module Judo
       end
     end
 
+    def note
+      get("note")
+    end
+
     def clone
       get("clone")
     end
@@ -102,7 +112,7 @@ module Judo
     end
 
     def snapshots
-      base.snapshots.select { |s| s.server == self }
+      @base.snapshots.select { |s| s.server == self }
     end
 
     def volumes
@@ -295,7 +305,7 @@ module Judo
     def force_detach_volumes
       volumes.each do |device,volume_id| 
         task("Force detaching #{volume_id}") do
-          @base.ec2.detach_volume(volume_id, instance_id, device, true)
+          @base.ec2.detach_volume(volume_id, instance_id, device, true) rescue nil
         end
       end
     end

data/lib/judo/snapshot.rb

@@ -32,10 +32,6 @@ module Judo
       get("version").to_i
     end
 
-    def num_ec2_snapshots
-      devs.size
-    end
-
     def devs
       Hash[ (state["devs"] || []).map { |a| a.split(":") } ]
     end
@@ -55,7 +51,7 @@ module Judo
     def clone(new_server, version = self.version)
       raise JudoError, "cannot clone, snapshotting not complete" unless completed?
       server = @base.new_server(new_server, group_name)
-      server.create(version, devs)
+      server.create( :version => version, :snapshots => devs)
       server.update "clone" => name ##, "secret" => rand(2 ** 128).to_s(36)  ## cant change this till kuzushi knows about a post-clone operation
     end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 4
-  version: 0.1.4
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Orion Henry