(maint) Update Gemfile with GEM_FACTER_VERSION

Without this patch we cannot explicitly set the version of Facter to
integrate using Bundler.  This patch addresses the problem by adding a
new environment variable, GEM_FACTER_VERSION which allows bundler to
install a specific version of Facter.  GEM_FACTER_VERSION is the
variable name instead of FACTER_GEM_VERSION to prevent the gem_version
fact from being defined.  In addition, GEM_PUPPET_VERSION is defined
based on PUPPET_GEM_VERSION in order to match the environment names and
provide backwards compatibility with CI jobs.

diff --git a/Gemfile b/Gemfile
index 50df2eeecb1a46a8c49ad59b3ed7c3a20175e7af..197cc6b0152777178012b23cbacb9ca63230af18 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,16 @@ group :development, :test do
   gem 'rspec-puppet', :require => false
 end
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
+facterversion = ENV['GEM_FACTER_VERSION']
+if facterversion
+  gem 'facter', *location_for(facterversion)
+else
+  gem 'facter', :require => false
+end
+
+ENV['GEM_PUPPET_VERSION'] ||= ENV['PUPPET_GEM_VERSION']
+puppetversion = ENV['GEM_PUPPET_VERSION']
+if puppetversion
   gem 'puppet', *location_for(puppetversion)
 else
   gem 'puppet', :require => false