kitchen-nodes 0.7.0 → 0.8.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (22) hide show
  1. checksums.yaml +4 -4
  2. data/.gitattributes +3 -0
  3. data/.kitchen.travis.yml +36 -0
  4. data/.travis.yml +18 -7
  5. data/Berksfile +1 -1
  6. data/CHANGELOG.md +100 -85
  7. data/Gemfile +5 -3
  8. data/Rakefile +3 -2
  9. data/kitchen-nodes.gemspec +2 -2
  10. data/lib/kitchen/provisioner/finder.rb +1 -1
  11. data/lib/kitchen/provisioner/finder/ssh.rb +3 -3
  12. data/lib/kitchen/provisioner/finder/winrm.rb +4 -6
  13. data/lib/kitchen/provisioner/nodes.rb +2 -2
  14. data/lib/kitchen/provisioner/nodes_version.rb +2 -2
  15. data/lib/kitchen/provisioner/run_list_expansion_from_kitchen.rb +1 -1
  16. data/spec/unit/nodes_spec.rb +1 -1
  17. data/test/integration/cookbooks/node-tests/libraries/helper.rb +2 -2
  18. data/test/integration/cookbooks/node-tests/metadata.rb +1 -1
  19. data/test/integration/cookbooks/node-tests/recipes/node2.rb +3 -2
  20. data/test/integration/node2/serverspec/Gemfile +1 -1
  21. data/test/integration/node2/serverspec/default_spec.rb +6 -8
  22. metadata +7 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 914e2ddce98d8878bc2341631e67a37865a80398
4
- data.tar.gz: bbedb84bb8903054635f693f46d1042d74cbc0d8
3
+ metadata.gz: 82deefff80e567b21e9b255f9be22a3c2983fc77
4
+ data.tar.gz: ef6ad588d037b73ce9632d779c733481952c460c
5
5
  SHA512:
6
- metadata.gz: 6715ea6d9d65bd27b9fe74268e936a0af167b62881d915bd6b5ef5c645bf3b2d9bff5667610403e8ffc2381b52c03acaa8b1166ea4481d055e547f61ab74310e
7
- data.tar.gz: b63538dac0dfd02f71ec9afbe794753583a89de3fffe79151448cfbfec2cc4f132c5d784b616d29285feef685ecb303204c205b19ad0438bf665ef10cf4a88c7
6
+ metadata.gz: c1993d7b1dae5d5a189d1cd4132f6af39ab9eb10f9cf6ab096e2ae38da6414e52c82d830537479fbb2279060d348f4955ba470856e8a49ace50a3b877e17bafe
7
+ data.tar.gz: 00c3cb8f6199a2f9159234c7ccfcab03dec4f47f1f04def86b9397e897dd600cb170f24eb0fdaf439fdef65e5f1d590b09d41341155135b60fb5a7462934f6db
data/.gitattributes ADDED
@@ -0,0 +1,3 @@
1
+ # Managing line ending conversions
2
+ # See http://git-scm.com/docs/gitattributes#_end-of-line_conversion
3
+ * text eol=lf
data/.kitchen.travis.yml ADDED
@@ -0,0 +1,36 @@
1
+ ---
2
+ driver:
3
+ name: docker
4
+ username: vagrant
5
+ provision_command:
6
+ - usermod -p $(echo vagrant | openssl passwd -1 -stdin) vagrant
7
+ - locale-gen en_US.UTF-8
8
+ - dpkg-reconfigure locales
9
+
10
+ provisioner:
11
+ name: nodes
12
+ roles_path: test/fixtures/roles
13
+ require_chef_omnibus: latest
14
+
15
+ platforms:
16
+ - name: ubuntu-14.04
17
+
18
+ suites:
19
+ - name: node1
20
+ run_list:
21
+ - role[test_role]
22
+ - recipe[node-tests::node1]
23
+ attributes:
24
+ consul:
25
+ config:
26
+ bootstrap_expect: 2
27
+ server: true
28
+
29
+ - name: node2
30
+ run_list:
31
+ - recipe[node-tests::node2]
32
+ attributes:
33
+ consul:
34
+ config:
35
+ bootstrap_expect: 2
36
+ server: true
data/.travis.yml CHANGED
@@ -1,11 +1,22 @@
1
1
  language: ruby
2
2
 
3
- rvm:
4
- - 2.0.0
5
- - 1.9.3
6
- - 1.9.2
7
- - ruby-head
8
-
9
3
  matrix:
10
- allow_failures:
4
+ include:
5
+ - rvm: 2.3.1
11
6
  - rvm: ruby-head
7
+ - rvm: 2.3.1
8
+ services: docker
9
+ sudo: required
10
+ before_script:
11
+ - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
12
+ script:
13
+ - bundle exec kitchen verify
14
+ after_failure:
15
+ - cat .kitchen/logs/kitchen.log
16
+ env:
17
+ - UBUNTU=14.04
18
+ - KITCHEN_YAML=.kitchen.travis.yml
19
+
20
+ branches:
21
+ only:
22
+ - master
data/Berksfile CHANGED
@@ -1,4 +1,4 @@
1
- source 'https://supermarket.chef.io'
1
+ source 'https://supermarket.chef.io'
2
2
 
3
3
  group :integration do
4
4
  cookbook 'apt'
data/CHANGELOG.md CHANGED
@@ -1,86 +1,101 @@
1
- # Change Log
2
-
3
- ## [0.7.0](https://github.com/mwrock/kitchen-nodes/tree/0.7.0) (2016-03-08)
4
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.6...0.7.0)
5
-
6
- **Implemented enhancements:**
7
-
8
- - Added support for windows 2008R2 [\#18](https://github.com/mwrock/kitchen-nodes/pull/18) ([johnsmyth](https://github.com/johnsmyth))
9
-
10
- **Fixed bugs:**
11
-
12
- - Fix device filtering breaking for IPv6 interfaces [\#15](https://github.com/mwrock/kitchen-nodes/pull/15) ([vervas](https://github.com/vervas))
13
-
14
- ## [v0.6.6](https://github.com/mwrock/kitchen-nodes/tree/v0.6.6) (2016-02-12)
15
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.5...v0.6.6)
16
-
17
- **Fixed bugs:**
18
-
19
- - kitchen-nodes fails serverspec test on 2012 node due to unpopulated IP address [\#11](https://github.com/mwrock/kitchen-nodes/issues/11)
20
- - Shave extra newline off fqdn [\#13](https://github.com/mwrock/kitchen-nodes/pull/13) ([watkinsv-hp](https://github.com/watkinsv-hp))
21
-
22
- ## [v0.6.5](https://github.com/mwrock/kitchen-nodes/tree/v0.6.5) (2016-02-11)
23
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.4...v0.6.5)
24
-
25
- **Fixed bugs:**
26
-
27
- - kitchen-nodes provisioner needs kitchen-sync sftp finder [\#10](https://github.com/mwrock/kitchen-nodes/issues/10)
28
-
29
- ## [v0.6.4](https://github.com/mwrock/kitchen-nodes/tree/v0.6.4) (2016-01-27)
30
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.0...v0.6.4)
31
-
32
- **Fixed bugs:**
33
-
34
- - Error: Sandbox directory has not yet been created [\#9](https://github.com/mwrock/kitchen-nodes/issues/9)
35
-
36
- ## [v0.6.0](https://github.com/mwrock/kitchen-nodes/tree/v0.6.0) (2015-12-14)
37
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.5.0...v0.6.0)
38
-
39
- **Implemented enhancements:**
40
-
41
- - Expand the run\_list into the automatic=\>recipes attribute [\#8](https://github.com/mwrock/kitchen-nodes/pull/8) ([eherot](https://github.com/eherot))
42
-
43
- ## [v0.5.0](https://github.com/mwrock/kitchen-nodes/tree/v0.5.0) (2015-10-11)
44
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.4.1...v0.5.0)
45
-
46
- **Implemented enhancements:**
47
-
48
- - Feature/adding fqdn [\#7](https://github.com/mwrock/kitchen-nodes/pull/7) ([faja](https://github.com/faja))
49
-
50
- ## [v0.4.1](https://github.com/mwrock/kitchen-nodes/tree/v0.4.1) (2015-08-14)
51
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.4.0...v0.4.1)
52
-
53
- ## [v0.4.0](https://github.com/mwrock/kitchen-nodes/tree/v0.4.0) (2015-08-12)
54
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.4...v0.4.0)
55
-
56
- ## [v0.3.4](https://github.com/mwrock/kitchen-nodes/tree/v0.3.4) (2015-08-04)
57
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.3...v0.3.4)
58
-
59
- ## [v0.3.3](https://github.com/mwrock/kitchen-nodes/tree/v0.3.3) (2015-07-30)
60
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.2...v0.3.3)
61
-
62
- **Implemented enhancements:**
63
-
64
- - Update IP finder to work for CentOS 7.1 [\#6](https://github.com/mwrock/kitchen-nodes/pull/6) ([joerocklin](https://github.com/joerocklin))
65
-
66
- ## [v0.3.2](https://github.com/mwrock/kitchen-nodes/tree/v0.3.2) (2015-06-26)
67
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.1...v0.3.2)
68
-
69
- **Fixed bugs:**
70
-
71
- - Fix search\(\) for currently provisioned node [\#4](https://github.com/mwrock/kitchen-nodes/pull/4) ([ustuehler](https://github.com/ustuehler))
72
-
73
- ## [v0.3.1](https://github.com/mwrock/kitchen-nodes/tree/v0.3.1) (2015-05-11)
74
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.0...v0.3.1)
75
-
76
- ## [v0.3.0](https://github.com/mwrock/kitchen-nodes/tree/v0.3.0) (2015-05-10)
77
- [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.2.0...v0.3.0)
78
-
79
- **Implemented enhancements:**
80
-
81
- - 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))
82
-
83
- ## [v0.2.0](https://github.com/mwrock/kitchen-nodes/tree/v0.2.0) (2015-04-21)
84
-
85
-
1
+ # Change Log
2
+
3
+ ## [0.8.0](https://github.com/mwrock/kitchen-nodes/tree/0.8.0) (2016-09-24)
4
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.7.0...0.8.0)
5
+
6
+ **Closed issues:**
7
+
8
+ - Searching fqdn and ip on windows breaks [\#28](https://github.com/mwrock/kitchen-nodes/issues/28)
9
+ - Nodes returned from search are missing attributes from ohai? [\#24](https://github.com/mwrock/kitchen-nodes/issues/24)
10
+ - policyfile support [\#14](https://github.com/mwrock/kitchen-nodes/issues/14)
11
+
12
+ **Merged pull requests:**
13
+
14
+ - run kitchen tests in travis/docker [\#27](https://github.com/mwrock/kitchen-nodes/pull/27) ([mwrock](https://github.com/mwrock))
15
+ - update rubies in travis [\#26](https://github.com/mwrock/kitchen-nodes/pull/26) ([mwrock](https://github.com/mwrock))
16
+ - Put node object to the "nodes\_path" if defined [\#25](https://github.com/mwrock/kitchen-nodes/pull/25) ([legal90](https://github.com/legal90))
17
+
18
+ ## [v0.7.0](https://github.com/mwrock/kitchen-nodes/tree/v0.7.0) (2016-03-08)
19
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.6...v0.7.0)
20
+
21
+ **Implemented enhancements:**
22
+
23
+ - Added support for windows 2008R2 [\#18](https://github.com/mwrock/kitchen-nodes/pull/18) ([johnsmyth](https://github.com/johnsmyth))
24
+
25
+ **Fixed bugs:**
26
+
27
+ - Fix device filtering breaking for IPv6 interfaces [\#15](https://github.com/mwrock/kitchen-nodes/pull/15) ([vervas](https://github.com/vervas))
28
+
29
+ ## [v0.6.6](https://github.com/mwrock/kitchen-nodes/tree/v0.6.6) (2016-02-12)
30
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.5...v0.6.6)
31
+
32
+ **Fixed bugs:**
33
+
34
+ - kitchen-nodes fails serverspec test on 2012 node due to unpopulated IP address [\#11](https://github.com/mwrock/kitchen-nodes/issues/11)
35
+ - Shave extra newline off fqdn [\#13](https://github.com/mwrock/kitchen-nodes/pull/13) ([watkinsv-hp](https://github.com/watkinsv-hp))
36
+
37
+ ## [v0.6.5](https://github.com/mwrock/kitchen-nodes/tree/v0.6.5) (2016-02-11)
38
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.4...v0.6.5)
39
+
40
+ **Fixed bugs:**
41
+
42
+ - kitchen-nodes provisioner needs kitchen-sync sftp finder [\#10](https://github.com/mwrock/kitchen-nodes/issues/10)
43
+
44
+ ## [v0.6.4](https://github.com/mwrock/kitchen-nodes/tree/v0.6.4) (2016-01-27)
45
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.6.0...v0.6.4)
46
+
47
+ **Fixed bugs:**
48
+
49
+ - Error: Sandbox directory has not yet been created [\#9](https://github.com/mwrock/kitchen-nodes/issues/9)
50
+
51
+ ## [v0.6.0](https://github.com/mwrock/kitchen-nodes/tree/v0.6.0) (2015-12-14)
52
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.5.0...v0.6.0)
53
+
54
+ **Implemented enhancements:**
55
+
56
+ - Expand the run\_list into the automatic=\>recipes attribute [\#8](https://github.com/mwrock/kitchen-nodes/pull/8) ([eherot](https://github.com/eherot))
57
+
58
+ ## [v0.5.0](https://github.com/mwrock/kitchen-nodes/tree/v0.5.0) (2015-10-11)
59
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.4.1...v0.5.0)
60
+
61
+ **Implemented enhancements:**
62
+
63
+ - Feature/adding fqdn [\#7](https://github.com/mwrock/kitchen-nodes/pull/7) ([faja](https://github.com/faja))
64
+
65
+ ## [v0.4.1](https://github.com/mwrock/kitchen-nodes/tree/v0.4.1) (2015-08-14)
66
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.4.0...v0.4.1)
67
+
68
+ ## [v0.4.0](https://github.com/mwrock/kitchen-nodes/tree/v0.4.0) (2015-08-12)
69
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.4...v0.4.0)
70
+
71
+ ## [v0.3.4](https://github.com/mwrock/kitchen-nodes/tree/v0.3.4) (2015-08-04)
72
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.3...v0.3.4)
73
+
74
+ ## [v0.3.3](https://github.com/mwrock/kitchen-nodes/tree/v0.3.3) (2015-07-30)
75
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.2...v0.3.3)
76
+
77
+ **Implemented enhancements:**
78
+
79
+ - Update IP finder to work for CentOS 7.1 [\#6](https://github.com/mwrock/kitchen-nodes/pull/6) ([joerocklin](https://github.com/joerocklin))
80
+
81
+ ## [v0.3.2](https://github.com/mwrock/kitchen-nodes/tree/v0.3.2) (2015-06-26)
82
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.1...v0.3.2)
83
+
84
+ **Fixed bugs:**
85
+
86
+ - Fix search\(\) for currently provisioned node [\#4](https://github.com/mwrock/kitchen-nodes/pull/4) ([ustuehler](https://github.com/ustuehler))
87
+
88
+ ## [v0.3.1](https://github.com/mwrock/kitchen-nodes/tree/v0.3.1) (2015-05-11)
89
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.3.0...v0.3.1)
90
+
91
+ ## [v0.3.0](https://github.com/mwrock/kitchen-nodes/tree/v0.3.0) (2015-05-10)
92
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.2.0...v0.3.0)
93
+
94
+ **Implemented enhancements:**
95
+
96
+ - 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))
97
+
98
+ ## [v0.2.0](https://github.com/mwrock/kitchen-nodes/tree/v0.2.0) (2015-04-21)
99
+
100
+
86
101
  \* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
data/Gemfile CHANGED
@@ -1,9 +1,11 @@
1
- source 'https://rubygems.org'
1
+ source 'https://rubygems.org'
2
2
 
3
3
  gemspec
4
4
 
5
- gem 'test-kitchen', '~> 1.6'
6
5
  gem 'kitchen-vagrant'
6
+ gem 'kitchen-docker'
7
7
  gem 'berkshelf'
8
8
  gem 'chef'
9
- gem 'winrm-fs', '~> 0.3'
9
+ gem 'winrm-fs', '~> 1.0'
10
+ gem 'pry'
11
+ gem 'rb-readline'
data/Rakefile CHANGED
@@ -1,4 +1,4 @@
1
- require 'bundler/gem_tasks'
1
+ require 'bundler/gem_tasks'
2
2
  require 'github_changelog_generator/task'
3
3
  require 'rspec/core/rake_task'
4
4
  require 'rubocop/rake_task'
@@ -17,7 +17,8 @@ GitHubChangelogGenerator::RakeTask.new :changelog do |config|
17
17
  config.exclude_tags = [
18
18
  'v0.1.0.dev', 'v0.2.0.dev', 'v0.2.0.dev.1',
19
19
  'v0.2.0.dev.2', 'v0.2.0.dev.3', 'v0.2.0.dev.4',
20
- 'v0.6.4.dev', 'v0.6.3', 'v0.6.2', 'v0.6.1']
20
+ 'v0.6.4.dev', 'v0.6.3', 'v0.6.2', 'v0.6.1'
21
+ ]
21
22
  end
22
23
 
23
24
  task default: [:test, :style]
data/kitchen-nodes.gemspec CHANGED
@@ -1,4 +1,4 @@
1
- # coding: utf-8
1
+ # coding: utf-8
2
2
  lib = File.expand_path('../lib', __FILE__)
3
3
  $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
  require 'kitchen/provisioner/nodes_version'
@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
20
20
 
21
21
  spec.add_dependency 'net-ping'
22
22
  spec.add_dependency 'win32-security'
23
- spec.add_dependency 'test-kitchen', '~> 1.4'
23
+ spec.add_dependency 'test-kitchen', '~> 1.13'
24
24
 
25
25
  spec.add_development_dependency 'bundler', '~> 1.3'
26
26
  spec.add_development_dependency 'fakefs', '~> 0.4'
data/lib/kitchen/provisioner/finder.rb CHANGED
@@ -1,4 +1,4 @@
1
- module Kitchen
1
+ module Kitchen
2
2
  module Provisioner
3
3
  # Locates active IPs that are not localhost
4
4
  # there are separate implementations for
data/lib/kitchen/provisioner/finder/ssh.rb CHANGED
@@ -1,4 +1,4 @@
1
- module Kitchen
1
+ module Kitchen
2
2
  module Transport
3
3
  class Ssh < Kitchen::Transport::Base
4
4
  # Monkey patch of test-kitchen ssh transport
@@ -8,7 +8,7 @@ module Kitchen
8
8
  return if command.nil?
9
9
  out, exit_code = node_execute_with_exit_code(command, &block)
10
10
 
11
- if exit_code != 0
11
+ if exit_code.nonzero?
12
12
  raise Transport::SshFailed,
13
13
  "SSH exited (#{exit_code}) for command: [#{command}]"
14
14
  end
@@ -61,7 +61,7 @@ module Kitchen
61
61
 
62
62
  def find_ips
63
63
  ips = []
64
- (0..5).each do
64
+ 5.times do
65
65
  begin
66
66
  ips = run_ifconfig
67
67
  rescue Kitchen::Transport::TransportFailed
data/lib/kitchen/provisioner/finder/winrm.rb CHANGED
@@ -5,7 +5,7 @@ module Kitchen
5
5
  # that returns stdout
6
6
  class Connection < Kitchen::Transport::Base::Connection
7
7
  def node_execute(command, &block)
8
- session.run_powershell_script(command, &block)
8
+ unelevated_session.run(command, &block)
9
9
  end
10
10
  end
11
11
  end
@@ -23,7 +23,8 @@ module Kitchen
23
23
 
24
24
  def find_ips
25
25
  out = @connection.node_execute(
26
- '(ipconfig) -match \'IPv[46] Address\'')
26
+ '(ipconfig) -match \'IPv[46] Address\''
27
+ )
27
28
  data = []
28
29
  out[:data].each do |out_data|
29
30
  stdout = out_data[:stdout]
@@ -40,10 +41,7 @@ module Kitchen
40
41
  % { \"{0}\" -f $_.Split(':')[1].Trim() }
41
42
  EOS
42
43
  data = ''
43
- out[:data].each do |out_data|
44
- stdout = out_data[:stdout]
45
- data << stdout.chomp unless stdout.nil?
46
- end
44
+ data = out.stdout.chomp unless out.stdout.nil?
47
45
  data
48
46
  end
49
47
  end
data/lib/kitchen/provisioner/nodes.rb CHANGED
@@ -1,4 +1,4 @@
1
- # -*- encoding: utf-8 -*-
1
+ # -*- encoding: utf-8 -*-
2
2
  #
3
3
  # Author:: Matt Wrock (<matt@mattwrock.com>)
4
4
  #
@@ -112,7 +112,7 @@ module Kitchen
112
112
  # rubocop:enable Metrics/AbcSize
113
113
 
114
114
  def node_dir
115
- File.join(config[:test_base_path], 'nodes')
115
+ config[:nodes_path] || File.join(config[:test_base_path], 'nodes')
116
116
  end
117
117
 
118
118
  def node_file
data/lib/kitchen/provisioner/nodes_version.rb CHANGED
@@ -1,4 +1,4 @@
1
- # -*- encoding: utf-8 -*-
1
+ # -*- encoding: utf-8 -*-
2
2
  #
3
3
  # Author:: Matt Wrock (<matt@mattwrock.com>)
4
4
  #
@@ -19,6 +19,6 @@
19
19
  module Kitchen
20
20
  # Version string for Nodes Kitchen driver
21
21
  module Provisioner
22
- NODES_VERSION = '0.7.0'.freeze
22
+ NODES_VERSION = '0.8.0'.freeze
23
23
  end
24
24
  end
data/lib/kitchen/provisioner/run_list_expansion_from_kitchen.rb CHANGED
@@ -1,4 +1,4 @@
1
- # -*- encoding: utf-8 -*-
1
+ # -*- encoding: utf-8 -*-
2
2
  #
3
3
  # Author:: Matt Wrock (<matt@mattwrock.com>)
4
4
  #
data/spec/unit/nodes_spec.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'erb'
1
+ require 'erb'
2
2
  require 'fakefs/safe'
3
3
  require 'kitchen'
4
4
  require 'kitchen/driver/dummy'
data/test/integration/cookbooks/node-tests/libraries/helper.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'timeout'
1
+ require 'timeout'
2
2
 
3
3
  def search_for_nodes(query, timeout = 120)
4
4
  nodes = []
@@ -10,7 +10,7 @@ def search_for_nodes(query, timeout = 120)
10
10
  end
11
11
  end
12
12
 
13
- if nodes.count == 0 || !nodes[0].key?('ipaddress')
13
+ if nodes.count.zero? || !nodes[0].key?('ipaddress')
14
14
  raise "Unable to find any nodes meeting the search criteria '#{query}'!"
15
15
  end
16
16
 
data/test/integration/cookbooks/node-tests/metadata.rb CHANGED
@@ -1,4 +1,4 @@
1
- name 'node-tests'
1
+ name 'node-tests'
2
2
  version '0.1.0'
3
3
  maintainer ''
4
4
  maintainer_email ''
data/test/integration/cookbooks/node-tests/recipes/node2.rb CHANGED
@@ -1,5 +1,6 @@
1
- first_node = search_for_nodes(
2
- "run_list:*node1* AND platform:#{node['platform']}")
1
+ first_node = search_for_nodes(
2
+ "run_list:*node1* AND platform:#{node['platform']}"
3
+ )
3
4
 
4
5
  ruby_block 'Save first attributes' do
5
6
  block do
data/test/integration/node2/serverspec/Gemfile CHANGED
@@ -1,3 +1,3 @@
1
- source 'https://rubygems.org'
1
+ source 'https://rubygems.org'
2
2
 
3
3
  gem 'winrm' if RUBY_PLATFORM =~ /mingw/
data/test/integration/node2/serverspec/default_spec.rb CHANGED
@@ -1,4 +1,4 @@
1
- require 'serverspec'
1
+ require 'serverspec'
2
2
  require 'json'
3
3
 
4
4
  if RUBY_PLATFORM =~ /mingw/
@@ -19,13 +19,11 @@ describe 'other node' do
19
19
  let(:connection) do
20
20
  if RUBY_PLATFORM =~ /mingw/
21
21
  require 'winrm'
22
- ::WinRM::WinRMWebService.new(
23
- "http://#{ip}:5985/wsman",
24
- :plaintext,
22
+ ::WinRM::Connection.new(
23
+ endpoint: "http://#{ip}:5985/wsman",
25
24
  user: 'vagrant',
26
- pass: 'vagrant',
27
- basic_auth_only: true
28
- )
25
+ password: 'vagrant'
26
+ ).shell(:cmd)
29
27
  else
30
28
  Net::SSH.start(
31
29
  ip,
@@ -53,7 +51,7 @@ describe 'other node' do
53
51
 
54
52
  if RUBY_PLATFORM =~ /mingw/
55
53
  it 'has a computername matching node fqdn' do
56
- expect(connection.run_cmd('hostname').stdout.chomp).to eq(fqdn)
54
+ expect(connection.run('hostname').stdout.chomp).to eq(fqdn)
57
55
  end
58
56
  else
59
57
  it 'has a computername matching node fqdn' do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-nodes
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.8.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Matt Wrock
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-08 00:00:00.000000000 Z
11
+ date: 2016-09-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-ping
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '1.4'
47
+ version: '1.13'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '1.4'
54
+ version: '1.13'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bundler
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -149,7 +149,9 @@ executables: []
149
149
  extensions: []
150
150
  extra_rdoc_files: []
151
151
  files:
152
+ - ".gitattributes"
152
153
  - ".gitignore"
154
+ - ".kitchen.travis.yml"
153
155
  - ".kitchen.yml"
154
156
  - ".rubocop.yml"
155
157
  - ".travis.yml"
@@ -197,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
197
199
  version: '0'
198
200
  requirements: []
199
201
  rubyforge_project:
200
- rubygems_version: 2.5.2
202
+ rubygems_version: 2.6.6
201
203
  signing_key:
202
204
  specification_version: 4
203
205
  summary: A Test Kitchen Provisioner for Chef Nodes