vagrant-serial 1.0.0 → 1.0.1

data/README.md

@@ -1,6 +1,6 @@
 # Vagrant::Serial
 
-Vagrant::Serial allows to configure serial ports forwarding with Vagrant.
+Vagrant::Serial allows you to configure serial ports forwarding with Vagrant.
 Tested with vagrant version 1.0.5.
 
 ## Installation
@@ -9,8 +9,9 @@ Tested with vagrant version 1.0.5.
 
 ## Configuration
 
-There is an restriction in VertualBox that you can use only 2 serial ports.
-So the basic `Vagrantfile` would look like this:
+There is a restriction in VirtualBox that you can use only 2 serial ports.
+
+The basic `Vagrantfile` will look like this:
 
 ```ruby
 Vagrant::Config.run do |config|
@@ -20,11 +21,15 @@ Vagrant::Config.run do |config|
   # Map COM2 port in virtual machine to 1025 port on the host
   config.serial.forward_com2 = 1025
 
-  # Default: ~/.vagrant.d/serial
   # Override sockets path
+  # Default: ~/.vagrant.d/serial
   # config.serial.sockets_path = "/path/to/sockets/dir"
 end
 ```
 
+## Requirements
+- Ubuntu or Debian Linux (or manually install /sbin/start-stop-daemon)
+- /usr/bin/socat (use apt-get install socat for Ubuntu/Debian)
+
 ## Copyright
-Copyright (c) 2012 Anton Mironov and 7 Pikes, Inc.
+Copyright (c) 2012 Anton Mironov, Alexey Zagarin and 7 Pikes, Inc.

data/lib/vagrant-serial.rb

@@ -9,8 +9,10 @@ require "fileutils"
 
 Vagrant.config_keys.register(:serial) { Vagrant::Serial::Config }
 
+Vagrant.actions[:start].insert_after Vagrant::Action::VM::Customize, Vagrant::Serial::Middleware::ClearForwardedPorts
 Vagrant.actions[:start].insert_after Vagrant::Action::VM::Customize, Vagrant::Serial::Middleware::ConfigurePorts
 Vagrant.actions[:start].insert_after Vagrant::Action::VM::Boot, Vagrant::Serial::Middleware::ForwardPorts
+
 Vagrant.actions[:resume].insert_after Vagrant::Action::VM::Resume, Vagrant::Serial::Middleware::ForwardPorts
 Vagrant.actions[:halt].insert_after Vagrant::Action::VM::CheckAccessible, Vagrant::Serial::Middleware::ClearForwardedPorts
 Vagrant.actions[:suspend].insert_after Vagrant::Action::VM::CheckAccessible, Vagrant::Serial::Middleware::ClearForwardedPorts

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

@@ -7,18 +7,11 @@ module Vagrant
         end
 
         def call(env)
-          if env[:vm].config.serial.set?
-            FileUtils.mkdir_p(env[:vm].config.serial.sockets_path) if !File.directory?(env[:vm].config.serial.sockets_path)
+          FileUtils.mkdir_p(env[:vm].config.serial.sockets_path) if env[:vm].config.serial.set? && !File.directory?(env[:vm].config.serial.sockets_path)
 
-            env[:ui].success "Stopping serial ports forwarding..."
-            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`
-            end
-          end
+          env[:ui].info "Stopping serial ports forwarding..."
+          `/sbin/start-stop-daemon --stop --oknodo --quiet --pidfile #{env[:vm].config.serial.sockets_path}/socat.#{env[:vm].uuid}-com1.pid --exec /usr/bin/socat && rm -f #{env[:vm].config.serial.sockets_path}/socat.#{env[:vm].uuid}-com1.pid`
+          `/sbin/start-stop-daemon --stop --oknodo --quiet --pidfile #{env[:vm].config.serial.sockets_path}/socat.#{env[:vm].uuid}-com2.pid --exec /usr/bin/socat && rm -f #{env[:vm].config.serial.sockets_path}/socat.#{env[:vm].uuid}-com2.pid`
 
           @app.call(env)
         end

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

@@ -10,6 +10,7 @@ module Vagrant
           if env[:vm].config.serial.set?
             FileUtils.mkdir_p(env[:vm].config.serial.sockets_path) if !File.directory?(env[:vm].config.serial.sockets_path)
 
+            env[:ui].info "Setting up serial ports..."
             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)

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

@@ -12,12 +12,12 @@ module Vagrant
 
             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`
-              env[:ui].success "COM1 => #{env[:vm].config.serial.forward_com1}"
+              env[:ui].info "COM1 => #{env[:vm].config.serial.forward_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`
-              env[:ui].success "COM2 => #{env[:vm].config.serial.forward_com2}"
+              env[:ui].info "COM2 => #{env[:vm].config.serial.forward_com2}"
             end
           end
 

data/lib/vagrant-serial/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Serial
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-serial
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies: []
 description: Vagrant plugin to configure serial-ports in vms
 email: