Skip to content

Commit fe26800

Browse files
committed
Update rubocop config and bump test gems
Remove the development group since guard-foodcritic currently prevents us from bumping the Foodcritic gem to current
1 parent 1e3a323 commit fe26800

3 files changed

Lines changed: 10 additions & 19 deletions

File tree

.rubocop.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ Encoding:
1515
Enabled: false
1616
Style/FileName:
1717
Enabled: false
18+
Style/Alias:
19+
Enabled: false
20+
Style/SpaceBeforeFirstArg:
21+
Enabled: false
1822
LineLength:
1923
Enabled: false
2024
MethodLength:
@@ -23,9 +27,5 @@ Metrics/AbcSize:
2327
Enabled: false
2428
PerceivedComplexity:
2529
Enabled: false
26-
SingleSpaceBeforeFirstArg:
27-
Enabled: false
2830
Style/ClassAndModuleChildren:
2931
Enabled: false
30-
Style/FileName:
31-
Enabled: false

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ before_script:
4444
- sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
4545
- eval "$(/opt/chefdk/bin/chef shell-init bash)"
4646
- /opt/chefdk/embedded/bin/chef gem install kitchen-docker
47+
- /opt/chefdk/embedded/bin/chef gem install rubocop -v 0.37
4748
script:
4849
- /opt/chefdk/embedded/bin/chef --version
4950
- /opt/chefdk/embedded/bin/rubocop --version

Gemfile

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,19 @@ group :rake do
66
end
77

88
group :lint do
9-
gem 'foodcritic', '~> 5.0'
10-
gem 'rubocop', '~> 0.34'
9+
gem 'foodcritic', '~> 6.0'
10+
gem 'rubocop', '~> 0.37'
1111
end
1212

1313
group :unit do
14-
gem 'berkshelf', '~> 4.0'
15-
gem 'chefspec', '~> 4.4'
14+
gem 'berkshelf', '~> 4.1'
15+
gem 'chefspec', '~> 4.5'
1616
end
1717

1818
group :kitchen_common do
19-
gem 'test-kitchen', '~> 1.4'
19+
gem 'test-kitchen', '~> 1.5'
2020
end
2121

2222
group :kitchen_vagrant do
2323
gem 'kitchen-vagrant', '~> 0.19'
2424
end
25-
26-
group :development do
27-
gem 'ruby_gntp'
28-
gem 'growl'
29-
gem 'rb-fsevent'
30-
gem 'guard-kitchen'
31-
gem 'guard-foodcritic'
32-
gem 'guard-rubocop'
33-
gem 'stove'
34-
end

0 commit comments

Comments
 (0)