vagrant-serial 1.0.1 → 1.0.2

data/lib/vagrant-serial.rb

@@ -9,10 +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[:start].insert_after Vagrant::Action::VM::Customize, Vagrant::Serial::Middleware::ClearConfiguredPorts
+Vagrant.actions[:start].insert_after Vagrant::Action::VM::Boot, Vagrant::Serial::Middleware::StartForwardingPorts
 
-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
+Vagrant.actions[:resume].insert_after Vagrant::Action::VM::Resume, Vagrant::Serial::Middleware::StartForwardingPorts
+Vagrant.actions[:halt].insert_after Vagrant::Action::VM::CheckAccessible, Vagrant::Serial::Middleware::StopForwardingPorts
+Vagrant.actions[:suspend].insert_after Vagrant::Action::VM::CheckAccessible, Vagrant::Serial::Middleware::StopForwardingPorts

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

@@ -0,0 +1,26 @@
+module Vagrant
+  module Serial
+    module Middleware
+      class ClearConfiguredPorts
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          FileUtils.mkdir_p(env[:vm].config.serial.sockets_path) if !File.directory?(env[:vm].config.serial.sockets_path)
+
+          env[:ui].info "Clearing any previously configured serial ports..."
+
+          command = ["modifyvm", env[:vm].uuid, "--uart1", "off"]
+          env[:vm].driver.execute_command(command)
+
+          command = ["modifyvm", env[:vm].uuid, "--uart2", "off"]
+          env[:vm].driver.execute_command(command)
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end
+

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

@@ -10,7 +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..."
+            env[:ui].info "Configuring 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 → start_forwarding_ports.rb}

@@ -1,7 +1,7 @@
 module Vagrant
   module Serial
     module Middleware
-      class ForwardPorts
+      class StartForwardingPorts
         def initialize(app, env)
           @app = app
         end
@@ -10,6 +10,8 @@ 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 "Starting serial ports forwarding..."
+
             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].info "COM1 => #{env[:vm].config.serial.forward_com1}"

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

@@ -0,0 +1,29 @@
+module Vagrant
+  module Serial
+    module Middleware
+      class StopForwardingPorts
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          if env[:vm].config.serial.set?
+            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].info "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
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-serial/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-serial
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-10 00:00:00.000000000 Z
+date: 2012-11-12 00:00:00.000000000 Z
 dependencies: []
 description: Vagrant plugin to configure serial-ports in vms
 email:
@@ -25,9 +25,10 @@ files:
 - Rakefile
 - lib/vagrant-serial.rb
 - lib/vagrant-serial/config.rb
-- lib/vagrant-serial/middleware/clear_forwarded_ports.rb
+- lib/vagrant-serial/middleware/clear_configured_ports.rb
 - lib/vagrant-serial/middleware/configure_ports.rb
-- lib/vagrant-serial/middleware/forward_ports.rb
+- lib/vagrant-serial/middleware/start_forwarding_ports.rb
+- lib/vagrant-serial/middleware/stop_forwarding_ports.rb
 - lib/vagrant-serial/version.rb
 - lib/vagrant_init.rb
 - vagrant-serial.gemspec

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

@@ -1,21 +0,0 @@
-module Vagrant
-  module Serial
-    module Middleware
-      class ClearForwardedPorts
-        def initialize(app, env)
-          @app = app
-        end
-
-        def call(env)
-          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].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
-      end
-    end
-  end
-end