kitchen-chefzero-nodes 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b948f1d84dee55995cc37b2f36c7c43f8387e7f
-  data.tar.gz: 52376d60bc6fba4b33a3aec3f8f34ab3d949b08b
+  metadata.gz: ecc7d28a6dc812c44bad750c640d88ef70a1d008
+  data.tar.gz: 12f8e162414f8c9d8feba3b6b47126ebbd1ff31f
 SHA512:
-  metadata.gz: f758fc957e6a78b5c88f787ec877fa09ecc2ee48c2991fa0a3abf731560cd96de4dace044f4d89b8b690c3c911cd9c533d8f5e2fe17b4d21219647eeca3b3ba7
-  data.tar.gz: 1a7c5d9515708d24304d152324c0a8fb9927b6ed99c847f65cb4c8bc4df10c68d07e102cd43740555b63b4ca0eeb739b6d1b921f09edb1d71cac7473121b4880
+  metadata.gz: 457f10d4baf4807b617ca890373c895c14bfcd9a1138c36eb3ed995c39c267e709df2034b82b789c4ae5d33a52e4ee967a50cf2ffc5980f9ecf944e0d2d2b923
+  data.tar.gz: c34edb45b38b45408717cf9aba9c8971483e13d664aa3a00486c0e38601dc9f53cc9515cfeba6b0ca9b91f9730d3263ff84bd5eef74be43d455fa53b7a48a406

data/.kitchen.yml

@@ -1,7 +1,9 @@
 ---
 driver:
   name: vagrant
-  provider: parallels
+  network:
+    private_network:
+      type: dhcp
 
 provisioner:
   name: chef_zero_nodes
@@ -9,9 +11,9 @@ provisioner:
   policyfile: test/integration/cookbooks/test/Policyfile.rb
 
 platforms:
-  - name: el6
+  - name: el7
     driver:
-      box: bento/centos-6.8
+      box: bento/centos-7.2
 
   - name: win2012R2
     driver:
@@ -35,7 +37,7 @@ suites:
     provisioner:
       named_run_list: win
     excludes:
-      - el6
+      - el7
 
   - name: ssh
     transport:

data/.rubocop.yml

@@ -22,7 +22,7 @@ Metrics/AbcSize:
   Enabled: false
 PerceivedComplexity:
   Enabled: false
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false

data/Gemfile

@@ -17,7 +17,7 @@ end
 
 group :kitchen do
   gem 'chef-dk', '~> 0.10'
-  gem 'test-kitchen', '~> 1.5'
   gem 'kitchen-sync', '~> 2.0'
   gem 'kitchen-vagrant', '~> 0.19'
+  gem 'test-kitchen', '~> 1.5'
 end

data/kitchen-chefzero-nodes.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kitchen/provisioner/chef_zero_nodes_version'

data/lib/kitchen/provisioner/chef_zero_nodes.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 #
 # Author:: Andrei Skopenko (<andrei@skopenko.net>)
 #
@@ -41,7 +42,7 @@ module Kitchen
       def converge(state)
         provisioner = instance.provisioner
         provisioner.create_sandbox
-        sandbox_dirs = Dir.glob("#{provisioner.sandbox_path}/*")
+        sandbox_dirs = Util.list_directory(provisioner.sandbox_path)
         instance.transport.connection(backcompat_merged_state(state)) do |conn|
           conn.execute(env_cmd(provisioner.install_command))
           conn.execute(env_cmd(provisioner.init_command))
@@ -161,6 +162,10 @@ module Kitchen
     class ChefZeroNodes < ChefZero
       # (see ChefZero#create_sandbox)
       def create_sandbox
+        if config[:nodes_path].nil?
+          info("Provisioner setting 'nodes_path' is not defined! Using 'test/fixtures/nodes' for node objects!")
+          config[:nodes_path] = 'test/fixtures/nodes'
+        end
         FileUtils.rm(ext_node_file) if File.exist?(ext_node_file)
         create_chefzero_sandbox
       end

data/lib/kitchen/provisioner/chef_zero_nodes_version.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 #
 # Author:: Andrei Skopenko (<andrei@skopenko.net>)
 #
@@ -19,6 +20,6 @@
 module Kitchen
   # Version string for chefzero_nodes Kitchen driver
   module Provisioner
-    CHEF_ZERO_NODES_VERSION = '1.0.4'.freeze
+    CHEF_ZERO_NODES_VERSION = '1.0.5'.freeze
   end
 end

data/test/integration/cookbooks/test/recipes/default.rb

@@ -15,3 +15,14 @@
 # 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.
+
+interfaces = node['network']['interfaces']
+interface_key = interfaces.keys.last
+
+# linux
+if node['virtualization'] && node['virtualization']['system'] == 'vbox'
+  interfaces[interface_key]['addresses'].each { |ip, params| node.automatic['ipaddress'] = ip if params['family'] == 'inet' }
+# windows
+elsif node['kernel'] && node['kernel']['cs_info'] && node['kernel']['cs_info']['model'] == 'VirtualBox'
+  node.automatic['ipaddress'] = interfaces[interface_key]['configuration']['ip_address'][0]
+end

data/test/integration/cookbooks/test/recipes/search.rb

@@ -16,18 +16,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sftp_node = search(:node, "name:sftp-* AND platform:#{node['platform']}")
+sftp_node = search(:node, "name:sftp-* AND platform:#{node['platform']}").first
+pp sftp_node['ipaddress']
 ruby_block 'save sftp attributes' do
   block do
     parent = File.join(ENV['TEMP'] || '/tmp', 'kitchen')
-    IO.write(File.join(parent, 'sftp.json'), sftp_node[0].to_json)
+    IO.write(File.join(parent, 'sftp.json'), sftp_node.to_json)
   end
 end
 
-win_node = search(:node, 'platform:windows')
+win_node = search(:node, 'platform:windows').first
+pp win_node['ipaddress']
 ruby_block 'save win attributes' do
   block do
     parent = File.join(ENV['TEMP'] || '/tmp', 'kitchen')
-    IO.write(File.join(parent, 'win.json'), win_node[0].to_json)
+    IO.write(File.join(parent, 'win.json'), win_node.to_json)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-chefzero-nodes
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Andrei Skopenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Test Kitchen provisioner based on chef_zero that generates searchable nodes