instance_selector 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb2b44d579472c7c234a48fb6d9892ecebf006ec
-  data.tar.gz: 2243b19c9f711da2f51f695fbb0faa0ccb24d65c
+  metadata.gz: 6bf8913d19e961b3b2bf2483471ab2977ed3df19
+  data.tar.gz: fc210a3b0dc754c62884127a3cdba34ca5c90397
 SHA512:
-  metadata.gz: 5e268509740d28db122682dc70e12b8dcd6f568106616757188d4290025af58fccca199dbdd9dae1cdee3729c20ef6b66627cb4555d623737c3f7f844cb0256a
-  data.tar.gz: 477a13c805017e7e21aeac5a3875effc27ce37d0d981b95c7e924b628f7ec451af19f8c7f041229157aaca341cb38ad597997cb9fa85d6994f7a2618c66397fb
+  metadata.gz: 8cb934239d57e47027dcd7d3fa4aaa478854892efcc7a570a6396bdc9ce87a2d658c9d0f6da0ff407a5428ba2b3f281276391a29d78724ffde7406f4ebb995e9
+  data.tar.gz: 19533d33a80aac59de41403c4a854771db2b544667318e13b68a09e61b04a38283c557ecb08d143aaad829b4f5d6bdd12bf4e5d1c988b91b8da83a8516e79d51

data/lib/instance_selector/providers/aws.rb

@@ -13,11 +13,9 @@ module InstanceSelector
         end
       end
 
-      def instances(filters={})
-        instances = @fog.describe_instances({"instance-state-name" => "running"}.merge(filters))
-
-        instances.body['reservationSet'].inject({}) do |memo, i|
 
+      def dns_from_instance_reservation_set(reservation_set)
+        reservation_set.inject({}) do |memo, i|
           # Each instancesSet can have multiple instances
           # Odd, but explains why it's plural.
           i['instancesSet'].each do |instance|
@@ -30,6 +28,32 @@ module InstanceSelector
         end
       end
 
+      def on_demand_instances(filters={})
+        instances = @fog.describe_instances({"instance-state-name" => "running"}.merge(filters))
+
+        dns_from_instance_reservation_set instances.body['reservationSet']
+      end
+
+      def spot_instances(filters={})
+        requests = @fog.describe_spot_instance_requests({'state' => 'active'}.merge(filters))
+        requests.body['spotInstanceRequestSet'].inject({}) do |memo, req|
+
+          if req['instanceId'] && !req['instanceId'].empty?
+            instances = @fog.describe_instances('instance-id' => req['instanceId'])
+            memo.merge! dns_from_instance_reservation_set(instances.body['reservationSet'])
+          end
+
+          memo
+        end
+      end
+
+
+      def instances(filters={})
+        on_demand = on_demand_instances(filters)
+        spot = spot_instances(filters)
+        on_demand.merge(spot)
+      end
+
       def connect
         begin
           @fog = Fog::Compute.new(provider:              'AWS',

data/lib/instance_selector/version.rb

@@ -1,3 +1,3 @@
 module InstanceSelector
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

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