Merge pull request #98 from pbitty/refactor_module

migrate HostsFile code into its own class

Author: pbitty

lib/vagrant-hostmanager/action/update_all.rb

@@ -1,18 +1,18 @@
-require 'vagrant-hostmanager/hosts_file'
+require 'vagrant-hostmanager/hosts_file/updater'
 require 'vagrant-hostmanager/util'
 
 module VagrantPlugins
   module HostManager
     module Action
       class UpdateAll
-        include HostsFile
 
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
           @global_env = @machine.env
           @provider = @machine.provider_name
           @config = Util.get_config(@global_env)
+          @updater = HostsFile::Updater.new(@global_env, @provider)
           @logger = Log4r::Logger.new('vagrant::hostmanager::update_all')
         end
 
@@ -31,14 +31,14 @@ def call(env)
           @global_env.active_machines.each do |name, p|
             if p == @provider
               machine = @global_env.machine(name, p)
-              update_guest(machine)
+              @updater.update_guest(machine)
             end
           end
 
           # update /etc/hosts files on host if enabled
           if @machine.config.hostmanager.manage_host?
             env[:ui].info I18n.t('vagrant_hostmanager.action.update_host')
-            update_host
+            @updater.update_host
           end
         end
       end

lib/vagrant-hostmanager/action/update_guest.rb

@@ -1,26 +1,23 @@
-require 'vagrant-hostmanager/hosts_file'
+require 'vagrant-hostmanager/hosts_file/updater'
 require 'vagrant-hostmanager/util'
 
 module VagrantPlugins
   module HostManager
     module Action
       class UpdateGuest
-        include HostsFile
 
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @global_env = @machine.env
-          @provider = env[:provider]
-          @config = Util.get_config(@global_env)
+          @updater = HostsFile::Updater.new(@machine.env, env[:provider])
           @logger = Log4r::Logger.new('vagrant::hostmanager::update_guest')
         end
 
         def call(env)
           env[:ui].info I18n.t('vagrant_hostmanager.action.update_guest', {
             :name => @machine.name
           })
-          update_guest(@machine)
+          @updater.update_guest(@machine)
 
           @app.call(env)
         end

lib/vagrant-hostmanager/action/update_host.rb

@@ -1,30 +1,30 @@
-require 'vagrant-hostmanager/hosts_file'
+require 'vagrant-hostmanager/hosts_file/updater'
 require 'vagrant-hostmanager/util'
 
 module VagrantPlugins
   module HostManager
     module Action
       class UpdateHost
-        include HostsFile
 
         def initialize(app, env)
           @app = app
-          @global_env = env[:global_env]
-          @provider = env[:provider]
-          @config = Util.get_config(@global_env)
+          
+          global_env = env[:global_env]
+          @config = Util.get_config(global_env)
+          @updater = HostsFile::Updater.new(global_env, env[:provider])
+          
           @logger = Log4r::Logger.new('vagrant::hostmanager::update_host')
         end
 
         def call(env)
           if @config.hostmanager.manage_host?
             env[:ui].info I18n.t('vagrant_hostmanager.action.update_host')
-            update_host
+            @updater.update_host
           end
 
           @app.call(env)
         end
       end
     end
   end
-end
-
+end

lib/vagrant-hostmanager/command.rb

@@ -1,7 +1,6 @@
 module VagrantPlugins
   module HostManager
     class Command < Vagrant.plugin('2', :command)
-      include HostsFile
 
       # Show description when `vagrant list-commands` is triggered
       def self.synopsis