vagrant-lxc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec70712d1aa228167002b92b029e5d2e11f5b61e
-  data.tar.gz: 3f38fbed1265b8075f47951fb4d9ea4ef5c0878f
+  metadata.gz: e1dddc38d13d5bbf1413f5cfbe0a668416096636
+  data.tar.gz: 646adccd342594104746e82741a0661a3c8a87d4
 SHA512:
-  metadata.gz: aa5ed8deeeb23cf12fbd93fbd719e6be1b62faf8b775c4bd1fff4046784a962f684643d22ce80f65f20bbb2ca84852f5d3d025dc21c91367a367a2dfe817dec7
-  data.tar.gz: e1263666e742eb120e13516e593765dddcfc5f2efb302682be69398f2ace2b0d6da69465707a5e7291700e2f5f56c34d0253c58ee3508294621290a6222cd239
+  metadata.gz: 7aec9d4adc32aa37d0c3371e412698057fda1e05701c0f50ac7fe31bc3b72fd89a1a98b68947a92cb828c539ebf09c53d5a428ebf2e31c18c7423e3b5eb83554
+  data.tar.gz: 0a0593325da1a0b775d79251099647580583955d52cc6eda41b7c1bdad1f62680b24c0e867b010e238960861ce124996568a8436968fc33eb80f84ec06e5f787

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.0.1](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0...v1.0.1) (Oct 15, 2014)
+
+IMPROVEMENTS:
+
+  - Avoid lock race condition when fetching container's IP [[GH-318]] and SSH execution [[GH-321]]
+  - Support for custom containers storage path by reading `lxc.lxcpath` [[GH-317]]
+
+
+[GH-317]: https://github.com/fgrehm/vagrant-lxc/pull/317
+[GH-318]: https://github.com/fgrehm/vagrant-lxc/pull/318
+[GH-321]: https://github.com/fgrehm/vagrant-lxc/issues/321
+
 ## [1.0.0](https://github.com/fgrehm/vagrant-lxc/compare/v1.0.0.alpha.3...v1.0.0) (Sep 23, 2014)
 
 DEPRECATIONS:

data/Gemfile.lock

@@ -40,7 +40,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-lxc (1.0.0)
+    vagrant-lxc (1.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/vagrant-lxc/action.rb

@@ -195,16 +195,11 @@ module Vagrant
 
       # This action is called to read the IP of the container. The IP found
       # is expected to be put into the `:machine_ip` key.
-      def self.action_fetch_ip
+      def self.action_ssh_ip
         Builder.new.tap do |b|
-          b.use Builtin::ConfigValidate
-          b.use Builtin::Call, Builtin::IsState, :running do |env, b2|
-            if env[:result]
-              b2.use FetchIpWithLxcAttach if env[:machine].provider.driver.supports_attach?
-              b2.use FetchIpFromDnsmasqLeases
-            else
-              b2.use Builtin::Message, I18n.t("vagrant_lxc.messages.not_running")
-            end
+          b.use Builtin::Call, Builtin::ConfigValidate do |env, b2|
+            b2.use FetchIpWithLxcAttach if env[:machine].provider.driver.supports_attach?
+            b2.use FetchIpFromDnsmasqLeases
           end
         end
       end

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

@@ -28,14 +28,24 @@ module Vagrant
         end
 
         def version
-          if run(:version) =~ /lxc version:\s+(.+)\s*$/
-            $1.downcase
+          return @version if @version
+          @version = support_version_command? ? run(:version) : run(:create, '--version')
+          if @version =~ /(lxc version:\s+|)(.+)\s*$/
+            @version = $2.downcase
           else
             # TODO: Raise an user friendly error
             raise 'Unable to parse lxc version!'
           end
         end
 
+        def config(param)
+          if support_config_command?
+            run(:config, param).gsub("\n", '')
+          else
+            raise Errors::CommandNotSupported, name: 'config', available_version: '> 1.x.x', version: version
+          end
+        end
+
         def state
           if @name && run(:info, '--name', @name, retryable: true) =~ /^state:[^A-Z]+([A-Z]+)$/i
             $1.downcase.to_sym
@@ -134,6 +144,16 @@ module Vagrant
           return @supports_attach
         end
 
+        def support_config_command?
+          version[0].to_i >= 1
+        end
+
+        def support_version_command?
+          @sudo_wrapper.run('which', 'lxc-version').strip.chomp != ''
+        rescue Vagrant::LXC::Errors::ExecuteError
+          return false
+        end
+
         private
 
         def run(command, *args)

data/lib/vagrant-lxc/driver.rb

@@ -13,8 +13,8 @@ module Vagrant
       # a name.
       class ContainerNotFound < StandardError; end
 
-      # Root folder where container configs are stored
-      CONTAINERS_PATH = '/var/lib/lxc'
+      # Default root folder where container configs are stored
+      DEFAULT_CONTAINERS_PATH = '/var/lib/lxc'
 
       attr_reader :container_name,
                   :customizations
@@ -31,12 +31,17 @@ module Vagrant
         raise ContainerNotFound if @container_name && ! @cli.list.include?(@container_name)
       end
 
+      # Root folder where container configs are stored
+      def containers_path
+        @containers_path ||= @cli.support_config_command? ? @cli.config('lxc.lxcpath') : DEFAULT_CONTAINERS_PATH
+      end
+
       def all_containers
         @cli.list
       end
 
       def base_path
-        Pathname.new("#{CONTAINERS_PATH}/#{@container_name}")
+        Pathname.new("#{containers_path}/#{@container_name}")
       end
 
       def rootfs_path

data/lib/vagrant-lxc/errors.rb

@@ -26,6 +26,10 @@ module Vagrant
         error_key(:lxc_container_already_exists)
       end
 
+      class CommandNotSupported < Vagrant::Errors::VagrantError
+        error_key(:lxc_command_not_supported)
+      end
+
       # Box related errors
       class TemplateFileMissing < Vagrant::Errors::VagrantError
         error_key(:lxc_template_file_missing)

data/lib/vagrant-lxc/provider.rb

@@ -64,13 +64,13 @@ module Vagrant
 
       # Returns the SSH info for accessing the Container.
       def ssh_info
-        # If the Container is not created then we cannot possibly SSH into it, so
+        # If the Container is not running then we cannot possibly SSH into it, so
         # we return nil.
-        return nil if state == :not_created
+        return nil if state.id != :running
 
-        # Run a custom action called "fetch_ip" which does what it says and puts
+        # Run a custom action called "ssh_ip" which does what it says and puts
         # the IP found into the `:machine_ip` key in the environment.
-        env = @machine.action("fetch_ip")
+        env = @machine.action("ssh_ip")
 
         # If we were not able to identify the container's IP, we return nil
         # here and we let Vagrant core deal with it ;)

data/lib/vagrant-lxc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module LXC
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

data/locales/en.yml

@@ -66,3 +66,7 @@ en:
         There is container on your system with the same name you've specified
         on your Vagrantfile (%{name}), please choose a different one or
         run `lxc-destroy --name %{name}` and try again.
+
+      lxc_command_not_supported: |-
+        Command (lxc-%{command}) not supported in version %{version}.
+        This command is available with version %{available_version}.

data/spec/unit/driver/cli_spec.rb

@@ -29,14 +29,52 @@ describe Vagrant::LXC::Driver::CLI do
   end
 
   describe 'version' do
-    let(:lxc_version_out) { "lxc version:  0.x.y-rc1\n" }
+    before do
+      allow(subject).to receive(:run).with(:version).and_return(lxc_version_out)
+    end
+
+    describe 'lxc version before 1.x.x' do
+      let(:lxc_version_out) { "lxc version:  0.x.y-rc1\n" }
+
+      it 'parses the version from the output' do
+        expect(subject.version).to eq('0.x.y-rc1')
+      end
+    end
+
+    describe 'lxc version after 1.x.x' do
+      let(:lxc_version_out) { "1.0.0\n" }
+
+      it 'parses the version from the output' do
+        expect(subject.version).to eq('1.0.0')
+      end
+    end
+  end
 
+  describe 'config' do
     before do
+      allow(subject).to receive(:run).with(:config, 'lxc.lxcpath').and_return(lxc_config_out)
       allow(subject).to receive(:run).with(:version).and_return(lxc_version_out)
+      allow(subject).to receive(:run).with(:create, '--version').and_return(lxc_version_out)
     end
 
-    it 'parses the version from the output' do
-      expect(subject.version).to eq('0.x.y-rc1')
+    describe 'lxc version before 1.x.x' do
+      let(:support_version_command?) { true }
+      let(:lxc_config_out)           { "/var/lib/lxc\n" }
+      let(:lxc_version_out)          { "lxc version:  0.x.y-rc1\n" }
+
+      it 'not supported' do
+        expect{subject.config('lxc.lxcpath')}.to raise_error(Vagrant::LXC::Errors::CommandNotSupported)
+      end
+    end
+
+    describe 'lxc version before after 1.x.x'do
+      let(:support_version_command?) { false }
+      let(:lxc_config_out)           { "/var/lib/lxc\n" }
+      let(:lxc_version_out)          { "1.0.0\n" }
+
+      it 'parser the lxc.lxcpath value' do
+        expect(subject.config('lxc.lxcpath')).not_to end_with("\n")
+      end
     end
   end
 

data/spec/unit/driver_spec.rb

@@ -89,7 +89,7 @@ describe Vagrant::LXC::Driver do
   describe 'start' do
     let(:customizations)         { [['a', '1'], ['b', '2']] }
     let(:internal_customization) { ['internal', 'customization'] }
-    let(:cli)                    { double(Vagrant::LXC::Driver::CLI, start: true) }
+    let(:cli)                    { double(Vagrant::LXC::Driver::CLI, start: true, support_config_command?: false) }
     let(:sudo)                   { double(Vagrant::LXC::SudoWrapper) }
 
     subject { described_class.new('name', sudo, cli) }
@@ -99,6 +99,7 @@ describe Vagrant::LXC::Driver do
         and_return('# CONFIGURATION')
       sudo.should_receive(:run).twice.with('cp', '-f', %r{/tmp/.*}, '/var/lib/lxc/name/config')
       sudo.should_receive(:run).twice.with('chown', 'root:root', '/var/lib/lxc/name/config')
+
       subject.customizations << internal_customization
       subject.start(customizations)
     end
@@ -150,6 +151,30 @@ describe Vagrant::LXC::Driver do
     end
   end
 
+  describe 'containers_path' do
+    let(:cli) { double(Vagrant::LXC::Driver::CLI, config: cli_config_value, support_config_command?: cli_support_config_command_value) }
+
+    subject { described_class.new('name', nil, cli) }
+
+    describe 'lxc version before 1.x.x' do
+      let(:cli_support_config_command_value) { false }
+      let(:cli_config_value)                 { '/var/lib/lxc' }
+
+      it 'delegates to cli' do
+        expect(subject.containers_path).to eq(cli_config_value)
+      end
+    end
+
+    describe 'lxc version after 1.x.x' do
+      let(:cli_support_config_command_value) { true }
+      let(:cli_config_value)                 { '/etc/lxc' }
+
+      it 'delegates to cli' do
+        expect(subject.containers_path).to eq(cli_config_value)
+      end
+    end
+  end
+
   describe 'folder sharing' do
     let(:shared_folder)       { {guestpath: '/vagrant', hostpath: '/path/to/host/dir'} }
     let(:ro_rw_folder)        { {guestpath: '/vagrant/ro_rw', hostpath: '/path/to/host/dir', mount_options: ['ro', 'rw']} }

data/templates/sudoers.rb.erb

@@ -95,12 +95,14 @@ Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-version'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-ls'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-info', '--name', /.*/
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-create', '-B', /.*/, '--template', /.*/, '--name', /.*/, '**'
+Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-create', '--version'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-destroy', '--name', /.*/
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-start', '-d', '--name', /.*/, '**'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-stop', '--name', /.*/
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-shutdown', '--name', /.*/
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-attach', '--name', /.*/, '**'
 Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-attach', '-h'
+Whitelist.add '<%= cmd_paths['lxc_bin'] %>/lxc-config', 'lxc.lxcpath'
 
 ##
 # Commands from driver/action/remove_temporary_files.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email: