mulder 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c74bd78ed1a5b5cf346c11d3c2e40c96b3415139
-  data.tar.gz: 86b32162edd9de13059ffbc0f52d67bf59f65447
+  metadata.gz: 6a53034a0cb8244e38367c1cc27b3eb0f17e6716
+  data.tar.gz: b88ceb563a7839f4ea91542fc4a90a1f99c19438
 SHA512:
-  metadata.gz: 70ee6aaaebc866db3d6f7a148b8a9b3d515e5749c5ea18974573255687f3097cacd65dfe997b73c5da799362074fcc331eb5daf2e14913b0e88c213db8df2df7
-  data.tar.gz: af7678ac094b8256d5be5e57dc3e47aeeb19b0ab7c084450578f790f292f1b13e03a89bfdfcf332b33fcbeba4e7c564d149c868b33eabc62d689e51a579e2f1c
+  metadata.gz: 62cde3c1e60be2a0841a6c81ab35fda37d72402fd00b5b13bc294d6408b28b7181736a87440a666e4d5a9820a6d8e714c91166760d95251f983f143a2da72fdf
+  data.tar.gz: 66adbf8dba59c6a7de266643055da51556f1ceff84dc82d7eead75d6f038c1afdcc63c45adf691d5ba6253f5a94f9c9fbc2bb4557ef0c1b7d63600a59a3814e7

data/lib/mulder/client.rb

@@ -15,7 +15,7 @@ module Mulder
     end
 
     def instances
-      @connection.instances_by_group(group)
+      @connection.instances_by_group(group).select(&:exists?)
     end
 
     def id_regexp

data/lib/mulder/instance.rb

@@ -37,6 +37,10 @@ module Mulder
       @fog_compute_instance.created_at
     end
 
+    def exists?
+      !@fog_compute_instance.nil?
+    end
+
     def as_hash
       @as_hash ||= {
         id: id,
@@ -49,4 +53,4 @@ module Mulder
       }.delete_if { |_, value| value == '' || value == nil }
     end
   end
-end
+end

data/lib/mulder/version.rb

@@ -1,3 +1,3 @@
 module Mulder
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/spec/lib/mulder/client_spec.rb

@@ -25,10 +25,36 @@ describe Mulder::Client do
   end
 
   describe '#instances' do
+    let(:mocked_connection) { mock }
+    let(:mocked_group) { mock }
+    let(:client) { described_class.new(mocked_connection, 'foo', 'bar', 'worker') }
+    let(:instances) { [] }
+
+    before do
+      mocked_connection.stubs(:instances_by_group).with(mocked_group).returns(instances)
+      client.stubs(:group).returns(mocked_group)
+    end
+
+    context 'when there are no unhealthy instances' do
+      let(:instances) {[mock('healthy instance', exists?: true), mock('healthy instance', exists?: true)]}
+
+      it 'returns all instances' do
+        client.instances.size.should == 2
+      end
+    end
+
+    context 'when there are unhealthy instances' do
+      let(:instances) { [mock('healthy instance', exists?: true), mock('unhealthy instance', exists?: false)] }
+
+      it 'returns only the healthy ones' do
+        client.instances.size.should == 1
+      end
+    end
+
     it 'finds the instances for the group' do
       mocked_connection = mock
       mocked_group = mock
-      mocked_connection.expects(:instances_by_group).with(mocked_group)
+      mocked_connection.expects(:instances_by_group).with(mocked_group).returns([])
       client = described_class.new(mocked_connection, 'foo', 'bar', 'worker')
       client.expects(:group).returns(mocked_group)
 
@@ -72,4 +98,4 @@ describe Mulder::Client do
     end
   end
 
-end
+end

data/spec/lib/mulder/instance_spec.rb

@@ -11,6 +11,21 @@ describe Mulder::Instance do
     end
   end
 
+  describe '#exists?' do
+    context 'when there is a compute instance' do
+      it 'returns true' do
+        fog_compute_instance = mock
+        described_class.new(fog_compute_instance).should exist
+      end
+    end
+
+    context 'when there no compute instance' do
+      it 'returns false' do
+        described_class.new(nil).should_not exist
+      end
+    end
+  end
+
   describe '#as_hash' do
     let(:instance) { mock(attributes) }
 
@@ -31,4 +46,4 @@ describe Mulder::Instance do
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mulder
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Duncan Grazier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler