fablicop 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b5caa1ee8828550cee968cb6207cc13bed218e6807a40411856ba69a43cb534
-  data.tar.gz: 8cb4ecff9101a1e21e308b7bb72614c1f85311dd5a089bf8802c2d14b9907f50
+  metadata.gz: 6569d42b358ee7df8ca5eabfa95d57750e05dd57cb80f2994f54b9cab6658816
+  data.tar.gz: 36dbc034a61fe4c3d972d3b5fdfc53603cfc1fed4bdf1ae58f22c64ab3c98977
 SHA512:
-  metadata.gz: af21d0e9d4474a040648c2163ae72555c5c10d887793a4c5cbb7337ef59039355b00eb6223bc13a2d2f24e00a02524991a63bd2ea01d00039cd7fdbac1618d0d
-  data.tar.gz: 4c3bc61b9626a3b899e84cc6cfeedcf1971cc9d8ca048e9332d6fcd9813fc5d82fa9be4e97d3fbdac17b0a15e14c52cef252cde9a158a8de1fe00e4d57cba03d
+  metadata.gz: dc26ed8cebee6f4bbbe62e7d34f42a244badecafcbae9c58c63a011e50a2b612d431f51d8202351031594ca55e2e48d4d2ef8c1eb9daca52c065801f39c31204
+  data.tar.gz: ecb8d33f436d7b3c4e1d657b57438785952a6038d8eb055ca777a9ddf04bf091f734d7d32447364eccddcd58871363a7d24b15b16da2ebcf88d9828c6b3a4f4b

data/.github/workflows/run-ci.yml

@@ -1,17 +1,36 @@
 name: Run CI
 
-on: push
+on:
+  push:
+    branches: ["master"]
+    tags: ["**"]
+  pull_request:
 
 jobs:
   'run-ci':
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-      uses: ruby/setup-ruby@v1
+    - uses: ruby/setup-ruby@v1
       with:
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run rspecs
-      run: bundle exec rspec
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rspec
+
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.5", "2.6", "2.7", "3.0"]
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rubocop

data/.rubocop.yml

@@ -1 +1,4 @@
 inherit_from: config/.base_rubocop.yml
+
+Rails:
+  Enabled: false

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fablicop.gemspec

data/README.md

@@ -1,39 +1,51 @@
 # fablicop
 
 fablicop is a RuboCop configration gem.
+It assumes your project is using Ruby on Rails, so some Cops prefixed with `Rails` are enabled out of the box.
+In other words, it's not appropriate to use it with non-Rails projects.
 
-## Usage
+## Installation
+
+You can install fablicop with this command:
+
+```console
+gem install fablicop
+```
+
+Or, run `bundle install` after adding this line to your application's Gemfile:
+
+```ruby
+gem 'fablicop', require: false
+```
+
+## Getting started
 
-Setup .rubocop.yml
+Set up `.rubocop.yml` with the command below.
 
-```sh
-bundle exec fablicop init
+```console
+fablicop init
 ```
 
-`init` generate the following directive to your `.rubocop.yml`:
+`init` generates the following directive to your `.rubocop.yml`:
 
 ```yaml
 inherit_gem:
   fablicop:
     - "config/.base_rubocop.yml"
-    # uncomment if use rails cops
-    # - "config/rails.yml"
-    # uncomment if use rspec cops
-    # - "config/rspec.yml"
 ```
 
-```sh
-bundle exec rubocop <options...>
-```
+## Usage
 
-## Installation
+After configuration, your RuboCop now sees fablicop's configuration. Just run `rubocop` as usual.
+
+```console
+rubocop
+```
 
-Add this line to your application's Gemfile:
+Or, prefix `bundle exec`.
 
-```ruby
-group :development do
-  gem "fablicop", require: false
-end
+```console
+bundle exec rubocop
 ```
 
 ## Contributing

data/Rakefile

@@ -1,2 +1,4 @@
-require "bundler/gem_tasks"
-task :default => :spec
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "fablicop"
+require 'bundler/setup'
+require 'fablicop'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "fablicop"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/config/.base_rubocop.yml

@@ -1,10 +1,11 @@
 require:
   - rubocop-rails
+  - rubocop-rspec
 
-# 自動生成されるものやテストデータはチェック対象から除外する
+# We exclude files that are generated automatically or test data.
 AllCops:
   Exclude:
-    - "vendor/**/*" # rubocop config/default.yml
+    - "vendor/**/*"
     - "db/schema.rb"
     - "db/migrate/*"
     - "db/fixtures/**/*"
@@ -13,12 +14,12 @@ AllCops:
     - "spec/test_app/db/*"
 
   DisplayCopNames: true
-  NewCops: enable # 新しい規約も随時取り入れる
+  NewCops: enable
 
 Rails:
   Enabled: true
 
-# rails >= 5 の設定のため
+# For rails >= 5. TODO: This should be enabled in my opinion.
 Rails/HttpPositionalArguments:
   Enabled: false
 
@@ -38,11 +39,11 @@ Gemspec/OrderedDependencies:
 
 ##################### Style ##################################
 
-# 日本語のコメントを許可する
+# We sometimes use non-ascii comments.
 Style/AsciiComments:
   Enabled: false
 
-# 複数行の場合は末尾にカンマを入れる
+# We prefer trailing comma all the time.
 Style/TrailingCommaInArrayLiteral:
   EnforcedStyleForMultiline: comma
 Style/TrailingCommaInHashLiteral:
@@ -50,32 +51,22 @@ Style/TrailingCommaInHashLiteral:
 Style/TrailingCommaInArguments:
   EnforcedStyleForMultiline: comma
 
-# class先頭のコメントを省略する
+# We sometimes omit the top-level documentation for classes/modules.
 Style/Documentation:
     Enabled: false
 
-# selfは省略しない
+# We sometimes want to use `self` anyway.
 Style/RedundantSelf:
     Enabled: false
 
-# 以下の2つのあわせ技で、こういうのを許可
+# We want to allow the code like this:
+#
 #   xs.select {
 #     f x
 #   }.map { |x|
 #     f x
 #     f x
 #   }.compact
-# Rubocopの意図としては、おそらく
-# * ブロックのあとにメソッドをチェインされると読みにくい(主観)
-# * ブロックの終わりを`}`ではなく`end`にすることで、defとかifとかと終了を揃える
-# だと思うけど、むしろ一旦変数に入れて改めてメソッド適用する方がかえって読みにくいと思うし(主観)、
-# 返り値を使う場合はブロックの終わりをendにせず}にしないとメソッド結合順序の関係などでやばいので
-# Style/BlockDelimitersとStyle/MultilineBlockChainはよくないと判断。
-#
-# 「返り値を目的とするブロック引数」には{}を、「副作用を目的とするブロック引数」にはdo/endを
-# 使うようにすると、可読性的にもメソッドの結合順序的にも実用上便利。
-# これが正しく運用されてるかどうかはgrammerではなくsemanticの話なので、レビュワーの人間が
-# 見ることになり、それは直感的な気がする (再び主観)
 Style/BlockDelimiters:
   Enabled: false
 Style/MultilineBlockChain:
@@ -83,7 +74,7 @@ Style/MultilineBlockChain:
 Style/EmptyMethod:
   Enabled: false
 
-# 候補が多いときはcondみたいに使いたい
+# We sometimes want to use empty case when there are many conditions.
 Style/EmptyCaseCondition:
   Enabled: false
 
@@ -99,19 +90,19 @@ Style/MethodCallWithoutArgsParentheses:
 Style/DefWithParentheses:
   Enabled: false
 
-# classが入れ子になった場合、テストの順番によってはエラーになりうる
+# This might not be a style cop because errors happen due to the order of tests with nested classes/modules.
 Style/ClassAndModuleChildren:
   Exclude:
     - "test/**/*.rb"
     - "spec/**/*.rb"
 
-# 3桁ごとに_を入れるとSQLの表示方法と乖離するためfixtureは対象外
+# This style differs from the expression of SQL.
 Style/NumericLiterals:
   Exclude:
     - "db/fixtures/*.rb"
 
 ##################### Layout ##################################
-# 引数前のスペースは複数許可
+# We sometimes want to put multiple spaces before arguments.
 Layout/SpaceBeforeFirstArg:
   Enabled: false
 Layout/SpaceInLambdaLiteral:
@@ -119,7 +110,8 @@ Layout/SpaceInLambdaLiteral:
 Layout/HeredocIndentation:
   Enabled: false
 
-# 引数の書き方の多様性を許可
+# We want to allow various expression for arguments.
+#
 # foo(a,
 #  b
 # )
@@ -134,7 +126,9 @@ Layout/HeredocIndentation:
 #  b)
 Layout/MultilineMethodCallBraceLayout:
   Enabled: false
-# メソッド指定の多様性を許可
+
+# We don't want to enforce various method calls.
+#
 # while a
 # .b
 #   something
@@ -153,27 +147,30 @@ Layout/MultilineMethodCallBraceLayout:
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
+# Sometimes, we want to write like this:
+#
 # aaa(bbb(
 #   ccc
 # ))
-# 的なのができないのは不便すぎるのでdisable
 Layout/FirstParameterIndentation:
   Enabled: false
 
-# 以下の両方を許容
+# We want to allow both of them:
+#
 #   aaa.
 #     bb().
 #     cc()
 #   aaa
 #     .bb()
 #     .cc()
-# 前者は途中にコメントをはさむことができて実用上圧倒的に便利.
-# 後者はデフォルトでrubocopがおすすめしてるやつ
+#
+# The first one allows us to insert comments, and it would be convenient.
+# The second one is the default of this Cop.
 Layout/DotPosition:
   Enabled: false
 
-# fixtureファイルの1行 -> DBの1レコードとして記述している
-# 複数行にまたがると直感的でなくなるため無効化
+# We want to consistently write fixture files with the rule: 1 line for 1 record.
+# It's not intuitive with multiple lines.
 Layout/ClosingParenthesisIndentation:
   Exclude:
     - "db/fixtures/*.rb"
@@ -181,30 +178,27 @@ Layout/ParameterAlignment:
   Exclude:
     - "db/fixtures/*.rb"
 
-# * 警告 120文字
-# * 禁止 160文字
-# のイメージ
 Layout/LineLength:
   Max: 160
   Exclude:
     - "db/migrate/*.rb"
-    - "db/fixtures/*.rb" # カラムが多い、もしくは文章が含まれるfixtureは一行が長くなってしまうため無効化
+    - "db/fixtures/*.rb" # Fixture files usually include long lines.
 
 ##################### Lint ##################################
 
-# 引数前のスペースを許容する
+# We sometimes want to put spaces before arguments.
 Lint/ParenthesesAsGroupedExpression:
     Enabled: false
 
 ##################### Metrics ##################################
 
-# 20 行超えるのは migration ファイル以外滅多に無い
+# There is something wrong with more than 20 lines aside from migration files.
 Metrics/MethodLength:
   Max: 20
   Exclude:
     - "db/migrate/*.rb"
 
-# キーワード引数は引数の数に含めない
+# We want to measure this metrics without keyword arguments.
 Metrics/ParameterLists:
   CountKeywordArgs: false
 

data/exe/fablicop

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../lib"
+$LOAD_PATH.prepend File.join(__dir__.to_s, '..', 'lib')
 
 # Exit cleanly from an early interrupt
-Signal.trap("INT") { exit 1 }
+Signal.trap('INT') { exit 1 }
 
-require "fablicop"
+require 'fablicop'
 
 Fablicop::CLI.start(ARGV)

data/fablicop.gemspec

@@ -1,40 +1,43 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fablicop/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "fablicop"
+  spec.name          = 'fablicop'
   spec.version       = Fablicop::VERSION
-  spec.authors       = ["tommy", "ujihisa", "sinamon129"]
-  spec.email         = ["kazushige_tominaga@fablic.co.jp", "tatsuhiro_ujihisa@fablic.co.jp", "shihomi_katayama@fablic.co.jp"]
+  spec.authors       = %w[tommy ujihisa sinamon129]
+  spec.email         = ['kazushige_tominaga@fablic.co.jp', 'tatsuhiro_ujihisa@fablic.co.jp', 'shihomi_katayama@fablic.co.jp']
 
-  spec.summary       = "fablicop is a RuboCop configration gem. "
-  spec.description   = "fablicop is a RuboCop configration gem."
-  spec.homepage      = "https://github.com/Fablic/fablicop"
-  spec.license       = "MIT"
+  spec.summary       = 'fablicop is a RuboCop configration gem. '
+  spec.description   = 'fablicop is a RuboCop configration gem.'
+  spec.homepage      = 'https://github.com/Fablic/fablicop'
+  spec.license       = 'MIT'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  #if spec.respond_to?(:metadata)
+  # if spec.respond_to?(:metadata)
   #  spec.metadata['allowed_push_host'] = "TODO: Set to 'http://mygemserver.com'"
-  #else
+  # else
   #  raise "RubyGems 2.0 or newer is required to protect against " \
   #    "public gem pushes."
-  #end
+  # end
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  spec.required_ruby_version = '>= 2.5.0'
 
-  spec.add_dependency "rubocop", "~> 1.14.0"
-  spec.add_dependency "rubocop-rspec", ">= 1.15.1"
-  spec.add_dependency "rubocop-rails"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "rake"
+  spec.add_dependency 'rubocop', '~> 1.14.0'
+  spec.add_dependency 'rubocop-rspec', '>= 1.15.1'
+  spec.add_dependency 'rubocop-rails'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rake'
   spec.add_development_dependency 'byebug'
 end

data/lib/fablicop/cli.rb

@@ -1,4 +1,7 @@
-require "fileutils"
+# frozen_string_literal: true
+
+require 'fileutils'
+
 module Fablicop
   class CLI
     def self.start(args)
@@ -17,26 +20,27 @@ module Fablicop
       puts "Could not find command #{action_name}."
       print_help
       exit(1)
-    rescue => e
+    rescue StandardError => e
       puts e.message
       exit(1)
     end
 
     def self.retrieve_command_name(args)
       meth = args.first.to_s unless args.empty?
-      args.shift if meth && (meth !~ /^\-/)
+      args.shift if meth && (meth !~ /^-/)
     end
 
     def self.print_help
-      puts "fablicop commands:"
-      puts "  init - Setup .rubocop.yml"
+      puts 'fablicop commands:'
+      puts '  init - Setup .rubocop.yml'
     end
 
-    CONFIG_FILE_NAME = ".rubocop.yml"
+    CONFIG_FILE_NAME = '.rubocop.yml'
     def init(args)
-      raise "usage: fablicop init" unless args.empty?
-      template_path = File.expand_path("../../templates", __dir__)
-      puts "#{File.exist?(CONFIG_FILE_NAME) ? "overwrite" : "create"} #{CONFIG_FILE_NAME}"
+      raise 'usage: fablicop init' unless args.empty?
+
+      template_path = File.expand_path('../../templates', __dir__)
+      puts "#{File.exist?(CONFIG_FILE_NAME) ? 'overwrite' : 'create'} #{CONFIG_FILE_NAME}"
       FileUtils.copy_file(File.join(template_path, CONFIG_FILE_NAME), CONFIG_FILE_NAME)
     end
   end

data/lib/fablicop/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Fablicop
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/fablicop.rb

@@ -1,5 +1,7 @@
-require "fablicop/cli"
-require "fablicop/version"
+# frozen_string_literal: true
+
+require 'fablicop/cli'
+require 'fablicop/version'
 
 module Fablicop
   # Your code goes here...

data/templates/.rubocop.yml

@@ -1,7 +1,3 @@
 inherit_gem:
   fablicop:
     - "config/.base_rubocop.yml"
-    # uncomment if use rails cops
-    # - "config/rails.yml"
-    # uncomment if use rspec cops
-    # - "config/rspec.yml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fablicop
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - tommy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-01 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -124,7 +124,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -151,15 +150,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: fablicop is a RuboCop configration gem.

data/.ruby-version

@@ -1 +0,0 @@
-2.5.5