kitchen-nodes 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 976a49573712dd5d54abd33a47203a02b41da230
-  data.tar.gz: 2fc7abd23d5ecb3bf2b43685d186f6e6982fecc6
+  metadata.gz: 0b9a2cf6b57cb0516a521ad8d9136fa7852fc352
+  data.tar.gz: 36d3bc7399afaaba2f07568239094376da14e617
 SHA512:
-  metadata.gz: d164e5a025af7d6de97c8e7581846078a98de57f5139637389ba728e2c8002a0702f76c935c70f03b80c2af299f3dbc64fca07a88a78694e6dc56b496fbfc8a6
-  data.tar.gz: f8184447754823ee28c23ac29e0fccf96823dd20fb16ced3deca0f1f0bf6b9bba999162ef57192d5ef56f668ad0160a842086d7008bc97dcf52f9ef92e6ad7a2
+  metadata.gz: 0911251b158aafc38d3cba56f8942ba3247b2565bb04eab4ff85042e4fccb67bcf3353ed0c14c91743bc0576b02584e8809a90ea82c54a9f99597a5b6634f722
+  data.tar.gz: b74ca4524bf4ef81f879f7d8f16eb96a95f23c56048c17cf108848246779fec8364b42f0829267b0861fc56d2f938377f08946ac7e7da163d779941bcd796bbd

data/Gemfile

@@ -6,3 +6,4 @@ gem 'kitchen-vagrant'
 gem 'berkshelf'
 gem 'chef'
 gem 'winrm-transport'
+gem 'winrm-s'

data/kitchen-nodes.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   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.34'
+  spec.add_development_dependency 'rubocop', '~> 0.37', '>= 0.37.1'
 end

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

@@ -9,8 +9,8 @@ module Kitchen
           out, exit_code = node_execute_with_exit_code(command, &block)
 
           if exit_code != 0
-            fail Transport::SshFailed,
-                 "SSH exited (#{exit_code}) for command: [#{command}]"
+            raise Transport::SshFailed,
+                  "SSH exited (#{exit_code}) for command: [#{command}]"
           end
           out
         rescue Net::SSH::Exception => ex

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

@@ -27,7 +27,7 @@ module Kitchen
           data = []
           out[:data].each do |out_data|
             stdout = out_data[:stdout]
-            data << stdout.chomp unless stdout.nil?
+            data << stdout.chomp unless stdout.nil? || stdout.chomp.empty?
           end
           data
         end

data/lib/kitchen/provisioner/nodes.rb

@@ -132,7 +132,7 @@ module Kitchen
           state[prop] = instance.driver[prop] if instance.driver[prop]
         end
         ips = Finder.for_transport(transport, state).find_ips
-        fail 'Unable to retrieve IPs' if ips.empty?
+        raise 'Unable to retrieve IPs' if ips.empty?
         ips
       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.6.4'
+    NODES_VERSION = '0.6.5'.freeze
   end
 end

data/spec/unit/nodes_spec.rb

@@ -157,6 +157,7 @@ describe Kitchen::Provisioner::Nodes do
 
       before do
         data = machine_ips.map { |ip| { stdout: "#{ip}\r\n" } }
+        data = data.insert(0, stdout: "\r\n")
         allow_any_instance_of(Kitchen::Transport::Base::Connection).to(
           receive(:node_execute).and_return(data: data)
         )

data/test/integration/cookbooks/node-tests/libraries/helper.rb

@@ -11,7 +11,7 @@ def search_for_nodes(query, timeout = 120)
   end
 
   if nodes.count == 0 || !nodes[0].key?('ipaddress')
-    fail "Unable to find any nodes meeting the search criteria '#{query}'!"
+    raise "Unable to find any nodes meeting the search criteria '#{query}'!"
   end
 
   nodes

data/test/integration/node2/serverspec/default_spec.rb

@@ -40,6 +40,10 @@ describe 'other node' do
     expect(ip).not_to eq('127.0.0.1')
   end
 
+  it 'has a valid ip' do
+    expect(ip).to match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)
+  end
+
   describe command('hostname') do
     its(:stdout) { should_not match(/#{Regexp.quote(fqdn)}/) }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -114,14 +114,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.37'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.37.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.37'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.37.1
 description: A Test Kitchen Provisioner for Chef Nodes
 email:
 - matt@mattwrock.com