Skip to content

Commit

Permalink
Introduce rubocop
Browse files Browse the repository at this point in the history
  • Loading branch information
mirakui committed Sep 1, 2024
1 parent 4cfa0be commit 2fedcb1
Show file tree
Hide file tree
Showing 24 changed files with 445 additions and 136 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ name: Integration Test
on:
push:
branches:
- master
- main
- v1
pull_request:
branches:
- master
- main
- v1

env:
RUBY_VERSION: 3.3
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: RuboCop

on:
push:
branches:
- main
- v1
pull_request:
branches:
- main
- v1

jobs:
rubocop:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.3

- name: Install dependencies
run: bundle install

- name: Run RuboCop
run: bundle exec rubocop
4 changes: 2 additions & 2 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ name: Ruby

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
test:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
Gemfile.lock
*.gemfile.lock
.bundle/
tmp/
278 changes: 278 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,278 @@
---
# Referenced from https://github.com/rails/rails/blob/main/.rubocop.yml

require:
- rubocop-md

AllCops:
TargetRubyVersion: 3.3
DisabledByDefault: true
SuggestExtensions: false
Exclude:
- '**/tmp/**/*'

# Prefer &&/|| over and/or.
Style/AndOr:
Enabled: true

Layout/ClosingHeredocIndentation:
Enabled: true

Layout/ClosingParenthesisIndentation:
Enabled: true

# Align comments with method definitions.
Layout/CommentIndentation:
Enabled: true

Layout/DefEndAlignment:
Enabled: true

Layout/ElseAlignment:
Enabled: true

# Align `end` with the matching keyword or starting expression except for
# assignments, where it should be aligned with the LHS.
Layout/EndAlignment:
Enabled: true
EnforcedStyleAlignWith: variable
AutoCorrect: true

Layout/EndOfLine:
Enabled: true

Layout/EmptyLineAfterMagicComment:
Enabled: true

Layout/EmptyLinesAroundAccessModifier:
Enabled: true
EnforcedStyle: only_before

Layout/EmptyLinesAroundBlockBody:
Enabled: true

# In a regular class definition, no empty lines around the body.
Layout/EmptyLinesAroundClassBody:
Enabled: true

# In a regular method definition, no empty lines around the body.
Layout/EmptyLinesAroundMethodBody:
Enabled: true

# In a regular module definition, no empty lines around the body.
Layout/EmptyLinesAroundModuleBody:
Enabled: true

# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
Style/HashSyntax:
Enabled: true
EnforcedShorthandSyntax: either

# Method definitions after `private` or `protected` isolated calls need one
# extra level of indentation.
Layout/IndentationConsistency:
Enabled: true
EnforcedStyle: indented_internal_methods
Exclude:
- '**/*.md'

# Two spaces, no tabs (for indentation).
Layout/IndentationWidth:
Enabled: true

Layout/LeadingCommentSpace:
Enabled: true

Layout/SpaceAfterColon:
Enabled: true

Layout/SpaceAfterComma:
Enabled: true

Layout/SpaceAfterSemicolon:
Enabled: true

Layout/SpaceAroundEqualsInParameterDefault:
Enabled: false

Layout/SpaceAroundKeyword:
Enabled: true

Layout/SpaceAroundOperators:
Enabled: true

Layout/SpaceBeforeComma:
Enabled: true

Layout/SpaceBeforeComment:
Enabled: true

Layout/SpaceBeforeFirstArg:
Enabled: true

Style/DefWithParentheses:
Enabled: true

# Defining a method with parameters needs parentheses.
Style/MethodDefParentheses:
Enabled: true

Style/ExplicitBlockArgument:
Enabled: true

Style/MapToHash:
Enabled: true

Style/RedundantFreeze:
Enabled: true

# Use `foo {}` not `foo{}`.
Layout/SpaceBeforeBlockBraces:
Enabled: true

# Use `foo { bar }` not `foo {bar}`.
Layout/SpaceInsideBlockBraces:
Enabled: true
EnforcedStyleForEmptyBraces: space

# Use `{ a: 1 }` not `{a:1}`.
Layout/SpaceInsideHashLiteralBraces:
Enabled: true

Layout/SpaceInsideParens:
Enabled: true

# Check quotes usage according to lint rule below.
Style/StringLiterals:
Enabled: true

# Detect hard tabs, no hard tabs.
Layout/IndentationStyle:
Enabled: true

# Empty lines should not have any spaces.
Layout/TrailingEmptyLines:
Enabled: true

# No trailing whitespace.
Layout/TrailingWhitespace:
Enabled: true

# Use quotes for string literals when they are enough.
Style/RedundantPercentQ:
Enabled: true

Lint/AmbiguousOperator:
Enabled: true

Lint/AmbiguousRegexpLiteral:
Enabled: true

Lint/Debugger:
Enabled: true
DebuggerRequires:
- debug

Lint/DuplicateRequire:
Enabled: true

Lint/DuplicateMagicComment:
Enabled: true

Lint/DuplicateMethods:
Enabled: true

Lint/ErbNewArguments:
Enabled: true

Lint/EnsureReturn:
Enabled: true

Lint/MissingCopEnableDirective:
Enabled: true

# Use my_method(my_arg) not my_method( my_arg ) or my_method my_arg.
Lint/RequireParentheses:
Enabled: true

Lint/RedundantCopDisableDirective:
Enabled: true

Lint/RedundantCopEnableDirective:
Enabled: true

Lint/RedundantRequireStatement:
Enabled: true

Lint/RedundantStringCoercion:
Enabled: true

Lint/RedundantSafeNavigation:
Enabled: true

Lint/UriEscapeUnescape:
Enabled: true

Lint/UselessAssignment:
Enabled: true

Lint/DeprecatedClassMethods:
Enabled: true

Lint/InterpolationCheck:
Enabled: true

Lint/SafeNavigationChain:
Enabled: true

Style/EvalWithLocation:
Enabled: false

Style/ParenthesesAroundCondition:
Enabled: true

Style/HashTransformKeys:
Enabled: true

Style/HashTransformValues:
Enabled: true

Style/RedundantBegin:
Enabled: true

Style/RedundantReturn:
Enabled: true
AllowMultipleReturnValues: true

Style/RedundantRegexpEscape:
Enabled: true

Style/Semicolon:
Enabled: true
AllowAsExpressionSeparator: true

# Prefer Foo.method over Foo::method
Style/ColonMethodCall:
Enabled: true

Style/TrivialAccessors:
Enabled: true

# Prefer a = b || c over a = b ? b : c
Style/RedundantCondition:
Enabled: true

Style/RedundantDoubleSplatHashBraces:
Enabled: true

Style/OpenStructUse:
Enabled: true

Style/ArrayIntersect:
Enabled: true

Markdown:
# Whether to run RuboCop against non-valid snippets
WarnInvalid: true
# Whether to lint codeblocks without code attributes
Autodetect: false
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@ source 'https://rubygems.org'

gemspec

gem 'rspec', '~> 3.13'
gem 'appraisal', '~> 2.5'
gem 'rspec'
gem 'appraisal'
gem 'rubocop'
gem 'rubocop-md'
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class QueryTracer < Arproxy::Base
end

Arproxy.configure do |config|
config.adapter = "mysql2" # A DB Apdapter name which is used in your database.yml
config.adapter = 'mysql2' # A DB Apdapter name which is used in your database.yml
config.use QueryTracer
end
Arproxy.enable!
Expand All @@ -27,7 +27,7 @@ Then you can see the backtrace of SQLs in the Rails' log.

```ruby
# In your Rails code
MyTable.where(:id => id).limit(1) # => The SQL and the backtrace appear in the log
MyTable.where(id: id).limit(1) # => The SQL and the backtrace appear in the log
```

## Architecture
Expand All @@ -43,7 +43,7 @@ With Arproxy:

```ruby
Arproxy.configure do |config|
config.adapter = "mysql2"
config.adapter = 'mysql2'
config.use MyProxy1
config.use MyProxy2
end
Expand Down Expand Up @@ -82,7 +82,7 @@ end
```ruby
class CommentAdder < Arproxy::Base
def execute(sql, name=nil)
sql += " /*this_is_comment*/"
sql += ' /*this_is_comment*/'
super(sql, name)
end
end
Expand Down
6 changes: 3 additions & 3 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "bundler/gem_tasks"
require "rspec/core/rake_task"
require 'bundler/gem_tasks'
require 'rspec/core/rake_task'

RSpec::Core::RakeTask.new(:spec)

task :default => :spec
task default: :spec
Loading

0 comments on commit 2fedcb1

Please sign in to comment.