yoshiki 8.0.0.pre.2 → 8.0.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d18fa7b1fe0b0ef1eed0cc107f3e610f22ced50865ad6c377195c027bfa8971e
-  data.tar.gz: 1957ce60a48c40ad0efadfe6f48d4371cad1a98e1dc24d16afdacbc9b2e786e9
+  metadata.gz: 1c2ce052efa139c62c9884b889a595326cec7b3e605812a03eadf0255b5eb5f0
+  data.tar.gz: 1a1d01a80cca93592739cf9fd4fe4a3ecb885bf735c5ae528dabe1bffc8a0a65
 SHA512:
-  metadata.gz: d2e63fdcd15134039cdcc5a3aec1baa4b38a9a66c2caacc946c74e5488d046281ab003fdb64a6b26b709ed799a614bb04a9c37b5883832c5018520d0a73957a2
-  data.tar.gz: dd630f851c64b6c9e8e7f4fc2abe0cdcff927ac6a32878bdb21127d6b443660af3c22158980cbdd55382af05ef3b3ac126f49c6f5982e83ec18cb1745c65162a
+  metadata.gz: fbf0c36520c0893fcb0e053137dd9a85cee48f15798f92d8f5fcfae3cce4444cff6cb95f8f556698b4cd0c6be1a7a22f0a41d62b41bea74aebb7cfa63762b06b
+  data.tar.gz: 2e7bdaade43f655ee9b98127e9ac03018666a65cbeb47f546702b52f1e97697bcc02512bb8d7fc642d3d3cbb9d1fb34b8c56d18dda9b2ab5c84a41449762d458

data/.rubocop.yml

@@ -4,7 +4,7 @@ AllCops:
 inherit_from:
   - .rubocop-defaults.yml
   - .rubocop-defaults-rails.yml
-  - .devfu-rubocop.yml
+  - .yoshiki.yml
 
 Naming/FileName:
   Exclude:

data/.yoshiki-rails.yml

@@ -0,0 +1,39 @@
+require:
+  - rubocop-rails
+
+AllCops:
+  Exclude:
+    - db/schema.rb
+    - lib/generators/**/*
+    - lib/templates/**/*
+    - vendor/**/*
+
+Rails:
+  Enabled: true
+
+Capybara/SpecificFinders: # new in 2.13
+  Enabled: false # prefer find('#css-id')
+
+FactoryBot/ConsistentParenthesesStyle: # new in 2.14
+  Enabled: true
+  EnforcedStyle: omit_parentheses # default is `require_parentheses`
+
+Rails/Inquiry: # new in 2.7
+  Enabled: false
+Rails/Output:
+  Exclude:
+    - 'config/unicorn.rb'
+Rails/PluckInWhere: # new in 2.7
+  Enabled: true
+  EnforcedStyle: aggressive # default is `conservative`
+Rails/ReadWriteAttribute:
+  Enabled: false
+Rails/ShortI18n: # new in 2.7
+  Enabled: true
+  EnforcedStyle: aggressive # default is `conservative`
+Rails/SkipsModelValidations:
+  Enabled: false
+Rails/ToFormattedS: # new in 2.15
+  Enabled: false # prefer to_s(:format)
+Rails/ToSWithArgument: # new in 2.16
+  Enabled: false # prefer to_s(:format)

data/{.devfu-rubocop.yml → .yoshiki-ruby.yml}

@@ -1,39 +1,28 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true
   ExtraDetails: true
+
   Exclude:
     - bin/**/*
-    - db/schema.rb
     - Gemfile.lock
-    - lib/generators/**/*
-    - lib/templates/**/*
-    - vendor/**/*
-
-Capybara/SpecificFinders: # new in 2.13
-  Enabled: false # prefer find('#css-id')
-
-FactoryBot/ConsistentParenthesesStyle: # new in 2.14
-  Enabled: true
-  EnforcedStyle: omit_parentheses # default is `require_parentheses`
 
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent # default is `indent`
-
 Layout/BeginEndAlignment:
   EnforcedStyleAlignWith: begin # default is `start_of_line`
-
 Layout/CaseIndentation:
   EnforcedStyle: end  # default is `case`
   IndentOneStep: true # default is `false`
-
 Layout/CommentIndentation:
   AllowForAlignment: true # default is `false`
-
 Layout/DefEndAlignment:
   EnforcedStyleAlignWith: def # default is `start_of_line`
   AutoCorrect: true
-
 Layout/EmptyLineBetweenDefs:
   AllowAdjacentOneLineDefs: true
   DefLikeMacros: # default is `[]`
@@ -45,59 +34,42 @@ Layout/EmptyLineBetweenDefs:
     - let
     - let!
     - subject
-
 Layout/EmptyLinesAroundBlockBody:
   Exclude:        # mostly *no* but yes
     - spec/**/*   # - for rspec context/describe
     - '**/*.rake' # - rake namespaces
-
 Layout/EmptyLinesAroundClassBody:
   EnforcedStyle: empty_lines_except_namespace # default is `no_empty_lines`
-
 Layout/EmptyLinesAroundModuleBody:
   EnforcedStyle: empty_lines_except_namespace # default is `no_empty_lines`
-
 Layout/ExtraSpacing:
   ForceEqualSignAlignment: true # default is `false`
   Exclude:
     - Gemfile
-
 Layout/HashAlignment:
   EnforcedHashRocketStyle: table # default is `key`
   EnforcedColonStyle:      table # default is `key`
-
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented # default is `aligned`
-
 Layout/SpaceInsideArrayLiteralBrackets:
   EnforcedStyle: space # default is `no_space`
   EnforcedStyleForEmptyBrackets: no_space
-
 Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false # doesn't support the `space` enforced style
-
 Layout/SpaceInsideStringInterpolation:
   EnforcedStyle: space # default is `no_space`
-
-# this cop now allows configuration with `AllowedMethods` & `AllowedPatterns`
-Lint/AmbiguousBlockAssociation:
+Lint/AmbiguousBlockAssociation: # this cop allows configuration with `AllowedMethods` & `AllowedPatterns`
   Enabled: true
-
 Lint/AmbiguousOperator:
   Enabled: false
-
 Lint/AmbiguousRegexpLiteral:
   Enabled: false
-
 Lint/AssignmentInCondition:
   Enabled: false
-
 Lint/RedundantSplatExpansion:
   Enabled: false
 
-# this cop now allows configuration with AllowedMethods, AllowedPatterns,
-# and CountAsOne
-Metrics/BlockLength:
+Metrics/BlockLength: # this cop allows configuration with AllowedMethods, AllowedPatterns, & CountAsOne
   AllowedMethods:
     - describe
     - context
@@ -105,26 +77,19 @@ Metrics/BlockLength:
     - array
     - heredoc
     - method_call
-
-# this cop now allows configuration with AllowedMethods, AllowedPatterns,
-# and CountAsOne
-Metrics/MethodLength:
+Metrics/MethodLength:  # this cop allows configuration with AllowedMethods, AllowedPatterns, & CountAsOne
   Exclude:
     - db/migrate/**/*
-
 Metrics/ParameterLists:
   CountKeywordArgs: false
 
 Naming/AsciiIdentifiers:
   Enabled: false
-
 Naming/BlockForwarding: # new in 1.24
   Enabled: true
   EnforcedStyle: explicit # default is `anonymous`
-
 Naming/InclusiveLanguage:
   Enabled: false
-
 Naming/PredicateName:
   NamePrefix:
     - is_
@@ -136,33 +101,6 @@ Naming/PredicateName:
   AllowedMethods:
     - is_a?
 
-Rails/Inquiry: # new in 2.7
-  Enabled: false
-
-Rails/Output:
-  Exclude:
-    - 'config/unicorn.rb'
-
-Rails/PluckInWhere: # new in 2.7
-  Enabled: true
-  EnforcedStyle: aggressive # default is `conservative`
-
-Rails/ReadWriteAttribute:
-  Enabled: false
-
-Rails/ShortI18n: # new in 2.7
-  Enabled: true
-  EnforcedStyle: aggressive # default is `conservative`
-
-Rails/SkipsModelValidations:
-  Enabled: false
-
-Rails/ToFormattedS: # new in 2.15
-  Enabled: false # prefer to_s(:format)
-
-Rails/ToSWithArgument: # new in 2.16
-  Enabled: false # prefer to_s(:format)
-
 RSpec/ContextWording:
   Prefixes:
     - as a
@@ -172,75 +110,54 @@ RSpec/ContextWording:
     - when
     - with
     - without
-
 RSpec/ImplicitExpect:
   EnforcedStyle: should
-
 RSpec/ImplicitSubject:
   EnforcedStyle: single_statement_only # default is `single_line_only`
-
 RSpec/LeadingSubject:
   Enabled: false # prefer subject after all let and let!
-
-# this cop can be configured with `AllowedGroups`
-RSpec/NestedGroups:
+RSpec/NestedGroups: # this cop can be configured with `AllowedGroups`
   Enabled: false
-
 RSpec/PendingWithoutReason: # new in 2.16
   Enabled: false
 
 Style/AndOr:
   Enabled: false
-
 Style/AsciiComments:
   Enabled: false
-
 Style/BarePercentLiterals:
   EnforcedStyle: percent_q # default is `bare_percent`
-
 Style/CommandLiteral:
   EnforcedStyle: mixed # default is `backticks`
-
 Style/Documentation: # default config doesn't exclude migrations
   Exclude:
     - 'db/migrate/**/*'
     - 'spec/**/*'
     - 'test/**/*'
-
 Style/DoubleNegation:
   Enabled: false
-
 Style/EndlessMethod: # new in 1.8
   Enabled: true
   EnforcedStyle: disallow # default is `allow_single_line`
-
 Style/HashSyntax:
   EnforcedShorthandSyntax: consistent # default is `always`
-
 Style/MethodDefParentheses:
   EnforcedStyle: require_no_parentheses
-
 Style/MixinUsage:
   Exclude:
     - .pryrc
-
 Style/MultilineIfModifier:
   Enabled: false
-
 Style/Not:
   Enabled: false
-
 Style/NumberedParameters: # new in 1.22
   Enabled: true
   EnforcedStyle: disallow # default is `allow_single_line`
-
 Style/NumberedParametersLimit:
   Enabled: true
   Max: 0 # default is `1`
-
 Style/OptionHash:
   Enabled: true # default is `false`
-
 Style/PercentLiteralDelimiters:
   PreferredDelimiters: # prefer methods that make arrays to use square brackets
     '%':  '[]'
@@ -252,24 +169,18 @@ Style/PercentLiteralDelimiters:
     '%w': '[]'
     '%W': '[]'
     '%x': '[]'
-
 Style/PerlBackrefs:
   Enabled: false
-
 Style/RescueModifier:
   Enabled: false
-
 Style/Semicolon:
   AllowAsExpressionSeparator: true # default is `false`
-
 Style/SingleLineBlockParams:
   Methods:
     - inject:
         - a # all / accumulator
         - t # this
-
 Style/SymbolArray:
   MinSize: 3 # default is `2`
-
 Style/TrailingUnderscoreVariable:
   AllowNamedUnderscoreVariables: false # defaults to `true`

data/.yoshiki.yml

@@ -0,0 +1,13 @@
+AllCops:
+  DisplayCopNames: true
+  DisplayStyleGuide: true
+  ExtraDetails: true
+
+inherit_from:
+  - .yoshiki-ruby.yml
+  - .yoshiki-rails.yml
+
+inherit_mode:
+  merge:
+    - Exclude
+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yoshiki (8.0.0.pre.2)
+    yoshiki (8.0.0.pre.4)
       activesupport (>= 6.0.0)
       rubocop (= 1.56.3)
       rubocop-rails (= 2.21.1)

data/README.md

@@ -1,11 +1,8 @@
-Yōshiki (様式)
-=============
+## Yōshiki (様式)
 
-Dev Fu! Style
--------------
+# Dev Fu! Style
 
-[![rubygems][gem-image]][gem]  
-[![build status][ci-image]][ci]  
+[![rubygems][gem-image]][gem] [![build status][ci-image]][ci]
 
 Because ruby code should be:
 
@@ -20,18 +17,30 @@ Make it so.
 
 ## Usage
 
-`$ gem install yoshiki`
-
-or in your gemfile
+In your gemfile
 
 `gem 'yoshiki'`
 
 
-In your `.rubocop.yml`
+In `.rubocop.yml`
+
+```
+inherit_gem:
+  yoshiki: .yoshiki.yml
+```
+
+to include just ruby
+
+```
+inherit_gem:
+  yoshiki: .yoshiki-ruby.yml
+```
+
+or, to include just rails
 
 ```
 inherit_gem:
-  yoshiki: .devfu-rubocop.yml
+  yoshiki: .yoshiki-rails.yml
 ```
 
 ## Ruby support
@@ -40,6 +49,7 @@ inherit_gem:
 - ruby 2.4, use [=> 4.0][4.0]
 - ruby 2.5, use [=> 4.3][4.3]
 - ruby 2.6, use [=> 6.0][6.0]
+- ruby 2.7+, use [=> 7.0][7.0]
 
 <!-- links -->
 [ci]: https://gitlab.com/devfu/yoshiki/pipelines?scope=branches "build history"
@@ -48,6 +58,7 @@ inherit_gem:
 [4.0]: https://gitlab.com/devfu/yoshiki/tags/v4.0.0
 [4.3]: https://gitlab.com/devfu/yoshiki/tags/v4.3.0
 [6.0]: https://gitlab.com/devfu/yoshiki/tags/v6.0.0
+[7.0]: https://gitlab.com/devfu/yoshiki/tags/v7.0.0
 
 <!-- images -->
 [ci-image]: https://gitlab.com/devfu/yoshiki/badges/master/pipeline.svg

data/lib/yoshiki/version.rb

@@ -2,6 +2,6 @@
 
 module Yoshiki
 
-  VERSION = '8.0.0-2'
+  VERSION = '8.0.0-4'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yoshiki
 version: !ruby/object:Gem::Version
-  version: 8.0.0.pre.2
+  version: 8.0.0.pre.4
 platform: ruby
 authors:
 - BM5k
@@ -87,7 +87,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".devfu-rubocop.yml"
 - ".git-blame-ignore-revs"
 - ".gitignore"
 - ".gitlab-ci.yml"
@@ -95,6 +94,9 @@ files:
 - ".rubocop-defaults-rails.yml"
 - ".rubocop-defaults.yml"
 - ".rubocop.yml"
+- ".yoshiki-rails.yml"
+- ".yoshiki-ruby.yml"
+- ".yoshiki.yml"
 - Dockerfile
 - Gemfile
 - Gemfile.lock