kitchen-nodes 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 424fe1bbfb440631414f59ffae27b23fa42c7737
-  data.tar.gz: 8d048f80afcb78ae15f54e6e38e03c69ed26b262
+  metadata.gz: 51197eb79b46b634f7d0a853e68c62e7e693d32a
+  data.tar.gz: 8f44cd17903d6d0e33ca289db6a4813b948d8434
 SHA512:
-  metadata.gz: ec45a10ac026b972be556a91f772b322f1f88f6fb59a4d5c865d29b38de5bb5175901bd2296cb1e98324ff31e688f73cf448e6af91ee0299bda5397ffc24b57f
-  data.tar.gz: d36de7c35202337667153848ddb5bad6136f1bfec52ca4dd839c29165962c59a0c65193ea45f3bc3edf3c907ec87783d17f9a3243ddc0970859004dd8636e496
+  metadata.gz: ec69542ce6d53c98d59876f5602e1c60d941f821316fb4080511ca80f6994815da4226e5c06a2724bd7d09da996049c9fe9f0fae35d5d703ee369e18aed1c639
+  data.tar.gz: ccfdb1f276c2ed48b840ffb1d0a6e05ec4700fcd7c0ce8ecf9962a61671adb0e31f3f3a14a1178eb857203fff12a476a70b547d19c52fa1e2f59e7eeb8962cbf

data/kitchen-nodes.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = []
-  spec.test_files    = spec.files.grep(/^(test|spec|features)\//)
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
   spec.add_dependency 'net-ping'

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

@@ -17,7 +17,7 @@ module Kitchen
           raise SshFailed, "SSH command failed (#{ex.message})"
         end
 
-        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+        # rubocop:disable Metrics/AbcSize
         def node_execute_with_exit_code(command)
           exit_code = nil
           out = []
@@ -42,7 +42,7 @@ module Kitchen
           session.loop
           [out.join("\n"), exit_code]
         end
-        # rubocop:enable  Metrics/MethodLength, Metrics/AbcSize
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/kitchen/provisioner/nodes.rb

@@ -52,9 +52,18 @@ module Kitchen
         state[:hostname]
       end
 
+      def chef_environment
+        env = '_default'
+        if config[:client_rb] && config[:client_rb][:environment]
+          env = config[:client_rb][:environment]
+        end
+        env
+      end
+
       def node_template
         {
           id: instance.name,
+          chef_environment: chef_environment,
           automatic: {
             ipaddress: ipaddress,
             platform: instance.platform.name.split('-')[0].downcase

data/lib/kitchen/provisioner/nodes_version.rb

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

data/spec/unit/nodes_spec.rb

@@ -13,7 +13,8 @@ describe Kitchen::Provisioner::Nodes do
       test_base_path: '/b',
       kitchen_root: '/r',
       run_list: 'cookbook:recipe',
-      attributes: { att_key: 'att_val' }
+      attributes: { att_key: 'att_val' },
+      client_rb: { environment: 'my_env' }
     }
   end
   let(:instance) do
@@ -57,6 +58,12 @@ describe Kitchen::Provisioner::Nodes do
     expect(node[:id]).to eq instance.name
   end
 
+  it 'sets the environment' do
+    subject.create_node
+
+    expect(node[:chef_environment]).to eq config[:client_rb][:environment]
+  end
+
   it 'sets the runlist' do
     subject.create_node
 
@@ -75,6 +82,16 @@ describe Kitchen::Provisioner::Nodes do
     expect(node[:automatic][:ipaddress]).to eq state[:hostname]
   end
 
+  context 'no environment explicitly set' do
+    before { config.delete(:client_rb) }
+
+    it 'sets the environment' do
+      subject.create_node
+
+      expect(node[:chef_environment]).to eq '_default'
+    end
+  end
+
   context 'instance is localhost' do
     let(:state) { { hostname: '127.0.0.1' } }
     let(:machine_ips) { ['192.168.1.1', '192.168.1.2', '192.168.1.3'] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping