judo 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/judo.rb

@@ -8,8 +8,6 @@ require 'json'
 require 'pp'
 require 'tempfile'
 
-raise "Judo Currently Requires Ruby 1.8.7" unless RUBY_VERSION == "1.8.7"
-
 class JudoError < RuntimeError ; end
 class JudoInvalid < RuntimeError ; end
 

data/lib/judo/commandline_helpers.rb

@@ -135,7 +135,7 @@ module JudoCommandLineHelpers
     printf "  SERVERS\n"
     printf "%s\n", ("-" * 80)
     servers.sort.each do |s|
-      printf "%-32s %-12s %-7s %-11s %-11s %-10s %-3s %s\n", s.name, s.group.name, s.version_desc, s.state["instance_id"], s.size_desc, s.ec2_state, "ebs:#{s.volumes.keys.size}", s.has_ip? ? "ip" : ""
+      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
 

data/lib/judo/group.rb

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

data/lib/judo/server.rb

@@ -138,7 +138,7 @@ module Judo
     end
 
     def volumes
-      Hash[ (state["volumes"] || []).map { |a| a.split(":") } ]
+      (state["volumes"] || []).inject({}) { |out, kv| k, v = kv.split(':'); out[k] = v; out }
     end
 
     def update(attrs)

data/lib/judo/snapshot.rb

@@ -59,7 +59,7 @@ module Judo
     end
 
     def devs
-      Hash[ (state["devs"] || []).map { |a| a.split(":") } ]
+      (state["devs"] || []).inject({}) { |out, kv| k, v = kv.split(':'); out[k] = v; out }
     end
 
     def create

metadata

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