kitchen-nodes 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da461052591bdff16f395e67bd2bd645a934b544
-  data.tar.gz: 4c57d3985ade375441b74038979db4fdda240431
+  metadata.gz: bbd0dda405d103305306b0103fd135441cd4b44e
+  data.tar.gz: c809ab49ba0bbdf3e233809f6d61d88f017a2fcd
 SHA512:
-  metadata.gz: c2c09cfb781316b8859b0cce26d83ed276013a9ddc019cea39b822eb96626c97444eac548495d924f3f054d6f0a7ce276a1f3b3f618ac63934fc1d6eb20c4595
-  data.tar.gz: c6f3d25e203197b2ee709232181f05e4983047c47454d115f1641bbbe289937acc550d42407a4b5603b8dfc0a26c7edf337df0fe5d17e4a8f292f127133208a3
+  metadata.gz: 5a0c9414d16951dd2ff128a42651ddc59e1ce77af273b00bda3520154e55e8edde7d028bef389fab3905b911733ea7a520f2ab31edebe7150f0664e3409a40a6
+  data.tar.gz: 64ef1c91fd2befb4464917bf6950eb206e3bf3b97bce08b8cb017a01a941fece4e315982c0c6d2aa0e17da9a474d84346582391a533cd332485b4e01aa6f79fe

data/README.md

@@ -13,6 +13,9 @@ The nodes provisioner extends the `chef-zero` provisioner along with all of its
     "ipaddress": "172.17.0.8",
     "platform": "ubuntu"
   },
+  "normal": {
+    "attr1": "val1"
+  }
   "run_list": [
     "recipe[apt]",
     "recipe[couchbase-tests::ipaddress]",
@@ -36,9 +39,13 @@ The nodes provisioner extends the `chef-zero` provisioner along with all of its
 }
 ```
 
-## <a name="installation"></a> Installation and Setup
+The node data includes the node id based on the test-kitchen suite name, the run list assigned to the node, the normal attributes included in the `.kitchen.yml` file, the externally reachable ip address and the platform of the test instance os.
 
-Please read the [Driver usage][driver_usage] page for more details.
+## <a name="installation"></a> Installation
+
+```
+gem install kitchen-nodes
+```
 
 ## <a name="config"></a> Configuration
 
@@ -49,7 +56,7 @@ provisioner:
   name: nodes
 ```
 
-## <a name="installation"></a> Usage
+## <a name="Usage"></a> Usage
 
 Using `kitchen-nodes` one can expect all previously converged nodes to be represented in a node file and be searchable. For example consider this scenario looking for a primary node in a cluster in order to add a node to join:
 
@@ -77,6 +84,31 @@ primary = search_for_nodes("run_list:*couchbase??server* AND platform:#{node['pl
 node.normal["couchbase-tests"]["primary_ip"] = primary[0]['ipaddress']
 
 ```
+### <a name="vagrant"></a> Using with Vagrant
+
+When using kitchen-nodes with the vagrant driver, make sure you add the following to your `driver_config`:
+
+```
+network:
+  - ["private_network", { type: "dhcp" }]
+```
+
+This will add an additional non-NAT NIC to your vagrant box with an IP reachable from the host and other test nodes.
+
+### <a name="virtualbox"></a> Why is my ohai `ipaddress` different from my node ipaddress on vagrant with VirtualBox?
+
+Ohai will pick up the localhost ipaddress on vagrant boxes using virtualbox. To reset the `node["ipaddress"]` to the reachable ip, add `hurry-up-and-test::set_non_nat_vbox_ip` to the top of your `run_list`. 
+
+```
+suites:
+  - name: my-suite
+    run_list:
+      - recipe[hurry-up-and-test::set_non_nat_vbox_ip]
+      - recipe[cookbook-under-test]
+```
+
+You can add this even if you do not use virtualbox and the recipe will do nothing.
+
 
 ## <a name="development"></a> Development
 

data/Rakefile

@@ -1,6 +1,11 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:test)
 
-task :default => [:test]
+RuboCop::RakeTask.new(:style) do |task|
+  task.options << '--display-cop-names'
+end
+
+task default: [:test, :style]

data/kitchen-nodes.gemspec

@@ -8,22 +8,23 @@ Gem::Specification.new do |spec|
   spec.version       = Kitchen::Provisioner::NODES_VERSION
   spec.authors       = ['Matt Wrock']
   spec.email         = ['matt@mattwrock.com']
-  spec.description   = %q{A Test Kitchen Provisioner for Chef Nodes}
+  spec.description   = 'A Test Kitchen Provisioner for Chef Nodes'
   spec.summary       = spec.description
   spec.homepage      = ''
   spec.license       = 'Apache 2.0'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = []
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
   spec.require_paths = ['lib']
 
   spec.add_dependency 'net-ping'
   spec.add_dependency 'win32-security'
-  spec.add_dependency 'test-kitchen', '1.4.0.rc.1'
+  spec.add_dependency 'test-kitchen', '~> 1.4'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency "fakefs",    "~> 0.4"
+  spec.add_development_dependency 'fakefs', '~> 0.4'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'rubocop', '~> 0.29'
 end

data/lib/kitchen/provisioner/ip_finder.rb

@@ -1,7 +1,9 @@
 module Kitchen
   module Provisioner
+    # Locates active IPs that are not localhost
+    # there are separate implementations for
+    # different kitchen transports
     module IpFinder
-
       def self.for_transport(transport, state)
         transport_string = transport.class.name.split('::').last
         require("kitchen/provisioner/ip_finder/#{transport_string.downcase}")

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

@@ -1,28 +1,29 @@
 module Kitchen
   module Transport
     class Ssh < Kitchen::Transport::Base
+      # Monkey patch of test-kitchen ssh transport
+      # that returns stdout
       class Connection < Kitchen::Transport::Base::Connection
         def node_execute(command, &block)
           return if command.nil?
           out, exit_code = node_execute_with_exit_code(command, &block)
 
           if exit_code != 0
-            raise Transport::SshFailed,
-              "SSH exited (#{exit_code}) for command: [#{command}]"
+            fail Transport::SshFailed,
+                 "SSH exited (#{exit_code}) for command: [#{command}]"
           end
           out
         rescue Net::SSH::Exception => ex
           raise SshFailed, "SSH command failed (#{ex.message})"
         end
 
-        def node_execute_with_exit_code(command, &block)
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        def node_execute_with_exit_code(command)
           exit_code = nil
           out = []
           session.open_channel do |channel|
-
             channel.request_pty
             channel.exec(command) do |_ch, _success|
-
               channel.on_data do |_ch, data|
                 out << data
                 yield data if block_given?
@@ -33,7 +34,7 @@ module Kitchen
                 yield data if block_given?
               end
 
-              channel.on_request("exit-status") do |_ch, data|
+              channel.on_request('exit-status') do |_ch, data|
                 exit_code = data.read_long
               end
             end
@@ -41,12 +42,14 @@ module Kitchen
           session.loop
           [out.join("\n"), exit_code]
         end
+        # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize
       end
     end
   end
 
   module Provisioner
     module IpFinder
+      # SSH implementation for returning active non-localhost IPs
       class Ssh
         def initialize(connection)
           @connection = connection
@@ -54,48 +57,42 @@ module Kitchen
 
         def find_ips
           ips = []
-          retry_count = 0
-
-          while retry_count < 5
+          (0..5).each do
             begin
               ips = run_ifconfig
             rescue Kitchen::Transport::TransportFailed
               ips = run_ip_addr
             end
             return ips unless ips.empty?
-            retry_count += 1
             sleep 0.5
           end
         end
 
         def run_ifconfig
-          response = @connection.node_execute("ifconfig -a")
+          response = @connection.node_execute('ifconfig -a')
           ips = []
-          start_token = "inet addr:"
           response.split(/^\S+/).each do |device|
-            if device.include?("RUNNING") && !device.include?("LOOPBACK")
-              start_idx = device.index(start_token)
-              start_idx += start_token.length unless start_idx.nil?
-              end_idx = device.index(" ", start_idx) unless start_idx.nil?
-              ips << device[start_idx,end_idx - start_idx] unless end_idx.nil?
-            end
+            next if !device.include?('RUNNING') || device.include?('LOOPBACK')
+            ips << parse_ip(device, 'inet addr:', ' ')
           end
-          ips
+          ips.compact
         end
 
         def run_ip_addr
-          response = @connection.node_execute("ip -4 addr show")
+          response = @connection.node_execute('ip -4 addr show')
           ips = []
-          start_token = "inet "
           response.split(/[0-9]+: /).each do |device|
-            unless device.include?("LOOPBACK") || device.include?("NO-CARRIER")
-              start_idx = device.index(start_token)
-              start_idx += start_token.length unless start_idx.nil?
-              end_idx = device.index("/", start_idx) unless start_idx.nil?
-              ips << device[start_idx,end_idx - start_idx] unless end_idx.nil?
-            end
+            next if device.include?('LOOPBACK') || device.include?('NO-CARRIER')
+            ips << parse_ip(device, 'inet ', '/')
           end
-          ips
+          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

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

@@ -1,6 +1,8 @@
 module Kitchen
   module Transport
     class Winrm < Kitchen::Transport::Base
+      # Monkey patch of test-kitchen winrm transport
+      # that returns stdout
       class Connection < Kitchen::Transport::Base::Connection
         def node_execute(command, &block)
           session.run_powershell_script(command, &block)
@@ -11,21 +13,23 @@ module Kitchen
 
   module Provisioner
     module IpFinder
+      # WinRM implementation for returning active non-localhost IPs
       class Winrm
         def initialize(connection)
           @connection = connection
         end
 
         def find_ips
-          out = @connection.node_execute("Get-NetIPConfiguration | % { $_.ipv4address.IPAddress}")
+          out = @connection.node_execute(
+            'Get-NetIPConfiguration | % { $_.ipv4address.IPAddress }')
           data = []
           out[:data].each do |out_data|
-            stdout = out_data[:stdout] 
+            stdout = out_data[:stdout]
             data << stdout.chomp unless stdout.nil?
           end
           data
         end
-      end 
+      end
     end
   end
 end

data/lib/kitchen/provisioner/nodes.rb

@@ -4,31 +4,29 @@
 #
 # Copyright (C) 2015, Matt Wrock
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
+# Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
+# distributed under the License is distributed on an 'AS IS' BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen"
-require "kitchen/provisioner/chef_zero"
-require "kitchen/provisioner/ip_finder"
-require "net/ping"
+require 'kitchen'
+require 'kitchen/provisioner/chef_zero'
+require 'kitchen/provisioner/ip_finder'
+require 'net/ping'
 
 module Kitchen
   module Provisioner
-
     # Nodes provisioner for Kitchen.
     #
     # @author Matt Wrock <matt@mattwrock.com>
     class Nodes < ChefZero
-
       def create_sandbox
         FileUtils.rm(node_file) if File.exist?(node_file)
         super
@@ -36,27 +34,38 @@ module Kitchen
       end
 
       def create_node
-        state = Kitchen::StateFile.new(config[:kitchen_root], instance.name).read
-        ip = state[:hostname]
-        ipaddress = (ip == "127.0.0.1" || ip == "localhost") ? get_reachable_guest_address(state) : ip
-
-        node = {
-          :id => instance.name,
-          :automatic => {
-            :ipaddress => ipaddress,
-            :platform => instance.platform.name.split("-")[0].downcase
-          },
-          :run_list => config[:run_list]
-        }
-
         FileUtils.mkdir_p(node_dir) unless Dir.exist?(node_dir)
         File.open(node_file, 'w') do |out|
-          out << JSON.pretty_generate(node)
+          out << JSON.pretty_generate(node_template)
         end
       end
 
+      def ipaddress
+        state = Kitchen::StateFile.new(
+          config[:kitchen_root],
+          instance.name
+        ).read
+
+        if %w(127.0.0.1 localhost).include?(state[:hostname])
+          return get_reachable_guest_address(state)
+        end
+        state[:hostname]
+      end
+
+      def node_template
+        {
+          id: instance.name,
+          automatic: {
+            ipaddress: ipaddress,
+            platform: instance.platform.name.split('-')[0].downcase
+          },
+          normal: config[:attributes],
+          run_list: config[:run_list]
+        }
+      end
+
       def node_dir
-        File.join(config[:test_base_path], "nodes")
+        File.join(config[:test_base_path], 'nodes')
       end
 
       def node_file
@@ -65,16 +74,16 @@ module Kitchen
 
       def get_reachable_guest_address(state)
         active_ips(instance.transport, state).each do |address|
-          next if address == "127.0.0.1"
+          next if address == '127.0.0.1'
           return address if Net::Ping::External.new.ping(address)
         end
-        return nil
       end
 
       def active_ips(transport, state)
         # inject creds into state for legacy drivers
-        state[:password] = instance.driver[:password] if instance.driver[:password]
-        state[:username] = instance.driver[:username] if instance.driver[:username]
+        [:username, :password].each do |prop|
+          state[prop] = instance.driver[prop] if instance.driver[prop]
+        end
         IpFinder.for_transport(transport, state).find_ips
       end
     end

data/lib/kitchen/provisioner/nodes_version.rb

@@ -17,10 +17,8 @@
 # limitations under the License.
 
 module Kitchen
-
+  # Version string for Nodes Kitchen driver
   module Provisioner
-
-    # Version string for Nodes Kitchen driver
-    NODES_VERSION = "0.2.0"
+    NODES_VERSION = '0.3.0'
   end
 end

data/spec/unit/nodes_spec.rb

@@ -1,99 +1,116 @@
-require "fakefs/safe"
-require "kitchen"
-require "kitchen/driver/dummy"
-require "kitchen/provisioner/nodes"
-require "kitchen/transport/dummy"
-require "kitchen/transport/winrm"
-require "kitchen/transport/ssh"
+require 'erb'
+require 'fakefs/safe'
+require 'kitchen'
+require 'kitchen/driver/dummy'
+require 'kitchen/provisioner/nodes'
+require 'kitchen/transport/dummy'
+require 'kitchen/transport/winrm'
+require 'kitchen/transport/ssh'
 
 describe Kitchen::Provisioner::Nodes do
-
-  let(:config) { { 
-    :test_base_path => "/b",
-    :kitchen_root => "/r",
-    :run_list => "cookbook:recipe" 
-  } }
-  let(:instance) { double(
-    "instance",
-    :name => "test_suite",
-    :suite => suite,
-    :platform => platform,
-    :transport => transport,
-    :driver => Kitchen::Driver::Dummy.new
-  ) }
+  let(:config) do
+    {
+      test_base_path: '/b',
+      kitchen_root: '/r',
+      run_list: 'cookbook:recipe',
+      attributes: { att_key: 'att_val' }
+    }
+  end
+  let(:instance) do
+    double(
+      'instance',
+      name: 'test_suite',
+      suite: suite,
+      platform: platform,
+      transport: transport,
+      driver: Kitchen::Driver::Dummy.new
+    )
+  end
   let(:transport) { Kitchen::Transport::Dummy.new }
-  let(:platform) { double("platform", :os_type => nil) }
-  let(:suite) { double("suite", :name => "suite") }
-  let(:state) { { :hostname => "192.168.1.10" } }
-  let(:node) { JSON.parse(File.read(subject.node_file), :symbolize_names => true) }
+  let(:platform) { double('platform', os_type: nil, name: 'ubuntu') }
+  let(:suite) { double('suite', name: 'suite') }
+  let(:state) { { hostname: '192.168.1.10' } }
+  let(:node) { JSON.parse(File.read(subject.node_file), symbolize_names: true) }
 
-  before {
+  before do
     FakeFS.activate!
     FileUtils.mkdir_p(config[:test_base_path])
-    allow_any_instance_of(Kitchen::StateFile).to receive(:read).and_return(state)
-  }
-  after {
+    allow_any_instance_of(Kitchen::StateFile)
+      .to receive(:read).and_return(state)
+  end
+  after do
     FakeFS.deactivate!
     FakeFS::FileSystem.clear
-  }
+  end
 
   subject { Kitchen::Provisioner::Nodes.new(config).finalize_config!(instance) }
 
-  it "creates node" do
+  it 'creates node' do
     subject.create_node
 
     expect(File).to exist(subject.node_file)
   end
 
-  it "sets the id" do
+  it 'sets the id' do
     subject.create_node
 
     expect(node[:id]).to eq instance.name
   end
 
-  it "sets the runlist" do
+  it 'sets the runlist' do
     subject.create_node
 
     expect(node[:run_list]).to eq config[:run_list]
   end
 
-  it "sets the ip address" do
+  it 'sets the normal attributes' do
+    subject.create_node
+
+    expect(node[:normal]).to eq config[:attributes]
+  end
+
+  it 'sets the ip address' do
     subject.create_node
 
     expect(node[:automatic][:ipaddress]).to eq state[:hostname]
   end
 
-  context "instance is localhost" do
-    let(:state) { { :hostname => "127.0.0.1" } }
-    let(:machine_ips) { [ "192.168.1.1", "192.168.1.2", "192.168.1.3" ] }
-    
-    before {
-      allow_any_instance_of(Net::Ping::External).to receive(:ping).and_return(true)
-      allow(transport).to receive(:connection).and_return(Kitchen::Transport::Base::Connection.new)
-    }
-    context "platform is windows" do
+  context 'instance is localhost' do
+    let(:state) { { hostname: '127.0.0.1' } }
+    let(:machine_ips) { ['192.168.1.1', '192.168.1.2', '192.168.1.3'] }
+
+    before do
+      allow_any_instance_of(Net::Ping::External).to receive(:ping)
+        .and_return(true)
+      allow(transport).to receive(:connection)
+        .and_return(Kitchen::Transport::Base::Connection.new)
+    end
+    context 'platform is windows' do
       let(:transport) { Kitchen::Transport::Winrm.new }
 
-      before {
-        data = machine_ips.map {|ip| { :stdout => "#{ip}\r\n" }}
+      before do
+        data = machine_ips.map { |ip| { stdout: "#{ip}\r\n" } }
         allow_any_instance_of(Kitchen::Transport::Base::Connection).to(
-          receive(:node_execute).and_return({ :data => data })
+          receive(:node_execute).and_return(data: data)
         )
-      }
+        allow(platform).to receive(:name).and_return('windows')
+      end
 
-      it "sets the ip address to the first reachable IP" do
+      it 'sets the ip address to the first reachable IP' do
         subject.create_node
 
         expect(node[:automatic][:ipaddress]).to eq machine_ips.first
       end
 
-      context "only the last ip is reachable" do
-        before {
-          allow_any_instance_of(Net::Ping::External).to receive(:ping).and_return(false)
-          allow_any_instance_of(Net::Ping::External).to receive(:ping).with(machine_ips.last).and_return(true)
-        }
+      context 'only the last ip is reachable' do
+        before do
+          allow_any_instance_of(Net::Ping::External).to receive(:ping)
+            .and_return(false)
+          allow_any_instance_of(Net::Ping::External).to receive(:ping)
+            .with(machine_ips.last).and_return(true)
+        end
 
-        it "sets the ip address to the last IP" do
+        it 'sets the ip address to the last IP' do
           subject.create_node
 
           expect(node[:automatic][:ipaddress]).to eq machine_ips.last
@@ -101,71 +118,47 @@ describe Kitchen::Provisioner::Nodes do
       end
     end
 
-    context "platform is *nix" do
+    context 'platform is *nix' do
+      let(:ifconfig_response) do
+        FakeFS.deactivate!
+        template = File.read('spec/unit/stubs/ifconfig.txt')
+        FakeFS.activate!
+        template.gsub!('1.1.1.1', machine_ips[0])
+        template.gsub!('2.2.2.2', machine_ips[1])
+      end
       let(:transport) { Kitchen::Transport::Ssh.new }
 
-      before {
-        allow_any_instance_of(Kitchen::Transport::Base::Connection).to receive(:node_execute) do
-          <<-EOS
-docker0   Link encap:Ethernet  HWaddr 56:84:7a:fe:97:99  
-          inet addr:#{machine_ips[0]}  Bcast:0.0.0.0  Mask:255.255.0.0
-          UP BROADCAST MULTICAST  MTU:1500  Metric:1
-          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
-          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
-          collisions:0 txqueuelen:0 
-          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
-
-eth0      Link encap:Ethernet  HWaddr 08:00:27:88:0c:a6  
-          inet addr:#{machine_ips[1]}  Bcast:10.0.2.255  Mask:255.255.255.0
-          inet6 addr: fe80::a00:27ff:fe88:ca6/64 Scope:Link
-          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
-          RX packets:10262 errors:0 dropped:0 overruns:0 frame:0
-          TX packets:7470 errors:0 dropped:0 overruns:0 carrier:0
-          collisions:0 txqueuelen:1000 
-          RX bytes:1497781 (1.4 MB)  TX bytes:1701791 (1.7 MB)
-
-lo        Link encap:Local Loopback  
-          inet addr:127.0.0.1  Mask:255.0.0.0
-          inet6 addr: ::1/128 Scope:Host
-          UP LOOPBACK RUNNING  MTU:65536  Metric:1
-          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
-          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
-          collisions:0 txqueuelen:0 
-          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
-
-          EOS
-        end
-      }
+      before do
+        allow_any_instance_of(Kitchen::Transport::Base::Connection)
+          .to receive(:node_execute).and_return(ifconfig_response)
+      end
 
-      it "sets the ip address to the RUNNING IP that is not localhost" do
+      it 'sets the ip address to the RUNNING IP that is not localhost' do
         subject.create_node
 
         expect(node[:automatic][:ipaddress]).to eq machine_ips[1]
       end
 
-      context "ifconfig not supported" do
-        before {
+      context 'ifconfig not supported' do
+        let(:ip_response) do
+          FakeFS.deactivate!
+          template = File.read('spec/unit/stubs/ip.txt')
+          FakeFS.activate!
+          template.gsub!('1.1.1.1', machine_ips[0])
+          template.gsub!('2.2.2.2', machine_ips[1])
+        end
+
+        before do
           allow_any_instance_of(Kitchen::Transport::Base::Connection)
-          .to receive(:node_execute).with("ifconfig -a")
-          .and_raise(Kitchen::Transport::TransportFailed.new(""))
+            .to receive(:node_execute).with('ifconfig -a')
+            .and_raise(Kitchen::Transport::TransportFailed.new(''))
 
           allow_any_instance_of(Kitchen::Transport::Base::Connection)
-          .to receive(:node_execute).with("ip -4 addr show") do
-            <<-EOS
-1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default 
-    inet 127.0.0.1/8 scope host lo
-       valid_lft forever preferred_lft forever
-3: wlan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP group default qlen 1000
-    inet #{machine_ips[0]}/24 brd 192.168.1.255 scope global wlan0
-       valid_lft forever preferred_lft forever
-5: docker0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN group default 
-    inet #{machine_ips[1]}/16 scope global docker0
-       valid_lft forever preferred_lft forever
-            EOS
-          end
-        }
-
-        it "sets the ip address to the connected IP that is not localhost" do
+            .to receive(:node_execute).with('ip -4 addr show')
+            .and_return(ip_response)
+        end
+
+        it 'sets the ip address to the connected IP that is not localhost' do
           subject.create_node
 
           expect(node[:automatic][:ipaddress]).to eq machine_ips[0]
@@ -173,4 +166,4 @@ lo        Link encap:Local Loopback
       end
     end
   end
-end
+end

data/spec/unit/stubs/ifconfig.txt

@@ -0,0 +1,26 @@
+docker0   Link encap:Ethernet  HWaddr 56:84:7a:fe:97:99
+          inet addr:1.1.1.1  Bcast:0.0.0.0  Mask:255.255.0.0
+          UP BROADCAST MULTICAST  MTU:1500  Metric:1
+          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+
+eth0      Link encap:Ethernet  HWaddr 08:00:27:88:0c:a6
+          inet addr:2.2.2.2  Bcast:10.0.2.255  Mask:255.255.255.0
+          inet6 addr: fe80::a00:27ff:fe88:ca6/64 Scope:Link
+          UP BROADCAST RUNNING MULTICAST  MTU:1500  Metric:1
+          RX packets:10262 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:7470 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:1000
+          RX bytes:1497781 (1.4 MB)  TX bytes:1701791 (1.7 MB)
+
+lo        Link encap:Local Loopback
+          inet addr:127.0.0.1  Mask:255.0.0.0
+          inet6 addr: ::1/128 Scope:Host
+          UP LOOPBACK RUNNING  MTU:65536  Metric:1
+          RX packets:0 errors:0 dropped:0 overruns:0 frame:0
+          TX packets:0 errors:0 dropped:0 overruns:0 carrier:0
+          collisions:0 txqueuelen:0
+          RX bytes:0 (0.0 B)  TX bytes:0 (0.0 B)
+

data/spec/unit/stubs/ip.txt

@@ -0,0 +1,9 @@
+1: lo: <LOOPBACK,UP,LOWER_UP> mtu 65536 qdisc noqueue state UNKNOWN group default
+    inet 127.0.0.1/8 scope host lo
+       valid_lft forever preferred_lft forever
+3: wlan0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP group default qlen 1000
+    inet 1.1.1.1/24 brd 192.168.1.255 scope global wlan0
+       valid_lft forever preferred_lft forever
+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

metadata

@@ -1,113 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: win32-security
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0.rc.1
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0.rc.1
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.29'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.29'
 description: A Test Kitchen Provisioner for Chef Nodes
 email:
 - matt@mattwrock.com
@@ -115,8 +129,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -129,6 +143,8 @@ files:
 - lib/kitchen/provisioner/nodes.rb
 - lib/kitchen/provisioner/nodes_version.rb
 - spec/unit/nodes_spec.rb
+- spec/unit/stubs/ifconfig.txt
+- spec/unit/stubs/ip.txt
 homepage: ''
 licenses:
 - Apache 2.0
@@ -139,20 +155,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Provisioner for Chef Nodes
 test_files:
 - spec/unit/nodes_spec.rb
+- spec/unit/stubs/ifconfig.txt
+- spec/unit/stubs/ip.txt
 has_rdoc: