poolparty 1.4.2 → 1.4.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 4
-:patch: 2
+:patch: 3
 :major: 1
 :build: 

data/lib/cloud_providers/ec2/ec2.rb

@@ -248,13 +248,16 @@ module CloudProviders
     #   with the id given will be returned
     #   if not given, details for all instances will be returned
     def describe_instances(id=nil)
-      @describe_instances = ec2.describe_instances.reservationSet.item.map do |r|
-        r.instancesSet.item.map do |i|
-          inst_options = i.merge(r.merge(:cloud => cloud)).merge(cloud.cloud_provider.dsl_options)
-          Ec2Instance.new(inst_options)
-        end
-      end.flatten
-      # id.nil? ? @describe_instances : @describe_instances.select {|a| a.instance_id == id }.first
+      begin
+        @describe_instances = ec2.describe_instances.reservationSet.item.map do |r|
+          r.instancesSet.item.map do |i|
+            inst_options = i.merge(r.merge(:cloud => cloud)).merge(cloud.cloud_provider.dsl_options)
+            Ec2Instance.new(inst_options)
+          end
+        end.flatten
+      rescue Exception => e
+        []
+      end
     end
     
     # Extras!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors: 
 - Ari Lerner