Skip to content

Commit

Permalink
Upgrade RuboCop
Browse files Browse the repository at this point in the history
  • Loading branch information
johnallen3d committed Jun 4, 2020
1 parent 5fa105c commit d607c34
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 19 deletions.
18 changes: 4 additions & 14 deletions .rubocop.yml
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.3
TargetRubyVersion: 2.4
Exclude:
- vendor/**
- bin/**
Expand All @@ -19,17 +19,7 @@ Style/FrozenStringLiteralComment:
# in each file to enable/check for it
Enabled: false

AlignParameters:
# allow for multi-line methods to have normal indentation.
# for example:
#
# Person.where(
# first_name: 'tom',
# last_name: 'foolery'
# )
EnforcedStyle: with_fixed_indentation

Layout/AlignParameters:
Layout/ParameterAlignment:
# allow for end of if to be aligned with a variable.
# for example:
#
Expand All @@ -40,7 +30,7 @@ Layout/AlignParameters:
# end
EnforcedStyle: with_fixed_indentation

Layout/AlignHash:
Layout/HashAlignment:
EnforcedHashRocketStyle: table

Layout/MultilineMethodCallIndentation:
Expand Down Expand Up @@ -81,7 +71,7 @@ Naming/FileName:
Exclude:
- Dangerfile

Naming/UncommunicativeMethodParamName:
Naming/MethodParameterName:
AllowedNames:
- _

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM docker/compose:1.19.0
FROM docker/compose:1.26.0

WORKDIR /usr/src/app

Expand All @@ -18,7 +18,7 @@ RUN \
ruby-json

RUN \
bundle install --gemfile=/usr/src/app/Gemfile --clean -j4
bundle install --gemfile=/usr/src/app/Gemfile --clean --force -j4

ENTRYPOINT []

Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Expand Up @@ -19,6 +19,6 @@ begin

task spec: %w(rspec:unit rspec:integration)
task default: %i(spec)
rescue LoadError # rubocop:disable Lint/HandleExceptions
rescue LoadError
# no rspec available
end
3 changes: 2 additions & 1 deletion nib.gemspec
Expand Up @@ -13,7 +13,7 @@ Gem::Specification.new do |s|
nib is a docker-compose wrapper geared towards Ruby/Rails development.
DESCRIPTION

s.required_ruby_version = '>= 2.3.0'
s.required_ruby_version = '>= 2.4.0'

s.files = Dir['lib/**/*.rb'] | Dir['config/**/*'] | ['VERSION']
s.require_paths << 'lib'
Expand All @@ -23,6 +23,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency('gli', '~> 2.16')

s.add_development_dependency('codeclimate-test-reporter', '~> 1.0.7')
s.add_development_dependency('did_you_mean')
s.add_development_dependency('guard')
s.add_development_dependency('guard-rspec')
s.add_development_dependency('guard-rubocop')
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Expand Up @@ -4,7 +4,7 @@
require 'pry'
require 'nib'

Dir['./spec/support/**/*.rb'].each { |f| require f }
Dir['./spec/support/**/*.rb'].sort.each { |f| require f }

# This file was generated by the `rspec --init` command. Conventionally, all
# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
Expand Down

0 comments on commit d607c34

Please sign in to comment.