judo 0.3.0 → 0.3.1

data/TODO

@@ -10,6 +10,8 @@
 ###     [ ] store s3 bucket in config
 ### [ ] saw a timeout on volume allocation - make sure we build in re-tries - need to allocate the server all together as much as possible
 ### [ ] round robin or specified availability_zone
+### [ ] clean up the --group stuff in the code - get it out of judo
+### [ ] want 'judo destroy :ronin ^server1' 
 
 ### MAYBE
 ### [ ] store things in s3 by sha1sum

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/judo

@@ -32,7 +32,7 @@ Usage: judo launch [options] SERVER ...
 
        judo snapshot [options] SERVER SNAPSHOT ## take an ebs snapshot of a server
        judo snapshots [options] [SERVER ...]   ## show current snapshots on servers
-       judo clone [options] SNAPSHOT SERVER    ## create a new server from a snapshot
+       judo animate [options] SNAPSHOT SERVER    ## create a new server from a snapshot
        judo erase [options] SNAPSHOT           ## erase an old snapshot
 
        judo swapip [options] SERVER SERVER     ## swap elastic IP's on the two servers
@@ -143,14 +143,14 @@ begin
       raise JudoError, "You must specify a valid server to snapshot" if servers.empty?
       raise JudoError, "You can only snapshot one server at a time" if servers.size > 1
       servers[0].snapshot(snapshot_name)
-    when "clone" then
+    when "animate" then
       snapshot_name = ARGV.shift
       raise JudoError, "You must specify a snapshot name" unless snapshot_name
       new_server = ARGV.shift
       raise JudoError, "You must specify a new server name" unless new_server
       snapshot = judo.snapshots.detect { |s| s.name == snapshot_name }
       raise JudoError, "No such snapshot #{snapshot_name}" unless snapshot
-      snapshot.clone(new_server,options[:version])
+      snapshot.animate(new_server,options[:version])
     when "destroy" then
       raise JudoError, "You must specify what servers to destroy" if ARGV.empty?
       find_either(judo, ARGV) do |i|

data/lib/judo/base.rb

@@ -24,9 +24,9 @@ end
 
 module Judo
   class Base
-    attr_accessor :judo_dir, :repo, :group
+    attr_accessor :judo_dir, :repo, :group, :domain
 
-    def initialize(options)
+    def initialize(options = Judo::Base.default_options)
       @judo_dir      = options[:judo_dir]
       @repo          = options[:repo]
       @group         = options[:group]
@@ -81,7 +81,7 @@ module Judo
       sdb_domain("judo_config")
     end
 
-    def self.default_options(pwd, dir = find_judo_dir(pwd))
+    def self.default_options(pwd = Dir.pwd, dir = find_judo_dir(pwd))
       config = YAML.load File.read("#{dir}/config.yml")
       repo_dir = config["repo"] || File.dirname(dir)
       group_config = Dir["#{repo_dir}/*/config.json"].detect { |d| File.dirname(d) == pwd }

data/lib/judo/commandline_helpers.rb

@@ -152,7 +152,7 @@ module JudoCommandLineHelpers
     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", "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|

data/lib/judo/group.rb

@@ -54,7 +54,7 @@ module Judo
           end
           File.open("config.json", "w") { |f| f.write(new_config.to_json) }
           Dir.chdir("..") do
-            system "tar czf #{tar_file} #{name}"
+            system "tar czvf #{tar_file} #{name}"
             # puts "Uploading to s3..."
             @base.s3_put(tar_file, File.new(tar_file).read)
             @base.s3_put(version_config_file, new_config.to_json)

data/lib/judo/server.rb

@@ -11,10 +11,13 @@ module Judo
     def create(options)
       raise JudoError, "no group specified" unless group_name
 
+      options[:virgin] = true if options[:virgin].nil?
+
       snapshots  = options[:snapshots]
-      note       = options[:note]  ## a user defined note field
-      data       = options[:data]  ## instance specific data passed in JUDO_DATA
-      ip         = options[:elastic_ip]      ## if the ip was allocated beforehand
+      note       = options[:note]        ## a user defined note field
+      data       = options[:data]        ## instance specific data passed in JUDO_DATA
+      ip         = options[:elastic_ip]  ## if the ip was allocated beforehand
+      virgin     = options[:virgin]      ## should the server init?
 
       version = options[:version]
       version ||= group.version
@@ -28,7 +31,7 @@ module Judo
 
       task("Creating server #{name}") do
         update "name" => name,         "group" => group_name,
-               "note" => note,         "virgin" => true,
+               "note" => note,         "virgin" => virgin,
                "secret" => new_secret, "version" => version,
                "data" => data,         "elastic_ip" => ip
         @base.sdb.put_attributes(@base.base_domain, "groups", group_name => name)
@@ -90,11 +93,7 @@ module Judo
 
     def kuzushi_action
       if virgin?
-        if cloned?
-          "start"
-        else
-          "init"
-        end
+        "init"
       else
         "start"
       end
@@ -328,6 +327,7 @@ module Judo
       force_detach_volumes if force
       wait_for_volumes_detached if volumes.size > 0
       remove "instance_id"
+      update "stopped_at" => Time.now.to_i
     end
 
     def launch_ec2(boot = nil)
@@ -342,7 +342,7 @@ module Judo
         :key_name => config["key_name"],
         :group_ids => security_groups,
         :user_data => ud).first
-      update "instance_id" => result[:aws_instance_id], "virgin" => false
+      update "instance_id" => result[:aws_instance_id], "virgin" => false, "started_at" => Time.now.to_i
     end
 
     def debug(str)
@@ -498,6 +498,7 @@ module Judo
 export DEBIAN_FRONTEND="noninteractive"
 export DEBIAN_PRIORITY="critical"
 export JUDO_ID='#{name}'
+export JUDO_DOMAIN='#{@base.domain}'
 export JUDO_BOOT='#{judo_boot}'
 export JUDO_DATA='#{data}'
 export SECRET='#{secret}'

data/lib/judo/snapshot.rb

@@ -1,11 +1,17 @@
 module Judo
+  ### sdb 
+  ### name { 
+  ###   "version"    => [ server.version ], 
+  ###   "devs"       => [ "/dev/sde1:snap-abc123", "/dev/sde2:snap-abc456" ],
+  ###   "server"     => server.name
+  ###   "group"      => server.group.name
+  ###   "virgin"     => server.virgin
+  ###   "note"       => server.note
+  ###   "data"       => server.data
+  ###   "created_at" => unixtime
   class Snapshot
     attr_accessor :name, :server_name
 
-    def self.domain
-      "judo_snapshots"
-    end
-
     def initialize(base, name, server_name)
       @base = base
       @name = name
@@ -28,10 +34,26 @@ module Judo
       get("group")
     end
 
+    def created_at
+      Time.at(get("time").to_i)
+    end
+
     def version
       get("version").to_i
     end
 
+    def note
+      get("note")
+    end
+
+    def data
+      get("data")
+    end
+
+    def virgin
+      get("virgin").to_s == "true"
+    end
+
     def devs
       Hash[ (state["devs"] || []).map { |a| a.split(":") } ]
     end
@@ -43,16 +65,26 @@ module Judo
         devs = server.volumes.map do |dev,vol|
           "#{dev}:#{@base.ec2.create_snapshot(vol)[:aws_id]}"
         end
-        @base.sdb.put_attributes(@base.snapshot_domain, name, { "version" => server.version, "devs" => devs, "server" => server.name, "group" => server.group.name }, :replace)
+        @base.sdb.put_attributes(@base.snapshot_domain, name, { 
+          "version" => server.version, 
+          "virgin" => server.virgin?, 
+          "note" => server.note, 
+          "data" => server.data, 
+          "devs" => devs, 
+          "server" => server.name, 
+          "group" => server.group.name,
+          "created_at" => Time.now.to_i.to_s
+        }, :replace)
         server.add "snapshots", name
       end
     end
 
-    def clone(new_server, version = self.version)
-      raise JudoError, "cannot clone, snapshotting not complete" unless completed?
+    def animate(new_server, version = self.version)
+      raise JudoError, "cannot animate, snapshotting not complete" unless completed?
       server = @base.new_server(new_server, group_name)
-      server.create( :version => version, :snapshots => devs)
+      server.create( :version => version, :snapshots => devs, :virgin => virgin, :note => note, :data => data )
       server.update "clone" => name ##, "secret" => rand(2 ** 128).to_s(36)  ## cant change this till kuzushi knows about a post-clone operation
+      server
     end
 
     def delete
@@ -81,8 +113,16 @@ module Judo
       devs.values
     end
 
+    def ec2_data
+      @base.ec2_snapshots.select { |s| ec2_ids.include? s[:aws_id] }
+    end
+
     def completed?
-      not @base.ec2_snapshots.select { |s| ec2_ids.include? s[:aws_id] }.detect { |s| s[:aws_status] != "completed" }
+      not ec2_data.detect { |s| s[:aws_status] != "completed" }
+    end
+
+    def progress
+      "#{(ec2_data.inject(0) { |sum,a| sum + a[:aws_progress].to_i } / ec2_data.size).to_i}%"
     end
 
     def size(snap_id)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Orion Henry
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 -04:00
+date: 2010-05-20 00:00:00 -04:00
 default_executable: judo
 dependencies: 
 - !ruby/object:Gem::Dependency