vagrant-auto_network 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54c4da4f0bee53e5b39ea4bd507e11166a7b56e0
-  data.tar.gz: a35c80d6ad5fe095c669ab317f997717e382077b
+  metadata.gz: b33ef5651e937a70d5b47f134bb044657b29050f
+  data.tar.gz: b380e2b4e66c9b56d8739286c991acca807b2cc4
 SHA512:
-  metadata.gz: 65765f2eec79a431f740eeb2ad805f513eaa2eee7d35da0c98a0881c0a369e8fd5654715cdebf838d74c2d0e25b170a151ff46d77655ba1cb1c2253ad454ae0b
-  data.tar.gz: 9227ad6e275f71921a88019851773e86f8bdffec965555e3d525df221293c9cb507efe01de936a0e4a485015cc2cac8579623badad469f0d6e90c75a28026875
+  metadata.gz: b1b9b251483b01f3bbd21739c55b030ba22e1b3e6c2bdfecc5601c23d2ab05b4ff34bea6bd8679043c903432fbf373d79226a39807a6a0ee409c870ef43c02f2
+  data.tar.gz: 79032d6d2960a87fb6038868b0819715e7a56b533faf19bcedc5a3bfb4709306cbcb171a20bd42af4d800e0d615baf3214973cbb44b6438a00b97458e16ba0c3

data/CHANGELOG

@@ -1,6 +1,18 @@
 vagrant-auto_network
 ====================
 
+1.0.2
+-----
+
+2014-06-21
+
+This is a backwards compatible bugfix release.
+
+  * (GH-24) Fix improper allocations of IP addresses to machines that are not
+    using AutoNetwork. This regression was caused by the fix for GH-23 released
+    in version 1.0.1.
+
+
 1.0.1
 -----
 

data/lib/auto_network/action/request.rb

@@ -16,10 +16,17 @@ class AutoNetwork::Action::Request < AutoNetwork::Action::Base
     @env = env
 
     machine = @env[:machine]
+    auto_networks = machine_auto_networks(machine)
 
-    # Move along if this machine has no AutoNetwork interfaces.
-    @app.call(@env) if machine_auto_networks(machine).empty?
+    # Do nothing if there are no private networks using :auto_network => true
+    filter_networks(machine, auto_networks) unless auto_networks.empty?
 
+    @app.call(@env)
+  end
+
+  private
+
+  def filter_networks(machine, networks)
     addr = AutoNetwork.active_pool_manager.address_for(machine)
     if addr.nil?
       addr = AutoNetwork.active_pool_manager.request(machine)
@@ -27,15 +34,7 @@ class AutoNetwork::Action::Request < AutoNetwork::Action::Base
         :prefix => true
     end
 
-    filter_networks(machine, addr)
-
-    @app.call(@env)
-  end
-
-  private
-
-  def filter_networks(machine, addr)
-    machine_auto_networks(machine).each do |net|
+    networks.each do |net|
       filter_private_network(net, addr)
     end
   end

data/lib/auto_network/plugin.rb

@@ -11,11 +11,12 @@ module AutoNetwork
     DESC
 
     action_hook('Auto network: filter private networks', :environment_load) do |hook|
-      load_pool = AutoNetwork::Action::LoadPool
+      pool_loader = Vagrant::Action::Builder.new.tap do |b|
+        b.use AutoNetwork::Action::LoadPool
+        b.use AutoNetwork::Action::FilterNetworks
+      end
 
-      # TODO: This should be re-factored to use ActionBuilder.
-      hook.prepend(load_pool)
-      hook.after(load_pool, AutoNetwork::Action::FilterNetworks)
+      hook.prepend(pool_loader)
     end
 
     action_hook('Auto network: request address') do |hook|

data/lib/auto_network/version.rb

@@ -1,3 +1,3 @@
 module AutoNetwork
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/integration/plugin_spec.rb

@@ -68,5 +68,17 @@ describe AutoNetwork::Plugin do
         expect(network_opts).to include(:ip => '10.20.1.4')
       end
     end
+
+    context 'on a machine with no AutoNetwork networks' do
+      it 'does not allocate an IP address' do
+        env = test_env.create_vagrant_env
+        test_machine = env.machine(:plain, :dummy)
+
+        action_env = { :machine => test_machine }
+        env.action_runner.run(subject, action_env)
+
+        expect(current_ip(test_machine)).to be_nil
+      end
+    end
   end
 end

data/spec/integration/shared/auto_network_integration_context.rb

@@ -53,6 +53,10 @@ shared_context 'auto_network integration' do
     #   - test3 has an allocated IP, but no ID.
     test_env.vagrantfile <<-EOF
 Vagrant.configure("2") do |config|
+  # Normal vanilla node.
+  config.vm.define 'plain'
+
+  # Test nodes with AutoNetwork enabled.
   %w[test1 test2 test3].each do |machine|
     config.vm.define machine do |node|
       node.vm.network :private_network, :auto_network => true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-auto_network
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake