vagrant-xenserver 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d130e14805be4d3322b14f8e9210e512b9ddca
-  data.tar.gz: f6b52d37d73fe2fbb8bb6a507049b2af353f7e81
+  metadata.gz: c36e407b54f5793660b1d301dca4043ab1027588
+  data.tar.gz: a36f6232bc1afee81fbeb034a38a1b9954fde56b
 SHA512:
-  metadata.gz: 5fc5a26835d2fdd138c3059fc08ffcbc6ebc06d3a7af8429cc00682363ffc706547597370d7ac54d56e0d9f4c67713b617f36049597819652775a9cda6461e81
-  data.tar.gz: 78ffce3ab5bf2f16debc6593759dfb62d663c56f3afc23c49f8a44494fb4ee549a51975af7c2676646c4b928b450e2e159548ce57dad7ee84f515c3bc6dd166d
+  metadata.gz: 0d0d585621e5cf7e9f0b9d9b6a73b1c264c4fa656788dd95fe8a1cc9240a162c65bc8c31b0c66f627b17b4dfcb236181c92fc44e5a4c71a3982ff2727845aac8
+  data.tar.gz: beaf065687e10e559d7eb529e4ea727f454655b0fa7340baac3fe3304f7d8bfd365415ca3078cd6f50fcb4262e0726b40f1902be5f09925d6ef5f9b793868296

data/lib/vagrant-xenserver/action/clone_disk.rb

@@ -20,7 +20,7 @@ module VagrantPlugins
 
           env[:my_vdi] = clone
 
-          @logger.info("clone VDI="+clone)
+          @logger.info("clone VDI=#{clone}")
 
           @app.call(env)
         end

data/lib/vagrant-xenserver/action/prepare_nfs_settings.rb

@@ -1,5 +1,25 @@
 require 'nokogiri'
 require 'socket'
+require 'rbconfig'
+
+def os
+    @os ||= (
+      host_os = RbConfig::CONFIG['host_os']
+      case host_os
+      when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+        :windows
+      when /darwin|mac os/
+        :macosx
+      when /linux/
+        :linux
+      when /solaris|bsd/
+        :unix
+      else
+        raise Vagrant::Errors::UnknownOS # "unknown os: #{host_os.inspect}"
+      end
+    )
+  end
+
 
 module VagrantPlugins
   module XenServer
@@ -41,9 +61,23 @@ module VagrantPlugins
         def read_host_ip(machine,env)
           ip = Socket.getaddrinfo(env[:machine].provider_config.xs_host,nil)[0][2]
           env[:xs_host_ip] = ip
-          re = /src ([0-9\.]+)/
-          match = `ip route get to #{ip} | head -n 1`.match re
-          match[1]
+          def get_local_ip_linux(ip)
+            re = /src ([0-9\.]+)/
+            match = `ip route get to #{ip} | head -n 1`.match re
+            match[1]
+          end
+          def get_local_ip_mac(ip)
+            re = /interface: ([a-z0-9]+)/
+            match = `route get #{ip} | grep interface | head -n 1`.match re
+            interface = match[1]
+            re = /inet ([0-9\.]+)/
+            match = `ifconfig #{interface} inet | tail -1`.match re
+            match[1]
+          end
+          if os == :linux then get_local_ip_linux(ip)
+          elsif os == :macosx then get_local_ip_mac(ip)
+          else raise Vagrant::Errors::UnknownOS # "unknown os: #{host_os.inspect}"
+          end 
         end
       end
     end

data/lib/vagrant-xenserver/errors.rb

@@ -23,6 +23,9 @@ module VagrantPlugins
         error_key(:api_error)
       end
 
+      class UnknownOS < VagrantXenServerError
+        error_key(:unknown_os)
+      end
     end
   end
 end

data/lib/vagrant-xenserver/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module XenServer
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-xenserver
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jon Ludlam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage XenServers.