improved rubocop config (puma#2152)

.rubocop.yml

@@ -6,6 +6,8 @@ AllCops:
   Exclude:
     - 'tmp/**/*'
     - 'vendor/**/*'
+    - 'examples/**/*'
+    - 'pkg/**/*'
     - 'Rakefile'
 
 Layout/SpaceAfterColon:
@@ -53,3 +55,24 @@ Style/TrailingCommaInArguments:
 
 Performance:
   Enabled: true
+
+Metrics/ParameterLists:
+  Max: 7
+
+Performance/RedundantMatch:
+  Enabled: true
+
+Performance/RedundantBlockCall:
+  Enabled: true
+
+Performance/StringReplacement:
+  Enabled: true
+
+Layout/AccessModifierIndentation:
+  EnforcedStyle: indent
+
+Style/WhileUntilModifier:
+  Enabled: true
+
+Style/TernaryParentheses:
+  Enabled: true

.rubocop_todo.yml

@@ -39,19 +39,7 @@ Layout/EmptyLinesAroundModuleBody:
 # 5 offenses
 Layout/IndentationWidth:
   Enabled: true
-
-# 3 offenses
-Layout/AccessModifierIndentation:
-  EnforcedStyle: indent
-
-# 2 offenses
-Style/WhileUntilModifier:
-  Enabled: true
-
-# 1 offense
-Style/TernaryParentheses:
-  Enabled: true
-
+
 # >200 offenses for 80
 # 58 offenses for 100
 # 18 offenses for 120
@@ -64,19 +52,3 @@ Metrics/LineLength:
     - https
   IgnoreCopDirectives: false
   IgnoredPatterns: []
-
-# 1 offense
-Metrics/ParameterLists:
-  Max: 5
-
-# 1 offense
-Performance/RedundantMatch:
-  Enabled: true
-
-# 1 offense
-Performance/RedundantBlockCall:
-  Enabled: true
-
-# 1 offense
-Performance/StringReplacement:
-  Enabled: true

lib/puma/cli.rb

@@ -80,7 +80,7 @@ def run
       @launcher.run
     end
 
-  private
+    private
     def unsupported(str)
       @events.error(str)
       raise UnsupportedOption

lib/puma/control_cli.rb

@@ -263,7 +263,7 @@ def run
       exit 1
     end
 
-  private
+    private
     def start
       require 'puma/cli'
 

lib/puma/minissl.rb

@@ -141,9 +141,7 @@ def close
           # Read any drop any partially initialized sockets and any received bytes during shutdown.
           # Don't let this socket hold this loop forever.
           # If it can't send more packets within 1s, then give up.
-          while should_drop_bytes?
-            return if [:timeout, :eof].include?(read_and_drop(1))
-          end
+          return if [:timeout, :eof].include?(read_and_drop(1)) while should_drop_bytes?
         rescue IOError, SystemCallError
           Thread.current.purge_interrupt_queue if Thread.current.respond_to? :purge_interrupt_queue
           # nothing

lib/puma/null_io.rb

@@ -15,7 +15,7 @@ def each
     # Mimics IO#read with no data.
     #
     def read(count = nil, _buffer = nil)
-      (count && count > 0) ? nil : ""
+      count && count > 0 ? nil : ""
     end
 
     def rewind

test/test_rack_handler.rb

@@ -33,9 +33,7 @@ def in_handler(app, options = {})
 
     # Wait for launcher to boot
     Timeout.timeout(10) do
-      until @launcher
-        sleep 1
-      end
+      sleep 1 until @launcher
     end
     sleep 1