lib/poolparty/net/remoter_base.rb in auser-poolparty-0.2.2 vs lib/poolparty/net/remoter_base.rb in auser-poolparty-0.2.3

@@ -52,11 +52,11 @@
       # list of shutting down instances
       def list_of_terminating_instances(list = remote_instances_list)
         list.reject {|i| true if !i.terminating? }
       end
       # Get the instances that are non-master instances
-      def nonmaster_nonterminated_instances(list = remote_instances_list)
+      def nonmaster_nonterminated_instances(list = list_of_nonterminated_instances)
         list_of_nonterminated_instances.reject {|i| i.master? }
       end
       # list all the nonterminated instances
       def list_of_nonterminated_instances(list = remote_instances_list)
         list.reject {|i| i.terminating? || i.terminated? }
@@ -71,11 +71,11 @@
       end
       # List the instances for the current key pair, regardless of their states
       # If no keypair is passed, select them all
       def list_of_instances(keyp=nil)
         key = keyp ? keyp : keypair
-        describe_instances.select {|a| key ? a[:keypair] == key : true }
+        describe_instances.select {|a| key ? a[:keypair] == key : true } if describe_instances
       end
       # Instances
       # Get the master from the cloud
       def master
         # remote_instances_list.select {|a| a.master }.first
@@ -85,10 +85,10 @@
       # Helpers
       def create_keypair
       end
       # Reset the cache of descriptions
       def reset!
-      end      
+      end
       def self.included(other)
         PoolParty.register_remote_base(self.class.to_s.downcase.to_sym)
       end
       
       # Callback after loaded
\ No newline at end of file