vagrant-lxc 0.4.0 → 0.5.0

data/vagrant-lxc.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["fgrehm@gmail.com"]
   gem.description   = %q{Linux Containers provider for Vagrant}
   gem.summary       = gem.description
+  gem.license       = 'MIT'
   gem.homepage      = "https://github.com/fgrehm/vagrant-lxc"
 
   gem.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-lxc
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Fabio Rehm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies: []
 description: Linux Containers provider for Vagrant
 email:
@@ -32,6 +32,7 @@ files:
 - boxes/common/install-babushka
 - boxes/common/install-chef
 - boxes/common/install-puppet
+- boxes/common/install-salt
 - boxes/common/lxc-template
 - boxes/common/lxc.conf
 - boxes/common/metadata.json
@@ -67,6 +68,8 @@ files:
 - lib/vagrant-lxc/action/destroy.rb
 - lib/vagrant-lxc/action/destroy_confirm.rb
 - lib/vagrant-lxc/action/disconnect.rb
+- lib/vagrant-lxc/action/fetch_ip_from_dnsmasq_leases.rb
+- lib/vagrant-lxc/action/fetch_ip_with_lxc_attach.rb
 - lib/vagrant-lxc/action/forced_halt.rb
 - lib/vagrant-lxc/action/forward_ports.rb
 - lib/vagrant-lxc/action/handle_box_metadata.rb
@@ -77,13 +80,11 @@ files:
 - lib/vagrant-lxc/action/share_folders.rb
 - lib/vagrant-lxc/config.rb
 - lib/vagrant-lxc/driver.rb
-- lib/vagrant-lxc/driver/builder.rb
 - lib/vagrant-lxc/driver/cli.rb
-- lib/vagrant-lxc/driver/fetch_ip_from_dnsmasq.rb
-- lib/vagrant-lxc/driver/fetch_ip_with_attach.rb
 - lib/vagrant-lxc/errors.rb
 - lib/vagrant-lxc/plugin.rb
 - lib/vagrant-lxc/provider.rb
+- lib/vagrant-lxc/sudo_wrapper.rb
 - lib/vagrant-lxc/version.rb
 - locales/en.yml
 - spec/Vagrantfile
@@ -109,7 +110,8 @@ files:
 - tasks/spec.rake
 - vagrant-lxc.gemspec
 homepage: https://github.com/fgrehm/vagrant-lxc
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

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

@@ -1,21 +0,0 @@
-require_relative 'fetch_ip_with_attach'
-require_relative 'fetch_ip_from_dnsmasq'
-
-module Vagrant
-  module LXC
-    class Driver
-      class Builder
-        def self.build(id)
-          version = CLI.new.version.match(/^(\d+\.\d+)\./)[1].to_f
-          Driver.new(id).tap do |driver|
-            mod = version >= 0.8 ?
-              Driver::FetchIpWithAttach :
-              Driver::FetchIpFromDsnmasq
-
-            driver.extend(mod)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,41 +0,0 @@
-module Vagrant
-  module LXC
-    class Driver
-      module FetchIpFromDsnmasq
-        def assigned_ip
-          @logger.debug 'Loading ip from dnsmasq leases'
-          ip = nil
-          # TODO: Use Vagrant::Util::Retryable
-          10.times do
-            if dnsmasq_leases =~ /#{Regexp.escape mac_address}\s+([0-9.]+)\s+/
-              ip = $1.to_s
-              break
-            else
-              @logger.debug 'Ip could not be parsed from dnsmasq leases file'
-              sleep 2
-            end
-          end
-          # TODO: Raise an user friendly error
-          raise 'Unable to identify container IP!' unless ip
-          ip
-        end
-
-        def mac_address
-          @mac_address ||= base_path.join('config').read.match(/^lxc\.network\.hwaddr\s+=\s+(.+)$/)[1]
-        end
-
-        LEASES_PATHS = %w(
-          /var/lib/misc/dnsmasq.leases
-          /var/lib/dnsmasq/dnsmasq.leases
-          /var/db/dnsmasq.leases
-        )
-
-        def dnsmasq_leases
-          LEASES_PATHS.map do |path|
-            File.read(path) if File.exists?(path)
-          end.join("\n")
-        end
-      end
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-module Vagrant
-  module LXC
-    class Driver
-      module FetchIpWithAttach
-        # Include this so we can use `Subprocess` more easily.
-        include Vagrant::Util::Retryable
-
-        def assigned_ip
-          ip = ''
-          retryable(:on => LXC::Errors::ExecuteError, :tries => 10, :sleep => 3) do
-            unless ip = get_container_ip_from_ip_addr
-              # retry
-              raise LXC::Errors::ExecuteError, :command => "lxc-attach"
-            end
-          end
-          ip
-        end
-
-        # From: https://github.com/lxc/lxc/blob/staging/src/python-lxc/lxc/__init__.py#L371-L385
-        def get_container_ip_from_ip_addr
-          output = @cli.attach '/sbin/ip', '-4', 'addr', 'show', 'scope', 'global', 'eth0', namespaces: 'network'
-          if output =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
-            return $1.to_s
-          end
-        end
-      end
-    end
-  end
-end