kitchen-nodes 0.1.0.dev → 0.2.0.dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df1c8dede4f01d42226a9fbfbc0f32d4fe97ca37
-  data.tar.gz: 00ecf4c1ec8cbad7c709636ff31463f456cf08d6
+  metadata.gz: 16404efb54531fe1bd15a88b0f2ae15cc4fb16f2
+  data.tar.gz: 05845fd2866124fccc58a78f6c36c7fa18043a64
 SHA512:
-  metadata.gz: bdd211c9b78b8b67834191f2634c9903a54f40f8889df6014a620be48efb590d68d92382c9726c9b8ff7bb96bba46026f1c2274c5692bc007ffff80d861e359b
-  data.tar.gz: 4a5fa19be79e810f21caf38276ed929c2bebd83fa6a66126bb4862743ee2b3031e18923f79f66b85f5e946bf76507ad519780b6f760a653504b2a075e516f7c9
+  metadata.gz: 734bffbe6238d2ce7be508e64c938abcec242fa8546cbcf96e6e071cab35ae23e1dedcf90427eeba7a9a4b4600fbae4bd6d2da084a954253d30f78ce8ddf789d
+  data.tar.gz: 94b9f6d54f7caf1ae4fe9b5e1efaefb757474ddd6d5f2d1b7c04b4dc86a68677a1ebcb1c264ebf96d151ded31ea2780d8e2ab5c01a2a98b725fea10cdc6bbeda

data/kitchen-nodes.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'net-ping'
+
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
 end

data/lib/kitchen/provisioner/nodes.rb

@@ -18,9 +18,20 @@
 
 require "kitchen"
 require "kitchen/provisioner/chef_zero"
+require "net/ping"
 
 module Kitchen
 
+  module Transport
+    class Winrm < Kitchen::Transport::Base
+      class Connection < Kitchen::Transport::Base::Connection
+        def node_session(retry_options = {})
+          session(retry_options)
+        end
+      end
+    end
+  end
+
   module Provisioner
 
     # Nodes provisioner for Kitchen.
@@ -39,11 +50,12 @@ module Kitchen
         node_file = File.join(node_dir, "#{instance.name}.json")
 
         state = Kitchen::StateFile.new(config[:kitchen_root], instance.name).read
+        ipaddress = get_reachable_guest_address(state) || state[:hostname]
 
         node = {
           :id => instance.name,
           :automatic => {
-            :ipaddress => state[:hostname]
+            :ipaddress => ipaddress
           },
           :run_list => config[:run_list]
         }
@@ -51,6 +63,15 @@ module Kitchen
         File.open(node_file, 'w') do |out|
           out << JSON.pretty_generate(node)
         end
+      end
+
+      def get_reachable_guest_address(state)
+        instance.transport.connection(state).node_session.run_powershell_script("Get-NetIPConfiguration | % { $_.ipv4address.IPAddress}") do |address, _|
+          address = address.chomp unless address.nil?
+          next if address.nil? || address == "127.0.0.1"
+          return address if Net::Ping::External.new.ping(address)
+        end
+        return nil
       end      
     end
   end

data/lib/kitchen/provisioner/nodes_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Provisioner
 
     # Version string for Nodes Kitchen driver
-    NODES_VERSION = "0.1.0.dev"
+    NODES_VERSION = "0.2.0.dev"
   end
 end

metadata

@@ -1,41 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.1.0.dev
+  version: 0.2.0.dev
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-ping
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A Test Kitchen Provisioner for Chef Nodes
@@ -45,8 +59,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -65,17 +79,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Provisioner for Chef Nodes