rubocop-elegant 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 400170a3fda22ccd3c629d58a47a9c142da2ebd38bd34c292fc702fc47e3fc51
-  data.tar.gz: c82766e8b09239583a125b2d769e01a356330a83210e113dfdf43031a81a59ec
+  metadata.gz: caefc6549542af9deff3c876e4f5820c45b1641a0006d797c05776123675a3d2
+  data.tar.gz: 59a23203e472ff8485a69e714f3085efa6a5a323381097f4fedb104df5363238
 SHA512:
-  metadata.gz: 1c2d09a8e4d0ffa82a2371396310bdd2d1cb0fa1308b87333f13edb30d9b3551a769309fe8e7a311806c221319c89b4be3160261115e92d9935ace180b878974
-  data.tar.gz: 7200ec078d268fe5baadd7ba8627f3b20c705273444cdd7ad81b73d63009ffa93f9ae91be1fc267ae46b17b551519c5c93d4adfbabbfa228e7a0b78945dfaa18
+  metadata.gz: 553939a2d42896140b0b778faa879bdf4729a5411a60c22013b66313173d2b2785d5c7052bf68baf8ec2b223d450de7707393a73aa7a0a47bfa970283ae388ab
+  data.tar.gz: 8dbae33a180941efead52d5ed739f0f1ee349947769790d322a8ece2e224169ef79179fed362383f508bd05d5ab27b84935e3a552028b04a132c0077a3ee2a28

data/Gemfile

@@ -9,7 +9,7 @@ gemspec
 gem 'minitest', '~>6.0', require: false
 gem 'minitest-reporters', '~>1.7', require: false
 gem 'rake', '~>13.2', require: false
-gem 'rdoc', '7.2.0', require: false
+gem 'rdoc', '8.0.0', require: false
 gem 'rubocop', '~>1.74', require: false
 gem 'rubocop-minitest', '~>0.38', require: false
 gem 'rubocop-performance', '~>1.25', require: false

data/README.md

@@ -43,7 +43,6 @@ Then, format your `.rubocop.yml` like this:
 
 ```yaml
 AllCops:
-  EnabledByDefault: true
   NewCops: enable
 plugins:
   - rubocop-minitest

data/config/default.yml

@@ -50,7 +50,7 @@ Elegant/OneClassPerFile:
   Exclude:
     - '**/*Test.rb'
     - '**/test_*.rb'
-Elegant/IndentationLadder:
+Elegant/MonotonicIndents:
   Description: 'Requires the indentation step to be exactly two spaces when a line indents to the right of the previous one'
   Enabled: true
   VersionAdded: '0.1.0'

data/lib/rubocop/cop/elegant/{indentation_ladder.rb → monotonic_indents.rb}

@@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-# Enforces the "indentation ladder" rule: when a line is indented further
+# Enforces the "monotonic indentation" rule: when a line is indented further
 # to the right than the previous non-empty line, the extra indentation
 # must be exactly two spaces. Larger jumps (or odd ones, such as a single
 # space or three spaces) break the visual rhythm of the code and make
@@ -11,7 +11,7 @@
 # de-indent by any amount, are not affected. Lines that belong to the
 # body of a heredoc are ignored, because their whitespace is part of the
 # literal value rather than program structure.
-class RuboCop::Cop::Elegant::IndentationLadder < RuboCop::Cop::Base
+class RuboCop::Cop::Elegant::MonotonicIndents < RuboCop::Cop::Base
   MSG = 'Indentation step of %<step>d spaces is not allowed; use 2 spaces'
   public_constant :MSG
 

data/lib/rubocop/cop/elegant/no_nil_return.rb

@@ -3,17 +3,21 @@
 # SPDX-FileCopyrightText: Copyright (c) 2019-2026 Yegor Bugayenko
 # SPDX-License-Identifier: MIT
 
-# Forbids a method from returning the literal +nil+ explicitly. The
-# cop flags two patterns: a +return nil+ statement anywhere inside
-# the method body, and a method whose tail expression is the literal
-# +nil+ (whether it stands alone or appears as the last statement of
-# a multi-statement body). Methods that omit +return+, use a bare
+# Forbids returning the literal +nil+ explicitly. The cop flags two
+# patterns: a +return nil+ statement anywhere inside the body, and a
+# body whose tail expression is the literal +nil+ (whether it stands
+# alone or appears as the last statement of a multi-statement body).
+# Both patterns are checked inside method definitions and inside
+# blocks, lambdas, and procs. Bodies that omit +return+, use a bare
 # +return+ keyword, or merely happen to evaluate to +nil+ through
 # control flow are not flagged.
 class RuboCop::Cop::Elegant::NoNilReturn < RuboCop::Cop::Base
   MSG = 'Method must not return nil explicitly'
   public_constant :MSG
 
+  SCOPES = %i[def defs block numblock].freeze
+  private_constant :SCOPES
+
   def on_def(node)
     check(node)
   end
@@ -22,6 +26,14 @@ class RuboCop::Cop::Elegant::NoNilReturn < RuboCop::Cop::Base
     check(node)
   end
 
+  def on_block(node)
+    check(node)
+  end
+
+  def on_numblock(node)
+    check(node)
+  end
+
   private
 
   def check(node)
@@ -32,7 +44,7 @@ class RuboCop::Cop::Elegant::NoNilReturn < RuboCop::Cop::Base
 
   def explicit(node)
     node.each_descendant(:return) do |ret|
-      next unless ret.each_ancestor(:def, :defs).first.equal?(node)
+      next unless ret.each_ancestor(*SCOPES).first.equal?(node)
       add_offense(ret) if void?(ret)
     end
   end

data/lib/rubocop/cop/elegant_cops.rb

@@ -8,7 +8,7 @@ module RuboCop::Cop::Elegant; end
 require_relative 'elegant/class_in_module'
 require_relative 'elegant/good_method_name'
 require_relative 'elegant/good_variable_name'
-require_relative 'elegant/indentation_ladder'
+require_relative 'elegant/monotonic_indents'
 require_relative 'elegant/no_class_in_module'
 require_relative 'elegant/no_comments'
 require_relative 'elegant/no_empty_lines_in_blocks'

data/rubocop-elegant.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to?(:required_rubygems_version=)
   s.required_ruby_version = '>=2.2'
   s.name = 'rubocop-elegant'
-  s.version = '0.5.1'
+  s.version = '0.7.0'
   s.license = 'MIT'
   s.summary = 'Set of custom RuboCop cops for elegant Ruby coding'
   s.description =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-elegant
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -56,7 +56,7 @@ files:
 - lib/rubocop/cop/elegant/class_in_module.rb
 - lib/rubocop/cop/elegant/good_method_name.rb
 - lib/rubocop/cop/elegant/good_variable_name.rb
-- lib/rubocop/cop/elegant/indentation_ladder.rb
+- lib/rubocop/cop/elegant/monotonic_indents.rb
 - lib/rubocop/cop/elegant/no_class_in_module.rb
 - lib/rubocop/cop/elegant/no_comments.rb
 - lib/rubocop/cop/elegant/no_empty_lines_in_blocks.rb