vagrant-hostmaster 0.6.12 → 0.7.0

data/lib/vagrant/hostmaster.rb

@@ -2,6 +2,14 @@ require 'vagrant/hostmaster/version'
 require 'vagrant/hostmaster/command/root'
 require 'vagrant/hostmaster/config'
 require 'vagrant/hostmaster/vm'
+require 'vagrant/hostmaster/middleware/remove'
+require 'vagrant/hostmaster/middleware/update'
 
 Vagrant.commands.register(:hosts) { Vagrant::Hostmaster::Command::Root }
-Vagrant.config_keys.register(:hosts) { Vagrant::Hostmaster::Config }
+Vagrant.config_keys.register(:hosts) { Vagrant::Hostmaster::Config }
+Vagrant.commands.register(:hosts) { Vagrant::Hostmaster::Command::Root }
+
+Vagrant.actions[:destroy].insert_after(Vagrant::Action::VM::ProvisionerCleanup, Vagrant::Hostmaster::Middleware::Remove)
+
+Vagrant.actions[:provision].insert(Vagrant::Action::VM::Provision, Vagrant::Hostmaster::Middleware::Update)
+Vagrant.actions[:start].insert(Vagrant::Action::VM::Provision, Vagrant::Hostmaster::Middleware::Update)

data/lib/vagrant/hostmaster/command/remove.rb

@@ -12,7 +12,6 @@ module Vagrant
           return if !argv
 
           with_target_vms(argv) do |vm|
-            @env.ui.info("Removing host entry for #{vm.name} VM. Administrator privileges will be required...", :prefix => false)
             Hostmaster::VM.new(vm).remove
           end
 

data/lib/vagrant/hostmaster/middleware/remove.rb

@@ -0,0 +1,21 @@
+module Vagrant
+  module Hostmaster
+    module Middleware
+      class Remove
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          remove env[:vm]
+          @app.call(env)
+        end
+
+        protected
+          def remove(vm)
+            Hostmaster::VM.new(vm).remove
+          end
+      end
+    end
+  end
+end

data/lib/vagrant/hostmaster/middleware/update.rb

@@ -0,0 +1,21 @@
+module Vagrant
+  module Hostmaster
+    module Middleware
+      class Update
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          update env[:vm]
+          @app.call(env)
+        end
+
+        protected
+          def update(vm)
+            Hostmaster::VM.new(vm).update
+          end
+      end
+    end
+  end
+end

data/lib/vagrant/hostmaster/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Hostmaster
-    VERSION = "0.6.12"
+    VERSION = "0.7.0"
   end
 end

data/lib/vagrant/hostmaster/vm.rb

@@ -11,20 +11,23 @@ module Vagrant
         @vm = vm
       end
 
-      def add
+      def add(options = {})
+        env.ui.info("Adding host entry for #{name} VM. Administrator privileges will be required...") unless options[:quiet]
         sudo %Q(sh -c 'echo "#{host_entry}" >>/etc/hosts')
       end
 
-      def list
+      def list(options = {})
         system %Q(grep '#{signature}$' /etc/hosts)
       end
 
-      def remove
+      def remove(options = {})
+        env.ui.info("Removing host entry for #{name} VM. Administrator privileges will be required...") unless options[:quiet]
         sudo %Q(sed -e '/#{signature}$/ d' -ibak /etc/hosts)
       end
 
-      def update
-        remove && add
+      def update(options = {})
+        env.ui.info("Updating host entry for #{name} VM. Administrator privileges will be required...") unless options[:quiet]
+        remove(:quiet => true) && add(:quiet => true)
       end
 
       protected

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 6
-  - 12
-  version: 0.6.12
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - S. Brent Faulkner
@@ -64,6 +64,8 @@ files:
 - lib/vagrant/hostmaster/command/root.rb
 - lib/vagrant/hostmaster/command/update.rb
 - lib/vagrant/hostmaster/config.rb
+- lib/vagrant/hostmaster/middleware/remove.rb
+- lib/vagrant/hostmaster/middleware/update.rb
 - lib/vagrant/hostmaster/version.rb
 - lib/vagrant/hostmaster/vm.rb
 - lib/vagrant_init.rb