judo 0.3.4 → 0.3.5

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/bin/judo

@@ -85,6 +85,16 @@ banner
   opts.on( '-a', '--accessid ID', 'Specify the AWS access ID' ) do |id|
     options[:access_id] = id
   end
+  opts.on( '-k', '--keypair KEY', 'Speicy the AWS keypair pem file to use or \'create\'' ) do |key|
+    if key == 'create'
+      options[:key_create] = true
+    elsif File.basename(key) =~ /(.*)[.]pem$/
+      options[:key_name] = $1
+      options[:key_material] = File.new(key).read
+    else
+      abort "Key file must be KEY_NAME.pem"
+    end
+  end
   opts.on( '-s', '--secret KEY', 'Specify the AWS access secret key' ) do |key|
     options[:access_secret] = key
   end
@@ -129,6 +139,10 @@ begin
     when "create" then mk_servers(judo, options, ARGV)
     when "launch" then mk_servers(judo, options, ARGV)         { |s| s.start(options) }
     when "snapshots" then do_snapshots(judo, ARGV)
+    when "config" then
+      puts "Judo DB Version: #{judo.db_version}"
+      puts "Judo Keypair:    #{judo.key_name}"
+      puts "Judo Bucket:     #{judo.bucket_name}"
     when "rename" then
       raise JudoError, "usage: judo rename SERVER SERVER" unless ARGV.size == 2
       old,new = ARGV

data/lib/judo/base.rb

@@ -34,6 +34,9 @@ module Judo
       @access_id     = options[:access_id]
       @access_secret = options[:access_secret]
       @domain        = options[:domain]
+      @key_name      = options[:key_name]
+      @key_material  = options[:key_material]
+      @key_create    = options[:key_create]
     end
 
     def volumes
@@ -228,16 +231,18 @@ module Judo
     end
 
     def set_keypair(key_name, material)
+      @key_name = key_name
+      @key_material = material
       s3_put("#{key_name}.pem", material)
       update "key_name" => key_name
     end
 
     def key_name
-      get("key_name")
+      @key_name ||= get("key_name")
     end
 
     def key_material
-      s3_get("#{key_name}.pem")
+      @key_material ||= s3_get("#{key_name}.pem")
     end
 
     def ip_to_judo(ip)
@@ -319,7 +324,7 @@ module Judo
             set_db_version(2)
           end
         else
-          raise JduoError, "judo db is newer than the current gem - upgrade judo and try again"
+          raise JudoError, "judo db is newer than the current gem - upgrade judo and try again"
       end
     end
 
@@ -352,7 +357,7 @@ module Judo
         upgrade_db
     end
 
-    def setup
+    def setup(options = {})
       @repo ||= "." ## use cwd as default repo dir
 
       setup_sdb
@@ -423,17 +428,24 @@ module Judo
       if name = get("bucket_name")
         puts "Bucket #{name} already set"
       else
+        puts "Setting bucket name #{bucket_name}"
         set_bucket_name(bucket_name)
       end
     end
 
     def setup_keypair
-      unless key_name
-        task("Generating an ssl keyapir") do
+      if @key_name and @key_material
+        task("Setting keypair #{@key_name}") do
+          set_keypair(@key_name, @key_material)
+        end
+      elsif @key_create or not key_name
+        task("Generating an ssl keypair") do
           name = "judo#{ec2.describe_key_pairs.map { |k| k[:aws_key_name] }.map { |k| k =~ /^judo(\d*)/; $1.to_i }.sort.last.to_i + 1}"
           material = ec2.create_key_pair(name)[:aws_material]
           set_keypair(name, material)
         end
+      else
+        puts "Keypair #{key_name} already set"
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Orion Henry