Skip to content

Commit

Permalink
Bump rubcop and autocorrect non application files
Browse files Browse the repository at this point in the history
  • Loading branch information
rossta committed Dec 9, 2017
1 parent 0a13140 commit 9d39111
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 20 deletions.
22 changes: 12 additions & 10 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ Metrics/CyclomaticComplexity:
Metrics/PerceivedComplexity:
Enabled: false

Metrics/BlockLength:
Enabled: false

Documentation:
Enabled: false # TODO: Enable again once we have more docs

Expand All @@ -56,13 +59,13 @@ Style/TrivialAccessors:
Style/HashSyntax:
Enabled: true

Style/MethodName:
Naming/MethodName:
Enabled: false

Style/AlignParameters:
Layout/AlignParameters:
EnforcedStyle: with_fixed_indentation

Style/AccessModifierIndentation:
Layout/AccessModifierIndentation:
Enabled: true

Style/StringLiterals:
Expand All @@ -71,7 +74,7 @@ Style/StringLiterals:
Style/StringLiteralsInInterpolation:
EnforcedStyle: double_quotes

Style/ClosingParenthesisIndentation:
Layout/ClosingParenthesisIndentation:
Enabled: false

Style/OneLineConditional:
Expand All @@ -83,8 +86,7 @@ Style/AndOr:
Style/Not:
Enabled: false

Style/CaseIndentation:
IndentWhenRelativeTo: case
Layout/CaseIndentation:
SupportedStyles:
- case
- end
Expand All @@ -95,13 +97,13 @@ Style/PercentLiteralDelimiters:
'%w': "[]"
'%W': "[]"

Style/AccessModifierIndentation:
Layout/AccessModifierIndentation:
EnforcedStyle: indent

Style/SignalException:
Enabled: false

Style/IndentationWidth:
Layout/IndentationWidth:
Enabled: false

Style/TrivialAccessors:
Expand All @@ -110,10 +112,10 @@ Style/TrivialAccessors:
Style/RegexpLiteral:
EnforcedStyle: percent_r

Style/DotPosition:
Layout/DotPosition:
EnforcedStyle: trailing

Style/VariableNumber:
Naming/VariableNumber:
Enabled: false

Style/FormatString:
Expand Down
2 changes: 2 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# frozen_string_literal: true

appraise "activesupport-5.1" do
gem "activesupport", "~> 5.1.0"
end
Expand Down
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# frozen_string_literal: true

source "https://rubygems.org"

gemspec

group :development do
gem "coveralls"
gem "guard", platforms: [:ruby_22, :ruby_23] # Guard no longer supports ruby 2.1
gem "guard-minitest", platforms: [:ruby_22, :ruby_23]
gem "guard-rubocop", platforms: [:ruby_22, :ruby_23]
gem "pry-byebug", platforms: [:ruby_21, :ruby_22, :ruby_23]
gem "guard", platforms: %i[ruby_22 ruby_23] # Guard no longer supports ruby 2.1
gem "guard-minitest", platforms: %i[ruby_22 ruby_23]
gem "guard-rubocop", platforms: %i[ruby_22 ruby_23]
gem "pry-byebug", platforms: %i[ruby_21 ruby_22 ruby_23]
gem "yard"
end
1 change: 1 addition & 0 deletions Guardfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

# A sample Guardfile
# More info at https://github.com/guard/guard#readme

Expand Down
3 changes: 2 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# frozen_string_literal: true

require "bundler/setup"
require "bundler/gem_tasks"
require "rake/testtask"
Expand All @@ -16,7 +17,7 @@ task test: :spec

RuboCop::RakeTask.new

task default: [:spec, :rubocop]
task default: %i[spec rubocop]

namespace :doc do
desc "Generate docs and publish to gh-pages"
Expand Down
10 changes: 5 additions & 5 deletions montrose.gemspec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# coding: utf-8
# frozen_string_literal: true

lib = File.expand_path("../lib", __FILE__)
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
require "montrose/version"
Expand All @@ -24,11 +24,11 @@ Gem::Specification.new do |spec|

spec.add_dependency "activesupport", ">= 4.1", "< 5.2"

spec.add_development_dependency "bundler", "~> 1.13"
spec.add_development_dependency "appraisal", "~> 2.2.0"
spec.add_development_dependency "rake", "~> 11.0"
spec.add_development_dependency "minitest", "~> 5.10"
spec.add_development_dependency "bundler", "~> 1.13"
spec.add_development_dependency "m", "~> 1.5"
spec.add_development_dependency "rubocop", "0.46.0"
spec.add_development_dependency "minitest", "~> 5.10"
spec.add_development_dependency "rake", "~> 11.0"
spec.add_development_dependency "rubocop", "0.51.0"
spec.add_development_dependency "timecop"
end

0 comments on commit 9d39111

Please sign in to comment.