judo 0.2.0 → 0.2.1

data/TODO

@@ -1,8 +1,8 @@
 ### NEEDED for new gem launch
 
-### [ ] snapshots/init/virgin
+### [ ] snapshot complete in do_snapshots()
 ### [ ] judo swap (x) (y) -> swaps elastic IP's and name
-### [ ] judo swap_ip (x) (y) -> swaps elastic IP's and name
+### [ ] snapshots/init/virgin
 
 ### [ ] judo does not work with ruby 1.8.6 - :(
 ### [ ] saw a timeout on volume allocation - make sure we build in re-tries - need to allocate the server all together as much as possible

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/judo

@@ -35,6 +35,8 @@ Usage: judo launch [options] SERVER ...
        judo clone [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
+
        judo info [options] [SERVER ...]
        judo console [options] [SERVER ...] ## shows AWS console output
        judo ssh [options] [SERVER ...]     ## ssh's into the server
@@ -76,6 +78,9 @@ banner
   opts.on( '-g', '--group GROUP', 'Specify the default group of the repo dir' ) do |group|
     options[:group] = group
   end
+  opts.on( '-n', '--note NOTE', 'Add a note to a server as you create or launch it') do |note|
+    options[:note] = note
+  end
   opts.on( '-v', '--version VERSION', 'Update the servers config version on create/start/launch' ) do |version|
     options[:version] = version
   end
@@ -103,9 +108,13 @@ 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( :version => options[:version]) }
-    when "launch" then mk_servers(judo, ARGV)         { |s| s.create( :version => options[:version]); s.start }
+    when "create" then mk_servers(judo, ARGV)         { |s| s.create(options) }
+    when "launch" then mk_servers(judo, ARGV)         { |s| s.create(options); s.start }
     when "snapshots" then do_snapshots(judo, ARGV)
+    when "swapip" then
+      servers = find_servers(judo, ARGV)
+      raise JudoError, "usage: judo swapip SERVER SERVER" unless servers.size == 2
+      servers[0].swapip(servers[1])
     when "erase" then
       raise JudoError, "usage: judo erase SNAPSHOT" unless ARGV.size == 1
       snapshot_name = ARGV.shift

data/lib/judo/base.rb

@@ -68,13 +68,16 @@ module Judo
         :judo_dir      => dir,
         :group         => group_config ? File.basename(File.dirname(group_config)) : nil,
         :repo          => repo_dir,
-        :bucket        => config["s3_bucket"],
-        :access_id     => config["access_id"],
-        :access_secret => config["access_secret"]
+        :bucket        => (config["s3_bucket"] || ENV['JUDO_BUCKET']),
+        :access_id     => (config["access_id"] || ENV['AWS_ACCESS_KEY_ID']),
+        :access_secret => (config["access_secret"] || ENV['AWS_SECRET_ACCESS_KEY'])
       }.delete_if { |key,value| value.nil? }
     rescue Object => e
-      puts e.inspect
-      {}
+      {
+        :access_id     => ENV['AWS_ACCESS_KEY_ID'],
+        :access_secret => ENV['AWS_SECRET_ACCESS_KEY'],
+        :bucket        => ENV['JUDO_BUCKET']
+      }.delete_if { |key,value| value.nil? }
     end
 
     def self.find_judo_dir(check)

data/lib/judo/commandline_helpers.rb

@@ -11,7 +11,7 @@ module JudoCommandLineHelpers
     if string =~  /([^:]*):(.*)/
       [ $1, $2 ]
     else
-      [ string, nil] 
+      [ string, nil]
     end
   end
 

data/lib/judo/server.rb

@@ -171,7 +171,7 @@ module Judo
     end
 
     def clone_snapshots(snapshots)
-      snapshots.each do |device,snap_id| 
+      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]
           add_volume(volume_id, device)
@@ -303,7 +303,7 @@ module Judo
     end
 
     def force_detach_volumes
-      volumes.each do |device,volume_id| 
+      volumes.each do |device,volume_id|
         task("Force detaching #{volume_id}") do
           @base.ec2.detach_volume(volume_id, instance_id, device, true) rescue nil
         end
@@ -382,7 +382,7 @@ module Judo
 
     def wait_for_volumes_detached
       begin
-        Timeout::timeout(30) do
+        Timeout::timeout(60) do
           loop do
             break if ec2_volumes.reject { |v| v[:aws_status] == "available" }.empty?
             sleep 2
@@ -540,6 +540,23 @@ USER_DATA
       snap.create
     end
 
+    def swapip(other)
+      ip1 = elastic_ip
+      ip2 = other.elastic_ip
+      raise JudoError, "Server must have an elastic IP to swap" unless ip1 and ip2
+
+      task("Swapping Ip Addresses") do 
+        @base.ec2.disassociate_address(ip1)
+        @base.ec2.disassociate_address(ip2)
+
+        @base.ec2.associate_address(instance_id, ip2)
+        @base.ec2.associate_address(other.instance_id, ip1)
+
+        update "elastic_ip" => ip2
+        other.update "elastic_ip" => ip1
+      end
+    end
+
     def <=>(s)
       [group.name, name] <=> [s.group.name, s.name]
     end

data/lib/judo/snapshot.rb

@@ -1,6 +1,6 @@
 module Judo
   class Snapshot
-    attr_accessor :name, :server_name 
+    attr_accessor :name, :server_name
 
     def self.domain
       "judo_snapshots"
@@ -39,7 +39,7 @@ module Judo
     def create
       raise JudoError,"snapshot already exists" unless state.empty?
       raise JudoError,"server has no disks to clone: #{server.volumes}" if server.volumes.empty?
-      task("Snapshotting #{server.name}") do 
+      @base.task("Snapshotting #{server.name}") do
         devs = server.volumes.map do |dev,vol|
           "#{dev}:#{@base.ec2.create_snapshot(vol)[:aws_id]}"
         end
@@ -66,9 +66,9 @@ module Judo
 
     def destroy
       devs.each do |dev,snapshot_id|
-        task("Deleting #{dev} #{snapshot_id}") do
+        @base.task("Deleting snapshot #{snapshot_id}") do
           begin
-            @base.ec2.delete_snapshot(snapshot_id) 
+            @base.ec2.delete_snapshot(snapshot_id)
           rescue Object => e
             puts "Error destrotying snapshot #{e.message}"
           end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Orion Henry