vagrant-lxc 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73218c6a794374a682e74972ea67214bd099f23de97c559ab8eea60550c9e3e7
-  data.tar.gz: 1f3e74d08fc10118458b5f0f0de19fc86e766bac9de2601e378c70d909dbf403
+  metadata.gz: b214bb08c296b36a640e465653255ef125947255780e6c1a3f3f37e59cf58240
+  data.tar.gz: 8a0fd49b88445c090e9f75427cf096aeec1bf174fe61d424696550d3f079ff38
 SHA512:
-  metadata.gz: df22280938f9a3f685260c891363b558c5b2eb052bedf5a7bfc5c43aabf0dd890c44308288cf4516e6dfe42e2ba9011d14d94ae00b29311a4a9e1575c74efb1d
-  data.tar.gz: 8ab355586daea42c581bb624c0de1beb769f70d719bbc0114398be954315c32af8552971fe12067d57817e5fa5858a7e3779a72c62bf9fab7a649c6c838b5fc4
+  metadata.gz: 494cbee88612672f2fd209110c6f269185e82ffae9349354cf49e918aa7af21762f5e6985e712fead8a7713826863ba58ed47480769379786458de4b213d6af9
+  data.tar.gz: 11b3acdb633317d75c50f1526c6dde90b73a5ee8ac602c51f4bc6bc43be31e23aed0e19502a20df4860ad2d905b2c1db1463eab42753d449ebbd2af7d0b4cc8a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.4.2](https://github.com/fgrehm/vagrant-lxc/compare/v1.4.1...v1.4.2) (Jul 17, 2018)
+
+FIXES:
+  - Fix problems with `redir` 3.x command line. [[GH-467]]
+
 ## [1.4.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.4.0...v1.4.1) (Apr 30, 2018)
 
 FEATURES:

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v2.0.4'
+  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git', tag: 'v1.8.7'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-inotify'
@@ -12,7 +12,7 @@ group :development, :test do
   gem 'rspec', '~> 2.99.0'
   gem 'coveralls', '~> 0.7.2', require: (ENV['COVERAGE'] == 'true')
   # The is the ref *just* before we switch to childprocess 0.6, which conflicts with vagrant 1.8 deps.
-  # gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git', ref: '5006bc73cd8796465ca09307d4774f8ec8375aa0'
+  gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git', ref: '5006bc73cd8796465ca09307d4774f8ec8375aa0'
 end
 
 group :plugins do

data/lib/vagrant-lxc/action/forward_ports.rb

@@ -81,8 +81,7 @@ module Vagrant
 
         def redirect_port(host_ip, host_port, guest_ip, guest_port)
           if redir_version >= 3
-            params = %W( :#{host_port} #{guest_ip}:#{guest_port} )
-            params[0] =  "#{host_ip}:#{host_port}" if host_ip
+            params = %W( -n #{host_ip}:#{host_port} #{guest_ip}:#{guest_port} )
           else
             params = %W( --lport=#{host_port} --caddr=#{guest_ip} --cport=#{guest_port} )
             params.unshift "--laddr=#{host_ip}" if host_ip
@@ -107,8 +106,9 @@ module Vagrant
         end
 
         def redir_version
-          # For some weird reason redir prints version information in STDERR
-          _, version, _ = Open3.capture3 "redir --version"
+          stdout, stderr, _ = Open3.capture3 "redir --version"
+          # For some weird reason redir printed version information in STDERR prior to 3.2
+          version = stdout || stderr
           version.split('.')[0].to_i
         end
 

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "1.4.1"
+    VERSION = "1.4.2"
   end
 end

data/spec/unit/action/forward_ports_spec.rb

@@ -35,7 +35,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
     subject.stub(system: true)
     subject.call(env)
     expect(subject).to have_received(:spawn).with(
-      "redir #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+      "redir -n #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
     )
   end
 
@@ -44,7 +44,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
     subject.stub(system: true)
     subject.call(env)
     expect(subject).to have_received(:spawn).with(
-      "redir 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+      "redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
     )
   end
 
@@ -53,7 +53,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
     subject.stub(system: true)
     subject.call(env)
     expect(subject).to have_received(:spawn).with(
-      "redir 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+      "redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
     )
   end
 
@@ -92,7 +92,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
       subject.stub(system: true)
       subject.call(env)
       expect(subject).to have_received(:spawn).with(
-        "sudo redir #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+        "sudo redir -n #{host_ip}:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
       )
     end
 
@@ -101,7 +101,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
       subject.stub(system: true)
       subject.call(env)
       expect(subject).to have_received(:spawn).with(
-        "sudo redir 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+        "sudo redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
       )
     end
 
@@ -110,7 +110,7 @@ describe Vagrant::LXC::Action::ForwardPorts do
       subject.stub(system: true)
       subject.call(env)
       expect(subject).to have_received(:spawn).with(
-        "sudo redir 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
+        "sudo redir -n 127.0.0.1:#{host_port} #{container_ip}:#{guest_port} 2>/dev/null"
       )
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-01 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Linux Containers provider for Vagrant