cluster 0.7.9 → 0.7.10

data/.gitignore

@@ -3,4 +3,5 @@ pkg/
 Session.vim
 .DS_Store
 .*.sw?
+.*.un?
 ._.DS_Store

data/instance_setup.sh

@@ -5,8 +5,8 @@ sed -i "/^# deb.*multiverse/ s/^# //" /etc/apt/sources.list
 
 gpg --keyserver keyserver.ubuntu.com --recv-key 40976EAF437D05B5
 gpg --keyserver keyserver.ubuntu.com --recv-key 3B4FE6ACC0B21F32
-gpg -a --export 40976EAF437D05B5 | sudo apt-key add -
-gpg -a --export 3B4FE6ACC0B21F32 | sudo apt-key add -
+gpg -a --export 40976EAF437D05B5 | apt-key add -
+gpg -a --export 3B4FE6ACC0B21F32 | apt-key add -
 
 apt-get -y update
 apt-get -y dist-upgrade

data/lib/cluster/infrastructures/amazon.rb

@@ -594,21 +594,23 @@ class Amazon < Infrastructure
     end
 
     def from_sdb_results(res)
-      res[:items].inject([]) {|m, obj|
+      res[:items].map {|obj|
         aws_id = obj.keys.first
-        attrs = obj[aws_id]
-        args = attrs.keys.inject({:aws_id => aws_id}) {|n, attr|
-          val = attrs[attr]
-          if val.empty?
-            n.merge attr => nil
-          elsif val.length == 1
-            n.merge attr => val.first
-          else
-            n.merge attr => val
-          end
-        }
-
-        m << args
+        hash = HashWithIndifferentAccess.new({:aws_id => aws_id})
+
+        obj[aws_id].each do |k,v|
+          v = if v.empty?
+                nil
+              elsif v.length == 1
+                v.first
+              else
+                v
+              end
+
+          hash.merge! k => v
+        end
+
+        hash
       }
     end
   end

data/lib/cluster/version.rb

@@ -5,7 +5,7 @@ class Cluster
 
   class << self
     def version
-      '0.7.9'
+      '0.7.10'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cluster
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools