rubocop fixes

Author: davidsiaw

.rubocop_todo.yml

@@ -45,7 +45,7 @@ Metrics/BlockNesting:
 # Offense count: 1
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 135
+  Max: 141
 
 # Offense count: 3
 # Configuration parameters: IgnoredMethods.

ext/mysql2/extconf.rb

@@ -108,7 +108,7 @@ def add_ssl_defines(header)
   warn "-----\nUsing --with-mysql-dir=#{File.dirname inc}\n-----"
   rpath_dir = lib
   have_library('mysqlclient')
-elsif (mc = (with_config('mysql-config') || Dir[GLOB].first))
+elsif (mc = with_config('mysql-config') || Dir[GLOB].first)
   # If the user has provided a --with-mysql-config argument, we must respect it or fail.
   # If the user gave --with-mysql-config with no argument means we should try to find it.
   mc = Dir[GLOB].first if mc == true

lib/mysql2/client.rb

@@ -98,7 +98,8 @@ def initialize(opts = {})
     end
 
     def extract_password(opts)
-      return (opts[:password] || opts[:pass]) if !opts[:password_provider]
+      return opts[:password] || opts[:pass] unless opts[:password_provider]
+
       klass = Kernel.const_get(opts[:password_provider])
 
       obj = klass.new(opts)

spec/mysql2/statement_spec.rb

@@ -320,7 +320,7 @@ def stmt_count
       result = @client.prepare("SELECT 1 UNION SELECT 2").execute(stream: true, cache_rows: false)
       expect do
         result.each {}
-        result.each {} # rubocop:disable Style/CombinableLoops
+        result.each {}
       end.to raise_exception(Mysql2::Error)
     end
   end