Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bixby 2.0 #28

Merged
merged 2 commits into from
Feb 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bixby.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ Gem::Specification.new do |spec|
spec.name = 'bixby'
spec.require_paths = ['lib']

spec.version = '1.0.0'
spec.version = '2.0.0-beta1'
spec.license = 'Apache-2.0'

spec.add_dependency 'rubocop', '~> 0.50', '<= 0.52.1'
spec.add_dependency 'rubocop-rspec', '~> 1.22', '<= 1.22.2'
spec.add_dependency 'rubocop', '0.63.1'
spec.add_dependency 'rubocop-rspec', '1.31.0'
end
54 changes: 24 additions & 30 deletions bixby_default.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
AllCops:
TargetRubyVersion: 2.1
TargetRubyVersion: 2.3
DisabledByDefault: true
DisplayCopNames: true
Include:
- '**/Rakefile'
- '**/config.ru'
Exclude:
- 'db/**/*'
- 'script/**/*'
Expand All @@ -15,8 +12,6 @@ inherit_from:
- bixby_rails_enabled.yml
- bixby_rspec_enabled.yml

# These are all the cops that are enabled in the default configuration.

Style/Alias:
Enabled: true

Expand Down Expand Up @@ -122,9 +117,6 @@ Style/EvenOdd:
Style/FrozenStringLiteralComment:
Enabled: true

Style/FlipFlop:
Enabled: true

Style/For:
Enabled: true

Expand Down Expand Up @@ -173,7 +165,10 @@ Style/MethodCallWithoutArgsParentheses:
Style/MethodDefParentheses:
Enabled: true

Style/MethodMissing:
Style/MethodMissingSuper:
Enabled: true

Style/MissingRespondToMissing:
Enabled: true

Style/ModuleFunction:
Expand Down Expand Up @@ -328,7 +323,10 @@ Style/TernaryParentheses:
Style/TrailingCommaInArguments:
Enabled: true

Style/TrailingCommaInLiteral:
Style/TrailingCommaInArrayLiteral:
Enabled: true

Style/TrailingCommaInHashLiteral:
Enabled: true

Style/TrivialAccessors:
Expand Down Expand Up @@ -376,6 +374,9 @@ Layout/AlignHash:
Layout/AlignParameters:
Enabled: true

Layout/BlockAlignment:
Enabled: true

Layout/BlockEndNewline:
Enabled: true

Expand All @@ -385,15 +386,24 @@ Layout/CaseIndentation:
Layout/ClosingParenthesisIndentation:
Enabled: true

Layout/ConditionPosition:
Enabled: true

Layout/CommentIndentation:
Enabled: true

Layout/DefEndAlignment:
Enabled: true

Layout/DotPosition:
Enabled: true

Layout/ElseAlignment:
Enabled: true

Layout/EndAlignment:
Enabled: true

Layout/EmptyLineBetweenDefs:
Enabled: true

Expand Down Expand Up @@ -645,21 +655,12 @@ Lint/AmbiguousRegexpLiteral:
Lint/AssignmentInCondition:
Enabled: true

Lint/BlockAlignment:
Enabled: true

Lint/CircularArgumentReference:
Enabled: true

Lint/ConditionPosition:
Enabled: true

Lint/Debugger:
Enabled: true

Lint/DefEndAlignment:
Enabled: true

Lint/DeprecatedClassMethods:
Enabled: true

Expand Down Expand Up @@ -691,15 +692,15 @@ Lint/EmptyInterpolation:
Lint/EmptyWhen:
Enabled: true

Lint/EndAlignment:
Enabled: true

Lint/EndInMethod:
Enabled: true

Lint/EnsureReturn:
Enabled: true

Lint/FlipFlop:
Enabled: true

Lint/FloatOutOfRange:
Enabled: true

Expand Down Expand Up @@ -776,9 +777,6 @@ Lint/UnderscorePrefixedVariableName:
Lint/UnifiedInteger:
Enabled: true

Lint/UnneededDisable:
Enabled: true

Lint/UnneededSplatExpansion:
Enabled: true

Expand Down Expand Up @@ -856,10 +854,6 @@ Performance/FlatMap:
# This can be dangerous since `flat_map` will only flatten 1 level, and
# `flatten` without any parameters can flatten multiple levels.

Performance/HashEachMethods:
Enabled: true
AutoCorrect: false

Performance/LstripRstrip:
Enabled: true

Expand Down