Skip to content

Commit

Permalink
rubocop cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
dpetzel committed Oct 25, 2015
1 parent 16076f4 commit 911ca1f
Show file tree
Hide file tree
Showing 16 changed files with 122 additions and 93 deletions.
9 changes: 9 additions & 0 deletions .rubocop.yml
Expand Up @@ -6,3 +6,12 @@ MethodLength:
Max: 50
HashSyntax:
Enabled: false

Metrics/ModuleLength:
Max: 169

Metrics/AbcSize:
Max: 41

Metrics/PerceivedComplexity:
Max: 8
2 changes: 0 additions & 2 deletions Berksfile
Expand Up @@ -4,5 +4,3 @@ metadata
cookbook 'minitest-handler_test1', path: 'test/cookbooks/minitest-handler_test1'
cookbook 'minitest-handler_test2', path: 'test/cookbooks/minitest-handler_test2'
cookbook 'chef_handler', :group => :integration


2 changes: 1 addition & 1 deletion Berksfile.lock
Expand Up @@ -10,7 +10,7 @@ DEPENDENCIES

GRAPH
chef_handler (1.1.6)
minitest-handler (1.3.3)
minitest-handler (1.4.1)
chef_handler (>= 0.0.0)
minitest-handler_test1 (0.0.1)
chef_handler (>= 0.0.0)
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,10 @@
Changelog
=====
### 1.5.0 UNRELEASED
* Upgrade ChefSpec from `4.0.0` to `4.4.0`
* Upgrade foodcritic from `4.0.0` to `5.0.0`
* Upgrade rubucop from `0.24.1` to `0.34.2`
* Address Chef 12 `compile_time` deprecations around `chef_gem` resources

### 1.4.0 (Jul 25, 2015)
* Add Chefspec tests for default recipe
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
@@ -1,9 +1,9 @@
source 'https://rubygems.org'

gem 'berkshelf', '~> 3.1'
gem 'chefspec', '~> 4.0.0'
gem 'rubocop', '= 0.24.1'
gem 'foodcritic', '~> 4.0'
gem 'berkshelf', '~> 3.3'
gem 'chefspec', '~> 4.4.0'
gem 'rubocop', '= 0.34.2'
gem 'foodcritic', '~> 5.0.0'
gem 'stove'

group :integration do
Expand Down
164 changes: 98 additions & 66 deletions Gemfile.lock
Expand Up @@ -8,7 +8,9 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
addressable (2.3.8)
ast (2.0.0)
ast (2.1.0)
astrolabe (1.3.1)
parser (~> 2.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
Expand All @@ -30,8 +32,8 @@ GEM
ridley (~> 4.0)
solve (~> 1.1)
thor (~> 0.19)
berkshelf-api-client (1.3.0)
faraday (~> 0.9.0)
berkshelf-api-client (1.3.1)
faraday (~> 0.9.1)
httpclient (~> 2.6.0)
buff-config (1.0.1)
buff-extensions (~> 1.0)
Expand All @@ -42,44 +44,53 @@ GEM
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
builder (3.2.2)
busser (0.6.0)
thor
busser (0.7.1)
thor (<= 0.19.0)
busser-bats (0.3.0)
busser
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid-io (0.16.2)
celluloid (>= 0.16.0)
nio4r (>= 1.1.0)
chef (11.18.12)
chef-zero (~> 2.2, >= 2.2.1)
chef (12.5.1)
chef-config (= 12.5.1)
chef-zero (~> 4.2, >= 4.2.2)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
ffi-yajl (~> 1.2)
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
mime-types (~> 1.16)
mixlib-authentication (~> 1.3)
mixlib-cli (~> 1.4)
mixlib-config (~> 2.0)
mixlib-log (~> 1.3)
mixlib-shellout (~> 1.4)
mixlib-shellout (~> 2.0)
net-ssh (~> 2.6)
net-ssh-multi (~> 1.1)
ohai (~> 7.4)
ohai (>= 8.6.0.alpha.1, < 9)
plist (~> 3.1.0)
pry (~> 0.9)
rest-client (>= 1.0.4, <= 1.6.7)
rspec-core (~> 3.2)
rspec-expectations (~> 3.2)
rspec-mocks (~> 3.2)
rspec_junit_formatter (~> 0.2.0)
serverspec (~> 2.7)
specinfra (~> 2.10)
syslog-logger (~> 1.6)
chef-api (0.5.0)
logify (~> 0.1)
mime-types
chef-zero (2.2.1)
ffi-yajl (~> 1.1)
hashie (~> 2.0)
chef-config (12.5.1)
mixlib-config (~> 2.0)
mixlib-shellout (~> 2.0)
chef-zero (4.3.2)
ffi-yajl (~> 2.2)
hashie (>= 2.0, < 4.0)
mixlib-log (~> 1.3)
rack
chefspec (4.0.0)
chef (~> 11.12)
fauxhai (~> 2.0)
uuidtools (~> 2.1)
chefspec (4.4.0)
chef (>= 11.14)
fauxhai (~> 2.3)
rspec (~> 3.0)
ci_reporter (1.9.3)
builder (>= 2.1.2)
Expand All @@ -94,53 +105,52 @@ GEM
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.2.5)
droplet_kit (1.2.3)
droplet_kit (1.3.0)
activesupport (> 3.0, < 5.0.0)
faraday (~> 0.9.1)
kartograph (~> 0.2.1)
resource_kit (~> 0.1.1)
kartograph (~> 0.2.3)
resource_kit (~> 0.1.4)
virtus (~> 1.0.3)
equalizer (0.0.11)
erubis (2.7.0)
faraday (0.9.1)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
fauxhai (2.3.0)
net-ssh
ohai
ffi (1.9.10)
ffi-yajl (1.4.0)
ffi (~> 1.5)
ffi-yajl (2.2.2)
libyajl2 (~> 1.2)
foodcritic (4.0.0)
foodcritic (5.0.0)
erubis
gherkin (~> 2.11)
nokogiri (~> 1.5)
nokogiri (>= 1.5, < 2.0)
rake
rufus-lru (~> 1.0)
treetop (~> 1.4)
yajl-ruby (~> 1.1)
gherkin (2.12.2)
multi_json (~> 1.3)
hashie (2.1.2)
highline (1.7.2)
hitimes (1.2.2)
hashie (3.4.2)
highline (1.7.8)
hitimes (1.2.3)
httpclient (2.6.0.1)
i18n (0.7.0)
ice_nine (0.11.1)
ipaddress (0.8.0)
json (1.8.3)
kartograph (0.2.2)
kitchen-digitalocean (0.9.2)
kartograph (0.2.3)
kitchen-digitalocean (0.9.3)
droplet_kit (~> 1.0)
test-kitchen (~> 1.2)
kitchen-docker (2.3.0)
test-kitchen (>= 1.0.0)
kitchen-vagrant (0.18.0)
kitchen-vagrant (0.19.0)
test-kitchen (~> 1.4)
libyajl2 (1.2.0)
logify (0.2.0)
method_source (0.8.2)
mime-types (1.25.1)
mime-types (2.6.2)
mini_portile (0.6.2)
minitar (0.5.4)
minitest (4.7.5)
Expand All @@ -153,10 +163,9 @@ GEM
mixlib-cli (1.5.0)
mixlib-config (2.2.1)
mixlib-log (1.6.0)
mixlib-shellout (1.6.1)
mixlib-shellout (2.2.3)
multi_json (1.11.2)
multipart-post (2.0.0)
net-http-persistent (2.9.4)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
Expand All @@ -165,40 +174,41 @@ GEM
net-ssh-multi (1.2.1)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
net-telnet (0.1.1)
nio4r (1.1.1)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
octokit (3.8.0)
sawyer (~> 0.6.0, >= 0.5.3)
ohai (7.4.1)
ohai (8.7.0)
chef-config (>= 12.5.0.alpha.1, < 13)
ffi (~> 1.9)
ffi-yajl (~> 1.1)
ffi-yajl (~> 2.2)
ipaddress
mime-types (~> 1.16)
mime-types (~> 2.0)
mixlib-cli
mixlib-config (~> 2.0)
mixlib-log
mixlib-shellout (~> 1.2)
mixlib-shellout (~> 2.0)
rake (~> 10.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
parser (2.3.0.pre.2)
parser (2.2.3.0)
ast (>= 1.1, < 3.0)
plist (3.1.0)
polyglot (0.3.5)
powerpack (0.0.9)
pry (0.10.1)
powerpack (0.1.1)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
rack (1.6.4)
rainbow (2.0.0)
rake (10.4.2)
resource_kit (0.1.3)
resource_kit (0.1.4)
addressable (~> 2.3.6)
rest-client (1.6.7)
mime-types (>= 1.16)
retryable (2.0.1)
ridley (4.2.0)
retryable (2.0.2)
ridley (4.3.2)
addressable
buff-config (~> 1.0)
buff-extensions (~> 1.0)
Expand All @@ -208,13 +218,13 @@ GEM
celluloid-io (~> 0.16.1)
erubis
faraday (~> 0.9.0)
hashie (>= 2.0.2, < 3.0.0)
hashie (>= 2.0.2, < 4.0.0)
httpclient (~> 2.6)
json (>= 1.7.7)
mixlib-authentication (>= 1.3.0)
net-http-persistent (>= 2.8)
retryable (~> 2.0)
semverse (~> 1.1)
varia_model (~> 0.4)
varia_model (~> 0.4.0)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
Expand All @@ -224,14 +234,20 @@ GEM
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
rubocop (0.24.1)
json (>= 1.7.7, < 2)
parser (>= 2.2.0.pre.3, < 3.0)
powerpack (~> 0.0.6)
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
rubocop (0.34.2)
astrolabe (~> 1.3)
parser (>= 2.2.2.5, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
ruby-progressbar (1.7.5)
Expand All @@ -241,30 +257,43 @@ GEM
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
semverse (1.2.1)
serverspec (2.24.1)
multi_json
rspec (~> 3.0)
rspec-its
specinfra (~> 2.43)
sfl (2.2)
slop (3.6.0)
solve (1.2.1)
dep_selector (~> 1.0)
semverse (~> 1.1)
specinfra (2.44.1)
net-scp
net-ssh (~> 2.7)
net-telnet
sfl
stove (3.2.7)
chef-api (~> 0.5)
logify (~> 0.2)
syslog-logger (1.6.8)
systemu (2.6.5)
test-kitchen (1.4.1)
test-kitchen (1.4.2)
mixlib-shellout (>= 1.2, < 3.0)
net-scp (~> 1.1)
net-ssh (~> 2.7)
net-ssh (~> 2.7, < 2.10)
safe_yaml (~> 1.0)
thor (~> 0.18)
thor (0.19.1)
thor (0.19.0)
thread_safe (0.3.5)
timers (4.0.1)
timers (4.0.4)
hitimes
treetop (1.6.3)
polyglot (~> 0.3)
tzinfo (0.3.44)
varia_model (0.4.0)
tzinfo (0.3.45)
uuidtools (2.1.5)
varia_model (0.4.1)
buff-extensions (~> 1.0)
hashie (>= 2.0.2, < 3.0.0)
hashie (>= 2.0.2, < 4.0.0)
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
Expand All @@ -277,16 +306,19 @@ PLATFORMS
ruby

DEPENDENCIES
berkshelf (~> 3.1)
berkshelf (~> 3.3)
busser-bats
chefspec (~> 4.0.0)
foodcritic (~> 4.0)
chefspec (~> 4.4.0)
foodcritic (~> 5.0.0)
kitchen-digitalocean
kitchen-docker
kitchen-vagrant (~> 0.14)
minitest (~> 4.7.0, >= 4.7.5)
minitest-chef-handler (~> 1.0.0, >= 1.0.3)
rake
rubocop (= 0.24.1)
rubocop (= 0.34.2)
stove
test-kitchen (~> 1.1)

BUNDLED WITH
1.10.7.depsolverfix.0

0 comments on commit 911ca1f

Please sign in to comment.