yoshiki 8.0.0 → 9.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 462e52f3bfe1af542d756fb5ea90c07838d216c557a4fae0ce38793b6defda4d
-  data.tar.gz: 015b6c3bcf0558fe43b8ae5c173b4a5edd98aad6b40ab46dfed92dff5a56947d
+  metadata.gz: 238a39575bd073ca95cdaa54ce97affac2d5d57b9763d25cddabefb93f312235
+  data.tar.gz: 487696c57ffc297c083b55343daccccbf976c49901a94f75b4da87b9f7049947
 SHA512:
-  metadata.gz: e278e9fa34ee6c79f472be35e1de5df8f5ab5d24a392f3dc5c967f2ef2e7ae2e9d603fe86e1487eead390729bafe51ad87c1b8a2207a7c82fa27a192b47a8508
-  data.tar.gz: 9de3b62363ba12ea271ce412ab1b01fbd9abed404ddbd7af27bfcedbfddc15a599dac9d17a54f12299a62945205ce0492565298d7bde22c72fcb0ef0e8b92b3c
+  metadata.gz: ed0fc7a3cecfca13a9d5ccd1697abd4edb5e82889a4a2b68e3285ae8cd7a4e4563c6994c1b2431e7899e083cbcb3fbd158abc61d771d83631efa479d7430ba0a
+  data.tar.gz: 04ae7dc9a3d18bae3de6ae33c4614c71874b961c43bef6c8db041afc73460fdb68edd76e33c573b8cd2802f3bc17d46b54161ca00bdd75b6d97aa71d0c75464e

data/.gitlab-ci.yml

@@ -7,6 +7,16 @@ before_script:
   - gem update bundler
   - bundle install --clean --jobs $(nproc) --retry=3
 
+ruby 3.3:
+  cache:
+    key: "$CI_BUILD_REF_NAME-3.3"
+    paths:
+      - vendor/bundle
+  image: ruby:3.3-alpine
+  script:
+    - bundle exec rake spec rubocop
+  stage: test
+
 ruby 3.2:
   cache:
     key: "$CI_BUILD_REF_NAME-3.2"
@@ -36,13 +46,3 @@ ruby 3.0:
   script:
     - bundle exec rake spec rubocop
   stage: test
-
-ruby 2.7:
-  cache:
-    key: "$CI_BUILD_REF_NAME-2.7"
-    paths:
-      - vendor/bundle
-  image: ruby:2.7-alpine
-  script:
-    - bundle exec rake spec rubocop
-  stage: test

data/.rubocop-defaults-rails.yml

@@ -36,6 +36,8 @@ Rails/DurationArithmetic: # new in 2.13
   Enabled: true
 Rails/EagerEvaluationLogMessage: # new in 2.11
   Enabled: true
+Rails/EnvLocal: # new in 2.22
+  Enabled: true
 Rails/ExpandedDateRange: # new in 2.11
   Enabled: true
 Rails/FindById: # new in 2.7

data/.rubocop-defaults.yml

@@ -1,4 +1,7 @@
 require:
+  - rubocop-capybara
+  - rubocop-factory_bot
+  - rubocop-performance
   - rubocop-rake
   - rubocop-rspec
 
@@ -6,17 +9,26 @@ Capybara/MatchStyle: # new in 2.17
   Enabled: true
 Capybara/NegationMatcher: # new in 2.14
   Enabled: true
+Capybara/RedundantWithinFind: # new in 2.20
+  Enabled: true
 Capybara/SpecificActions: # new in 2.14
   Enabled: true
 Capybara/SpecificMatcher: # new in 2.12
   Enabled: true
 
+Capybara/RSpec/HaveSelector: # new in 2.19
+  Enabled: true
+
 FactoryBot/AssociationStyle: # new in 2.23
   Enabled: true
+FactoryBot/ExcessiveCreateList: # new in 2.25
+  Enabled: true
 FactoryBot/FactoryAssociationWithStrategy: # new in 2.23
   Enabled: true
 FactoryBot/FactoryClassName: # new in 1.37
   Enabled: true
+FactoryBot/IdSequence: # new in 2.19
+  Enabled: true
 FactoryBot/FactoryNameStyle: # new in 2.16
   Enabled: true
 FactoryBot/RedundantFactoryOption: # new in 2.23
@@ -68,8 +80,12 @@ Lint/EmptyInPattern: # new in 1.16
   Enabled: true
 Lint/IncompatibleIoSelectWithFiberScheduler: # new in 1.21
   Enabled: true
+Lint/ItWithoutArgumentsInBlock: # new in 1.59
+  Enabled: true
 Lint/LambdaWithoutLiteralBlock: # new in 1.8
   Enabled: true
+Lint/LiteralAssignmentInCondition: # new in 1.58
+  Enabled: false
 Lint/MixedCaseRange: # new in 1.53
   Enabled: true
 Lint/NonAtomicFileOperation: # new in 1.31
@@ -107,6 +123,46 @@ Lint/UselessRuby2Keywords: # new in 1.23
 
 Metrics/CollectionLiteralLength: # new in 1.47
   Enabled: true
+
+Performance/AncestorsInclude: # new in 1.7
+  Enabled: true
+Performance/BigDecimalWithNumericArgument: # new in 1.7
+  Enabled: true
+Performance/BlockGivenWithExplicitBlock: # new in 1.9
+  Enabled: true
+Performance/CollectionLiteralInLoop: # new in 1.8
+  Enabled: true
+Performance/ConcurrentMonotonicTime: # new in 1.12
+  Enabled: true
+Performance/ConstantRegexp: # new in 1.9
+  Enabled: true
+Performance/MapCompact: # new in 1.11
+  Enabled: true
+Performance/MapMethodChain: # new in 1.19
+  Enabled: true
+Performance/MethodObjectAsBlock: # new in 1.9
+  Enabled: true
+Performance/RedundantEqualityComparisonBlock: # new in 1.10
+  Enabled: true
+Performance/RedundantSortBlock: # new in 1.7
+  Enabled: true
+Performance/RedundantSplitRegexpArgument: # new in 1.10
+  Enabled: true
+Performance/RedundantStringChars: # new in 1.7
+  Enabled: true
+Performance/ReverseFirst: # new in 1.7
+  Enabled: true
+Performance/SortReverse: # new in 1.7
+  Enabled: true
+Performance/Squeeze: # new in 1.7
+  Enabled: true
+Performance/StringIdentifierArgument: # new in 1.13
+  Enabled: true
+Performance/StringInclude: # new in 1.7
+  Enabled: true
+Performance/Sum: # new in 1.8
+  Enabled: true
+
 RSpec/BeEmpty: # new in 2.20
   Enabled: true
 RSpec/BeEq: # new in 2.9.0
@@ -141,6 +197,10 @@ RSpec/ReceiveMessages: # new in 2.23
   Enabled: true
 RSpec/RedundantAround: # new in 2.19
   Enabled: true
+RSpec/RedundantPredicateMatcher: # new in 2.26
+  Enabled: true
+RSpec/RemoveConst: # new in 2.26
+  Enabled: true
 RSpec/SkipBlockInsideExample: # new in 2.19
   Enabled: true
 RSpec/SortMetadata: # new in 2.14
@@ -255,8 +315,12 @@ Style/RedundantStringEscape: # new in 1.37
   Enabled: true
 Style/SelectByRegexp: # new in 1.22
   Enabled: true
+Style/SingleLineDoEndBlock: # new in 1.57
+  Enabled: true
 Style/StringChars: # new in 1.12
   Enabled: true
+Style/SuperWithArgsParentheses: # new in 1.58
+  Enabled: false
 Style/SwapValues: # new in 1.1
   Enabled: true
 Style/YAMLFileRead: # new in 1.53

data/.rubocop.yml

@@ -1,12 +1,8 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.3
 
 inherit_from:
-  - .rubocop-defaults.yml
-  - .rubocop-defaults-rails.yml
   - .yoshiki.yml
 
-Naming/FileName:
-  Exclude:
-    - lib/yoshiki.rb
-    - spec/yoshiki_spec.rb
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/.yoshiki-rails.yml

@@ -8,12 +8,20 @@ AllCops:
     - lib/templates/**/*
     - vendor/**/*
 
-Rails:
-  Enabled: true
+inherit_from:
+  - .rubocop-defaults-rails.yml
 
+Capybara/ClickLinkOrButtonStyle: # new in 2.19
+  Enabled: true
+  EnforcedStyle: strict
 Capybara/SpecificFinders: # new in 2.13
   Enabled: false # prefer find('#css-id')
 
+Capybara/RSpec/PredicateMatcher: # new in 2.19
+  Enabled: true
+  EnforcedStyle: inflected
+  Strict: false
+
 FactoryBot/ConsistentParenthesesStyle: # new in 2.14
   Enabled: true
   EnforcedStyle: omit_parentheses # default is `require_parentheses`
@@ -37,3 +45,15 @@ Rails/ToFormattedS: # new in 2.15
   Enabled: false # prefer to_s(:format)
 Rails/ToSWithArgument: # new in 2.16
   Enabled: false # prefer to_s(:format)
+
+Style/Documentation: # this isn't a rails cop, but this config only makes sense for rails projects
+  Exclude: # default config doesn't exclude migrations
+    - app/controllers/application_controller.rb
+    - app/helpers/application_helper.rb
+    - app/jobs/application_job.rb
+    - app/mailers/application_mailer.rb
+    - app/models/application_record.rb
+    - config/application.rb
+    - db/migrate/**/*
+    - spec/**/*
+    - test/**/*

data/.yoshiki-ruby.yml

@@ -11,6 +11,9 @@ AllCops:
     - bin/**/*
     - Gemfile.lock
 
+inherit_from:
+  - .rubocop-defaults.yml
+
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent # default is `indent`
 Layout/BeginEndAlignment:
@@ -75,6 +78,7 @@ Metrics/BlockLength: # this cop allows configuration with AllowedMethods, Allowe
     - context
   CountAsOne:
     - array
+    - hash
     - heredoc
     - method_call
 Metrics/MethodLength:  # this cop allows configuration with AllowedMethods, AllowedPatterns, & CountAsOne
@@ -120,6 +124,15 @@ RSpec/NestedGroups: # this cop can be configured with `AllowedGroups`
   Enabled: false
 RSpec/PendingWithoutReason: # new in 2.16
   Enabled: false
+RSpec/NoExpectationExample:
+  Exclude:
+    - spec/models/factory_spec.rb
+RSpec/NotToNot:
+  EnforcedStyle: to_not # default is not_to; prefer common prefix
+RSpec/MultipleExpectations:
+  Enabled: false # recommend using `aggregate_failures`
+RSpec/SubjectStub: # allow stubbing subject
+  Enabled: false   # should only be used for methods *not* under test
 
 Style/AndOr:
   Enabled: false
@@ -129,16 +142,13 @@ 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/FrozenStringLiteralComment:
+  SafeAutoCorrect: true # default is `false`
 Style/HashSyntax:
   EnforcedShorthandSyntax: consistent # default is `always`
 Style/MethodDefParentheses:

data/Gemfile.lock

@@ -1,45 +1,58 @@
 PATH
   remote: .
   specs:
-    yoshiki (8.0.0)
-      rubocop (= 1.56.3)
-      rubocop-rails (= 2.21.1)
-      rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 2.24.0)
+    yoshiki (9.0.0.pre.2)
+      rubocop (>= 1.56.4)
+      rubocop-capybara (>= 2.19.0)
+      rubocop-factory_bot (>= 2.24.0)
+      rubocop-performance (>= 1.20.2)
+      rubocop-rails (>= 2.22.2)
+      rubocop-rake (>= 0.6.0)
+      rubocop-rspec (>= 2.25.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8)
+    activesupport (7.1.3)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
-    base64 (0.1.1)
+    base64 (0.2.0)
+    bigdecimal (3.1.6)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
+    drb (2.2.0)
+      ruby2_keywords
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.7.1)
     language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    minitest (5.20.0)
-    parallel (1.23.0)
-    parser (3.2.2.3)
+    minitest (5.21.2)
+    mutex_m (0.2.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.1.0)
+    psych (5.1.2)
       stringio
-    racc (1.7.1)
+    racc (1.7.3)
     rack (3.0.8)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.8.1)
+    rake (13.1.0)
+    regexp_parser (2.9.0)
     rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
@@ -54,39 +67,43 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.1)
-    rubocop (1.56.3)
-      base64 (~> 0.1.1)
+    rubocop (1.60.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.29.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.18.0)
+    rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.23.1)
-      rubocop (~> 1.33)
-    rubocop-rails (2.21.1)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-performance (1.20.2)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-rails (2.23.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.24.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
-    stringio (3.0.8)
+    ruby2_keywords (0.0.5)
+    stringio (3.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -99,4 +116,4 @@ DEPENDENCIES
   yoshiki!
 
 BUNDLED WITH
-   2.3.26
+   2.5.5

data/README.md

@@ -43,22 +43,21 @@ inherit_gem:
   yoshiki: .yoshiki-rails.yml
 ```
 
-## Ruby support
+## Ruby compatibility
 
-- ruby 2.3, use [~> 3.2][3.2]
-- 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]
+- ruby 3.0+, use [=> 9.0][9.0]
+- ruby 2.7, use [~> 8.0][8.0]
+- ruby 2.6, use [~> 7.0][7.0]
+- ruby 2.4+, use [~> 6.0][6.0.1]
+- ruby 2.3, use [~> 3.2][3.2.0]
 
 <!-- links -->
 [ci]: https://gitlab.com/devfu/yoshiki/pipelines?scope=branches "build history"
 [gem]: https://rubygems.org/gems/yoshiki
-[3.2]: https://gitlab.com/devfu/yoshiki/tags/v3.2.0
-[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
+[3.2.0]: https://gitlab.com/devfu/yoshiki/tags/v3.2.0
+[6.0.1]: https://gitlab.com/devfu/yoshiki/tags/v6.0.1
 [7.0]: https://gitlab.com/devfu/yoshiki/tags/v7.0.0
+[8.0]: https://gitlab.com/devfu/yoshiki/tags/v8.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'
+  VERSION = '9.0.0-2'
 
 end

data/yoshiki.gemspec

@@ -20,10 +20,13 @@ Gem::Specification.new do |spec|
 
   spec.metadata['rubygems_mfa_required'] = 'true'
 
-  spec.required_ruby_version = '>= 2.7.0'
+  spec.required_ruby_version = '>= 3.0.0'
 
-  spec.add_dependency 'rubocop',       '1.56.3'
-  spec.add_dependency 'rubocop-rails', '2.21.1'
-  spec.add_dependency 'rubocop-rake',  '0.6.0'
-  spec.add_dependency 'rubocop-rspec', '2.24.0'
+  spec.add_dependency 'rubocop',             '>= 1.56.4'
+  spec.add_dependency 'rubocop-capybara',    '>= 2.19.0'
+  spec.add_dependency 'rubocop-factory_bot', '>= 2.24.0'
+  spec.add_dependency 'rubocop-performance', '>= 1.20.2'
+  spec.add_dependency 'rubocop-rails',       '>= 2.22.2'
+  spec.add_dependency 'rubocop-rake',        '>= 0.6.0'
+  spec.add_dependency 'rubocop-rspec',       '>= 2.25.0'
 end

metadata

@@ -1,71 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: yoshiki
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 9.0.0.pre.2
 platform: ruby
 authors:
 - BM5k
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2024-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.56.3
+        version: 1.56.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.56.3
+        version: 1.56.4
+- !ruby/object:Gem::Dependency
+  name: rubocop-capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.19.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.19.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.24.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.24.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.20.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.20.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.21.1
+        version: 2.22.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.21.1
+        version: 2.22.2
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.24.0
+        version: 2.25.0
 description: Dev Fu! Style for rubocop.
 email:
 - me@bm5k.com
@@ -107,14 +149,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.5
 signing_key:
 specification_version: 4
 summary: Dev Fu! Style