kitchen-nodes 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5fbc28eea9b0f2814f5cb89766c40e7cdfa491
-  data.tar.gz: 181b4f8d573a26988d91ebd80765a8a33abf6e5f
+  metadata.gz: 32559c20845947bc1b2c40d2fd7393841da83db5
+  data.tar.gz: df3c3bd467f8adabab15aaf89d4a94997d679e32
 SHA512:
-  metadata.gz: dd24b6af6573a856e0a31a199d7fb4bf992cd763912f08724f704556f60c6a1652de8ee6fdc1d1193c897c79caed3a680196fb78b997dcebe872e921c667c173
-  data.tar.gz: 690eb6fe3656d9c1974551406b0c64e142794dcaa03bf714fd0d4c86ef2c0771dd910f56578ac1640f68411a16a8341e885ee12d8507e50552f13e1d84e472cd
+  metadata.gz: c0c555909d3ac750086b938136841209d03a3915f63b70a61fcd11004defcf2efa9b977e11abbfce19f23a48a09cf0e2c94138e658e58136f4ebb10713f74b12
+  data.tar.gz: 5ca523f6854c4a6c913d2b7e98dcd985e2b8c5b556f0c8adbe3816056623c677d4ec7048e97c4f869876583f827e5035deed6453c1452ca9589ce6dbc20df785

data/.rubocop.yml

@@ -0,0 +1,2 @@
+Metrics/MethodLength:
+  Max: 20

data/lib/kitchen/provisioner/ip_finder/ssh.rb

@@ -51,6 +51,7 @@ module Kitchen
     module IpFinder
       # SSH implementation for returning active non-localhost IPs
       class Ssh
+        IP4REGEX = /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
         def initialize(connection)
           @connection = connection
         end
@@ -66,6 +67,7 @@ module Kitchen
             return ips unless ips.empty?
             sleep 0.5
           end
+          ips
         end
 
         def run_ifconfig
@@ -73,7 +75,7 @@ module Kitchen
           ips = []
           response.split(/^\S+/).each do |device|
             next if !device.include?('RUNNING') || device.include?('LOOPBACK')
-            ips << parse_ip(device, 'inet addr:', ' ')
+            ips << IP4REGEX.match(device)[1]
           end
           ips.compact
         end
@@ -81,19 +83,13 @@ module Kitchen
         def run_ip_addr
           response = @connection.node_execute('/sbin/ip -4 addr show')
           ips = []
-          response.split(/[0-9]+: /).each do |device|
+          response.split(/^[0-9]+: /).each do |device|
             next if device.include?('LOOPBACK') || device.include?('NO-CARRIER')
-            ips << parse_ip(device, 'inet ', '/')
+            next if device == ''
+            ips << IP4REGEX.match(device)[1]
           end
           ips.compact
         end
-
-        def parse_ip(device, start_token, delimiter)
-          start_idx = device.index(start_token)
-          start_idx += start_token.length unless start_idx.nil?
-          end_idx = device.index(delimiter, start_idx) unless start_idx.nil?
-          device[start_idx, end_idx - start_idx] unless end_idx.nil?
-        end
       end
     end
   end

data/lib/kitchen/provisioner/nodes.rb

@@ -84,7 +84,9 @@ module Kitchen
         [:username, :password].each do |prop|
           state[prop] = instance.driver[prop] if instance.driver[prop]
         end
-        IpFinder.for_transport(transport, state).find_ips
+        ips = IpFinder.for_transport(transport, state).find_ips
+        fail 'Unable to retrieve IPs' if ips.empty?
+        ips
       end
     end
   end

data/lib/kitchen/provisioner/nodes_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   # Version string for Nodes Kitchen driver
   module Provisioner
-    NODES_VERSION = '0.3.2'
+    NODES_VERSION = '0.3.3'
   end
 end

data/spec/unit/nodes_spec.rb

@@ -85,6 +85,28 @@ describe Kitchen::Provisioner::Nodes do
       allow(transport).to receive(:connection)
         .and_return(Kitchen::Transport::Base::Connection.new)
     end
+
+    context 'cannot find an ip' do
+      let(:ifconfig_response) do
+        FakeFS.deactivate!
+        template = File.read('spec/unit/stubs/ifconfig.txt')
+        FakeFS.activate!
+        template.gsub!('', machine_ips[0])
+        template.gsub!('', machine_ips[1])
+        template.gsub!('', machine_ips[2])
+      end
+      let(:transport) { Kitchen::Transport::Ssh.new }
+
+      before do
+        allow_any_instance_of(Kitchen::Transport::Base::Connection)
+          .to receive(:node_execute).and_return(ifconfig_response)
+      end
+
+      it 'fails' do
+        expect { subject.create_node }.to raise_error('Unable to retrieve IPs')
+      end
+    end
+
     context 'platform is windows' do
       let(:transport) { Kitchen::Transport::Winrm.new }
 
@@ -125,6 +147,7 @@ describe Kitchen::Provisioner::Nodes do
         FakeFS.activate!
         template.gsub!('1.1.1.1', machine_ips[0])
         template.gsub!('2.2.2.2', machine_ips[1])
+        template.gsub!('3.3.3.3', machine_ips[2])
       end
       let(:transport) { Kitchen::Transport::Ssh.new }
 
@@ -146,6 +169,7 @@ describe Kitchen::Provisioner::Nodes do
           FakeFS.activate!
           template.gsub!('1.1.1.1', machine_ips[0])
           template.gsub!('2.2.2.2', machine_ips[1])
+          template.gsub!('3.3.3.3', machine_ips[2])
         end
 
         before do

data/spec/unit/stubs/ifconfig.txt

@@ -24,3 +24,12 @@ lo        Link encap:Local Loopback
           collisions:0 txqueuelen:0
           RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
 
+# The following represents the format of ifconfig from CentOS 7.1
+enp0s8: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
+        inet 3.3.3.3  netmask 255.255.255.0  broadcast 3.3.3.0
+        inet6 fe80::a00:27ff:fe5e:e9b0  prefixlen 64  scopeid 0x20<link>
+        ether 08:00:27:5e:e9:b0  txqueuelen 1000  (Ethernet)
+        RX packets 7961  bytes 823710 (804.4 KiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 263  bytes 50868 (49.6 KiB)
+        TX errors 0  dropped 0 overruns 0  carrier 0  collisions 0

data/spec/unit/stubs/ip.txt

@@ -7,3 +7,8 @@
 5: docker0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN group default
     inet 2.2.2.2/16 scope global docker0
        valid_lft forever preferred_lft forever
+# The following represents the format of ipaddr from CentOS 7.1 (which is the same in this case, but
+# adding for completeness)
+6: enp0s8: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000
+    inet 3.3.3.3/24 brd 3.3.3.255 scope global dynamic enp0s8
+       valid_lft 966sec preferred_lft 966sec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-26 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile