X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=Gemfile;h=19423c55c815fbe65ad38af33f1603113a99bf3f;hb=cc04b37121efb0fab5a356187d0a3de7d5327b1b;hp=3373f01763ea1b3d343658b868bfa5585670ff04;hpb=0e75ab7ce4b9ebeca33348b19c2957d5870af690;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/Gemfile b/Gemfile
index 3373f01..19423c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ group :development do
   gem "json", '= 1.8.1',                                         require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-posix-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:ruby]
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.4',     require: false, platforms: [:ruby]
@@ -32,18 +33,18 @@ group :development do
   gem "puppet-lint-i18n",                                        require: false
 end
 
-# puppet_version = ENV['PUPPET_GEM_VERSION']
-# facter_version = ENV['FACTER_GEM_VERSION']
+puppet_version = ENV['PUPPET_GEM_VERSION']
+facter_version = ENV['FACTER_GEM_VERSION']
 hiera_version = ENV['HIERA_GEM_VERSION']
 
 gems = {}
 
-# gems['puppet'] = location_for(puppet_version)
+gems['puppet'] = location_for(puppet_version)
 
 # If facter or hiera versions have been specified via the environment
 # variables
 
-# gems['facter'] = location_for(facter_version) if facter_version
+gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version
 
 if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
@@ -66,12 +67,6 @@ extra_gemfiles = [
   File.join(Dir.home, '.gemfile'),
 ]
 
-gem 'facter', path:"/Users/bogdan.irimie/projects/facter"
-gem 'puppet', path:"/Users/bogdan.irimie/projects/puppet"
-# gem 'facter'
-gem 'pry-byebug'
-
-
 extra_gemfiles.each do |gemfile|
   if File.file?(gemfile) && File.readable?(gemfile)
     eval(File.read(gemfile), binding)