vagrant-redir 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1c8789c7750060b8749d313883dce21fcad8bf9
-  data.tar.gz: ef453e3fafa1f95d1147de45274d9e602ab45ff4
+  metadata.gz: 3bfd7b86e9518808552a3340dbebcfb254de8188
+  data.tar.gz: ac2809a1ce01b5b32b498edab2d246854028bb9e
 SHA512:
-  metadata.gz: 3abde7d52ca301d85887b26f740a8ba4c87c8c7a4815313b24c255ca6357a2ef9bb1eee892d2bee332622e6fc735be07e17662f35a87f4b0e72f30c206fa375c
-  data.tar.gz: 0ad8718b6c11d81ab83a17475bdaf3fb8bc9b508bf5c4edfd0d3e760e97b4d55199f9cfcfae60a6ad2ee425724cc864e3064cea599b244724f7f09eccca7a740
+  metadata.gz: a30839f12638e188b99916c3d4722d217d36484252a9e89ecb1e509825189a2abee4158775a486ba259dd2f46e50f08d3592504c4d0c4cbb96bb040d3817c016
+  data.tar.gz: 95b88546444b0c1970e0cfc7b14ab1157de286faa051070cf2bf7458dbaa664bf7fd62df6754c4b83184adfbcbc90f53da80a725d7452c67365ae800d13c4306

data/README.md

@@ -69,16 +69,16 @@ will show:
 
 ```shell
 Port forwarding configuration for VM 'xdg':
- guest: 8000, host: 8900, host_ip: 0.0.0.0, protocol: tcp
- guest: 8001, host: 8901, host_ip: 0.0.0.0, protocol: tcp
- guest: 80, host: 8908, host_ip: 0.0.0.0, protocol: tcp
- guest: 22, host: 8902, host_ip: 0.0.0.0, protocol: tcp
+ guest: 8000; host: 8900; host_ip: 0.0.0.0; protocol: tcp
+ guest: 8001; host: 8901; host_ip: 0.0.0.0; protocol: tcp
+ guest: 80; host: 8908; host_ip: 0.0.0.0; protocol: tcp
+ guest: 22; host: 8902; host_ip: 0.0.0.0; protocol: tcp
 
 Port forwarding configuration for VM 'db1':
- guest: 8000, host: 9000, host_ip: 0.0.0.0, protocol: tcp
- guest: 8001, host: 9001, host_ip: 0.0.0.0, protocol: tcp
- guest: 80, host: 9080, host_ip: 0.0.0.0, protocol: tcp
- guest: 22, host: 9022, host_ip: 0.0.0.0, protocol: tcp
+ guest: 8000; host: 9000; host_ip: 0.0.0.0; protocol: tcp
+ guest: 8001; host: 9001; host_ip: 0.0.0.0; protocol: tcp
+ guest: 80; host: 9080; host_ip: 0.0.0.0; protocol: tcp
+ guest: 22; host: 9022; host_ip: 0.0.0.0; protocol: tcp
 ```
 or for particular VM:
 
@@ -189,12 +189,29 @@ $ vagrant redir ps [<name>]
 
 ### status
 
-Show list of running redir processes by stored pids
+Show list of running redir processes by stored pids.
+This command cleans up inactive stored pids and shows only running ones. 
 
 ```shell
 $ vagrant redir status
 ```
 
+will show:
+
+```shell
+List of running redir processes for VM 'xdb' by stored pids:
+ pid: 22351; host_port: 8901; is_system_port: false
+ pid: 22365; host_port: 8908; is_system_port: false
+ pid: 22379; host_port: 8902; is_system_port: false
+ pid: 22337; host_port: 8900; is_system_port: false
+
+List of running redir processes for VM 'db' by stored pids:
+ pid: 22412; host_port: 9000; is_system_port: false
+ pid: 22440; host_port: 9080; is_system_port: false
+ pid: 22426; host_port: 9001; is_system_port: false
+ pid: 22454; host_port: 9022; is_system_port: false
+```
+
 
 or for particular VM:
 
@@ -210,14 +227,14 @@ Setup port forwarding for vm(s).
 Same process vagrant starts on 'vagrant up' command.
 
 ```shell
-$ vagrant redir pids
+$ vagrant redir up
 ```
 
 
 or for particular VM:
 
 ```shell
-$ vagrant redir pids [<name>]
+$ vagrant redir up [<name>]
 ```
 
 

data/lib/vagrant/redir/command/config.rb

@@ -30,7 +30,7 @@ module Vagrant
                   r = record.delete(:id)
                   s = record.collect do |k, v|
                       "#{k}: #{v}"
-                  end.join(', ')
+                  end.join('; ')
                   @env.ui.info(" #{s}")
               end
               @env.ui.info("")

data/lib/vagrant/redir/helper.rb

@@ -69,19 +69,6 @@ module Vagrant
           end
         end
 
-        def redirect_port(host_ip, host_port, guest_ip, guest_port)
-          params = %W( --lport=#{host_port} --caddr=#{guest_ip} --cport=#{guest_port} )
-          params.unshift "--laddr=#{host_ip}" if host_ip
-          params << '--syslog' if ENV['REDIR_LOG']
-          if host_port < 1024
-            redir_cmd = "sudo redir #{params.join(' ')} 2>/dev/null"
-          else
-            redir_cmd = "redir #{params.join(' ')} 2>/dev/null"
-          end
-          @logger.debug "Forwarding port with `#{redir_cmd}`"
-          spawn redir_cmd
-        end
-
         def store_redir_pid(host_port, redir_pid, vm)
           data_dir = vm.data_dir.join('pids')
           data_dir.mkdir unless data_dir.directory?
@@ -95,13 +82,6 @@ module Vagrant
           system "which redir > /dev/null"
         end
 
-        def redir_pids_old(vm)
-          @redir_pids = Dir[vm.data_dir.join('pids').to_s + "/redir_*.pid"].map do |file|
-            port_number = File.basename(file).split(/[^\d]/).join
-            [ File.read(file).strip.chomp, Integer(port_number) <= 1024, port_number, file ]
-          end
-        end
-
         def is_redir_pid?(pid)
           @logger.debug "Checking if #{pid} is a redir process with `ps -o cmd= #{pid}`"
           `ps -o cmd= #{pid}`.strip.chomp =~ /redir/

data/lib/vagrant/redir/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Redir
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-redir
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - st02tkh