kienan
/
vagrant-hostmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extract old vagrant version compatibility code into util method

This commit is contained in:
Paulo Bittencourt 2014-06-01 15:29:29 -04:00
parent f92153ed94
commit 0bc2f30b7b
5 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vagrant-hostmanager/action/update_all.rb
View File

@ -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

10
lib/vagrant-hostmanager/action/update_guest.rb
View File

@ -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

10
lib/vagrant-hostmanager/action/update_host.rb
View File

@ -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

9
lib/vagrant-hostmanager/provisioner.rb
View File

@ -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

14
lib/vagrant-hostmanager/util.rb Normal file
View File

@ -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