Merge branch 'master' into force_latin1_to_utf8

* master: (56 commits)
  Remove leftover ifdef HAVE_RB_BIG_CMP
  Minor whitespace/variable rewording
  Prefix the methods in client.c with rb_mysql_
  Prefix the methods in statement.c with rb_mysql_
  Remove more 1.8.7, REE compatibility shims (brianmario#908)
  Style/SignalException
  Style/PercentLiteralDelimiters
  Style/NumericPredicate
  Style/MutableConstant
  Style/IfInsideElse
  Style/HashSyntax
  Style/GuardClause
  Style/Encoding
  Style/BlockDelimiters
  Style/Alias
  Performance/TimesMap
  Performance/RedundantMerge
  Performance/HashEachMethods
  Naming/HeredocDelimiterCase
  Lint/UnifiedInteger
  ...

Author: jeremy

.rubocop.yml

@@ -1,31 +1,35 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
+  TargetRubyVersion: 1.9
+
   DisplayCopNames: true
   Exclude:
     - 'pkg/**/*'
     - 'tmp/**/*'
     - 'vendor/**/*'
 
+Layout/CaseIndentation:
+  EnforcedStyle: end
+
+Layout/IndentHash:
+  EnforcedStyle: consistent
+
+Layout/IndentHeredoc:
+  EnforcedStyle: powerpack
+
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
 
-Style/CaseIndentation:
-  IndentWhenRelativeTo: end
+Style/Encoding:
+  AutoCorrectEncodingComment: '# encoding: UTF-8'
+  EnforcedStyle: always
 
-Style/IndentHash:
-  EnforcedStyle: consistent
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: consistent_comma
 
-Style/TrailingComma:
+Style/TrailingCommaInLiteral:
   EnforcedStyleForMultiline: consistent_comma
 
 Style/TrivialAccessors:
   AllowPredicates: true
-
-# TODO: remove when we end support for < 1.9.3
-
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-Style/Lambda:
-  Enabled: false

.rubocop_todo.yml

@@ -1,75 +1,86 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-09-06 13:16:09 -0400 using RuboCop version 0.34.0.
+# on 2017-11-25 19:54:28 -0500 using RuboCop version 0.50.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
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 2
 Metrics/AbcSize:
-  Max: 85
+  Max: 90
+
+# Offense count: 31
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/BlockLength:
+  Max: 825
 
 # Offense count: 1
+# Configuration parameters: CountBlocks.
 Metrics/BlockNesting:
   Max: 5
 
 # Offense count: 1
+# Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 125
 
-# Offense count: 2
+# Offense count: 3
 Metrics/CyclomaticComplexity:
   Max: 30
 
-# Offense count: 290
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 313
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 232
 
-# Offense count: 5
+# Offense count: 6
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 60
+  Max: 57
 
-# Offense count: 1
+# Offense count: 2
 Metrics/PerceivedComplexity:
-  Max: 26
+  Max: 27
 
-# Offense count: 40
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-Style/BlockDelimiters:
-  Enabled: false
+# Offense count: 3
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'tasks/compile.rake'
 
-# Offense count: 12
+# Offense count: 10
 Style/Documentation:
   Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
     - 'benchmark/active_record.rb'
     - 'benchmark/allocations.rb'
     - 'benchmark/query_with_mysql_casting.rb'
     - 'lib/mysql2.rb'
     - 'lib/mysql2/client.rb'
     - 'lib/mysql2/em.rb'
     - 'lib/mysql2/error.rb'
-    - 'lib/mysql2/field.rb'
     - 'lib/mysql2/result.rb'
     - 'lib/mysql2/statement.rb'
-    - 'lib/mysql2/version.rb'
 
-# Offense count: 9
+# Offense count: 14
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
   Exclude:
     - 'ext/mysql2/extconf.rb'
 
-# Offense count: 14
+# Offense count: 17
 # Cop supports --auto-correct.
+# Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 20
 
-# Offense count: 680
+# Offense count: 726
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false

.travis.yml

@@ -27,28 +27,6 @@ rvm:
   - ruby-head
 matrix:
   include:
-    - rvm: 1.8.7
-      dist: precise
-      env: SPEC_OPTS="--order rand:11"
-      addons:
-        hosts:
-          - mysql2gem.example.com
-        apt:
-          packages:
-          - mysql-server-5.5
-          - mysql-client-core-5.5
-          - mysql-client-5.5
-    - rvm: ree
-      dist: precise
-      env: SPEC_OPTS="--order rand:11"
-      addons:
-        hosts:
-          - mysql2gem.example.com
-        apt:
-          packages:
-          - mysql-server-5.5
-          - mysql-client-core-5.5
-          - mysql-client-5.5
     - rvm: 2.4
       env: DB=mariadb10.0
       addons:

.travis_mysql51.sh

@@ -5,7 +5,7 @@ set -eux
 apt-get purge -qq '^mysql*' '^libmysql*'
 rm -fr /etc/mysql
 rm -fr /var/lib/mysql
-apt-key adv --keyserver keys.gnupg.net --recv-keys 8507EFA5
+apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 9334A25F8507EFA5
 add-apt-repository 'deb http://repo.percona.com/apt precise main'
 apt-get update -qq
 apt-get install -qq percona-server-server-5.1 percona-server-client-5.1 libmysqlclient16-dev

.travis_mysql57.sh

@@ -5,7 +5,7 @@ set -eux
 apt-get purge -qq '^mysql*' '^libmysql*'
 rm -fr /etc/mysql
 rm -fr /var/lib/mysql
-apt-key adv --keyserver pgp.mit.edu --recv-keys 5072E1F5
+apt-key add - < support/5072E1F5.asc
 add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ trusty mysql-5.7'
 apt-get update -qq
 apt-get install -qq mysql-server libmysqlclient-dev

.travis_mysql80.sh

@@ -5,7 +5,7 @@ set -eux
 apt-get purge -qq '^mysql*' '^libmysql*'
 rm -fr /etc/mysql
 rm -fr /var/lib/mysql
-apt-key adv --keyserver pgp.mit.edu --recv-keys 5072E1F5
+apt-key add - < support/5072E1F5.asc
 add-apt-repository 'deb http://repo.mysql.com/apt/ubuntu/ trusty mysql-8.0'
 apt-get update -qq
 apt-get install -qq mysql-server libmysqlclient-dev

.travis_setup.sh

@@ -17,6 +17,16 @@ if [[ -n ${DB-} && x$DB =~ ^xmysql80 ]]; then
   sudo bash .travis_mysql80.sh
 fi
 
+# Install MariaDB client headers after Travis CI fix for MariaDB 10.2 broke earlier 10.x
+if [[ -n ${DB-} && x$DB =~ ^xmariadb10.0 ]]; then
+  sudo apt-get install -y -o Dpkg::Options::='--force-confnew' libmariadbclient-dev
+fi
+
+# Install MariaDB client headers after Travis CI fix for MariaDB 10.2 broke earlier 10.x
+if [[ -n ${DB-} && x$DB =~ ^xmariadb10.1 ]]; then
+  sudo apt-get install -y -o Dpkg::Options::='--force-confnew' libmariadbclient-dev
+fi
+
 # Install MariaDB 10.2 if DB=mariadb10.2
 # NOTE this is a workaround until Travis CI merges a fix to its mariadb addon.
 if [[ -n ${DB-} && x$DB =~ ^xmariadb10.2 ]]; then

Gemfile

@@ -1,14 +1,18 @@
+# encoding: UTF-8
+
 source 'https://rubygems.org'
 
 gemspec
 
 gem 'rake', '~> 10.4.2'
-gem 'rake-compiler', '~> 0.9.5'
+gem 'rake-compiler', '~> 1.0'
 
 group :test do
   gem 'eventmachine' unless RUBY_PLATFORM =~ /mswin|mingw/
   gem 'rspec', '~> 3.2'
-  gem 'rubocop', '~> 0.34.0' unless RUBY_VERSION =~ /1.8/
+  # https://github.com/bbatsov/rubocop/pull/3328
+  # https://github.com/bbatsov/rubocop/pull/4789
+  gem 'rubocop', '~> 0.50.0' unless RUBY_VERSION =~ /1.9/
 end
 
 group :benchmarks do
@@ -22,7 +26,7 @@ end
 
 group :development do
   gem 'pry'
-  gem 'rake-compiler-dock', '~> 0.5.1'
+  gem 'rake-compiler-dock', '~> 0.6.0'
 end
 
 platforms :rbx do

README.md

@@ -213,6 +213,7 @@ Mysql2::Client.new(
   :read_timeout = seconds,
   :write_timeout = seconds,
   :connect_timeout = seconds,
+  :connect_attrs = {:program_name => $PROGRAM_NAME, ...},
   :reconnect = true/false,
   :local_infile = true/false,
   :secure_auth = true/false,
@@ -519,8 +520,7 @@ As for field values themselves, I'm workin on it - but expect that soon.
 
 This gem is tested with the following Ruby versions on Linux and Mac OS X:
 
- * Ruby MRI 1.8.7, 1.9.3, 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x
- * Ruby Enterprise Edition (based on MRI 1.8.7)
+ * Ruby MRI 1.9.3, 2.0.0, 2.1.x, 2.2.x, 2.3.x, 2.4.x
  * Rubinius 2.x and 3.x do work but may fail under some workloads
 
 This gem is tested with the following MySQL and MariaDB versions:

Rakefile

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 require 'rake'
 
 # Load custom tasks (careful attention to define tasks before prerequisites)
@@ -8,18 +9,11 @@ load 'tasks/compile.rake'
 load 'tasks/generate.rake'
 load 'tasks/benchmarks.rake'
 
-# TODO: remove engine check when rubinius stops crashing on RuboCop
-# TODO: remove defined?(Encoding) when we end support for < 1.9.3
-has_rubocop = if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby' && defined?(Encoding)
-  begin
-    require 'rubocop/rake_task'
-    RuboCop::RakeTask.new
-    task :default => [:spec, :rubocop]
-  rescue LoadError # rubocop:disable Lint/HandleExceptions
-  end
-end
-
-unless has_rubocop
+begin
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+  task default: [:spec, :rubocop]
+rescue LoadError
   warn 'RuboCop is not available'
-  task :default => :spec
+  task default: :spec
 end