vagrant-vsphere-ddns 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e97a91cc097dadbd37d312c351a9b0e45bd5b21b
-  data.tar.gz: 66c19e1bd6a8c6fd95df74ebc444a0abef6027b6
+  metadata.gz: b7e4f80120a9cdcb7906e07110c9d92904f87659
+  data.tar.gz: 30345f6af937a8b3a932dea8455498f034478124
 SHA512:
-  metadata.gz: 4db20af3d8ade721965180c4069f61111d3818513fbed0cb02a9df1c0eb54d151a193407a9ce7f21e7144b2c15d96068868926b7295489ae39742333d854aa9a
-  data.tar.gz: c0f09e92715a71a185678975eedc22369780199928cfd6474f70ea4ec13d954aa3eae2b0f4cc6ab1a5d752cb0a85b836941459059223d7a52cd7353ee0a187a1
+  metadata.gz: 15e6361b1b6aec9e0bcf9ace4245e1db91bc97b75d0e0f356628adcb5a6f093658c677bae40b6cf9ccc976c4d21c0a11efb6cef9b945729ab95784b2428e9b63
+  data.tar.gz: 2a2f140d642bf195cb2b878396b8526a04b6bd0541bae8045a6a650e328a3c93b0c26d22bc5efc7a231f4dfef98f4f701e033a30f01783dc226433f29e1e59ca

data/lib/vagrant-vsphere-ddns/action.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
       # autoload
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
       autoload :GetSshInfo, action_root.join('get_ssh_info')
-      autoload :WaitForIPAddress, action_root.join("wait_for_ip_address")
+      autoload :WaitForIPAddress, action_root.join('wait_for_ip_address')
     end
   end
 end

data/lib/vagrant-vsphere-ddns/action/get_ssh_info.rb

@@ -15,7 +15,9 @@ module VagrantPlugins
                 def call(env)
                     env[:machine_ssh_info] = get_ssh_info(env[:vSphere_connection], env[:machine])
                     if !env[:machine_ssh_info].nil?
-                        @logger.info("SSH info: %s:%s" % [env[:machine_ssh_info][:host], env[:machine_ssh_info][:port]])
+                        @logger.debug("SSH info: #{env[:machine_ssh_info]}")
+                    else
+                        @logger.debug("SSH info is nil")
                     end
                     @app.call env
                 end
@@ -23,9 +25,12 @@ module VagrantPlugins
                 private
                 
                 def get_ssh_info(connection, machine)
+                    @logger.debug("machine.config.ddns.host is nil, plugin disabled") if machine.config.ddns.host.nil?
                     return nil if machine.config.ddns.host.nil?
-                    return nil if machine.id.nil?                    
+                    @logger.warn("machine.id is nil") if machine.id.nil?
+                    return nil if machine.id.nil?
                     vm = get_vm_by_uuid connection, machine
+                    @logger.warn("get_vm_by_uuid is nil") if vm.nil?
                     return nil if vm.nil?
                     
                     format_data = {}
@@ -33,6 +38,7 @@ module VagrantPlugins
                         break if card.nil?
                         format_data["mac#{id}".to_sym] = (card.macAddress.scan /[a-f0-9]/).join
                     end
+                    @logger.debug("format_data: #{format_data}")
                     
                     {
                         host: machine.config.ddns.host % format_data,

data/lib/vagrant-vsphere-ddns/action/wait_for_ip_address.rb

@@ -14,8 +14,9 @@ module VagrantPlugins
                 def call(env)
                     return if env[:machine_ssh_info].nil?
                     
-                    timeout = env[:machine].config.ddns.ssh_timeout                        
-                    @logger.info("Trying to resolve #{env[:machine_ssh_info][:host]} (timeout #{timeout} seconds)")
+                    host = env[:machine_ssh_info][:host]
+                    timeout = env[:machine].config.ddns.ssh_timeout
+                    @logger.info("Trying to resolve #{host} (timeout #{timeout} seconds)")
                     
                     Timeout.timeout(timeout) do
                         while true
@@ -23,11 +24,11 @@ module VagrantPlugins
                             return if env[:interrupted]
 
                             begin
-                                ip_address = Resolv.getaddress(env[:machine_ssh_info][:host])
-                                @logger.info("Host #{env[:machine_ssh_info][:host]} resolved to #{ip_address}")
+                                ip_address = Resolv.getaddress(host)
+                                @logger.info("Host #{host} resolved to #{ip_address}")
                                 break
                             rescue Resolv::ResolvError
-                                @logger.warn("Could not resolve: #{env[:machine_ssh_info][:host]}")
+                                @logger.warn("Could not resolve: #{host}")
                             end
                             sleep 1
                         end
@@ -36,7 +37,7 @@ module VagrantPlugins
                     @app.call(env)
                     
                 rescue Timeout::Error
-                    raise Errors::IPAddrTimeout
+                    raise Errors::IPAddrTimeout, host: host, timeout: timeout
                 end
                 
             end

data/lib/vagrant-vsphere-ddns/config.rb

@@ -7,12 +7,13 @@ module VagrantPlugins
       attr_accessor :ssh_timeout
 
       def initialize
-        @host = nil
-        @ssh_timeout = nil
+        @host = UNSET_VALUE
+        @ssh_timeout = UNSET_VALUE
       end
       
       def finalize!
-        @ssh_timeout = 120 if @ssh_timeout.nil?
+        @host = nil if @host == UNSET_VALUE
+        @ssh_timeout = 120 if @ssh_timeout == UNSET_VALUE
       end
       
       def validate(machine)

data/lib/vagrant-vsphere-ddns/errors.rb

@@ -1,7 +1,7 @@
 require 'vagrant'
 
 module VagrantPlugins
-  module VSphereDNS
+  module VSphereDDNS
     module Errors
       class VSphereDDNSError < Vagrant::Errors::VagrantError
         error_namespace("vagrant-vsphere-ddns.errors")

data/lib/vagrant-vsphere-ddns/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VSphereDDNS
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/locales/en.yml

@@ -2,4 +2,4 @@ en:
   vagrant-vsphere-ddns:
     errors:
       ip_addr_timeout: |-
-        Could not resolve host within timeout
+        Could not resolve host %{host} within timeout %{timeout}s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vsphere-ddns
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tobias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-vsphere