vagrant-lxc 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d037f1ba303000765f7744d6400f4d6191e24689
-  data.tar.gz: ef8dbd484d7768f7b1cdd6efc9d9fed64504b1b0
+  metadata.gz: 7f832d2e6fd41e1b63a88dd5a1916422f4fffd32
+  data.tar.gz: 670c915439fd684e8626266c1c686b20972e7165
 SHA512:
-  metadata.gz: fb469f28e25a5521c907f316df78e4274aaa5c198a39ee89bf2a0500abc7193101b2283a54ea370203f815e92ab98fdf015b0098cd276b0b0d8d72d4c82d2b02
-  data.tar.gz: 6c8fc71c88a63a3cd790d7a7577ae8eedf35c920fd611fcf93fdd8951647992c43929f0edc4c45598f58a49efa99d4e165e627098eb8b29e91b93938633e0e2d
+  metadata.gz: b14dfc2a2736cd770ece958308cb7b57220021f0d20208a746d2a79ba6ea9222d6aade55ce45c8471961c4dd4c24840278a558d09138e2eba711b64ed7186f25
+  data.tar.gz: be33ff31ddbe43c3700ce7e507ffa164802d718f36075283e24d2d185d075794058e67db3b2a3575de7cd3b6e0889ad75c95b09c806c0cd39b044ad884c89970

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.6.2](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.1...v0.6.2) (Oct 03, 2013)
+
+IMPROVEMENTS:
+
+  - Cache the result of `lxc-attach --namespaces` parameter support checking to
+    avoid excessive logging.
+
+BUG FIXES:
+
+  - Fix detection of `lxc-attach --namespaces` parameter support checking.
+
 ## [0.6.1](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.0...v0.6.1) (Oct 03, 2013)
 
 IMPROVEMENTS:

data/Gemfile.lock

@@ -26,7 +26,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (0.6.1)
+    vagrant-lxc (0.6.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/vagrant-lxc/driver/cli.rb

@@ -82,10 +82,12 @@ module Vagrant
             opts       = cmd.pop
             namespaces = Array(opts[:namespaces]).map(&:upcase).join('|')
 
-            if run(:attach, '-h').include?('--namespaces')
-              extra = ['--namespaces', namespaces] if namespaces
-            else
-              raise LXC::Errors::NamespacesNotSupported
+            if namespaces
+              if supports_attach_with_namespaces?
+                extra = ['--namespaces', namespaces] if namespaces
+              else
+                raise LXC::Errors::NamespacesNotSupported
+              end
             end
           end
 
@@ -114,6 +116,14 @@ module Vagrant
         def run(command, *args)
           @sudo_wrapper.run("lxc-#{command}", *args)
         end
+
+        def supports_attach_with_namespaces?
+          unless defined?(@supports_attach_with_namespaces)
+            @supports_attach_with_namespaces = run(:attach, '-h', '2>&1').include?('--namespaces')
+          end
+
+          return @supports_attach_with_namespaces
+        end
       end
     end
   end

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

data/spec/unit/driver/cli_spec.rb

@@ -146,13 +146,13 @@ describe Vagrant::LXC::Driver::CLI do
     end
 
     it 'supports a "namespaces" parameter' do
-      subject.stub(:run).with(:attach, '-h').and_return('--namespaces')
+      subject.stub(:run).with(:attach, '-h', '2>&1').and_return('--namespaces')
       subject.attach *(command + [{namespaces: ['network', 'mount']}])
       subject.should have_received(:run).with(:attach, '--name', name, '--namespaces', 'NETWORK|MOUNT', '--', *command)
     end
 
     it 'raises a NamespacesNotSupported error if not supported' do
-      subject.stub(:run).with(:attach, '-h').and_return('not supported')
+      subject.stub(:run).with(:attach, '-h', '2>&1').and_return('not supported')
       expect {
         subject.attach *(command + [{namespaces: ['network', 'mount']}])
       }.to raise_error(Vagrant::LXC::Errors::NamespacesNotSupported)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Fabio Rehm