X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=Gemfile;h=582e584673a2ca031057a1a1b7051446221859b0;hb=2e8b93fc83efbf0a6d3c7b8106cc0b54bb249827;hp=c65a5becca1b8be9b64bde4b1e6d40a99fd3641b;hpb=351b481a2cc78e53dd9fc0ccdfc30dad53f0dda1;p=puppet-modules%2Fpuppetlabs-apt.git diff --git a/Gemfile b/Gemfile index c65a5be..582e584 100644 --- a/Gemfile +++ b/Gemfile @@ -30,22 +30,20 @@ group :development do gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2') gem "puppet-lint-i18n", require: false - gem 'ed25519', '>= 1.2', '< 2.0' - gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0' 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://)} @@ -68,12 +66,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)