From 0bc2f30b7b40e8766e4f4650884d0e1aa50c8094 Mon Sep 17 00:00:00 2001
From: Paulo Bittencourt <pbitty@gmail.com>
Date: Sun, 1 Jun 2014 15:29:29 -0400
Subject: [PATCH] extract old vagrant version compatibility code into util
 method

---
 lib/vagrant-hostmanager/action/update_all.rb   | 10 ++--------
 lib/vagrant-hostmanager/action/update_guest.rb | 10 ++--------
 lib/vagrant-hostmanager/action/update_host.rb  | 10 ++--------
 lib/vagrant-hostmanager/provisioner.rb         |  9 +--------
 lib/vagrant-hostmanager/util.rb                | 14 ++++++++++++++
 5 files changed, 21 insertions(+), 32 deletions(-)
 create mode 100644 lib/vagrant-hostmanager/util.rb

diff --git a/lib/vagrant-hostmanager/action/update_all.rb b/lib/vagrant-hostmanager/action/update_all.rb
index eb76d51..2791a6e 100644
--- a/lib/vagrant-hostmanager/action/update_all.rb
+++ b/lib/vagrant-hostmanager/action/update_all.rb
@@ -1,4 +1,5 @@
 require 'vagrant-hostmanager/hosts_file'
+require 'vagrant-hostmanager/util'
 
 module VagrantPlugins
   module HostManager
@@ -11,14 +12,7 @@ module VagrantPlugins
           @machine = env[:machine]
           @global_env = @machine.env
           @provider = @machine.provider_name
-
-          # config_global is deprecated from v1.5
-          if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new('1.5')
-            @config = @global_env.vagrantfile.config
-          else
-            @config = @global_env.config_global
-          end
-
+          @config = Util.get_config(@global_env)
           @logger = Log4r::Logger.new('vagrant::hostmanager::update_all')
         end
 
diff --git a/lib/vagrant-hostmanager/action/update_guest.rb b/lib/vagrant-hostmanager/action/update_guest.rb
index 7ab7352..7d9a34b 100644
--- a/lib/vagrant-hostmanager/action/update_guest.rb
+++ b/lib/vagrant-hostmanager/action/update_guest.rb
@@ -1,4 +1,5 @@
 require 'vagrant-hostmanager/hosts_file'
+require 'vagrant-hostmanager/util'
 
 module VagrantPlugins
   module HostManager
@@ -11,14 +12,7 @@ module VagrantPlugins
           @machine = env[:machine]
           @global_env = @machine.env
           @provider = env[:provider]
-
-          # config_global is deprecated from v1.5
-          if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new('1.5')
-            @config = @global_env.vagrantfile.config
-          else
-            @config = @global_env.config_global
-          end
-          
+          @config = Util.get_config(@global_env)
           @logger = Log4r::Logger.new('vagrant::hostmanager::update_guest')
         end
 
diff --git a/lib/vagrant-hostmanager/action/update_host.rb b/lib/vagrant-hostmanager/action/update_host.rb
index 8d48255..ae945f8 100644
--- a/lib/vagrant-hostmanager/action/update_host.rb
+++ b/lib/vagrant-hostmanager/action/update_host.rb
@@ -1,4 +1,5 @@
 require 'vagrant-hostmanager/hosts_file'
+require 'vagrant-hostmanager/util'
 
 module VagrantPlugins
   module HostManager
@@ -10,14 +11,7 @@ module VagrantPlugins
           @app = app
           @global_env = env[:global_env]
           @provider = env[:provider]
-
-          # config_global is deprecated from v1.5
-          if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new('1.5')
-            @config = @global_env.vagrantfile.config
-          else
-            @config = @global_env.config_global
-          end
-
+          @config = Util.get_config(@global_env)
           @logger = Log4r::Logger.new('vagrant::hostmanager::update_host')
         end
 
diff --git a/lib/vagrant-hostmanager/provisioner.rb b/lib/vagrant-hostmanager/provisioner.rb
index afe027a..27f0b33 100644
--- a/lib/vagrant-hostmanager/provisioner.rb
+++ b/lib/vagrant-hostmanager/provisioner.rb
@@ -7,14 +7,7 @@ module VagrantPlugins
         super(machine, config)
         @global_env = machine.env
         @provider = machine.provider_name
-
-        # config_global is deprecated from v1.5
-        if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new('1.5')
-          @config = @global_env.vagrantfile.config
-        else
-          @config = @global_env.config_global
-        end
-
+        @config = Util.get_config(@global_env)
       end
 
       def provision
diff --git a/lib/vagrant-hostmanager/util.rb b/lib/vagrant-hostmanager/util.rb
new file mode 100644
index 0000000..0bc4dcd
--- /dev/null
+++ b/lib/vagrant-hostmanager/util.rb
@@ -0,0 +1,14 @@
+module VagrantPlugins
+  module HostManager
+    module Util
+      def self.get_config(env)
+        # config_global has been removed from v1.5
+        if Gem::Version.new(::Vagrant::VERSION) >= Gem::Version.new('1.5')
+          env.vagrantfile.config
+        else
+          env.config_global
+        end
+      end
+    end
+  end
+end
\ No newline at end of file