vagrant-lxc 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f832d2e6fd41e1b63a88dd5a1916422f4fffd32
-  data.tar.gz: 670c915439fd684e8626266c1c686b20972e7165
+  metadata.gz: 990ef5aede9667e2cb3b0abab7eb851da17d7b28
+  data.tar.gz: 969e6045235f3d9e12e942f8ee10244c4c3a5834
 SHA512:
-  metadata.gz: b14dfc2a2736cd770ece958308cb7b57220021f0d20208a746d2a79ba6ea9222d6aade55ce45c8471961c4dd4c24840278a558d09138e2eba711b64ed7186f25
-  data.tar.gz: be33ff31ddbe43c3700ce7e507ffa164802d718f36075283e24d2d185d075794058e67db3b2a3575de7cd3b6e0889ad75c95b09c806c0cd39b044ad884c89970
+  metadata.gz: fca22e79ad331aa2e7ae48bd9ccc13c7497b0a79cb83d4aa292ae74492bf70905734b2b564812644b8cf950d54b230b7025b4f50fe4340ea070c0f6d376d2f09
+  data.tar.gz: d2a5421b294892a96bf8a777e35501a3b8a0e1b589bdf076f91982b8783357b79f9223cf1736c700291052c30856b1ab870f71aa3770504f299ff2f820648fc1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [0.6.3](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.2...v0.6.3) (Oct 12, 2013)
+
+IMPROVEMENTS:
+
+  - Respect Vagrantfile option to disable synced folders [#147](https://github.com/fgrehm/vagrant-lxc/issues/147)
+
+BUG FIXES:
+
+  - Fix error raised when fetching container's IP with the sudo wrapper disabled [#157](https://github.com/fgrehm/vagrant-lxc/issues/157)
+
 ## [0.6.2](https://github.com/fgrehm/vagrant-lxc/compare/v0.6.1...v0.6.2) (Oct 03, 2013)
 
 IMPROVEMENTS:

data/Gemfile.lock

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

data/boxes/build-debian-box.sh

@@ -124,7 +124,7 @@ if [ $PUPPET = 1 ]; then
 fi
 
 if [ $SALT = 1 ]; then
-  ./common/install-salt $ROOTFS
+  ./common/install-salt-debian $ROOTFS
 fi
 
 if [ $BABUSHKA = 1 ]; then

data/boxes/common/install-salt-debian

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+rootfs=$1
+
+echo "installing salt"
+
+if [ $SUITE == "squeeze" ]; then
+    SALT_SOURCE="deb http://debian.saltstack.com/debian squeeze-saltstack main\ndeb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free"
+elif [ $SUITE == "sid" ]; then
+    SALT_SOURCE="deb http://debian.saltstack.com/debian unstable main"
+else
+    SALT_SOURCE="deb http://debian.saltstack.com/debian wheezy-saltstack main"
+fi
+
+cat > $rootfs/tmp/install-salt << EOF
+#!/bin/sh
+echo "$SALT_SOURCE" > /etc/apt/sources.list.d/saltstack.list
+wget -q -O- "http://debian.saltstack.com/debian-salt-team-joehealy.gpg.key" | apt-key add -
+apt-get update
+apt-get install -y salt-minion
+apt-get clean
+EOF
+
+chroot $rootfs sh /tmp/install-salt
+
+rm -rf $rootfs/tmp/*

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

@@ -13,11 +13,13 @@ module Vagrant
           @app.call env
         end
 
-        # This method returns an actual list of VirtualBox shared
-        # folders to create and their proper path.
+        # This method returns an actual list of synced folders to create and their
+        # proper path.
         def shared_folders
           {}.tap do |result|
             @env[:machine].config.vm.synced_folders.each do |id, data|
+              # Ignore disabled shared folders
+              next if data[:disabled]
               # This to prevent overwriting the actual shared folders data
               result[id] = data.dup
             end

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

@@ -84,7 +84,7 @@ module Vagrant
 
             if namespaces
               if supports_attach_with_namespaces?
-                extra = ['--namespaces', namespaces] if namespaces
+                extra = ['--namespaces', namespaces]
               else
                 raise LXC::Errors::NamespacesNotSupported
               end
@@ -119,7 +119,7 @@ module Vagrant
 
         def supports_attach_with_namespaces?
           unless defined?(@supports_attach_with_namespaces)
-            @supports_attach_with_namespaces = run(:attach, '-h', '2>&1').include?('--namespaces')
+            @supports_attach_with_namespaces = run(:attach, '-h', :show_stderr => true).values.join.include?('--namespaces')
           end
 
           return @supports_attach_with_namespaces

data/lib/vagrant-lxc/sudo_wrapper.rb

@@ -58,7 +58,12 @@ module Vagrant
 
         # Return the output, making sure to replace any Windows-style
         # newlines with Unix-style.
-        r.stdout.gsub("\r\n", "\n")
+        stdout = r.stdout.gsub("\r\n", "\n")
+        if opts[:show_stderr]
+          { :stdout => stdout, :stderr => r.stderr.gsub("\r\n", "\n") }
+        else
+          stdout
+        end
       end
 
       def raw(*command, &block)

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "0.6.2"
+    VERSION = "0.6.3"
   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', '2>&1').and_return('--namespaces')
+      subject.stub(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => '--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', '2>&1').and_return('not supported')
+      subject.stub(:run).with(:attach, '-h', :show_stderr => true).and_return({:stdout => '', :stderr => 'not supported'})
       expect {
         subject.attach *(command + [{namespaces: ['network', 'mount']}])
       }.to raise_error(Vagrant::LXC::Errors::NamespacesNotSupported)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-03 00:00:00.000000000 Z
+date: 2013-10-12 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -37,6 +37,7 @@ files:
 - boxes/common/install-chef
 - boxes/common/install-puppet
 - boxes/common/install-salt
+- boxes/common/install-salt-debian
 - boxes/common/lxc-template
 - boxes/common/lxc.conf
 - boxes/common/metadata.json
@@ -142,4 +143,3 @@ test_files:
 - spec/unit/driver_spec.rb
 - spec/unit/support/unit_example_group.rb
 - spec/unit_helper.rb
-has_rdoc: