judo 0.4.4 → 0.5.0

data/lib/judo/snapshot.rb

@@ -1,14 +1,4 @@
 module Judo
-  ### sdb
-  ### name {
-  ###   "version"    => [ server.version ],
-  ###   "devs"       => [ "/dev/sde1:snap-abc123", "/dev/sde2:snap-abc456" ],
-  ###   "server"     => server.id
-  ###   "group"      => server.group.name
-  ###   "virgin"     => server.virgin
-  ###   "note"       => server.note
-  ###   "data"       => server.data
-  ###   "created_at" => unixtime
   class Snapshot
     attr_accessor :name, :server_id
 
@@ -46,12 +36,9 @@ module Judo
       get("version").to_i
     end
 
-    def note
-      get("note")
-    end
-
-    def data
-      get("data")
+    def metadata
+      metadata_json = get("metadata_json")
+      JSON.load(metadata_json) if metadata_json
     end
 
     def virgin
@@ -72,26 +59,25 @@ module Judo
         @base.sdb.put_attributes(@base.snapshot_domain, name, {
           "version" => server.version,
           "virgin" => server.virgin?,
-          "note" => server.note,
-          "data" => server.data,
+          "metadata_json" => server.get("metadata_json"),
           "devs" => devs,
           "server" => server.id,
           "group" => server.group.name,
           "created_at" => Time.now.to_i.to_s
         }, :replace)
-        server.add "snapshots", name
       end
     end
 
-    def animate(new_server)
+    def animate(new_server_name)
       raise JudoError, "cannot animate, snapshotting not complete" unless completed?
-      @base.create_server(new_server, group_name, :version => version, :snapshots => devs, :virgin => virgin, :note => note, :data => data , :clone => name)
+      @base.create_server(new_server_name, group_name,
+        :version => version, :snapshots => devs, :virgin => virgin,
+        :metadata => metadata , :clone => name, :instance_type => server.instance_type)
     end
 
     def delete
-      ### TODO - wait for snapshotting to finish
+      raise JudoError, "cannot delete, snapshotting not complete" unless completed?
       @base.sdb.delete_attributes(@base.snapshot_domain, name)
-      server.remove("snapshots", name) if server
     end
 
     def get(key)
@@ -124,7 +110,8 @@ module Judo
     end
 
     def progress
-      "#{(ec2_data.inject(0) { |sum,a| sum + a[:aws_progress].to_i } / ec2_data.size).to_i}%"
+      min_percent = ec2_data.map { |s| s[:aws_progress].to_i }.min
+      "#{min_percent}%"
     end
 
     def size(snap_id)

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Orion Henry
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -04:00
+date: 2010-06-11 00:00:00 -07:00
 default_executable: judo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,11 +63,9 @@ extensions: []
 
 extra_rdoc_files: 
 - README.markdown
-- TODO
 files: 
 - README.markdown
 - Rakefile
-- TODO
 - VERSION
 - bin/judo
 - default/config.json
@@ -76,13 +74,11 @@ files:
 - default/userdata.erb
 - lib/judo.rb
 - lib/judo/base.rb
-- lib/judo/commandline_helpers.rb
+- lib/judo/cli_helpers.rb
 - lib/judo/group.rb
+- lib/judo/patch.rb
 - lib/judo/server.rb
 - lib/judo/snapshot.rb
-- spec/base.rb
-- spec/base_spec.rb
-- spec/server_spec.rb
 has_rdoc: true
 homepage: http://github.com/orionz/judo
 licenses: []
@@ -113,7 +109,5 @@ rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: The gentle way to manage and control ec2 instances
-test_files: 
-- spec/base.rb
-- spec/base_spec.rb
-- spec/server_spec.rb
+test_files: []
+

data/TODO

@@ -1,15 +0,0 @@
-### NEEDED for new gem launch
-
-### [ ] round robin or specified availability_zone
-### [ ] implement auto security_group creation and setup
-### [ ] start and stop services in parallel
-### [ ] retry volume creation timeout (happened once)
-
-### MAYBE
-### [ ] ebs backed root disk + start/stop
-### [ ] two phase delete
-### [ ] write specs
-### [ ] store git commit hash with commit to block a judo commit if there is newer material stored
-### [ ] use amazon's new conditional write tools so we never have problems from concurrent updates
-### [ ] zerigo integration for automatic DNS setup
-

data/lib/judo/commandline_helpers.rb

@@ -1,144 +0,0 @@
-module JudoCommandLineHelpers
-
-  def each_server(judo, args, &blk)
-    raise JudoError, "No servers specified - use :all for all servers" if args.empty?
-    servers = judo.find_servers_by_name_or_groups_with_not(args)
-    servers.each do |server|
-      begin
-        blk.call(server)
-      rescue JudoInvalid => e
-        puts "#{server} - #{e.message}"
-      end
-    end
-  end
-
-  def mk_server_names(judo, args, &blk)
-    args.each do |arg|
-      name,group = arg.split(":")
-      raise JudoError, "You must specify a group on create and launch" unless group
-      names = if name =~ /^[12345]$/ 
-        (1..(name.to_i)).each do 
-          blk.call(judo.mk_server_name(group), group)
-        end
-      elsif name == ""
-        blk.call(judo.mk_server_name(group), group)
-      elsif name =~ /^\d+$/ 
-        raise JudoError, "You can batch-create between 1 and 5 servers" if count < 1 or count > 5
-      else
-        blk.call(name, group)
-      end
-    end
-  end
-
-  def mk_groups(judo, args, &blk)
-    args.each do |name|
-      if name =~ /:(.+)$/
-        blk.call(judo.get_group($1))
-      else
-        raise JudoError, "Invalid group name '#{name}'"
-      end
-    end
-  end
-
-  def mk_servers(judo, options, args, start)
-    mk_server_names(judo, args) do |name, group|
-      begin
-        server = judo.create_server(name, group, options)
-        server.start(options) if start
-      rescue JudoInvalid => e
-        puts "#{server} - #{e.message}"
-      end
-    end
-  end
-
-  def do_groups(judo)
-    printf "  SERVER GROUPS\n"
-    judo.groups.each do |g|
-      printf "%-18s %s servers\n", g.name, g.servers.size
-    end
-  end
-
-  def do_volumes(judo)
-    vols = judo.volumes.sort { |a,b| [ a[:assigned_to].to_s, a[:instance_id].to_s ] <=> [ b[:assigned_to].to_s, b[:instance_id].to_s ] }
-
-    format = "%13s %6s %12s  %-10s %-16s %-16s\n"
-    printf format, "AWS_ID", "SIZE", "AWS_STATUS", "AWS_DEVICE", "ATTACHED TO", "CONFIGURED FOR"
-    printf "%s\n", ("-" * 80)
-
-    vols.each do |v|
-      attached = v[:attached_to] ? v[:attached_to].name : v[:instance_id]
-      assigned = v[:assigned_to] ? v[:assigned_to].name : ""
-      printf format, v[:id], v[:size], v[:status], v[:device], attached, assigned
-    end
-  end
-
-  def do_ips(judo)
-    ips = judo.ips.sort { |a,b| a[:assigned_to].to_s <=> b[:assigned_to].to_s }
-
-    format = "%15s %20s %20s\n"
-    printf format, "IP", "ATTACHED TO", "CONFIGURED FOR"
-    printf "%s\n", ("-"*57)
-
-    ips.each do |ip|
-      attached = ip[:attached_to] ? ip[:attached_to].name : ip[:instance_id]
-      assigned = ip[:assigned_to] ? ip[:assigned_to].name : ""
-      printf format, ip[:ip], attached, assigned
-    end
-  end
-
-  def do_snapshots(judo, args)
-    printf "  SNAPSHOTS\n"
-    printf "%s\n", ("-" * 80)
-    judo.snapshots.each do |snapshot|
-      printf "%-15s %-25s %-15s %-10s %s\n", snapshot.name, snapshot.server_name, snapshot.group_name, snapshot.version_desc, "ebs:#{snapshot.ec2_ids.size}"
-    end
-  end
-
-  def do_list(judo, args)
-    printf "  SERVERS\n"
-    printf "%s\n", ("-" * 80)
-    args << ":all" if args.empty?
-    each_server(judo,args) do |s|
-      printf "%-32s %-12s %-7s %-11s %-11s %-10s %-3s %s\n", s.name, s.group.name, s.version_desc, s.get("instance_id"), s.size_desc, s.ec2_state, "ebs:#{s.volumes.keys.size}", s.has_ip? ? "ip" : ""
-    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} ]"
-    printf "    %-24s: %s\n", "ID", server.id
-    printf "    %-24s: %s\n", "Group", server.group.name
-    printf "    %-24s: %s\n", "Note", server.note if server.note
-    printf "    %-24s: %s\n", "Animated From", 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 "    %-24s: %s\n",k, i[k]
-      end
-    end
-    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|
-      printf "    %-13s %-10s %-10s %4d  %-10s %-8s\n",
-      v[:aws_id],
-      v[:aws_status],
-      v[:zone],
-      v[:aws_size],
-      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/spec/base.rb

@@ -1,21 +0,0 @@
-require File.dirname(__FILE__) + '/../lib/judo'
-
-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/base_spec.rb

@@ -1,9 +0,0 @@
-require File.dirname(__FILE__) + '/base'
-
-describe Judo::Base do
-	before do
-	end
-	
-	it "xxx" do
-	end
-end

data/spec/server_spec.rb

@@ -1,9 +0,0 @@
-require File.dirname(__FILE__) + '/base'
-
-describe Judo::Server do
-	before do
-	end
-	
-	it "creates a new server" do
-	end
-end