Merge branch 'master' into fix/rubocop-linting-more

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-02-27 20:31:05 +0100 using RuboCop version 0.65.0.
+# on 2019-02-27 21:25:04 +0100 using RuboCop version 0.65.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -239,13 +239,6 @@ Style/ClassVars:
     - 'lib/faraday/rack_builder.rb'
     - 'test/helper.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/ColonMethodCall:
-  Exclude:
-    - 'script/proxy-server'
-    - 'script/server'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.

script/proxy-server

@@ -23,7 +23,7 @@ log_io = $stdout
 log_io.sync = true
 
 webrick_opts = {
-  Port: port, Logger: WEBrick::Log::new(log_io),
+  Port: port, Logger: WEBrick::Log.new(log_io),
   AccessLog: [[log_io, '[%{X-Faraday-Adapter}i] %m  %U  ->  %s %b']],
   ProxyAuthProc: lambda { |req, res|
     if username

script/server

@@ -18,7 +18,7 @@ log_io = $stdout
 log_io.sync = true
 
 webrick_opts = {
-  Port: port, Logger: WEBrick::Log::new(log_io),
+  Port: port, Logger: WEBrick::Log.new(log_io),
   AccessLog: [[log_io, '[%{X-Faraday-Adapter}i] %m  %U  ->  %s %b']]
 }