vagrant-serial 0.0.15 → 0.0.16

data/lib/vagrant-serial/config.rb

@@ -6,10 +6,16 @@ module Vagrant
       attr_accessor :sockets_path
 
       def sockets_path
-        @sockets_path.nil? ? (@sockets_path = "#{DEFAULT_HOME}/serial") : @sockets_path
+        @sockets_path.nil? ? (@sockets_path = "#{Vagrant::Environment::DEFAULT_HOME}/serial") : @sockets_path
+      end
+
+      def set?
+        forward_com1 || forward_com2
       end
 
       def validate(env, errors)
+        return unless set?
+
         errors.add("Host port for com1 forwarding couldn't be below 1024.") if forward_com1 && forward_com1.to_i < 1024
         errors.add("Host port for com2 forwarding couldn't be below 1024.") if forward_com2 && forward_com2.to_i < 1024
       end

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

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

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

@@ -7,16 +7,18 @@ module Vagrant
         end
 
         def call(env)
-          FileUtils.mkdir_p(env[:vm].config.serial.sockets_path) if !File.directory?(env[:vm].config.serial.sockets_path)
+          if env[:vm].config.serial.set?
+            FileUtils.mkdir_p(env[:vm].config.serial.sockets_path) if !File.directory?(env[:vm].config.serial.sockets_path)
 
-          if env[:vm].config.serial.forward_com1
-            command = ["modifyvm", env[:vm].uuid, "--uart1", "0x3F8", "4", "--uartmode1", "server", "#{env[:vm].config.serial.sockets_path}/#{env[:vm].uuid}-com1"]
-            env[:vm].driver.execute_command(command)
-          end
+            if env[:vm].config.serial.forward_com1
+              command = ["modifyvm", env[:vm].uuid, "--uart1", "0x3F8", "4", "--uartmode1", "server", "#{env[:vm].config.serial.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[:vm].config.serial.sockets_path}/#{env[:vm].uuid}-com2"]
-            env[:vm].driver.execute_command(command)
+            if env[:vm].config.serial.forward_com2
+              command = ["modifyvm", env[:vm].uuid, "--uart2", "0x2F8", "3", "--uartmode2", "server", "#{env[:vm].config.serial.sockets_path}/#{env[:vm].uuid}-com2"]
+              env[:vm].driver.execute_command(command)
+            end
           end
 
           @app.call(env)

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

@@ -7,14 +7,16 @@ module Vagrant
         end
 
         def call(env)
-          FileUtils.mkdir_p(env[:vm].config.serial.sockets_path) if !File.directory?(env[:vm].config.serial.sockets_path)
+          if env[:vm].config.serial.set?
+            FileUtils.mkdir_p(env[:vm].config.serial.sockets_path) if !File.directory?(env[:vm].config.serial.sockets_path)
 
-          if env[:vm].config.serial.forward_com1
-            `/sbin/start-stop-daemon --quiet --start --pidfile #{env[:vm].config.serial.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.serial.sockets_path}/#{env[:vm].uuid}-com1`
-          end
+            if env[:vm].config.serial.forward_com1
+              `/sbin/start-stop-daemon --quiet --start --pidfile #{env[:vm].config.serial.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.serial.sockets_path}/#{env[:vm].uuid}-com1`
+            end
 
-          if env[:vm].config.serial.forward_com2
-            `/sbin/start-stop-daemon --quiet --start --pidfile #{env[:vm].config.serial.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.serial.sockets_path}/#{env[:vm].uuid}-com2`
+            if env[:vm].config.serial.forward_com2
+              `/sbin/start-stop-daemon --quiet --start --pidfile #{env[:vm].config.serial.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.serial.sockets_path}/#{env[:vm].uuid}-com2`
+            end
           end
 
           @app.call(env)

data/lib/vagrant-serial/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Serial
-    VERSION = "0.0.15"
+    VERSION = "0.0.16"
   end
 end

metadata

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