ecco 0.7.0-java → 0.8.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0ab7f8a563e384b8c17e08072610eccfe3c52d7f
-  data.tar.gz: d3e8ac4b8ae63cc0adbcd0c2673f87268aa3b6c3
+SHA256:
+  metadata.gz: aa0f1adf6e5a97d969a6acf43b3ec6d083e7975e3e60f4684e46b672453dd7e1
+  data.tar.gz: de78c5aba80a3ff667d63408721723737e5ae731124c55f413b2c5f0fdb15f4c
 SHA512:
-  metadata.gz: 7f4db2c00bffd2fa65fea63d2485979b3c6c3c52d413a42d2f172696be12f3aba0efa18e78ba27cde5fd98d21d20cfbd8f96a383badc21f3e94a8c3eb5719de5
-  data.tar.gz: 2bc753ab284ab855130bc9eea73afa21e5167e2c3c1b1bbb167a698990b4240993704a0c49d9d1798e03faea9cd98587abd12725e0736411b23c4a4a8d73bfa9
+  metadata.gz: 1ee74c54f9ab18d42046b00e7e6e48b7de8c761482a1a5840945ff77bdd3c618ed81721987a6873f76d99dc99835a373c872e8eeba68ed480995a898b6c250e8
+  data.tar.gz: 56a14190b670b5a8e02cd1d200f9aab042c3a471287c07a0f80372230a068d90de7c5e80c108f062fe918f8ccf4d383cc48a00edc3d0da474d924424c5d0d0dc

data/.gitignore

@@ -8,5 +8,3 @@
 /spec/reports/
 /tmp/
 .env
-.vagrant
-*.retry

data/.travis.yml

@@ -1,46 +1,34 @@
-sudo: true
+dist: bionic
+language: ruby
+services:
+  - docker
 
-dist: trusty
 addons:
   apt:
     packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
     - haveged # Extra entropy
 
-language: ruby
-
-rvm:
-  - jruby-9.0.5.0
-
-services:
-  - mysql
-
 before_install:
-  - sudo service haveged start # Extra entropy too ensure quick start time for JRuby
-  - printf "[mysqld]\nlog-bin=mysql-bin\nserver-id=1\nbinlog-format=ROW\n" | sudo tee /etc/mysql/conf.d/binlog.cnf
-  - sudo service mysql restart
-  - mysql -u root -e 'create database ecco_test;'
-  - gem install bundler
+  - sudo service haveged start # Extra entropy to ensure quick start time for JRuby
+  - rvm get master
+  - rvm install jruby-9.2.13.0
+  - rvm use jruby-9.2.13.0
+  - gem install bundler -v '< 2'
+  - docker-compose -f docker-compose-mysql-base.yml -f docker-compose-mysql-$MYSQL_VERSION.yml up -d
 
 env:
   global:
-    - DATABASE_USER=root
-    - DATABASE_PASS=""
-    - DATABASE_URL=jdbc:mysql://localhost:3306/ecco_test
-    - JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -Xcext.enabled=false -J-Xss2m -Xcompile.invokedynamic=false'
+    - JRUBY_OPTS='--client -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-Xss2m -Xcompile.invokedynamic=false'
+  jobs:
+    - MYSQL_VERSION="5-6"
+    - MYSQL_VERSION="5-7"
+    - MYSQL_VERSION="8-0"
+
+jobs:
+  allow_failures:
+    - env: MYSQL_VERSION="8-0"
 
 script: bin/all_specs
 
 notifications:
   email: false
-  hipchat:
-    on_success: never
-    on_failure: change
-    template:
-    - '%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}
-      (<a href="%{build_url}">Details</a>/<a href="%{compare_url}">Change view</a>)'
-    format: html
-    rooms:
-      secure: J7yYVGr6NQ0rOA6WdOVxiB4XxPJJDcQG7R0fgAXxtAzQNun+QHLBH9Yu7NN7kaJrVU69oIMrAw2e7EGSh9mnQ3fmGyA/z9Xu5+3GYjGuN3QDLGA8kbnDggIeo8vZrTZYL9aITVHMUH/6oKwAtg4Q5Tx4ftguj4zvMMWiZTFHuv05V0FgyoQkSggKLE3w8ZndEjZfaBbtgUeN/eGeAl2oeP8w53eM4ebh2+VNYNVGr+5zr1VGkkXz1SoRT3YEJtSjH0DvinZDrsU3VZZY9hIcUKu3dzhPuwZFMIDGshDxVqf/0XADOFUqgYFeHmg64O+ikIye4MiuBKw/miqSvx6lZSdjlsYyHruYFCbjcZue/WIKAw5nWZNQ+YZmzxMWZV4czImO8q2ljMOXUluVgW78mZMYsqzsoE5tX6PVO4I7aVL4L9mnb01nPDAPgJAXCGfudOkHfUi6jaVTkvLqSJvifbCzhsRvaPCA2VAQGUTssv9pm2YkCP5rOOeasU+XgJtLJif8Uv1g/zNjNajNU19A1PLCSNgdvX381Dgd3NS/DjMtNtgTXxGjSpHwQM54aL/lp6a2XhCpSpBZBcBz01KQJGsgLUgDDQJSzO1e8OdiP6YQHIGEA0OM4Wfoq2I3TLWMSlGSzJBvUBHJwstPMjTbH+1HM2AOY80orVHQWzttZlc=

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v0.7.0](https://github.com/twingly/ecco/tree/v0.7.0) (2016-10-07)
+[Full Changelog](https://github.com/twingly/ecco/compare/v0.6.1...v0.7.0)
+
+**Implemented enhancements:**
+
+- Extend on\_save\_position with information about the event [\#23](https://github.com/twingly/ecco/issues/23)
+
+**Merged pull requests:**
+
+- Expose event information in on\_save\_position [\#24](https://github.com/twingly/ecco/pull/24) ([dentarg](https://github.com/dentarg))
+- Add changelog [\#21](https://github.com/twingly/ecco/pull/21) ([dentarg](https://github.com/dentarg))
+
 ## [v0.6.1](https://github.com/twingly/ecco/tree/v0.6.1) (2016-07-18)
 [Full Changelog](https://github.com/twingly/ecco/compare/v0.6.0...v0.6.1)
 

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/twingly/ecco.svg?branch=master)](https://travis-ci.org/twingly/ecco)
 
-MySQL (version 5.5 and 5.6) replication binlog parser using [mysql-binlog-connector-java].
+MySQL (5.6 and 5.7) replication binlog parser using [mysql-binlog-connector-java].
 
 ## Installation
 
@@ -46,8 +46,8 @@ client.on_row_event do |row_event|
   puts "Row event: #{database} #{table} #{type} #{second_column}"
 end
 
-client.on_save_position do |filename, position|
-  puts "Save event: #{filename} #{position}"
+client.on_save_position do |filename, position, event_type_name|
+  puts "Saved #{event_type_name} event: #{filename} #{position}"
 end
 
 client.on_communication_failure do |client, error|
@@ -91,13 +91,22 @@ The integration tests don't run by default. To run all the tests, including inte
 
 The tests needs a MySQL server with replication enabled.
 
-Ecco includes a Vagrant machine, that can be used for this. Note that your Vagrant host need to have [Ansible] installed as it is used for provisioning.
+Ecco includes multiple Docker Compose definitions that can be used for this, one per supported MySQL version.
 
-Just start it before running the tests
+Start the desired version before running the tests:
 
-    vagrant up
+```shell
+# MySQL 5.6
+docker-compose -f docker-compose-mysql-base.yml -f docker-compose-mysql-5-6.yml up
 
-*Note: Stop any local mysql servers first as it forwards mysql to localhost:3306.*
+# MySQL 5.7
+docker-compose -f docker-compose-mysql-base.yml -f docker-compose-mysql-5-7.yml up
+
+# MySQL 8.0
+docker-compose -f docker-compose-mysql-base.yml -f docker-compose-mysql-8-0.yml up
+```
+
+*Note: Stop any local MySQL server first, otherwise there will be port collisions*
 
 ## Release
 
@@ -123,5 +132,4 @@ Make a commit with the changelog changes and push.
 The gem is available as open source under the terms of the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0).
 
 [mysql-binlog-connector-java]: https://github.com/shyiko/mysql-binlog-connector-java
-[Ansible]: http://www.ansible.com/
 [GitHub Changelog Generator]: https://github.com/skywinder/github-changelog-generator/

data/docker-compose-mysql-5-6.yml

@@ -0,0 +1,5 @@
+version: "3.7"
+
+services:
+  db:
+    image: mysql:5.6

data/docker-compose-mysql-5-7.yml

@@ -0,0 +1,5 @@
+version: "3.7"
+
+services:
+  db:
+    image: mysql:5.7

data/docker-compose-mysql-8-0.yml

@@ -0,0 +1,5 @@
+version: "3.7"
+
+services:
+  db:
+    image: mysql:8.0

data/docker-compose-mysql-base.yml

@@ -0,0 +1,13 @@
+# https://docs.docker.com/compose/extends/#adding-and-overriding-configuration
+
+version: "3.7"
+
+services:
+  db:
+    volumes:
+      - ./docker/ecco-my.cnf:/etc/mysql/conf.d/ecco-my.cnf
+    ports:
+      - 3306:3306
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_DATABASE: ecco_test

data/{vagrant/files → docker}/ecco-my.cnf

@@ -2,4 +2,3 @@
 log-bin=mysql-bin
 server-id=1
 binlog-format=ROW
-bind-address=0.0.0.0

data/ecco.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sequel"
   spec.add_development_dependency "jdbc-mysql"

data/lib/ecco/client.rb

@@ -12,10 +12,25 @@ module Ecco
     def_delegators :@client, :set_server_id, :get_server_id
     def_delegators :@client, :set_keep_alive, :is_keep_alive
     def_delegators :@client, :set_keep_alive_interval, :get_keep_alive_interval
-    def_delegators :@client, :set_keep_alive_connect_timeout, :get_keep_alive_connect_timeout
+    def_delegators :@client, :set_heartbeat_interval, :get_heartbeat_interval
+    def_delegators :@client, :set_connect_timeout, :get_connect_timeout
     def_delegators :@client, :set_binlog_filename, :get_binlog_filename
     def_delegators :@client, :set_binlog_position, :get_binlog_position
 
+    def get_keep_alive_connect_timeout
+      warn "[DEPRECATION] `#{__method__}` is deprecated. "\
+           "Please use `get_connect_timeout` instead."
+
+      get_connect_timeout
+    end
+
+    def set_keep_alive_connect_timeout(timeout)
+      warn "[DEPRECATION] `#{__method__}` is deprecated. "\
+           "Please use `set_connect_timeout` instead."
+
+      set_connect_timeout(timeout)
+    end
+
     java_import com.github.shyiko.mysql.binlog.BinaryLogClient
     java_import java.io.IOException
 

data/lib/ecco/version.rb

@@ -1,4 +1,4 @@
 module Ecco
-  VERSION = "0.7.0"
-  MYSQL_BINLOG_CONNECTOR_VERSION = "0.2.4"
+  VERSION = "0.8.0"
+  MYSQL_BINLOG_CONNECTOR_VERSION = "0.21.0"
 end

data/pom.xml

@@ -14,7 +14,7 @@
     <dependency>
       <groupId>com.github.shyiko</groupId>
       <artifactId>mysql-binlog-connector-java</artifactId>
-      <version>0.2.4</version>
+      <version>0.21.0</version>
     </dependency>
   </dependencies>
 </project>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecco
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: java
 authors:
 - Twingly AB
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2020-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
   name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -29,15 +29,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: sequel
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: jdbc-mysql
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,10 +95,14 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- Vagrantfile
 - bin/all_specs
 - bin/console
 - bin/specs
+- docker-compose-mysql-5-6.yml
+- docker-compose-mysql-5-7.yml
+- docker-compose-mysql-8-0.yml
+- docker-compose-mysql-base.yml
+- docker/ecco-my.cnf
 - ecco.gemspec
 - lib/ecco.rb
 - lib/ecco/client.rb
@@ -109,10 +113,8 @@ files:
 - lib/ecco/row_event_listener.rb
 - lib/ecco/save_event_listener.rb
 - lib/ecco/version.rb
-- lib/ext/mysql-binlog-connector-java-0.2.4.jar
+- lib/ext/mysql-binlog-connector-java-0.21.0.jar
 - pom.xml
-- vagrant/files/ecco-my.cnf
-- vagrant/playbook.yml
 homepage: https://github.com/twingly/ecco
 licenses:
 - Apache-2.0
@@ -132,8 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.7
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: MySQL replication binlog parser.

data/Vagrantfile

@@ -1,14 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.define "ecco-test" do |ubuntu|
-    ubuntu.vm.hostname = "ecco-test"
-    ubuntu.vm.box = "ubuntu/trusty64"
-    ubuntu.vm.provision :ansible do |ansible|
-      ansible.playbook = "vagrant/playbook.yml"
-    end
-
-    ubuntu.vm.network :forwarded_port, host: 3306, guest: 3306
-    ubuntu.vm.provider "virtualbox" do |vbox|
-      vbox.memory = 1024
-    end
-  end
-end

data/vagrant/playbook.yml

@@ -1,27 +0,0 @@
----
-- hosts: all
-  become: yes
-  tasks:
-
-  - name: Update package cache
-    apt: update_cache=yes
-
-  - name: Install ansible dependencies
-    apt: name={{ item }}
-    with_items:
-      - python-mysqldb
-
-  - name: Install mysql server
-    apt: name=mysql-server-5.6 state=present
-
-  - name: Copy mysql config file
-    copy: src=files/ecco-my.cnf dest=/etc/mysql/conf.d/
-
-  - name: Allow mysql root connection from remote hosts
-    mysql_user: name=root password="" host=% priv=*.*:ALL state=present
-
-  - name: Restart mysql
-    service: name=mysql state=restarted
-
-  - name: Create database
-    mysql_db: name=ecco_test