vagrant-libvirt 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f679c4994924e362840cb557548fd54cb12fa9
-  data.tar.gz: a6f1ffd51906f47c366fb72b0cf87b8ffbd145b2
+  metadata.gz: 9bc2f0fdfc01511f71626fdc2fe8b7cbe21c6a09
+  data.tar.gz: a6af2428f90f0ccc535835336f07cf1f765dd4ba
 SHA512:
-  metadata.gz: 1cdcb6b6d8d55a4dc5e025cc7c83452d64d1f964013ade0537acfbea3c27c314133a52ff58d842ec74832056f230d4ea259757482101a1f2613162199aeaccde
-  data.tar.gz: de6039104f84243740a0437c278f0d6b4b283293ff6efb0a15e6109cd58f4fa0d6ebdd2111bece79e88b87fc85b9d4d5501cbdbefcd8832bda8c539e375767b1
+  metadata.gz: 62d3180bf379f2b6d264c6c8e8fa29e8d340b5d6dd74c456ac536967c8c10c77b42a942963569db8e6ed936622a8b20ebf9dbb6f81a12b99e420290b943b5b54
+  data.tar.gz: 6b6ff342e37bfe6c6ceae077d974dad0cedae2eed7581529b2e0b465dac81a007b6ed17c026e6125a160c741abe3322b3338e8e9a584ed1abbbcfb2b79a3ed1b

data/lib/vagrant-libvirt/action/forward_ports.rb

@@ -3,6 +3,8 @@ module VagrantPlugins
     module Action
       # Adds support for vagrant's `forward_ports` configuration directive.
       class ForwardPorts
+        @@lock = Mutex.new
+
         def initialize(app, env)
           @app    = app
           @logger = Log4r::Logger.new('vagrant_libvirt::action::forward_ports')
@@ -94,8 +96,21 @@ module VagrantPlugins
           ) + ssh_info[:private_key_path].map do |pk|
               "IdentityFile=#{pk}"
             end).map { |s| s.prepend('-o ') }.join(' ')
-            
-          ssh_cmd = "ssh #{options} #{params}"
+
+          # TODO: instead of this, try and lock and get the stdin from spawn...
+          ssh_cmd = ''
+          if host_port <= 1024
+            @@lock.synchronize do
+              # TODO: add i18n
+              @env[:ui].info 'Requesting sudo for host port(s) <= 1024'
+              r = system('sudo -v')
+              if r
+                ssh_cmd << 'sudo '	# add sudo prefix
+              end
+            end
+          end
+
+          ssh_cmd << "ssh #{options} #{params}"
 
           @logger.debug "Forwarding port with `#{ssh_cmd}`"
           spawn(ssh_cmd,  [:out, :err] => '/dev/null')
@@ -119,6 +134,8 @@ module VagrantPlugins
     module Action
       # Cleans up ssh-forwarded ports on VM halt/destroy.
       class ClearForwardedPorts
+        @@lock = Mutex.new
+
         def initialize(app, env)
           @app = app
           @logger = Log4r::Logger.new(
@@ -133,10 +150,19 @@ module VagrantPlugins
             env[:ui].info I18n.t(
               'vagrant.actions.vm.clear_forward_ports.deleting'
             )
-            ssh_pids.each do |pid|
-              next unless ssh_pid?(pid)
-              @logger.debug "Killing pid #{pid}"
-              system "kill #{pid}"
+            ssh_pids.each do |tag|
+              next unless ssh_pid?(tag[:pid])
+              @logger.debug "Killing pid #{tag[:pid]}"
+              kill_cmd = ''
+
+              if tag[:port] <= 1024
+                kill_cmd << 'sudo '	# add sudo prefix
+              end
+
+              kill_cmd << "kill #{tag[:pid]}"
+              @@lock.synchronize do
+                system(kill_cmd)
+              end
             end
 
             @logger.info 'Removing ssh pid files'
@@ -153,7 +179,10 @@ module VagrantPlugins
         def ssh_pids
           glob = @env[:machine].data_dir.join('pids').to_s + '/ssh_*.pid'
           @ssh_pids = Dir[glob].map do |file|
-            File.read(file).strip.chomp
+            {
+              :pid => File.read(file).strip.chomp,
+              :port => File.basename(file)['ssh_'.length..-1*('.pid'.length+1)].to_i
+            }
           end
         end
 

data/lib/vagrant-libvirt/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ProviderLibvirt
-    VERSION = '0.0.17'
+    VERSION = '0.0.18'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-libvirt
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Lukas Stanek
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog