vagrant-serial 0.0.11 → 0.0.12

data/README.md

@@ -20,8 +20,6 @@ Or install it yourself as:
 
 1. Good readme file
 2. Add logging
-3. Traverse ports
-4. Make configurable: range of ports, path to sockets
 
 ## Usage
 

data/lib/vagrant-serial/config.rb

@@ -0,0 +1,13 @@
+module Vagrant
+  module Serial
+    class Config < Vagrant::Config::Base
+      attr_accessor :forward_com1
+      attr_accessor :forward_com2
+
+      def validate(env, errors)
+        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
+    end
+  end
+end

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

@@ -7,8 +7,14 @@ module Vagrant
         end
 
         def call(env)
-          `/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['HOME']}/serial/socat.#{env[:vm].uuid}-com2.pid --exec /usr/bin/socat && rm #{ENV['HOME']}/serial/socat.#{env[:vm].uuid}-com2.pid`
+          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`
+          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`
+          end
+
           @app.call(env)
         end
       end

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

@@ -7,10 +7,16 @@ module Vagrant
         end
 
         def call(env)
-          command = ["modifyvm", env[:vm].uuid, "--uart1", "0x3F8", "4", "--uartmode1", "server", "#{ENV['HOME']}/serial/#{env[:vm].uuid}-com1"]
-          env[:vm].driver.execute_command(command)
-          command = ["modifyvm", env[:vm].uuid, "--uart2", "0x2F8", "3", "--uartmode2", "server", "#{ENV['HOME']}/serial/#{env[:vm].uuid}-com2"]
-          env[:vm].driver.execute_command(command)
+          if env[:vm].config.serial.forward_com1
+            command = ["modifyvm", env[:vm].uuid, "--uart1", "0x3F8", "4", "--uartmode1", "server", "#{ENV['HOME']}/serial/#{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"]
+            env[:vm].driver.execute_command(command)
+          end
+
           @app.call(env)
         end
       end

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

@@ -7,8 +7,14 @@ module Vagrant
         end
 
         def call(env)
-          `/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:30001,reuseaddr,fork UNIX-CONNECT:#{ENV['HOME']}/serial/#{env[:vm].uuid}-com1`
-          `/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:30002,reuseaddr,fork UNIX-CONNECT:#{ENV['HOME']}/serial/#{env[:vm].uuid}-com2`
+          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`
+          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`
+          end
+
           @app.call(env)
         end
       end

data/lib/vagrant-serial/version.rb

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

data/lib/vagrant-serial.rb

@@ -1,9 +1,12 @@
 require "vagrant"
+require "vagrant-serial/config"
 require "vagrant-serial/version"
 require "vagrant-serial/middleware/configure_ports"
 require "vagrant-serial/middleware/forward_ports"
 require "vagrant-serial/middleware/clear_forwarded_ports"
 
+Vagrant.config_keys.register(:serial) { Vagrant::Serial::Config }
+
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-serial
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies: []
 description: Vagrant plugin to configure serial-ports in vms
 email:
@@ -24,6 +24,7 @@ files:
 - README.md
 - Rakefile
 - lib/vagrant-serial.rb
+- lib/vagrant-serial/config.rb
 - lib/vagrant-serial/middleware/clear_forwarded_ports.rb
 - lib/vagrant-serial/middleware/configure_ports.rb
 - lib/vagrant-serial/middleware/forward_ports.rb