kitchen-nodes 0.8.0 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/.kitchen.travis.yml +2 -1
  3. data/.kitchen.yml +3 -2
  4. data/.rubocop.yml +3 -0
  5. data/CHANGELOG.md +14 -2
  6. data/Gemfile +3 -3
  7. data/lib/kitchen/provisioner/nodes_version.rb +1 -1
  8. data/lib/kitchen/provisioner/run_list_expansion_from_kitchen.rb +2 -2
  9. data/test/fixtures/roles/{test_role.json → test_json_role.json} +1 -1
  10. data/test/fixtures/roles/test_ruby_role.rb +2 -0
  11. metadata +6 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 82deefff80e567b21e9b255f9be22a3c2983fc77
4
- data.tar.gz: ef6ad588d037b73ce9632d779c733481952c460c
3
+ metadata.gz: 0d6c87f451e7a0e4674ca1e50c60f72c763abf7f
4
+ data.tar.gz: e4c8af60fdbded114da28eb3ada964c18cb47324
5
5
  SHA512:
6
- metadata.gz: c1993d7b1dae5d5a189d1cd4132f6af39ab9eb10f9cf6ab096e2ae38da6414e52c82d830537479fbb2279060d348f4955ba470856e8a49ace50a3b877e17bafe
7
- data.tar.gz: 00c3cb8f6199a2f9159234c7ccfcab03dec4f47f1f04def86b9397e897dd600cb170f24eb0fdaf439fdef65e5f1d590b09d41341155135b60fb5a7462934f6db
6
+ metadata.gz: be0b287d79d8fb054afc4f17cd66e70732c8c91f192afe2309f8822b5e70e7672f388f1691ba3919c9833ae0ceba75f1028fc64beae9242e11827d942ec01dff
7
+ data.tar.gz: 7387603d4f782ef646dee59b78f9d56e0b1924cbab8b833067f027f1a0f8ca495e4a8ac6a532f5b6cbb983c80ca4ae822bb938390366dcb9c84bc8a235dcbb1b
data/.kitchen.travis.yml CHANGED
@@ -18,7 +18,8 @@ platforms:
18
18
  suites:
19
19
  - name: node1
20
20
  run_list:
21
- - role[test_role]
21
+ - role[test_json_role]
22
+ - role[test_ruby_role]
22
23
  - recipe[node-tests::node1]
23
24
  attributes:
24
25
  consul:
data/.kitchen.yml CHANGED
@@ -28,14 +28,15 @@ platforms:
28
28
  suites:
29
29
  - name: node1
30
30
  run_list:
31
- - role[test_role]
31
+ - role[test_json_role]
32
+ - role[test_ruby_role]
32
33
  - recipe[node-tests::node1]
33
34
  attributes:
34
35
  consul:
35
36
  config:
36
37
  bootstrap_expect: 2
37
38
  server: true
38
-
39
+
39
40
  - name: node2
40
41
  run_list:
41
42
  - recipe[hurry-up-and-test::set_non_nat_vbox_ip]
data/.rubocop.yml CHANGED
@@ -1,6 +1,9 @@
1
1
  Metrics/MethodLength:
2
2
  Max: 20
3
3
 
4
+ Metrics/BlockLength:
5
+ Max: 150
6
+
4
7
  AllCops:
5
8
  Exclude:
6
9
  - '.kitchen/**/*'
data/CHANGELOG.md CHANGED
@@ -1,7 +1,19 @@
1
1
  # Change Log
2
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)
3
+ ## [0.9.0](https://github.com/mwrock/kitchen-nodes/tree/0.9.0) (2017-01-12)
4
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.8.0...0.9.0)
5
+
6
+ **Closed issues:**
7
+
8
+ - Trouble searching the node [\#23](https://github.com/mwrock/kitchen-nodes/issues/23)
9
+ - Working Example: Nginx Balancer + 2 App Nodes [\#22](https://github.com/mwrock/kitchen-nodes/issues/22)
10
+
11
+ **Merged pull requests:**
12
+
13
+ - Add support for loading roles from .rb and .json [\#31](https://github.com/mwrock/kitchen-nodes/pull/31) ([dullyouth](https://github.com/dullyouth))
14
+
15
+ ## [v0.8.0](https://github.com/mwrock/kitchen-nodes/tree/v0.8.0) (2016-09-24)
16
+ [Full Changelog](https://github.com/mwrock/kitchen-nodes/compare/v0.7.0...v0.8.0)
5
17
 
6
18
  **Closed issues:**
7
19
 
data/Gemfile CHANGED
@@ -2,10 +2,10 @@
2
2
 
3
3
  gemspec
4
4
 
5
- gem 'kitchen-vagrant'
6
- gem 'kitchen-docker'
7
5
  gem 'berkshelf'
8
6
  gem 'chef'
9
- gem 'winrm-fs', '~> 1.0'
7
+ gem 'kitchen-docker'
8
+ gem 'kitchen-vagrant'
10
9
  gem 'pry'
11
10
  gem 'rb-readline'
11
+ gem 'winrm-fs', '~> 1.0'
data/lib/kitchen/provisioner/nodes_version.rb CHANGED
@@ -19,6 +19,6 @@
19
19
  module Kitchen
20
20
  # Version string for Nodes Kitchen driver
21
21
  module Provisioner
22
- NODES_VERSION = '0.8.0'.freeze
22
+ NODES_VERSION = '0.9.0'.freeze
23
23
  end
24
24
  end
data/lib/kitchen/provisioner/run_list_expansion_from_kitchen.rb CHANGED
@@ -28,8 +28,8 @@ module Kitchen
28
28
  end
29
29
 
30
30
  def fetch_role(name, included_by)
31
- role_file = File.join(@role_dir, "#{name}.json")
32
- ::Chef::Role.json_create(JSON.parse(File.read(role_file)))
31
+ role_file = File.join(@role_dir, name)
32
+ ::Chef::Role.from_disk(role_file)
33
33
  rescue ::Chef::Exceptions::RoleNotFound
34
34
  role_not_found(name, included_by)
35
35
  end
data/test/fixtures/roles/{test_role.json → test_json_role.json} RENAMED
@@ -1,5 +1,5 @@
1
1
  {
2
- "name": "test_role",
2
+ "name": "test_json_role",
3
3
  "chef_type": "role",
4
4
  "json_class": "Chef::Role",
5
5
  "default_attributes": {
data/test/fixtures/roles/test_ruby_role.rb ADDED
@@ -0,0 +1,2 @@
1
+ name('test_ruby_role')
2
+ run_list 'recipe[hurry-up-and-test::set_non_nat_vbox_ip]'
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.8.0
4
+ version: 0.9.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-09-24 00:00:00.000000000 Z
11
+ date: 2017-01-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: net-ping
@@ -171,7 +171,8 @@ files:
171
171
  - spec/unit/nodes_spec.rb
172
172
  - spec/unit/stubs/ifconfig.txt
173
173
  - spec/unit/stubs/ip.txt
174
- - test/fixtures/roles/test_role.json
174
+ - test/fixtures/roles/test_json_role.json
175
+ - test/fixtures/roles/test_ruby_role.rb
175
176
  - test/integration/cookbooks/node-tests/libraries/helper.rb
176
177
  - test/integration/cookbooks/node-tests/metadata.rb
177
178
  - test/integration/cookbooks/node-tests/recipes/node1.rb
@@ -207,7 +208,8 @@ test_files:
207
208
  - spec/unit/nodes_spec.rb
208
209
  - spec/unit/stubs/ifconfig.txt
209
210
  - spec/unit/stubs/ip.txt
210
- - test/fixtures/roles/test_role.json
211
+ - test/fixtures/roles/test_json_role.json
212
+ - test/fixtures/roles/test_ruby_role.rb
211
213
  - test/integration/cookbooks/node-tests/libraries/helper.rb
212
214
  - test/integration/cookbooks/node-tests/metadata.rb
213
215
  - test/integration/cookbooks/node-tests/recipes/node1.rb