vagrant-auto_network 1.0.0.beta2 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f95b22bf6a47ec537f8006cc11b3c3f3997507eb
-  data.tar.gz: 6c54bb78892dfca504042ccfd29d69fe9a7e7ca2
+  metadata.gz: 497131d24f1670f54dd51b9264f9d896c6d5c299
+  data.tar.gz: acfdf515d2a0c57f6607b1d43029d290e99ce33c
 SHA512:
-  metadata.gz: 6f54e0c340517c61c20969df5fd69cc4d40757ab2f355a053c5de4b1a14bc2794c8585fae6fd50d6975d5d9a2a5cd12bfc75cc83e1d43ed1f4440dd1b1d1378c
-  data.tar.gz: f3d2054ae710fd14231ae1ff7e3f2c058f717d468a284244f74b059bb0c4ad5b3979e35e07582013740869e8ccc3d88a2ebb76ae08f29a4991e85e515e9e184d
+  metadata.gz: ebb3a65b50265b98b07310e1a5ceab508acb57f2146bea4157d57f5562bdc4453176d89954c8b0dea0a20fb6817e52c8afbf2e6bcd1e329df0ec1931fe6a6fa7
+  data.tar.gz: b0df283881996781bcf2ad23fe7dfcca4259a3c10f7ac3e7022f5e304c8d4f521af6d9f9062e864b0b2d2a1d5c91421bfdb79072c28151780d1a3ada2565032e

data/.gitignore

@@ -2,6 +2,9 @@
 .yardoc
 Gemfile.local
 Gemfile.lock
+license-vagrant-vmware-fusion.lic
+vagrant-spec.config.rb
 acceptance/artifacts
 coverage
 doc
+rgloader

data/.travis.yml

@@ -0,0 +1,17 @@
+---
+language: ruby
+before_install:
+  - gem install bundler --version 1.5.3
+install: bundle $BUNDLER_VERSION install
+script: bundle $BUNDLER_VERSION exec rspec --color --format documentation
+notifications:
+  email: false
+rvm:
+  - 2.0.0
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  matrix:
+    - TEST_VAGRANT_VERSION=v1.5.4 BUNDLER_VERSION=_1.5.3_
+    - TEST_VAGRANT_VERSION=v1.6.2
+    - TEST_VAGRANT_VERSION=HEAD

data/.yardopts

@@ -1 +1,2 @@
 --markup markdown
+--protected

data/CHANGELOG

@@ -26,8 +26,24 @@ Specifically, the following issues have been addressed:
 	  storage mechanism that offers more resiliance to race conditions and data
 		loss from aborted actions.
 
+The following features have been removed:
+
 	* (GH-14) Remove depreciated AutoNetwork mixin module.
 
+
+1.0.0.rc1
+---------
+
+2014-05-12
+
+Changes since 1.0.0.beta2:
+
+  * Addition of integration tests that check for interoperability between
+	  AutoNetwork and Vagrant. Test suite automatically run by Travis CI.
+
+  * Internal refactoring and cleanup.
+
+
 1.0.0.beta2
 -----------
 
@@ -39,6 +55,7 @@ Bug Fixes:
 
   * Ensure directories exist when creating `pool.yaml` for the first time.
 
+
 1.0.0.beta1
 -----------
 

data/Gemfile

@@ -1,17 +1,23 @@
 source 'https://rubygems.org'
 ruby '2.0.0'
 
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.6.2'
+
 # Using the :plugins group causes Vagrant to automagially load auto_network
 # during acceptance tests.
 group :plugins do
   gemspec
 end
 
-group :development do
-  gem 'vagrant', :github => 'mitchellh/vagrant', :tag => 'v1.5.4'
-  # Pinned on 05/05/2014.
+group :test do
+  if ENV['TEST_VAGRANT_VERSION'] == 'HEAD'
+    gem 'vagrant', :github => 'mitchellh/vagrant', :branch => 'master'
+  else
+    gem 'vagrant', :github => 'mitchellh/vagrant', :tag => ENV['TEST_VAGRANT_VERSION']
+  end
+
+  # Pinned on 05/05/2014. Compatible with Vagrant 1.5.x and 1.6.x.
   gem 'vagrant-spec', :github => 'mitchellh/vagrant-spec', :ref => 'aae28ee'
-  gem 'rake'
 end
 
 if File.exists? "#{__FILE__}.local"

data/README.markdown

@@ -3,6 +3,8 @@ Vagrant Auto-network
 
 Automatically configure Vagrant private network interfaces.
 
+[![Build Status](https://travis-ci.org/adrienthebo/vagrant-auto_network.svg?branch=travis-ci)](https://travis-ci.org/adrienthebo/vagrant-auto_network)
+
 Summary
 -------
 

data/acceptance/auto_network/auto_network_spec.rb

@@ -22,12 +22,12 @@ shared_examples 'provider/auto_network' do |provider, options|
   # invocation is dependant on the state created by the prior command.
   it 'manages IP address allocation for the lifecycle of a VM' do
     result = assert_execute('vagrant', 'up', "--provider=#{provider}")
-    expect(result.stdout).to match(/Assigning "\S+" to 'default'/)
+    expect(result.stdout).to match(/AutoNetwork assigning "\S+" to 'default'/)
 
     assert_execute('vagrant', 'status')
     assert_execute('vagrant', 'reload', 'default')
 
     result = assert_execute('vagrant', 'destroy', '--force')
-    expect(result.stdout).to match(/Releasing "\S+" from default/)
+    expect(result.stdout).to match(/AutoNetwork releasing "\S+" from 'default'/)
   end
 end

data/lib/auto_network/action/base.rb

@@ -0,0 +1,65 @@
+module AutoNetwork
+  # This is an abstract base class for AutoNetwork actions that provides
+  # helper methods for interfacing with a {AutoNetwork::PoolManager} object
+  # and the {AutoNetwork::Pool} instances it manages.
+  #
+  # @abstract Subclass and override {#call} to implement a new AutoNetwork
+  #   action.
+  class Action::Base
+    # Create a new action instance that is suitable for execution as part of
+    # Vagrant middleware.
+    #
+    # @param app [#call] an instance of an object that responds to `call`.
+    #   Typically an object representing a chain of Vagrant actions.
+    #   Executing `call` passes execution to the next action in the chain.
+    # @param env [Hash] a hash representing the Vagrant state this action
+    #   executes under. Unfortunately, there are two or three variations of
+    #   what data can be passed, so Action logic that inspects this parameter
+    #   is a bit fragile.
+    def initialize(app, env)
+      @app, @env = app, env
+    end
+
+    def call(env)
+      raise NotImplementedError
+    end
+
+    protected
+
+    # Determine if the given machine exists and has an auto_network address
+    #
+    # @param machine [Vagrant::Machine]
+    #
+    # @return [true, false]
+    def machine_has_address?(machine)
+      !!(machine and AutoNetwork.active_pool_manager.address_for(machine))
+    end
+
+    # Fetch all private networks that are tagged for auto networking
+    #
+    # @param machine [Vagrant::Machine]
+    #
+    # @return [Array(Symbol, Hash)] All auto_networks
+    def machine_auto_networks(machine)
+      machine.config.vm.networks.select do |(net_type, options)|
+        net_type == :private_network and options[:auto_network]
+      end
+    end
+
+    # Convert an auto network to a private network with a static IP address.
+    #
+    # This does an in-place modification of the private_network options hash
+    # to strip out the auto_network configuration and make this behave like a
+    # normal private network interface with a static IP address.
+    #
+    # @param iface [Array(Symbol, Hash)]
+    # @param addr [String] The static IP address to assign to the private network
+    #
+    # @return [void]
+    def filter_private_network(iface, addr)
+      opts = iface[1]
+      opts.delete(:auto_network)
+      opts[:ip] = addr
+    end
+  end
+end

data/lib/auto_network/action/filter_networks.rb

@@ -1,16 +1,6 @@
-require 'auto_network/action_helpers'
-require 'log4r'
-
-class AutoNetwork::Action::FilterNetworks
-
-  include AutoNetwork::ActionHelpers
-
-  def initialize(app, env)
-    @app, @env = app, env
-
-    @logger = Log4r::Logger.new('vagrant::auto_network::filter_networks')
-  end
+require 'auto_network/action/base'
 
+class AutoNetwork::Action::FilterNetworks < AutoNetwork::Action::Base
   # Convert auto_network interfaces to static private_network interfaces.
   #
   # @param env [Hash]
@@ -48,8 +38,7 @@ class AutoNetwork::Action::FilterNetworks
 
   def assign_address(machine)
     machine_auto_networks(machine).each do |net|
-      addr = AutoNetwork.pool_manager.address_for(machine)
-      @logger.info "Reassigning #{addr.inspect} to existing machine #{machine.name}"
+      addr = AutoNetwork.active_pool_manager.address_for(machine)
       filter_private_network(net, addr)
     end
   end

data/lib/auto_network/action/load_pool.rb

@@ -1,11 +1,6 @@
-require 'auto_network'
-
-class AutoNetwork::Action::LoadPool
-
-  def initialize(app, env)
-    @app, @env = app, env
-  end
+require 'auto_network/action/base'
 
+class AutoNetwork::Action::LoadPool < AutoNetwork::Action::Base
   # Handle the loading and unloading of the auto_network pool
   #
   # @param env [Hash]
@@ -39,6 +34,9 @@ class AutoNetwork::Action::LoadPool
   end
 
   def deserialize!
+    unless @statefile.exist?
+      @env[:env].ui.info "Initializing AutoNetwork pool storage."
+    end
     AutoNetwork.pool_manager = AutoNetwork::PoolManager.new(@statefile)
   end
 end

data/lib/auto_network/action/release.rb

@@ -1,13 +1,6 @@
-require 'auto_network/action_helpers'
-
-class AutoNetwork::Action::Release
-
-  include AutoNetwork::ActionHelpers
-
-  def initialize(app, env)
-    @app, @env = app, env
-  end
+require 'auto_network/action/base'
 
+class AutoNetwork::Action::Release < AutoNetwork::Action::Base
   # Release auto_network IP address on VM destruction
   #
   # @param env [Hash]
@@ -29,8 +22,9 @@ class AutoNetwork::Action::Release
   private
 
   def release_network_addresses
-    addr = AutoNetwork.pool_manager.address_for(@machine)
-    @env[:ui].info "Releasing #{addr.inspect} from #{@machine.name}", :prefix => true
-    AutoNetwork.pool_manager.release(@machine)
+    addr = AutoNetwork.active_pool_manager.address_for(@machine)
+    @env[:ui].info "AutoNetwork releasing #{addr.inspect} from '#{@machine.name}'",
+      :prefix => true
+    AutoNetwork.active_pool_manager.release(@machine)
   end
 end

data/lib/auto_network/action/request.rb

@@ -1,13 +1,6 @@
-require 'auto_network/action_helpers'
-
-class AutoNetwork::Action::Request
-
-  include AutoNetwork::ActionHelpers
-
-  def initialize(app, env)
-    @app, @env = app, env
-  end
+require 'auto_network/action/base'
 
+class AutoNetwork::Action::Request < AutoNetwork::Action::Base
   # Request an auto_network IP address on VM creation
   #
   # @param env [Hash]
@@ -30,8 +23,9 @@ class AutoNetwork::Action::Request
 
   def request_address
     machine_auto_networks(@machine).each do |net|
-      addr = AutoNetwork.pool_manager.request(@machine)
-      @env[:ui].info "Assigning #{addr.inspect} to '#{@machine.name}'", :prefix => true
+      addr = AutoNetwork.active_pool_manager.request(@machine)
+      @env[:ui].info "AutoNetwork assigning #{addr.inspect} to '#{@machine.name}'",
+        :prefix => true
       filter_private_network(net, addr)
     end
   end

data/lib/auto_network/pool.rb

@@ -13,8 +13,7 @@ module AutoNetwork
       error_key(:pool_exhausted, 'vagrant_auto_network')
     end
 
-    # @!attribute [r] network_range
-    #   @return [String] The address range manged by this Pool instance.
+    # @return [String] The address range manged by this Pool instance.
     attr_reader :network_range
 
     # Create a new Pool object that manages a range of IP addresses.
@@ -76,6 +75,14 @@ module AutoNetwork
       addr
     end
 
+    # Compute the value that will be used to identify a machine. This value
+    # will be associated with IP addresses allocated to the machine.
+    #
+    # @param machine [Vagrant::Machine]
+    #
+    # @return [Hash{String=>String}] A hash containing the path to the
+    #   directory containing the Vagrantfile that defined the machine and the
+    #   machine name.
     def id_for(machine)
       {
         'path' => machine.env.root_path.to_s,

data/lib/auto_network/settings.rb

@@ -1,4 +1,5 @@
 require 'ipaddr'
+require 'auto_network/pool_manager'
 require 'vagrant/errors'
 
 module AutoNetwork
@@ -13,10 +14,29 @@ module AutoNetwork
       error_key(:invalid_setting, 'vagrant_auto_network')
     end
 
-    # @!attribute [rw] pool_manager
-    #   @return [AutoNetwork::PoolManager, nil]
+    # Access the global {AutoNetwork::PoolManager} instance.
+    # @return [AutoNetwork::PoolManager, nil]
     attr_accessor :pool_manager
 
+    # Assertively retrieve the global {AutoNetwork::PoolManager} instance.
+    #
+    # Raises an error if {#pool_manager} has been set to `nil` or an invalid
+    # value.
+    #
+    # @return [AutoNetwork::PoolManager]
+    # @raise [InvalidSettingErrror] If {#pool_manager} is not set to a usable
+    #   value.
+    def active_pool_manager
+      manager = pool_manager
+      unless manager.is_a?(AutoNetwork::PoolManager)
+        raise InvalidSettingErrror,
+          :setting_name => 'pool_manager',
+          :value => manager
+      end
+
+      manager
+    end
+
     # Unless overriden, this will be the IP range assigned to the very first
     # {AutoNetwork::Pool} created by {AutoNetwork::PoolManager} instances.
     DEFAULT_POOL = '10.20.1.0/24'

data/lib/auto_network/version.rb

@@ -1,3 +1,3 @@
 module AutoNetwork
-  VERSION = '1.0.0.beta2'
+  VERSION = '1.0.0.rc1'
 end

data/spec/integration/legacy_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require_relative 'shared/auto_network_0x_context'
+
+describe 'Working with AutoNetwork 0.x data' do
+  include_context 'vagrant-unit'
+  include_context 'auto_network 0.x'
+
+  def current_ip(machine)
+    settings.pool_manager.with_pool_for(machine) {|p| p.address_for(machine)}
+  end
+
+  before(:each) do
+    env = test_env.create_vagrant_env
+    @test_machine = env.machine(:test1, :dummy)
+
+    # Legacy pool data is assigned to the VirtualBox provider. Fake our
+    # provider name for this purpose.
+    allow(@test_machine).to receive(:provider_name).and_return(:virtualbox)
+  end
+
+  it 'upgrades the poolfile format when saving data' do
+    # Running a read/write transaction will cause the poolfile to be
+    # regenerated.
+    settings.pool_manager.with_pool_for(@test_machine, read_only=false){|p| }
+    pool_data = YAML.load_file(pool_file)
+
+    # Expect that the poolfile has been upgraded to the latest version.
+    expect(pool_data).to include({
+      'poolfile_version' => AutoNetwork::PoolStorage::POOLFILE_VERSION
+    })
+  end
+
+  # The 0.x context defines one machine with an IP allocated by UUID.
+  it 'releases IP addresses allocated by UUID' do
+    expect(current_ip(@test_machine)).to eq('10.20.1.2')
+
+    @test_machine.action(:destroy)
+
+    expect(current_ip(@test_machine)).to be_nil
+  end
+end

data/spec/integration/plugin_spec.rb

@@ -1,28 +1,51 @@
 require 'spec_helper'
+require_relative 'shared/auto_network_1x_context'
 
 describe AutoNetwork::Plugin do
   include_context 'vagrant-unit'
+  include_context 'auto_network 1.x'
 
   context 'when a vagrant environment is initialized' do
-    let(:settings) {
-      Module.new do
-        extend AutoNetwork::Settings
-      end
-    }
-    let(:manager_double) { double().as_null_object }
-
     it 'sets the global pool_manager' do
-      allow(AutoNetwork).to receive(:pool_manager=) do |pool_manager|
-        settings.pool_manager = pool_manager
-      end
-      allow(manager_double).to receive(:new).and_return('a_pool_manager')
-      stub_const('AutoNetwork::PoolManager', manager_double)
-
       # Create an environment \o/
-      isolated_environment.create_vagrant_env
+      test_env.create_vagrant_env
+
+      expect(settings.pool_manager).to be_a(AutoNetwork::PoolManager)
+    end
+
+    it 'assigns autonetworked IP addresses to existing machines' do
+      env = test_env.create_vagrant_env
+
+      test_machine = env.machine(:test1, :dummy)
+      _, network_opts = test_machine.config.vm.networks.find {|n| n.first == :private_network}
+
+      expect(network_opts).to include(:ip => '10.20.1.2')
+    end
+  end
+
+  context 'when destroying a machine' do
+    def current_ip(machine)
+      settings.pool_manager.with_pool_for(machine) {|p| p.address_for(machine)}
+    end
+
+    it 'releases the allocated IP address' do
+      env = test_env.create_vagrant_env
+      test_machine = env.machine(:test1, :dummy)
 
-      expect(settings.pool_manager).to eq('a_pool_manager')
+      expect(current_ip(test_machine)).to eq('10.20.1.2')
+
+      test_machine.action(:destroy)
+
+      expect(current_ip(test_machine)).to be_nil
     end
+  end
 
+  # Testing IP allocation is pretty tricky since it hooks into
+  # provider-specific behavior that our dummy provider does not have.
+  # Currently, this behavior is exercised by the acceptance tests.
+  context 'when creating a machine' do
+    it 'allocates an IP address' do
+      pending 'This is currently delegated to the acceptance suite.'
+    end
   end
 end

data/spec/integration/shared/auto_network_0x_context.rb

@@ -0,0 +1,48 @@
+require_relative 'isolated_settings_context'
+
+# Creates an environment for each test containing data that would have been
+# created by an installation of AutoNetwork 0.x.
+shared_context 'auto_network 0.x' do
+  include_context 'vagrant-unit'
+  include_context 'auto_network-settings'
+
+  # Configure each testing environment to contain an AutoNetwork version 1 pool
+  # file and a single existing machine that has been allocated in the pool
+  let(:test_env) { isolated_environment }
+  let(:pool_file) { test_env.homedir.join('auto_network', 'pool.yaml') }
+  before(:each) do
+    pool_file.dirname.mkpath
+    pool_file.open('w+') do |f|
+      f.write <<-EOF
+--- !ruby/object:AutoNetwork::Pool
+network_range: 10.20.1.0/29
+pool:
+  10.20.1.2: some-uuid-string
+  10.20.1.3: 
+  10.20.1.4: 
+  10.20.1.5: 
+  10.20.1.6: 
+EOF
+    end
+
+    test_env.vagrantfile <<-EOF
+Vagrant.configure("2") do |config|
+  config.vm.define 'test1' do |node|
+    node.vm.network :private_network, :auto_network => true
+  end
+end
+EOF
+
+    # Touch an ID file so that Vagrant thinks test1 exists. The 'dummy'
+    # component of the path actually tells Vagrant which provider is managing
+    # the machine. vagrant-spec defines a dummy provider for us.
+    machine_dir = test_env.workdir.join('.vagrant/machines/test1/dummy')
+    machine_dir.mkpath
+    machine_dir.join('id').open('w+') { |f| f.write('some-uuid-string') }
+  end
+
+  # Dispose of the temporary directory used to run the test.
+  after(:each) do
+    test_env.close
+  end
+end

data/spec/integration/shared/auto_network_1x_context.rb

@@ -0,0 +1,53 @@
+require_relative 'isolated_settings_context'
+
+# Creates an environment for each test containing a small pool of AutoNetwork
+# addresses and a single "created" VM.
+shared_context 'auto_network 1.x' do
+  include_context 'vagrant-unit'
+  include_context 'auto_network-settings'
+
+  # Configure each testing environment to contain an AutoNetwork version 2 pool
+  # file and a single existing machine that has been allocated in the pool
+  let(:test_env) { isolated_environment }
+  let(:pool_file) { test_env.homedir.join('auto_network', 'pool.yaml') }
+  before(:each) do
+    pool_file.dirname.mkpath
+    pool_file.open('w+') do |f|
+      f.write <<-EOF
+---
+poolfile_version: 2
+pools:
+  dummy: !ruby/object:AutoNetwork::Pool
+    network_range: 10.20.1.0/29
+    pool:
+      10.20.1.2:
+        path: #{test_env.workdir}
+        name: test1
+      10.20.1.3: 
+      10.20.1.4: 
+      10.20.1.5: 
+      10.20.1.6: 
+EOF
+    end
+
+    test_env.vagrantfile <<-EOF
+Vagrant.configure("2") do |config|
+  config.vm.define 'test1' do |node|
+    node.vm.network :private_network, :auto_network => true
+  end
+end
+EOF
+
+    # Touch an ID file so that Vagrant thinks test1 exists. The 'dummy'
+    # component of the path actually tells Vagrant which provider is managing
+    # the machine. vagrant-spec defines a dummy provider for us.
+    machine_dir = test_env.workdir.join('.vagrant/machines/test1/dummy')
+    machine_dir.mkpath
+    machine_dir.join('id').open('w+') { |f| f.write('') }
+  end
+
+  # Dispose of the temporary directory used to run the test.
+  after(:each) do
+    test_env.close
+  end
+end

data/spec/integration/shared/isolated_settings_context.rb

@@ -0,0 +1,17 @@
+shared_context 'auto_network-settings' do
+  # Create a Dummy settings module for each test.
+  let(:settings) {
+    Module.new do
+      extend AutoNetwork::Settings
+    end
+  }
+
+  # Stub the settings attached to the AutoNetwork module so we don't change
+  # global state during tests.
+  before(:each) do
+    allow(AutoNetwork).to receive(:pool_manager=) do |pool_manager|
+      settings.pool_manager = pool_manager
+    end
+    allow(AutoNetwork).to receive(:pool_manager).and_return { settings.pool_manager }
+  end
+end

data/spec/unit/settings_spec.rb

@@ -19,4 +19,12 @@ describe AutoNetwork::Settings do
     end
 
   end
+
+  describe 'pool_manager' do
+    context 'when unset' do
+      it 'raises an error when accessed through active_pool_manager' do
+        expect { subject.active_pool_manager }.to raise_error(AutoNetwork::Settings::InvalidSettingErrror)
+      end
+    end
+  end
 end

data/vagrant-auto_network.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |gem|
   gem.name        = "vagrant-auto_network"
   gem.version     = AutoNetwork::VERSION
 
-  gem.authors  = 'Adrien Thebo'
-  gem.email    = 'adrien@somethingsinistral.net'
+  gem.authors  = ['Adrien Thebo', 'Charlie Sharpsteen']
+  gem.email    = ['adrien@somethingsinistral.net', 'source@sharpsteen.net']
   gem.homepage = 'https://github.com/adrienthebo/vagrant-auto_network'
 
   gem.summary     = "Automatically create an internal network for all vagrant boxes"
@@ -18,5 +18,6 @@ Gem::Specification.new do |gem|
 
   gem.license = 'Apache 2.0'
 
+  gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec', '~> 2.14.0'
 end

data/{vagrant-spec.config.rb → vagrant-spec.config.example.rb}

@@ -13,4 +13,13 @@ Vagrant::Spec::Acceptance.configure do |c|
       'VBOX_USER_HOME' => '{{homedir}}',
       'AUTO_NETWORK_TEST_RANGE' => '10.42.1.0/24',
     }
+
+  # VMware Fusion disabled by default. Instructions:
+  #   https://github.com/adrienthebo/vagrant-auto_network/wiki#vmware-fusion
+
+  #c.provider 'vmware_fusion',
+  #  box: (acceptance_dir + 'artifacts' + 'vmware_fusion.box').to_s,
+  #  env_vars: {
+  #    'AUTO_NETWORK_TEST_RANGE' => '10.42.2.0/24',
+  #  }
 end

metadata

@@ -1,15 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-auto_network
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Adrien Thebo
+- Charlie Sharpsteen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -25,12 +40,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: 
-email: adrien@somethingsinistral.net
+email:
+- adrien@somethingsinistral.net
+- source@sharpsteen.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - .yardopts
 - CHANGELOG
 - Gemfile
@@ -40,11 +58,11 @@ files:
 - acceptance/skeletons/auto_network/Vagrantfile
 - lib/auto_network.rb
 - lib/auto_network/action.rb
+- lib/auto_network/action/base.rb
 - lib/auto_network/action/filter_networks.rb
 - lib/auto_network/action/load_pool.rb
 - lib/auto_network/action/release.rb
 - lib/auto_network/action/request.rb
-- lib/auto_network/action_helpers.rb
 - lib/auto_network/plugin.rb
 - lib/auto_network/pool.rb
 - lib/auto_network/pool_manager.rb
@@ -52,14 +70,18 @@ files:
 - lib/auto_network/settings.rb
 - lib/auto_network/version.rb
 - lib/vagrant-auto_network.rb
+- spec/integration/legacy_spec.rb
 - spec/integration/plugin_spec.rb
+- spec/integration/shared/auto_network_0x_context.rb
+- spec/integration/shared/auto_network_1x_context.rb
+- spec/integration/shared/isolated_settings_context.rb
 - spec/spec_helper.rb
 - spec/unit/pool_spec.rb
 - spec/unit/settings_spec.rb
 - tasks/acceptance.rake
 - templates/locales/en.yml
 - vagrant-auto_network.gemspec
-- vagrant-spec.config.rb
+- vagrant-spec.config.example.rb
 homepage: https://github.com/adrienthebo/vagrant-auto_network
 licenses:
 - Apache 2.0

data/lib/auto_network/action_helpers.rb

@@ -1,40 +0,0 @@
-module AutoNetwork
-  module ActionHelpers
-
-    # Determine if the given machine exists and has an auto_network address
-    #
-    # @param [Vagrant::Machine]
-    #
-    # @return [true, false]
-    def machine_has_address?(machine)
-      !!(machine and AutoNetwork.pool_manager.address_for(machine))
-    end
-
-    # Fetch all private networks that are tagged for auto networking
-    #
-    # @param iface [Array<Symbol, Hash>]
-    #
-    # @return [Array<Symbol, Hash>] All auto_networks
-    def machine_auto_networks(machine)
-      machine.config.vm.networks.select do |(net_type, options)|
-        net_type == :private_network and options[:auto_network]
-      end
-    end
-
-    # Convert an auto network to a private network with a static IP address.
-    #
-    # This does an in-place modification of the private_network options hash
-    # to strip out the auto_network configuration and make this behave like a
-    # normal private network interface with a static IP address.
-    #
-    # @param iface [Array<Symbol, Hash>]
-    # @param addr [String] The static IP address to assign to the private network
-    #
-    # @return [void]
-    def filter_private_network(iface, addr)
-      opts = iface[1]
-      opts.delete(:auto_network)
-      opts[:ip] = addr
-    end
-  end
-end