Skip to content

Commit 1c84bae

Browse files
Merge pull request #213 from artem-forks/gemfile-new
Tests: update of gems
2 parents 5a2dae3 + f68789e commit 1c84bae

File tree

3 files changed

+112
-49
lines changed

3 files changed

+112
-49
lines changed

Gemfile

+7-15
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,23 @@
22

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

5-
gem 'berkshelf', '~> 6.1'
6-
gem 'chef', '~> 12.5' # chefspec builds get stucked with 13.1
5+
gem 'berkshelf', '~> 7.0'
6+
gem 'chef', '~> 14.11'
77

88
group :test do
9-
gem 'chefspec', '~> 7.1.0'
9+
gem 'chefspec', '~> 7.3.4'
1010
gem 'coveralls', require: false
11-
gem 'cucumber-core', '~> 3.2.1' # it fails with cucumber 4
12-
gem 'foodcritic', '~> 13.0'
11+
gem 'foodcritic', '~> 15.1'
1312
gem 'rake'
1413
gem 'rubocop', '~> 0.49.0'
15-
gem 'simplecov', '~> 0.10'
16-
end
17-
18-
group :development do
19-
gem 'guard'
20-
gem 'guard-foodcritic', '~> 3.0'
21-
gem 'guard-rspec'
22-
gem 'guard-rubocop'
14+
gem 'simplecov', '~> 0.16'
2315
end
2416

2517
group :integration do
2618
gem 'kitchen-dokken'
27-
gem 'kitchen-inspec', '>= 0.23.1'
19+
gem 'kitchen-inspec', '~> 1.0.1'
2820
gem 'kitchen-vagrant'
29-
gem 'test-kitchen', '~> 1.20'
21+
gem 'test-kitchen', '~> 1.24'
3022
end
3123

3224
group :tools do

Guardfile

-22
This file was deleted.

chefignore

+105-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,112 @@
1-
# os generated
1+
# Put files/directories that should be ignored in this file when uploading
2+
# to a chef-server or supermarket.
3+
# Lines that start with '# ' are comments.
4+
5+
# OS generated files #
6+
######################
27
.DS_Store
38
Icon?
9+
nohup.out
410
ehthumbs.db
511
Thumbs.db
612

7-
# artefacts
8-
*/coverage
13+
# SASS #
14+
########
15+
.sass-cache
16+
17+
# EDITORS #
18+
###########
19+
\#*
20+
.#*
21+
*~
22+
*.sw[a-z]
23+
*.bak
24+
REVISION
25+
TAGS*
26+
tmtags
27+
*_flymake.*
28+
*_flymake
29+
*.tmproj
30+
.project
31+
.settings
32+
mkmf.log
33+
34+
## COMPILED ##
35+
##############
36+
a.out
37+
*.o
38+
*.pyc
39+
*.so
40+
*.com
41+
*.class
42+
*.dll
43+
*.exe
44+
*/rdoc/
45+
46+
# Testing #
47+
###########
48+
.watchr
49+
.rspec
50+
spec/*
51+
spec/fixtures/*
52+
test/*
53+
features/*
54+
examples/*
55+
Guardfile
56+
Procfile
57+
.kitchen*
58+
kitchen.yml*
59+
.rubocop.yml
60+
spec/*
61+
Rakefile
62+
.travis.yml
63+
.foodcritic
64+
.codeclimate.yml
65+
66+
# SCM #
67+
#######
68+
.git
69+
*/.git
70+
.gitignore
71+
.gitmodules
72+
.gitconfig
73+
.gitattributes
74+
.svn
75+
*/.bzr/*
76+
*/.hg/*
77+
*/.svn/*
78+
79+
# Berkshelf #
80+
#############
81+
Berksfile
82+
Berksfile.lock
83+
cookbooks/*
84+
tmp
85+
86+
# Bundler #
87+
###########
88+
vendor/*
89+
90+
# Policyfile #
91+
##############
92+
Policyfile.rb
93+
Policyfile.lock.json
94+
95+
# Cookbooks #
96+
#############
97+
CONTRIBUTING*
98+
CHANGELOG*
99+
TESTING*
9100

10-
# tests
11-
*/*file
12-
*/*file.lock
13-
*/spec
14-
*/test
15-
*/bundle
16-
*/vendor
101+
# Vagrant #
102+
###########
103+
.vagrant
104+
Vagrantfile
17105

18-
# self
19-
*/chefignore
106+
# Others #
107+
##########
108+
.github/*
109+
coverage/*
110+
Gemfile
111+
Gemfile.lock
112+
chefignore

0 commit comments

Comments
 (0)