kitchen-nodes 0.6.6 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e777a5df2864a9b03a6ac3fbbd196c0698e2e083
-  data.tar.gz: e4ab0b5afe6f02b3d74c3afed22ed1a66e9efbfa
+  metadata.gz: 914e2ddce98d8878bc2341631e67a37865a80398
+  data.tar.gz: bbedb84bb8903054635f693f46d1042d74cbc0d8
 SHA512:
-  metadata.gz: 9d63342e2fbec032b42df9b0c65e974fcbd61cf4f037ce1f75115bbc91cdc11c9499341e2ae223b1583546697e8d12fe35cad7bed20c7d53d28247488db97946
-  data.tar.gz: 56f8c2f2252debbd9469f7e657b8191236c97e78efbf4694649b31e07b0c7ac3e017070a748919f0527e5058f8def13f367fe73873b12885c92595ae6c699b92
+  metadata.gz: 6715ea6d9d65bd27b9fe74268e936a0af167b62881d915bd6b5ef5c645bf3b2d9bff5667610403e8ffc2381b52c03acaa8b1166ea4481d055e547f61ab74310e
+  data.tar.gz: b63538dac0dfd02f71ec9afbe794753583a89de3fffe79151448cfbfec2cc4f132c5d784b616d29285feef685ecb303204c205b19ad0438bf665ef10cf4a88c7

data/.kitchen.yml

@@ -20,6 +20,11 @@ platforms:
     gui: true
     box: mwrock/Windows2012R2
 
+- name: windows-2008R2
+  driver_config:
+    gui: true
+    box: opentable/win-2008r2-datacenter-amd64-nocm
+
 suites:
 - name: node1
   run_list:

data/CHANGELOG.md

@@ -0,0 +1,86 @@
+# Change Log
+
+## [0.7.0](https://github.com/mwrock/kitchen-nodes/tree/0.7.0) (2016-03-08)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.6...0.7.0)
+
+**Implemented enhancements:**
+
+- Added support for windows 2008R2 [\#18](https://github.com/mwrock/kitchen-nodes/pull/18) ([johnsmyth](https://github.com/johnsmyth))
+
+**Fixed bugs:**
+
+- Fix device filtering breaking for IPv6 interfaces [\#15](https://github.com/mwrock/kitchen-nodes/pull/15) ([vervas](https://github.com/vervas))
+
+## [v0.6.6](https://github.com/mwrock/kitchen-nodes/tree/v0.6.6) (2016-02-12)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.5...v0.6.6)
+
+**Fixed bugs:**
+
+- kitchen-nodes fails serverspec test on 2012 node due to unpopulated IP address [\#11](https://github.com/mwrock/kitchen-nodes/issues/11)
+- Shave extra newline off fqdn [\#13](https://github.com/mwrock/kitchen-nodes/pull/13) ([watkinsv-hp](https://github.com/watkinsv-hp))
+
+## [v0.6.5](https://github.com/mwrock/kitchen-nodes/tree/v0.6.5) (2016-02-11)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.4...v0.6.5)
+
+**Fixed bugs:**
+
+- kitchen-nodes provisioner needs kitchen-sync sftp finder [\#10](https://github.com/mwrock/kitchen-nodes/issues/10)
+
+## [v0.6.4](https://github.com/mwrock/kitchen-nodes/tree/v0.6.4) (2016-01-27)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.0...v0.6.4)
+
+**Fixed bugs:**
+
+- Error: Sandbox directory has not yet been created [\#9](https://github.com/mwrock/kitchen-nodes/issues/9)
+
+## [v0.6.0](https://github.com/mwrock/kitchen-nodes/tree/v0.6.0) (2015-12-14)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.5.0...v0.6.0)
+
+**Implemented enhancements:**
+
+- Expand the run\_list into the automatic=\>recipes attribute [\#8](https://github.com/mwrock/kitchen-nodes/pull/8) ([eherot](https://github.com/eherot))
+
+## [v0.5.0](https://github.com/mwrock/kitchen-nodes/tree/v0.5.0) (2015-10-11)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.4.1...v0.5.0)
+
+**Implemented enhancements:**
+
+- Feature/adding fqdn [\#7](https://github.com/mwrock/kitchen-nodes/pull/7) ([faja](https://github.com/faja))
+
+## [v0.4.1](https://github.com/mwrock/kitchen-nodes/tree/v0.4.1) (2015-08-14)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.4.0...v0.4.1)
+
+## [v0.4.0](https://github.com/mwrock/kitchen-nodes/tree/v0.4.0) (2015-08-12)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.4...v0.4.0)
+
+## [v0.3.4](https://github.com/mwrock/kitchen-nodes/tree/v0.3.4) (2015-08-04)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.3...v0.3.4)
+
+## [v0.3.3](https://github.com/mwrock/kitchen-nodes/tree/v0.3.3) (2015-07-30)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.2...v0.3.3)
+
+**Implemented enhancements:**
+
+- Update IP finder to work for CentOS 7.1 [\#6](https://github.com/mwrock/kitchen-nodes/pull/6) ([joerocklin](https://github.com/joerocklin))
+
+## [v0.3.2](https://github.com/mwrock/kitchen-nodes/tree/v0.3.2) (2015-06-26)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.1...v0.3.2)
+
+**Fixed bugs:**
+
+- Fix search\(\) for currently provisioned node [\#4](https://github.com/mwrock/kitchen-nodes/pull/4) ([ustuehler](https://github.com/ustuehler))
+
+## [v0.3.1](https://github.com/mwrock/kitchen-nodes/tree/v0.3.1) (2015-05-11)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.0...v0.3.1)
+
+## [v0.3.0](https://github.com/mwrock/kitchen-nodes/tree/v0.3.0) (2015-05-10)
+[Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.2.0...v0.3.0)
+
+**Implemented enhancements:**
+
+- Include .kitchen.yml attributes to the node file at 'normal' scope. [\#2](https://github.com/mwrock/kitchen-nodes/pull/2) ([jcejohnson](https://github.com/jcejohnson))
+
+## [v0.2.0](https://github.com/mwrock/kitchen-nodes/tree/v0.2.0) (2015-04-21)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -2,8 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'test-kitchen', '~> 1.6'
 gem 'kitchen-vagrant'
 gem 'berkshelf'
 gem 'chef'
-gem 'winrm-transport'
-gem 'winrm-s'
+gem 'winrm-fs', '~> 0.3'

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler/gem_tasks'
+require 'github_changelog_generator/task'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 
@@ -8,4 +9,15 @@ RuboCop::RakeTask.new(:style) do |task|
   task.options << '--display-cop-names'
 end
 
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.future_release = Kitchen::Provisioner::NODES_VERSION
+  config.enhancement_labels = ['enhancement']
+  config.bug_labels = ['bug']
+  config.exclude_labels = %w(duplicate question invalid wontfix no_changelog)
+  config.exclude_tags = [
+    'v0.1.0.dev', 'v0.2.0.dev', 'v0.2.0.dev.1',
+    'v0.2.0.dev.2', 'v0.2.0.dev.3', 'v0.2.0.dev.4',
+    'v0.6.4.dev', 'v0.6.3', 'v0.6.2', 'v0.6.1']
+end
+
 task default: [:test, :style]

data/kitchen-nodes.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'fakefs', '~> 0.4'
+  spec.add_development_dependency 'github_changelog_generator', '1.11.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.2'
   spec.add_development_dependency 'rubocop', '~> 0.37', '>= 0.37.1'

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

@@ -84,6 +84,7 @@ module Kitchen
           ips = []
           response.split(/^\S+/).each do |device|
             next if !device.include?('RUNNING') || device.include?('LOOPBACK')
+            next if IP4REGEX.match(device).nil?
             ips << IP4REGEX.match(device)[1]
           end
           ips.compact

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

@@ -23,11 +23,11 @@ module Kitchen
 
         def find_ips
           out = @connection.node_execute(
-            'Get-NetIPConfiguration | % { $_.ipv4address.IPAddress }')
+            '(ipconfig) -match \'IPv[46] Address\'')
           data = []
           out[:data].each do |out_data|
             stdout = out_data[:stdout]
-            data << stdout.chomp unless stdout.nil? || stdout.chomp.empty?
+            data << Regexp.last_match[1] if stdout.chomp =~ /:\s*(\S+)/
           end
           data
         end

data/lib/kitchen/provisioner/nodes.rb

@@ -122,10 +122,17 @@ module Kitchen
       def get_reachable_guest_address(state)
         active_ips(instance.transport, state).each do |address|
           next if address == '127.0.0.1'
-          return address if Net::Ping::External.new.ping(address)
+          return address if reachable?(address)
         end
       end
 
+      def reachable?(address)
+        Net::Ping::External.new.ping(address) ||
+          Net::Ping::TCP.new(address, 5985).ping ||
+          Net::Ping::TCP.new(address, 5986).ping ||
+          Net::Ping::TCP.new(address, 22).ping
+      end
+
       def active_ips(transport, state)
         # inject creds into state for legacy drivers
         [:username, :password].each do |prop|

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.6'.freeze
+    NODES_VERSION = '0.7.0'.freeze
   end
 end

data/spec/unit/nodes_spec.rb

@@ -156,7 +156,7 @@ describe Kitchen::Provisioner::Nodes do
       let(:transport) { Kitchen::Transport::Winrm.new }
 
       before do
-        data = machine_ips.map { |ip| { stdout: "#{ip}\r\n" } }
+        data = machine_ips.map { |ip| { stdout: "IPv4 Address .: #{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)
@@ -172,6 +172,8 @@ describe Kitchen::Provisioner::Nodes do
 
       context 'only the last ip is reachable' do
         before do
+          allow_any_instance_of(Net::Ping::TCP).to receive(:ping)
+            .and_return(false)
           allow_any_instance_of(Net::Ping::External).to receive(:ping)
             .and_return(false)
           allow_any_instance_of(Net::Ping::External).to receive(:ping)

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

@@ -44,8 +44,11 @@ describe 'other node' 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)}/) }
+  # Skip this test on the 2008 box bc its not sysprepped....
+  unless ENV['computername'] =~ /VAGRANT\-2008R2/i
+    describe command('hostname') do
+      its(:stdout) { should_not match(/#{Regexp.quote(fqdn)}/) }
+    end
   end
 
   if RUBY_PLATFORM =~ /mingw/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.11.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Berksfile
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -182,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Provisioner for Chef Nodes