instance_selector 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9623a48c51d1a7fffa815c7432857ef84e2b6fce
-  data.tar.gz: 2afa2b4aebf772ae0c28ed392f0c55701eec19cd
+  metadata.gz: 3e8540d1aa73b8d8c0398465ce48026d01248a52
+  data.tar.gz: ece8050bdc46946040c3d4d2b07fd2f961a1fbd2
 SHA512:
-  metadata.gz: dbc76565667a69829f480081bde6460504be8758f0853f680c48441cf36ec7e17f735a41dba853a42baad217cae97d29287c4ee27b7f10b7e3180690bc58b432
-  data.tar.gz: cd59a0c2aa1712a7d63742f8145e710d4ec7864907650305a9d49ea23db3fa5a8b744a7d70a6a510553a52fcc84632038c8e3cf623dcf2834a157a5e11d78bff
+  metadata.gz: ba5a5537ff8455b7583d3f4b29573e3fbdf1da7863328df6deb226d5e97f2d5796aafc7edbfc1003654443bcdf63041c41d5ebe524a6d2317d82f28d6f1123a3
+  data.tar.gz: 45253fcdd8c1492baae31b828309943ee3be3d23ab7405f2900f6851afa944e5f6e44091877f75730b732681561c5e6e42e8ed278dcdccafe2746f67c9b645f9

data/lib/instance_selector/capistrano.rb

@@ -16,8 +16,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "List all cloud instances for a stage"
   task :instance_selector_list do
     puts
-    @instance_selector_instances.sort_by {|k,v| v}.each do |instance|
-      puts instance.join("\t")
+    @instance_selector_instances.sort_by {|k,v| v[:name]}.each do |k, v|
+      puts k + "\t" + v.values.join("\t")
     end
   end
 end

data/lib/instance_selector/providers/aws.rb

@@ -19,9 +19,8 @@ module InstanceSelector
           # Each instancesSet can have multiple instances
           # Odd, but explains why it's plural.
           i['instancesSet'].each do |instance|
-            # instance = i['instancesSet'][0]
             key = instance['dnsName'].empty? ? instance['ipAddress'] : instance['dnsName']
-            memo[key] = instance['tagSet']['Name']
+            memo[key] = {name: instance['tagSet']['Name'], instance_id: instance['instanceId']}
           end
 
           memo
@@ -49,9 +48,7 @@ module InstanceSelector
 
 
       def instances(filters={})
-        on_demand = on_demand_instances(filters)
-        spot = spot_instances(filters)
-        on_demand.merge(spot)
+        on_demand_instances(filters).merge(spot_instances(filters))
       end
 
       def connect

data/lib/instance_selector/version.rb

@@ -1,3 +1,3 @@
 module InstanceSelector
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instance_selector
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Kevin McFadden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-19 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog