kitchen-nodes 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b8930d518f65a1dee4809dbb78e4ae736fe4541
-  data.tar.gz: aa20c8911a41adc5825ff1652c23bcf8f60181ed
+  metadata.gz: 740fc4fc0bb5e9e69004285216c232ce23e1b9be
+  data.tar.gz: b5d9dd976ce3e579cc431e1a2a16d17a5e1b9a26
 SHA512:
-  metadata.gz: 49add0cf3e506a17bbcee92212ac72b38629141c25e3d3c23333540736b255f49c8a000304dd27aa07b5195926e1b2ead7926fc847225470fd407109316a78f2
-  data.tar.gz: ef5e99b812d19f73495d89f2d8d208a1aab8159a938c19a285fef8e2527723aa74c0cc31140ed68b3c4a881281d49bb1f150bd5714221bcca870a52c904a7455
+  metadata.gz: 124a5b80d69634b68e88de94711325d16278a3f100a61a825db4321c499a0b3a9dad5d58e77622d851eca8e7761053331de12e19f478237a75cff60b9e049f67
+  data.tar.gz: b4d65e7ad42faf4b2d0f942bd2d40793cc573fb4ebcfa4d81cfab4f60fd53b69dce1044b988670f76ecb26209e15fc02d3a8a038bbeb4b9706b452cf8fb3d4ee

data/.gitignore

@@ -17,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+test/integration/nodes

data/Gemfile

@@ -4,4 +4,5 @@ gemspec
 
 gem 'kitchen-vagrant'
 gem 'berkshelf'
+gem 'chef'
 gem 'winrm-transport'

data/README.md

@@ -11,7 +11,13 @@ The nodes provisioner extends the `chef-zero` provisioner along with all of its
   "id": "server-community-ubuntu-1204",
   "automatic": {
     "ipaddress": "172.17.0.8",
-    "platform": "ubuntu"
+    "platform": "ubuntu",
+    "recipes": [
+      "apt::default",
+      "couchbase-tests::ipaddress",
+      "couchbase::server",
+      "export-node"
+    ]
   },
   "normal": {
     "attr1": "val1"
@@ -28,7 +34,13 @@ The nodes provisioner extends the `chef-zero` provisioner along with all of its
   "id": "second-node-ubuntu-1204",
   "automatic": {
     "ipaddress": "172.17.0.9",
-    "platform": "ubuntu"
+    "platform": "ubuntu",
+    "recipes": [
+      "apt::default",
+      "couchbase-tests::ipaddress",
+      "couchbase::server",
+      "export-node"
+    ]
   },
   "run_list": [
     "recipe[apt]",

data/lib/kitchen/provisioner/nodes.rb

@@ -19,7 +19,9 @@
 require 'kitchen'
 require 'kitchen/provisioner/chef_zero'
 require 'kitchen/provisioner/finder'
+require 'kitchen/provisioner/run_list_expansion_from_kitchen'
 require 'net/ping'
+require 'chef/run_list'
 
 module Kitchen
   module Provisioner
@@ -69,6 +71,19 @@ module Kitchen
         end
       end
 
+      def recipes
+        rl = config[:run_list].map do |item|
+          ::Chef::RunList::RunListItem.new item
+        end
+        rle = RunListExpansionFromKitchen.new(
+          chef_environment,
+          rl,
+          config[:roles_path]
+        )
+        rle.expand
+        rle.recipes
+      end
+
       def chef_environment
         env = '_default'
         if config[:client_rb] && config[:client_rb][:environment]
@@ -77,6 +92,7 @@ module Kitchen
         env
       end
 
+      # rubocop:disable Metrics/AbcSize
       def node_template
         {
           id: instance.name,
@@ -84,12 +100,14 @@ module Kitchen
           automatic: {
             ipaddress: ipaddress,
             platform: instance.platform.name.split('-')[0].downcase,
-            fqdn: fqdn
+            fqdn: fqdn,
+            recipes: recipes
           },
           normal: config[:attributes],
           run_list: config[:run_list]
         }
       end
+      # rubocop:enable Metrics/AbcSize
 
       def node_dir
         File.join(config[:test_base_path], 'nodes')

data/lib/kitchen/provisioner/nodes_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   # Version string for Nodes Kitchen driver
   module Provisioner
-    NODES_VERSION = '0.5.0'
+    NODES_VERSION = '0.6.0'
   end
 end

data/lib/kitchen/provisioner/run_list_expansion_from_kitchen.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+#
+# Copyright (C) 2015, Matt Wrock
+#
+# 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,
+# 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 'chef/role'
+
+module Kitchen
+  module Provisioner
+    # fetches roles from kitchen roles directory
+    class RunListExpansionFromKitchen < ::Chef::RunList::RunListExpansion
+      def fetch_role(name, included_by, role_dir)
+        role_file = File.join(role_dir, "#{name}.json")
+        Chef::Role.json_create(JSON.parse(File.read(role_file)))
+      rescue Chef::Exceptions::RoleNotFound
+        role_not_found(name, included_by)
+      end
+    end
+  end
+end

data/spec/unit/nodes_spec.rb

@@ -12,7 +12,7 @@ describe Kitchen::Provisioner::Nodes do
     {
       test_base_path: '/b',
       kitchen_root: '/r',
-      run_list: 'cookbook:recipe',
+      run_list: ['recipe[cookbook::default]'],
       attributes: { att_key: 'att_val' },
       client_rb: { environment: 'my_env' }
     }
@@ -75,6 +75,12 @@ describe Kitchen::Provisioner::Nodes do
     expect(node[:run_list]).to eq config[:run_list]
   end
 
+  it 'expands the runlist' do
+    subject.create_node
+
+    expect(node[:automatic][:recipes]).to eq ['cookbook::default']
+  end
+
   it 'sets the normal attributes' do
     subject.create_node
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -144,6 +144,7 @@ files:
 - lib/kitchen/provisioner/finder/winrm.rb
 - lib/kitchen/provisioner/nodes.rb
 - lib/kitchen/provisioner/nodes_version.rb
+- lib/kitchen/provisioner/run_list_expansion_from_kitchen.rb
 - spec/unit/nodes_spec.rb
 - spec/unit/stubs/ifconfig.txt
 - spec/unit/stubs/ip.txt
@@ -154,10 +155,6 @@ files:
 - test/integration/node1/serverspec/default_spec.rb
 - test/integration/node2/serverspec/Gemfile
 - test/integration/node2/serverspec/default_spec.rb
-- test/integration/nodes/node1-ubuntu-1204.json
-- test/integration/nodes/node1-windows-2012R2.json
-- test/integration/nodes/node2-ubuntu-1204.json
-- test/integration/nodes/node2-windows-2012R2.json
 homepage: ''
 licenses:
 - Apache 2.0
@@ -193,8 +190,3 @@ test_files:
 - test/integration/node1/serverspec/default_spec.rb
 - test/integration/node2/serverspec/Gemfile
 - test/integration/node2/serverspec/default_spec.rb
-- test/integration/nodes/node1-ubuntu-1204.json
-- test/integration/nodes/node1-windows-2012R2.json
-- test/integration/nodes/node2-ubuntu-1204.json
-- test/integration/nodes/node2-windows-2012R2.json
-has_rdoc: 

data/test/integration/nodes/node1-ubuntu-1204.json

@@ -1,22 +0,0 @@
-{
-  "id": "node1-ubuntu-1204",
-  "chef_environment": "_default",
-  "automatic": {
-    "ipaddress": "192.168.1.147",
-    "platform": "ubuntu",
-    "fqdn": "node1-ubuntu-1204"
-  },
-  "normal": {
-    "consul": {
-      "config": {
-        "bootstrap_expect": 2,
-        "server": true
-      }
-    }
-  },
-  "run_list": [
-    "recipe[apt]",
-    "recipe[hurry-up-and-test::set_non_nat_vbox_ip]",
-    "recipe[node-tests::node1]"
-  ]
-}

data/test/integration/nodes/node1-windows-2012R2.json

@@ -1,21 +0,0 @@
-{
-  "id": "node1-windows-2012R2",
-  "chef_environment": "_default",
-  "automatic": {
-    "ipaddress": "192.168.1.149",
-    "platform": "windows",
-    "fqdn": "WIN-HKCPKCREPB8"
-  },
-  "normal": {
-    "consul": {
-      "config": {
-        "bootstrap_expect": 2,
-        "server": true
-      }
-    }
-  },
-  "run_list": [
-    "recipe[hurry-up-and-test::set_non_nat_vbox_ip]",
-    "recipe[node-tests::node1]"
-  ]
-}

data/test/integration/nodes/node2-ubuntu-1204.json

@@ -1,22 +0,0 @@
-{
-  "id": "node2-ubuntu-1204",
-  "chef_environment": "_default",
-  "automatic": {
-    "ipaddress": "192.168.1.148",
-    "platform": "ubuntu",
-    "fqdn": "node2-ubuntu-1204"
-  },
-  "normal": {
-    "consul": {
-      "config": {
-        "bootstrap_expect": 2,
-        "server": true
-      }
-    }
-  },
-  "run_list": [
-    "recipe[apt]",
-    "recipe[hurry-up-and-test::set_non_nat_vbox_ip]",
-    "recipe[node-tests::node2]"
-  ]
-}

data/test/integration/nodes/node2-windows-2012R2.json

@@ -1,21 +0,0 @@
-{
-  "id": "node2-windows-2012R2",
-  "chef_environment": "_default",
-  "automatic": {
-    "ipaddress": "192.168.1.150",
-    "platform": "windows",
-    "fqdn": "WIN-70EEPS83GN7"
-  },
-  "normal": {
-    "consul": {
-      "config": {
-        "bootstrap_expect": 2,
-        "server": true
-      }
-    }
-  },
-  "run_list": [
-    "recipe[hurry-up-and-test::set_non_nat_vbox_ip]",
-    "recipe[node-tests::node2]"
-  ]
-}