diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2013-05-06 16:22:59 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2013-05-07 09:42:17 -0700 |
| commit | f44d535a0f6283d91700238b9ad86f83abe6c4e9 (patch) | |
| tree | b010eb06e620b8b43e41c0e1bde8d0bfdf7f7012 /Gemfile | |
| parent | 0c68ff6d66960424567f15711cb20b674fc60054 (diff) | |
(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.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -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 |