vagrant-serial 0.0.12 → 0.0.13

data/lib/vagrant-serial/config.rb

@@ -3,6 +3,11 @@ module Vagrant
     class Config < Vagrant::Config::Base
       attr_accessor :forward_com1
       attr_accessor :forward_com2
+      attr_accessor :sockets_path
+
+      def sockets_path
+        @sockets_path.nil? ? (@sockets_path = "#{ENV["VAGRANT_HOME"]}/serial") : @sockets_path
+      end
 
       def validate(env, errors)
         errors.add("Host port for com1 forwarding couldn't be below 1024.") if forward_com1 && forward_com1.to_i < 1024

data/lib/vagrant-serial/middleware/clear_forwarded_ports.rb

@@ -7,12 +7,14 @@ module Vagrant
         end
 
         def call(env)
+          FileUtils.mkdir_p(env[:vm].config.sockets_path) if !File.directory?(env[:vm].config.sockets_path)
+
           if env[:vm].config.serial.forward_com1
-            `/sbin/start-stop-daemon --stop --quiet --pidfile #{ENV['HOME']}/serial/socat.#{env[:vm].uuid}-com1.pid --exec /usr/bin/socat && rm #{ENV['HOME']}/serial/socat.#{env[:vm].uuid}-com1.pid`
+            `/sbin/start-stop-daemon --stop --quiet --pidfile #{env[:vm].config.sockets_path}/socat.#{env[:vm].uuid}-com1.pid --exec /usr/bin/socat && rm #{env[:vm].config.sockets_path}/socat.#{env[:vm].uuid}-com1.pid`
           end
 
           if env[:vm].config.serial.forward_com2
-            `/sbin/start-stop-daemon --stop --quiet --pidfile #{ENV['HOME']}/serial/socat.#{env[:vm].uuid}-com2.pid --exec /usr/bin/socat && rm #{ENV['HOME']}/serial/socat.#{env[:vm].uuid}-com2.pid`
+            `/sbin/start-stop-daemon --stop --quiet --pidfile #{env[:vm].config.sockets_path}/socat.#{env[:vm].uuid}-com2.pid --exec /usr/bin/socat && rm #{env[:vm].config.sockets_path}/socat.#{env[:vm].uuid}-com2.pid`
           end
 
           @app.call(env)

data/lib/vagrant-serial/middleware/configure_ports.rb

@@ -7,13 +7,15 @@ module Vagrant
         end
 
         def call(env)
+          FileUtils.mkdir_p(env[:vm].config.sockets_path) if !File.directory?(env[:vm].config.sockets_path)
+
           if env[:vm].config.serial.forward_com1
-            command = ["modifyvm", env[:vm].uuid, "--uart1", "0x3F8", "4", "--uartmode1", "server", "#{ENV['HOME']}/serial/#{env[:vm].uuid}-com1"]
+            command = ["modifyvm", env[:vm].uuid, "--uart1", "0x3F8", "4", "--uartmode1", "server", "#{env[:vm].config.sockets_path}/#{env[:vm].uuid}-com1"]
             env[:vm].driver.execute_command(command)
           end
 
           if env[:vm].config.serial.forward_com2
-            command = ["modifyvm", env[:vm].uuid, "--uart2", "0x2F8", "3", "--uartmode2", "server", "#{ENV['HOME']}/serial/#{env[:vm].uuid}-com2"]
+            command = ["modifyvm", env[:vm].uuid, "--uart2", "0x2F8", "3", "--uartmode2", "server", "#{env[:vm].config.sockets_path}/#{env[:vm].uuid}-com2"]
             env[:vm].driver.execute_command(command)
           end
 

data/lib/vagrant-serial/middleware/forward_ports.rb

@@ -7,12 +7,14 @@ module Vagrant
         end
 
         def call(env)
+          FileUtils.mkdir_p(env[:vm].config.sockets_path) if !File.directory?(env[:vm].config.sockets_path)
+
           if env[:vm].config.serial.forward_com1
-            `/sbin/start-stop-daemon --quiet --start --pidfile #{ENV['HOME']}/serial/socat.#{env[:vm].uuid}-com1.pid --background --make-pidfile --exec /usr/bin/socat -- tcp-l:#{env[:vm].config.serial.forward_com1},reuseaddr,fork UNIX-CONNECT:#{ENV['HOME']}/serial/#{env[:vm].uuid}-com1`
+            `/sbin/start-stop-daemon --quiet --start --pidfile #{env[:vm].config.sockets_path}/socat.#{env[:vm].uuid}-com1.pid --background --make-pidfile --exec /usr/bin/socat -- tcp-l:#{env[:vm].config.serial.forward_com1},reuseaddr,fork UNIX-CONNECT:#{env[:vm].config.sockets_path}/#{env[:vm].uuid}-com1`
           end
 
           if env[:vm].config.serial.forward_com2
-            `/sbin/start-stop-daemon --quiet --start --pidfile #{ENV['HOME']}/serial/socat.#{env[:vm].uuid}-com2.pid --background --make-pidfile --exec /usr/bin/socat -- tcp-l:#{env[:vm].config.serial.forward_com2},reuseaddr,fork UNIX-CONNECT:#{ENV['HOME']}/serial/#{env[:vm].uuid}-com2`
+            `/sbin/start-stop-daemon --quiet --start --pidfile #{env[:vm].config.sockets_path}/socat.#{env[:vm].uuid}-com2.pid --background --make-pidfile --exec /usr/bin/socat -- tcp-l:#{env[:vm].config.serial.forward_com2},reuseaddr,fork UNIX-CONNECT:#{env[:vm].config.sockets_path}/#{env[:vm].uuid}-com2`
           end
 
           @app.call(env)

data/lib/vagrant-serial/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Serial
-    VERSION = "0.0.12"
+    VERSION = "0.0.13"
   end
 end

data/lib/vagrant-serial.rb

@@ -5,6 +5,8 @@ require "vagrant-serial/middleware/configure_ports"
 require "vagrant-serial/middleware/forward_ports"
 require "vagrant-serial/middleware/clear_forwarded_ports"
 
+require "fileutils"
+
 Vagrant.config_keys.register(:serial) { Vagrant::Serial::Config }
 
 Vagrant.actions[:start].insert_after Vagrant::Action::VM::Customize, Vagrant::Serial::Middleware::ConfigurePorts

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-serial
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors: