kitchen-fog 0.7.1 → 0.7.2

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 0.7.2 / 2013-12-20
+
+### New Features
+
+* PR [#4][] - Handle get_ip case when no plural address methods on Fog Server class; AWS support (thanks svanderbleek)
+
+# 0.7.1 / 2013-10-02
+
+### New Features
+
+* PR [#3][] - Back port of server name issue (thanks bkw)
+
 # 0.7.0 / 2013-10-02
 
 ### New Features

data/lib/kitchen/driver/fog.rb

@@ -147,14 +147,23 @@ module Kitchen
           pub, priv = server.public_ip_addresses, server.private_ip_addresses
         rescue Exception => e
           # See Fog issue: https://github.com/fog/fog/issues/2160
-          addrs = server.addresses
-          addrs['public'] and pub = addrs['public'].map { |i| i['addr'] }
-          addrs['private'] and priv = addrs['private'].map { |i| i['addr'] }
+          pub, priv = extract_ips(server)
         end
         pub, priv = parse_ips(pub, priv)
         pub.first || priv.first || raise(ActionFailed, 'Could not find an IP')
       end
 
+      def extract_ips(server)
+        addrs = server.addresses
+        if addrs.any?
+          addrs['public'] and pub = addrs['public'].map { |i| i['addr'] }
+          addrs['private'] and priv = addrs['private'].map { |i| i['addr'] }
+        else
+          pub, priv = server.public_ip_address, server.private_ip_address
+        end
+        [pub, priv]
+      end
+
       def parse_ips(pub, priv)
         pub, priv = Array(pub), Array(priv)
         if config[:use_ipv6]

data/lib/kitchen/driver/fog_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for Fog Kitchen driver
-    FOG_VERSION = '0.7.1'
+    FOG_VERSION = '0.7.2'
   end
 end
 

data/spec/kitchen/driver/fog_spec.rb

@@ -387,6 +387,8 @@ describe Kitchen::Driver::Fog do
     let(:addresses) { nil }
     let(:public_ip_addresses) { nil }
     let(:private_ip_addresses) { nil }
+    let(:public_ip_address) { nil }
+    let(:private_ip_address) { nil }
     let(:parsed_ips) { [[], []] }
     let(:driver) do
       d = Kitchen::Driver::Fog.new(config)
@@ -397,7 +399,10 @@ describe Kitchen::Driver::Fog do
     let(:server) do
       double(:addresses => addresses,
         :public_ip_addresses => public_ip_addresses,
-        :private_ip_addresses => private_ip_addresses)
+        :private_ip_addresses => private_ip_addresses,
+        :public_ip_address => public_ip_address,
+        :private_ip_address => private_ip_address
+      )
     end
 
     context 'both public and private IPs' do
@@ -428,6 +433,32 @@ describe Kitchen::Driver::Fog do
       end
     end
 
+    context 'no method for plural addresses' do
+      let(:addresses) { [] }
+      let(:public_ip_address) { '5.5.5.5' }
+      let(:private_ip_address) { '4.4.4.4' }
+      let(:parsed_ips) { [[public_ip_address], [private_ip_address]] }
+      let(:no_method) { Proc.new { raise NoMethodError } }
+
+      before do
+        allow(server).to receive(:public_ip_addresses).and_return(no_method)
+        allow(server).to receive(:private_ip_addresses).and_return(no_method)
+      end
+
+      it 'returns a public IPv4 address' do
+        driver.send(:get_ip, server).should eq(public_ip_address)
+      end
+
+      context 'no public IP address' do
+        let(:public_ip_address) { nil }
+        let(:parsed_ips) { [[], [private_ip_address]] }
+
+        it 'returns a private IPv4 address' do
+          driver.send(:get_ip, server).should eq(private_ip_address)
+        end
+      end
+    end
+
     context 'IPs in user-defined network group' do
       let(:config) { { :network_name => 'mynetwork' } }
       let(:addresses) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-fog
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen