ecco 0.3.1-java → 0.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5de5d242ea893caf73ec7ccd363865d8b82fd76f
-  data.tar.gz: 8f3261533096668cbd7bb226e0e59a6cb058d57a
+  metadata.gz: dd1b527dc35566172d3b9365bf81b4a13f474855
+  data.tar.gz: d8537a4cb9aa49ccfe4ff2c203d2157d22b521a7
 SHA512:
-  metadata.gz: f5b5568a8d96673ecb018ce070e7e0aeaa3ff93d9051d78869f5e9d8507070e24185cdc9547300bd06ef84ddee1de5aed264e7dfbfeab2a3d7672071ae3ef837
-  data.tar.gz: 87de078128a9364b0b4fcdebd44a60191e0749bbc008acec540a92026248a1832beaf239fec0d89629d8797eaf8b1537bde943b0be760be5a504f90329335889
+  metadata.gz: 21ebf8126ab13e13635514f67c8b9635516f37dad9d87710f95e4c211cf4a1da465273e3a8422ccf4b688ba2b240cbd085b6afde5524bb9257620604a5e13e37
+  data.tar.gz: 13fac62a6a3089741ca5176bb7163ddc21482e15571e6bb1ce078d4b5cd634a6608eaf70341ee856c46b56b81f944b905c8eb29d7f6a709857ddd96212d38545

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+.env
+.vagrant

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--order rand

data/.travis.yml

@@ -1,5 +1,26 @@
+sudo: true
+
 language: ruby
-before_install: gem install bundler -v 1.10.6
+
+services:
+  - mysql
+
+before_install:
+  - rvm get head
+  - rvm use jruby-9.0.3.0 --install
+  - 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 -v 1.10.6
+
+env:
+  global:
+    - DATABASE_USER=root
+    - DATABASE_PASS=""
+    - DATABASE_URL=jdbc:mysql://localhost:3306/ecco_test
+
+script: bin/all_specs
+
 notifications:
   email: false
   hipchat:

data/README.md

@@ -69,7 +69,7 @@ Note: You need Maven to download
 
 Run the tests
 
-    jruby --dev -G -S rake
+    bin/specs
 
 For an interactive prompt
 
@@ -79,6 +79,22 @@ To install this gem onto your local machine
 
     bundle exec rake install
 
+### Integration tests
+
+The integration tests don't run by default. To run all the tests, including integration, use
+
+    bin/all_specs
+
+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.
+
+Just start it before running the tests
+
+    vagrant up
+
+*Note: Stop any local mysql servers first as it forwards mysql to localhost:3306.*
+
 ## Release
 
 To release a new version, update the version number in `version.rb`, and then run
@@ -92,3 +108,4 @@ which will create a git tag for the version, push git commits and tags, 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/

data/Rakefile

@@ -1,7 +1,13 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |task|
+  task.exclude_pattern = "spec/integration/*_spec.rb"
+end
+
+namespace :spec do
+  RSpec::Core::RakeTask.new(:all)
+end
 
 task :default => :spec
 

data/Vagrantfile

@@ -0,0 +1,11 @@
+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
+  end
+end

data/bin/all_specs

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+jruby --dev -G -S rake spec:all

data/bin/specs

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+jruby --dev -G -S rake

data/ecco.gemspec

@@ -22,4 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "sequel"
+  spec.add_development_dependency "jdbc-mysql"
 end

data/lib/ecco/client.rb

@@ -1,15 +1,19 @@
 require "ext/mysql-binlog-connector-java-#{Ecco::MYSQL_BINLOG_CONNECTOR_VERSION}.jar"
 require "ecco/row_event_listener"
 require "ecco/save_event_listener"
+require "ecco/error"
 
 module Ecco
   class Client
+    DEFAULT_CONNECT_TIMEOUT = 3000 # ms
+
     extend Forwardable
     def_delegators :@client, :set_server_id, :get_server_id
     def_delegators :@client, :set_binlog_filename, :get_binlog_filename
     def_delegators :@client, :set_binlog_position, :get_binlog_position
 
     java_import com.github.shyiko.mysql.binlog.BinaryLogClient
+    java_import java.io.IOException
 
     def initialize(hostname: "localhost", port: 3306, username:, password:)
       @client = BinaryLogClient.new(hostname, port, username, password)
@@ -31,6 +35,16 @@ module Ecco
 
     def start
       @client.connect
+    rescue IOException => e
+      raise Ecco::Error::ConnectionError, e.get_message
+    end
+
+    def start_in_thread(connect_timeout: DEFAULT_CONNECT_TIMEOUT)
+      @client.connect(connect_timeout)
+    end
+
+    def stop
+      @client.disconnect
     end
   end
 end

data/lib/ecco/error.rb

@@ -0,0 +1,6 @@
+module Ecco
+  module Error
+    class ConnectionError < StandardError
+    end
+  end
+end

data/lib/ecco/version.rb

@@ -1,4 +1,4 @@
 module Ecco
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
   MYSQL_BINLOG_CONNECTOR_VERSION = "0.2.4"
 end

data/vagrant/files/ecco-my.cnf

@@ -0,0 +1,5 @@
+[mysqld]
+log-bin=mysql-bin
+server-id=1
+binlog-format=ROW
+bind-address=0.0.0.0

data/vagrant/playbook.yml

@@ -0,0 +1,27 @@
+---
+- hosts: all
+  sudo: 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 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

metadata

@@ -1,57 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: ecco
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: java
 authors:
 - Twingly AB
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
   name: bundler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '10.0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
+  name: rspec
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: sequel
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  name: jdbc-mysql
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: MySQL replication binlog parser using mysql-binlog-connector-java.
 email:
 - support@twingly.com
@@ -66,10 +94,14 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- Vagrantfile
+- bin/all_specs
 - bin/console
+- bin/specs
 - ecco.gemspec
 - lib/ecco.rb
 - lib/ecco/client.rb
+- lib/ecco/error.rb
 - lib/ecco/event_listener.rb
 - lib/ecco/row_event.rb
 - lib/ecco/row_event_listener.rb
@@ -77,6 +109,8 @@ files:
 - lib/ecco/version.rb
 - lib/ext/mysql-binlog-connector-java-0.2.4.jar
 - pom.xml
+- vagrant/files/ecco-my.cnf
+- vagrant/playbook.yml
 homepage: https://github.com/twingly/ecco
 licenses:
 - Apache-2.0