Skip to content

Commit 1328fd4

Browse files
committed
update Gemfile
Signed-off-by: Patrick Münch <patrick.muench1111@gmail.com>
1 parent 66ddb16 commit 1328fd4

File tree

5 files changed

+15
-32
lines changed

5 files changed

+15
-32
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ before_script:
3131
- /opt/chefdk/embedded/bin/chef --version
3232
- /opt/chefdk/embedded/bin/cookstyle --version
3333
- /opt/chefdk/embedded/bin/foodcritic --version
34-
- /opt/chefdk/embedded/bin/chef gem install coveralls # needed for chefspecs
34+
- /opt/chefdk/embedded/bin/chef gem install coveralls -v 0.8.19 # needed for chefspecs
3535

3636
script: KITCHEN_LOCAL_YAML=.kitchen.docker.yml /opt/chefdk/embedded/bin/kitchen verify ${INSTANCE}
3737

Gemfile

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,38 @@
22

33
source 'https://rubygems.org'
44

5-
gem 'berkshelf', '~> 5.0'
6-
gem 'chef', '>= 12.0'
7-
8-
# pin dependency for Ruby 1.9.3 since bundler is not
9-
# detecting that net-ssh 3 does not work with 1.9.3
10-
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
11-
gem 'listen', '~> 3.0.0'
12-
gem 'ruby_dep', '~> 1.3.0'
13-
gem 'rack', '< 2.0'
14-
end
5+
gem 'berkshelf', '~> 6.1'
6+
gem 'chef', '~> 12.5' # chefspec builds get stucked with 13.1
157

168
group :test do
179
gem 'rake'
18-
gem 'chefspec', '~> 5.3'
19-
gem 'foodcritic', '~> 8.0'
10+
gem 'chefspec', '~> 7.1.0'
11+
gem 'foodcritic', '~> 11.1'
12+
gem 'thor', '~> 0.19.1'
2013
gem 'thor-foodcritic'
2114
gem 'cookstyle'
2215
gem 'coveralls', require: false
23-
gem 'minitest', '~> 5.5'
16+
gem 'minitest', '~> 5.10.2'
17+
gem 'rubocop', '~> 0.49.0'
2418
gem 'simplecov', '~> 0.10'
2519
end
2620

2721
group :development do
2822
gem 'guard'
2923
gem 'guard-rspec'
24+
gem 'guard-foodcritic', '~> 3.0'
3025
gem 'guard-kitchen'
3126
gem 'guard-rubocop'
32-
# gem 'guard-foodcritic' # disabled until a new release comes out that removes the pin
3327
end
3428

3529
group :integration do
36-
gem 'test-kitchen', '~> 1.0'
30+
gem 'test-kitchen', '~> 1.16.0'
3731
gem 'kitchen-vagrant'
38-
gem 'kitchen-inspec'
39-
gem 'kitchen-sharedtests', '~> 0.2.0'
40-
gem 'concurrent-ruby', '~> 0.9'
4132
gem 'kitchen-dokken'
33+
gem 'kitchen-inspec'
34+
gem 'concurrent-ruby', '~> 1.0.5'
4235
end
4336

4437
group :tools do
45-
gem 'github_changelog_generator', '~> 1.14.0'
38+
gem 'github_changelog_generator', '~> 1.14'
4639
end

test/integration/controls/test.rb

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include_controls 'nginx-baseline' do
2-
# skip entropy test, as our short living test VMs usually do not
3-
# have enough
2+
# skip http method control
43
skip_control 'nginx-14'
4+
# skip HTTPOnly and secure cookie control
55
skip_control 'nginx-16'
66
end

test/integration/inspec.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)