Merge pull request #429 from chef/sr/dedup-gemfiles

dedup Gemfiles
This commit is contained in:
Christoph Hartmann 2016-02-08 16:27:57 +01:00
commit 7799f389a1
3 changed files with 6 additions and 43 deletions

View file

@ -18,12 +18,8 @@ before_install:
matrix:
include:
- rvm: 1.9.3
gemfile: Gemfile.193
- rvm: 2.0
gemfile: Gemfile
- rvm: 2.2
gemfile: Gemfile
script: bundle exec rake lint test test:resources config=test/test.yaml
- rvm: 2.2
gemfile: Gemfile
script: bundle exec rake test:resources config=test/test-extra.yaml

View file

@ -2,6 +2,12 @@
source 'https://rubygems.org'
gemspec
# pin dependency for Ruby 1.9.3 since bundler is not
# detecting that net-ssh 3 does not work with 1.9.3
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
gem 'net-ssh', '~> 2.9'
end
group :test do
gem 'bundler', '~> 1.5'
gem 'minitest', '~> 5.5'

View file

@ -1,39 +0,0 @@
# encoding: utf-8
source 'https://rubygems.org'
gemspec
# pin dependency for Ruby 1.9.3 since bundler is not
# detecting that net-ssh 3 does not work with 1.9.3
gem 'net-ssh', '~> 2.9'
group :test do
gem 'bundler', '~> 1.5'
gem 'minitest', '~> 5.5'
gem 'rake', '~> 10'
gem 'rubocop', '~> 0.36.0'
gem 'simplecov', '~> 0.10'
gem 'concurrent-ruby', '~> 0.9'
end
group :integration do
gem 'berkshelf', '~> 4.0'
gem 'test-kitchen'
gem 'kitchen-vagrant'
gem 'kitchen-inspec'
gem 'kitchen-ec2'
end
group :tools do
gem 'pry', '~> 0.10'
gem 'license_finder'
gem 'github_changelog_generator', '~> 1'
end
# gems for Maintainers.md generation
group :maintenance do
gem 'tomlrb'
# To sync maintainers with github
gem 'octokit'
gem 'netrc'
end