vagrant-hostmanager 1.1.0 → 1.2.0

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.2.2'
+  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.2.7'
 end
 
 gemspec

data/README.md

@@ -5,6 +5,9 @@ file on guest machines (and optionally the host). Its goal is to enable
 resolution of multi-machine environments deployed with a cloud provider
 where IP addresses are not known in advance.
 
+*NOTE:* Version 1.1 of the plugin prematurely introduced a feature to hook into
+commands other than `vagrant up` and `vagrant destroy`. Version 1.1 broke support for some providers. Version 1.2 reverts this feature until a suitable implementation supporting all providers is available.
+
 Installation
 ------------
 Install the plugin following the typical Vagrant 1.1 procedure:
@@ -18,8 +21,8 @@ command:
 
     $ vagrant hostmanager
 
-The plugin hooks into the `vagrant up`, `vagrant destroy`, `vagrant halt`,
-`vagrant resume` and `vagrant suspend` commands automatically.
+The plugin hooks into the `vagrant up` and `vagrant destroy` commands
+automatically.
 When a machine enters or exits the running state , all active
 machines with the same provider will have their `/etc/hosts` file updated
 accordingly. Set the `hostmanager.enabled` attribute to `true` in the

data/lib/vagrant-hostmanager/action/update_all.rb

@@ -15,17 +15,13 @@ module VagrantPlugins
         end
 
         def call(env)
-          # skip if machine is running and the action is resume or up
-          return @app.call(env) if @machine.state.id == :running && [:resume, :up].include?(env[:machine_action])
-          # skip if machine is not running and the action is destroy, halt or suspend
-          return @app.call(env) if @machine.state.id != :running && [:destroy, :halt, :suspend].include?(env[:machine_action])
-          # skip if machine is not saved and the action is resume
-          return @app.call(env) if @machine.state.id != :saved && env[:machine_action] == :resume
-          # skip if machine is not running and the action is suspend
-          return @app.call(env) if @machine.state.id != :running && env[:machine_action] == :suspend
+          # skip if machine is already active on up action
+          return @app.call(env) if @machine.id && env[:machine_action] == :up
+          # skip if machine is not active on destroy action
+          return @app.call(env) if !@machine.id && env[:machine_action] == :destroy
 
           # check config to see if the hosts file should be update automatically
-          return @app.call(env) unless @machine.config.hostmanager.enabled?
+          return @app.call(env) unless @global_env.config_global.hostmanager.enabled?
           @logger.info 'Updating /etc/hosts file automatically'
 
           @app.call(env)

data/lib/vagrant-hostmanager/hosts_file.rb

@@ -72,21 +72,20 @@ module VagrantPlugins
       end
 
       def get_machines
-        machines = []
-        @global_env.machine_names.each do |name|
-          begin
-            machine = @global_env.machine(name, @provider)
-
-            # check if offline machines should be included in host entries
-            if @global_env.config_global.hostmanager.include_offline? || machine.state.id == :running 
+        if @global_env.config_global.hostmanager.include_offline?
+          machines = []
+          @global_env.machine_names.each do |name|
+            begin
+              @global_env.machine(name, @provider)
               machines << [name, @provider]
+            rescue Vagrant::Errors::MachineNotFound
             end
-          rescue Vagrant::Errors::MachineNotFound
           end
+          machines
+        else
+          @global_env.active_machines
         end
-        machines
       end
-
     end
   end
 end

data/lib/vagrant-hostmanager/plugin.rb

@@ -24,18 +24,6 @@ module VagrantPlugins
         hook.prepend(Action.update_all)
       end
 
-      action_hook(:hostmanager, :machine_action_halt) do |hook|
-        hook.prepend(Action.update_all)
-      end
-
-      action_hook(:hostmanager, :machine_action_resume) do |hook|
-        hook.prepend(Action.update_all)
-      end
-
-      action_hook(:hostmanager, :machine_action_suspend) do |hook|
-        hook.prepend(Action.update_all)
-      end
-
       provisioner(:hostmanager) do
         require_relative 'provisioner'
         Provisioner

data/lib/vagrant-hostmanager/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostManager
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hostmanager
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9183860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
+  version_requirements: *9183860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9190520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *9190520
 description: A Vagrant plugin that manages the /etc/hosts file within a multi-machine
   environment
 email:
@@ -92,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A Vagrant plugin that manages the /etc/hosts file within a multi-machine