[DRE-commits] [ruby-em-synchrony] 01/01: Import Debian patch 1.0.5-1
zeha at debian.org
zeha at debian.org
Mon Dec 19 01:14:23 UTC 2016
This is an automated email from the git hooks/post-receive script.
zeha pushed a commit to branch master
in repository ruby-em-synchrony.
commit f28c4165844ca50902ee3379fd0e668877404067
Merge: 0ced324 004de4e
Author: Cédric Boutillier <boutil at debian.org>
Date: Wed Jul 6 19:22:44 2016 +0200
Import Debian patch 1.0.5-1
.travis.yml | 28 ++++
Gemfile | 10 +-
LICENSE | 20 +++
README.md | 26 ++++
debian/changelog | 15 +++
debian/control | 3 +-
debian/patches/disable-amqp.patch | 20 +--
debian/patches/disable-em-mongo-test.patch | 8 +-
.../disable-failing-activerecord-tests.patch | 23 ++--
debian/patches/disable-hiredis-tests.patch | 16 +--
debian/patches/disable-redis-auth.test | 8 +-
.../patches/disable-synchrony-failing-test.patch | 8 +-
.../patches/fix-tests-with-new-rspec-syntax.patch | 44 ------
debian/patches/no-amqp-client.patch | 17 +++
debian/patches/series | 2 +-
em-synchrony.gemspec | 4 +-
.../connection_adapters/em_mysql2_adapter.rb | 7 +-
lib/em-synchrony.rb | 13 ++
lib/em-synchrony/activerecord_4_2.rb | 61 +++++++++
lib/em-synchrony/em-multi.rb | 4 +-
lib/em-synchrony/fiber_iterator.rb | 2 +-
lib/em-synchrony/kernel.rb | 27 ++++
metadata.yml | 149 ---------------------
spec/activerecord_spec.rb | 34 ++---
spec/amqp_spec.rb | 4 +-
spec/defer_spec.rb | 2 +-
spec/em-mongo_spec.rb | 12 +-
spec/fiber_iterator_spec.rb | 13 ++
spec/helper/all.rb | 2 +
spec/hiredis_spec.rb | 7 +-
spec/kernel_override_spec.rb | 78 +++++++++++
spec/multi_spec.rb | 18 ++-
spec/redis_spec.rb | 6 +-
spec/remcached_spec.rb | 6 +-
spec/synchrony_spec.rb | 21 ++-
spec/system_spec.rb | 8 +-
spec/widgets.sql | 9 ++
37 files changed, 439 insertions(+), 296 deletions(-)
diff --cc debian/changelog
index c6829a6,0000000..656f25e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,0 +1,43 @@@
++ruby-em-synchrony (1.0.5-1) unstable; urgency=medium
++
++ * Team upload
++ * Imported Upstream version 1.0.5
++ * Remove version in the gem2deb build-dependency
++ * Use https:// in Vcs-* fields
++ * Add no-amqp-client.patch to remove reference to AMQP::Client, which
++ disappeared in amqp >= 1.1 (Closes: #818258)
++ * Drop fix-tests-with-new-rspec-syntax.patch, not needed anymore
++ * Refresh patches
++ * Bump Standards-Version to 3.9.8 (no changes needed)
++ * Set Testsuite to autopkgtest-pkg-ruby
++
++ -- Cédric Boutillier <boutil at debian.org> Wed, 06 Jul 2016 19:22:44 +0200
++
+ruby-em-synchrony (1.0.4-1) unstable; urgency=medium
+
+ * Team upload.
+ * Imported Upstream version 1.0.4
+ * Create patch to fix tests with ruby2.3 (Closes: #800029)
+ * Create patch to remove relative requires from tests
+ * Refresh existent patches
+ * Update disable-failing-activerecord-tests.patch, skip new activerecord test
+ * rename debian/start_services_and_auto_install.sh to
+ debian/start_services_and_run.sh and make it generic; adapt all in
+ debian/rules accordingly.
+ * Move logic for calling debian/start_services_and_run.sh for running the
+ tests inside debian/ruby-tests.rake
+ * debian/control: update Vcs ulr, silence lintian
+ * Declare compliance with Debian policy 3.9.7
+ * debian/copyright: add Upstream-Contact field and add some commas
+ * Update Debian packaging copyright
+ * Bump debhelper compatibility level to 9
+ * debian/control: wrap and sort
+
+ -- Lucas Kanashiro <kanashiro.duarte at gmail.com> Wed, 02 Mar 2016 09:35:09 -0300
+
+ruby-em-synchrony (1.0.3-1) unstable; urgency=low
+
+ [ Jonas Genannt ]
+ * Initial release (Closes: #705578)
+
+ -- Pirate Praveen <praveen at debian.org> Sun, 04 May 2014 14:48:43 +0530
diff --cc debian/control
index 23eaf82,0000000..13c7820
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,57 -1,0 +1,58 @@@
+Source: ruby-em-synchrony
+Section: ruby
+Priority: optional
+Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Uploaders: Jonas Genannt <jonas.genannt at capi2name.de>,
+ Pirate Praveen <praveen at debian.org>
+Build-Depends: debhelper (>= 9),
+ gem2deb,
+ memcached,
+ mysql-server,
+ procps,
+ redis-server,
+ ruby-activerecord,
+ ruby-amq-protocol,
+ ruby-amqp,
+ ruby-em-hiredis,
+ ruby-em-http-request (>= 1.1.2-2),
+ ruby-em-mongo,
+ ruby-em-redis,
+ ruby-eventmachine,
+ ruby-mongo,
+ ruby-mysql2,
+ ruby-remcached,
+ ruby-rspec
- Standards-Version: 3.9.7
++Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-em-synchrony.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-em-synchrony.git
+Homepage: http://github.com/igrigorik/em-synchrony
+XS-Ruby-Versions: all
++Testsuite: autopkgtest-pkg-ruby
+
+Package: ruby-em-synchrony
+Architecture: all
+XB-Ruby-Versions: ${ruby:Versions}
+Depends: ruby | ruby-interpreter,
+ ruby-activerecord,
+ ruby-amq-protocol,
+ ruby-amqp,
+ ruby-em-hiredis,
+ ruby-em-http-request,
+ ruby-em-mongo,
+ ruby-eventmachine,
+ ruby-mongo,
+ ruby-mysql2,
+ ruby-remcached,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: fiber aware EventMachine libraries
+ Collection of convenience classes and primitives to help untangle evented
+ code, plus a number of patched EM clients to make them Fiber aware.
+ .
+ * Fiber aware ConnectionPool with sync/async query support
+ * Fiber aware Iterator to allow concurrency control & mixing of sync / async
+ * Fiber aware async inline support: turns any async function into sync
+ * Fiber aware Multi-request interface for any callback enabled clients
+ * Fiber aware TCPSocket replacement, powered by EventMachine
+ * Fiber aware Thread, Mutex, ConditionVariable clases
+ * Fiber aware sleep, defer, system
diff --cc debian/patches/disable-amqp.patch
index 2a3e8a5,0000000..dbc83bd
mode 100644,000000..100644
--- a/debian/patches/disable-amqp.patch
+++ b/debian/patches/disable-amqp.patch
@@@ -1,79 -1,0 +1,79 @@@
+Description: Disable tests requiring amqp service
+ Debian specific patch
+Author: Pirate Praveen <praveen at debian.org>
- Last-Updated: 2014-05-04
++Last-Update: 2016-07-06
+
+--- a/spec/amqp_spec.rb
++++ b/spec/amqp_spec.rb
- @@ -2,7 +2,7 @@ require "spec/helper/all"
++@@ -2,7 +2,7 @@
+
+ describe EM::Synchrony::AMQP do
+
+- it "should yield until connection is ready" do
++ xit "should yield until connection is ready" do
+ EM.synchrony do
+ connection = EM::Synchrony::AMQP.connect
- connection.connected?.should be_true
- @@ -10,7 +10,7 @@ describe EM::Synchrony::AMQP do
++ connection.connected?.should eq(true)
++@@ -10,7 +10,7 @@
+ end
+ end
+
+- it "should yield until disconnection is complete" do
++ xit "should yield until disconnection is complete" do
+ EM.synchrony do
+ connection = EM::Synchrony::AMQP.connect
+ connection.disconnect
- @@ -19,7 +19,7 @@ describe EM::Synchrony::AMQP do
++@@ -19,7 +19,7 @@
+ end
+ end
+
+- it "should yield until the channel is created" do
++ xit "should yield until the channel is created" do
+ EM.synchrony do
+ connection = EM::Synchrony::AMQP.connect
+ channel = EM::Synchrony::AMQP::Channel.new(connection)
- @@ -28,7 +28,7 @@ describe EM::Synchrony::AMQP do
++@@ -28,7 +28,7 @@
+ end
+ end
+
+- it "should yield until the queue is created" do
++ xit "should yield until the queue is created" do
+ EM.synchrony do
+ connection = EM::Synchrony::AMQP.connect
+ channel = EM::Synchrony::AMQP::Channel.new(connection)
- @@ -37,7 +37,7 @@ describe EM::Synchrony::AMQP do
++@@ -37,7 +37,7 @@
+ end
+ end
+
+- it "should yield when a queue is created from a channel" do
++ xit "should yield when a queue is created from a channel" do
+ EM.synchrony do
+ connection = EM::Synchrony::AMQP.connect
+ channel = EM::Synchrony::AMQP::Channel.new(connection)
- @@ -46,7 +46,7 @@ describe EM::Synchrony::AMQP do
++@@ -46,7 +46,7 @@
+ end
+ end
+
+- it "should yield until the exchange is created" do
++ xit "should yield until the exchange is created" do
+ EM.synchrony do
+ connection = EM::Synchrony::AMQP.connect
+ channel = EM::Synchrony::AMQP::Channel.new(connection)
- @@ -65,7 +65,7 @@ describe EM::Synchrony::AMQP do
++@@ -65,7 +65,7 @@
+ end
+ end
+
+- it "should publish and receive messages" do
++ xit "should publish and receive messages" do
+ nb_msg = 10
+ EM.synchrony do
+ connection = EM::Synchrony::AMQP.connect
- @@ -102,7 +102,7 @@ describe EM::Synchrony::AMQP do
++@@ -102,7 +102,7 @@
+ end
+ end
+
+- it "should handle several consumers" do
++ xit "should handle several consumers" do
+ nb_msg = 10
+ EM.synchrony do
+ connection = EM::Synchrony::AMQP.connect
diff --cc debian/patches/disable-em-mongo-test.patch
index 95ff35f,0000000..2f22260
mode 100644,000000..100644
--- a/debian/patches/disable-em-mongo-test.patch
+++ b/debian/patches/disable-em-mongo-test.patch
@@@ -1,124 -1,0 +1,124 @@@
+Description: Disable tests requiring mongodb service
+ Debian specific patch
+Author: Pirate Praveen <praveen at debian.org>
- Last-Updated: 2014-05-04
++Last-Update: 2016-07-06
+
+--- a/spec/em-mongo_spec.rb
++++ b/spec/em-mongo_spec.rb
+@@ -1,7 +1,7 @@
+ require "spec/helper/all"
+
+ describe EM::Mongo do
+- it "should yield until connection is ready" do
++ xit "should yield until connection is ready" do
+ EventMachine.synchrony do
+ connection = EM::Mongo::Connection.new
- connection.connected?.should be_true
++ connection.connected?.should eq(true)
+@@ -14,7 +14,7 @@
+ end
+
+ describe 'Synchronously (find & first)' do
+- it "should insert a record into db" do
++ xit "should insert a record into db" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -30,7 +30,7 @@
+ end
+ end
+
+- it "should insert a record into db and be able to find it" do
++ xit "should insert a record into db and be able to find it" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -51,7 +51,7 @@
+ end
+ end
+
+- it "should be able to order results" do
++ xit "should be able to order results" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -81,7 +81,7 @@
+ #
+ if defined?(EM::Mongo::Cursor)
+ describe '*A*synchronously (afind & afirst) [Mongo > 0.3.6, using cursor]' do
+- it "should insert a record into db" do
++ xit "should insert a record into db" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -99,7 +99,7 @@
+ end
+ end
+
+- it "should insert a record into db and be able to find it" do
++ xit "should insert a record into db and be able to find it" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -121,7 +121,7 @@
+ end
+ end
+
+- it "should be able to order results" do
++ xit "should be able to order results" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -149,7 +149,7 @@
+
+ else
+ describe '*A*synchronously (afind & afirst) [Mongo <= 0.3.6, using blocks]' do
+- it "should insert a record into db" do
++ xit "should insert a record into db" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -166,7 +166,7 @@
+ end
+ end
+
+- it "should insert a record into db and be able to find it" do
++ xit "should insert a record into db and be able to find it" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -188,7 +188,7 @@
+ end
+ end
+
+- it "should be able to order results" do
++ xit "should be able to order results" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -216,7 +216,7 @@
+
+ end
+
+- it "should update records in db" do
++ xit "should update records in db" do
+ EventMachine.synchrony do
+ collection = EM::Mongo::Connection.new.db('db').collection('test')
+ collection.remove({}) # nuke all keys in collection
+@@ -233,7 +233,7 @@
+
+ context "authentication" do
+ # these specs only get asserted if you run mongod with the --auth flag
- - it "successfully authenticates" do
- + xit "successfully authenticates" do
++- it "successfully authenticates", ci_skip: true do
+++ xit "successfully authenticates", ci_skip: true do
+ # For this spec you will need to add this user to the database
+ #
+ # From the Mongo shell:
+@@ -246,7 +246,7 @@
+ end
+ end
+
+- it "raises an AuthenticationError if it cannot authenticate" do
++ xit "raises an AuthenticationError if it cannot authenticate" do
+ EventMachine.synchrony do
+ database = EM::Mongo::Connection.new.db('db')
+ proc {
diff --cc debian/patches/disable-failing-activerecord-tests.patch
index b214e5e,0000000..a1094c1
mode 100644,000000..100644
--- a/debian/patches/disable-failing-activerecord-tests.patch
+++ b/debian/patches/disable-failing-activerecord-tests.patch
@@@ -1,68 -1,0 +1,61 @@@
+Description: Disable failing activerecord tests
+ Debian specific patch. Help troubleshooting this is welcome.
+Author: Pirate Praveen <praveen at debian.org>
- Last-Updated: 2014-05-04
++Last-Update: 2016-07-06
+
+--- a/spec/activerecord_spec.rb
++++ b/spec/activerecord_spec.rb
- @@ -26,7 +26,7 @@ describe "Fiberized ActiveRecord driver
- Widget.delete_all
++@@ -29,7 +29,7 @@
++ Widget.delete_all
+ end
+
+- it "should establish AR connection" do
++ xit "should establish AR connection" do
+ EventMachine.synchrony do
+ establish_connection
+
- @@ -36,7 +36,7 @@ describe "Fiberized ActiveRecord driver
++@@ -39,7 +39,7 @@
+ end
+ end
+
+- it "should fire sequential, synchronous requests within single fiber" do
++ xit "should fire sequential, synchronous requests within single fiber" do
+ EventMachine.synchrony do
+ establish_connection
+
- @@ -53,7 +53,7 @@ describe "Fiberized ActiveRecord driver
++@@ -56,7 +56,7 @@
+ end
+ end
+
+- it "should fire 100 requests in fibers" do
++ xit "should fire 100 requests in fibers" do
+ EM.synchrony do
+ establish_connection
+ EM::Synchrony::FiberIterator.new(1..100, 40).each do |i|
- @@ -64,7 +64,7 @@ describe "Fiberized ActiveRecord driver
++@@ -67,7 +67,7 @@
+ end
+ end
+
+- it "should create widget" do
++ xit "should create widget" do
+ EM.synchrony do
+ establish_connection
+ Widget.create
- @@ -74,7 +74,7 @@ describe "Fiberized ActiveRecord driver
++@@ -77,7 +77,7 @@
+ end
+ end
+
+- it "should update widget" do
++ xit "should update widget" do
+ EM.synchrony do
+ establish_connection
+ ActiveRecord::Base.connection.execute("TRUNCATE TABLE widgets;")
- @@ -86,7 +86,7 @@ describe "Fiberized ActiveRecord driver
++@@ -89,7 +89,7 @@
+ end
+
+ describe "transactions" do
+- it "should work properly" do
++ xit "should work properly" do
+ EM.synchrony do
+ establish_connection
+ EM::Synchrony::FiberIterator.new(1..50, 30).each do |i|
- @@ -106,4 +106,4 @@ describe "Fiberized ActiveRecord driver
- end
- end
-
- -end
- \ No newline at end of file
- +end
diff --cc debian/patches/disable-hiredis-tests.patch
index 216834e,0000000..9165a1e
mode 100644,000000..100644
--- a/debian/patches/disable-hiredis-tests.patch
+++ b/debian/patches/disable-hiredis-tests.patch
@@@ -1,52 -1,0 +1,52 @@@
+Description: Disable tests requiring hiredis adapter
+ Debian specific patch
+Author: Pirate Praveen <praveen at debian.org>
- Last-Updated: 2014-05-04
++Last-Update: 2016-07-06
+
+--- a/spec/hiredis_spec.rb
++++ b/spec/hiredis_spec.rb
+@@ -2,7 +2,7 @@
+
+ describe EM::Hiredis do
+
- - it "should yield until connection is ready" do
- + xit "should yield until connection is ready" do
++- it "should connect on demand" do
+++ xit "should connect on demand" do
+ EventMachine.synchrony do
+ connection = EM::Hiredis::Client.connect
- connection.connected.should be_true
- @@ -11,7 +11,7 @@
++ connection.should_not be_connected
++@@ -14,7 +14,7 @@
+ end
+ end
+
+- it "should work with compact connect syntax" do
++ xit "should work with compact connect syntax" do
+ EventMachine.synchrony do
+ redis = EM::Hiredis.connect
+
- @@ -22,7 +22,7 @@
++@@ -25,7 +25,7 @@
+ end
+ end
+
+- it "should work with manual db select" do
++ xit "should work with manual db select" do
+ EventMachine.synchrony do
+ redis = EM::Hiredis.connect 'redis://127.0.0.1:6379'
+ redis.select(0)
- @@ -34,7 +34,7 @@
++@@ -37,7 +37,7 @@
+ end
+ end
+
+- it "should get/set records synchronously" do
++ xit "should get/set records synchronously" do
+ EventMachine.synchrony do
+ redis = EM::Hiredis::Client.connect
+
- @@ -46,7 +46,7 @@
++@@ -49,7 +49,7 @@
+ end
+ end
+
+- it "should incr/decr key synchronously" do
++ xit "should incr/decr key synchronously" do
+ EventMachine.synchrony do
+ redis = EM::Hiredis::Client.connect
+ redis.del('key')
diff --cc debian/patches/disable-redis-auth.test
index a4b01eb,0000000..e4bc15a
mode 100644,000000..100644
--- a/debian/patches/disable-redis-auth.test
+++ b/debian/patches/disable-redis-auth.test
@@@ -1,16 -1,0 +1,16 @@@
+Description: Disable tests that tries to auth to redis
+ Debian specific patch
+Author: Pirate Praveen <praveen at debian.org>
- Last-Updated: 2014-05-04
++Last-Update: 2016-07-06
+
+--- a/spec/redis_spec.rb
++++ b/spec/redis_spec.rb
- @@ -90,7 +90,7 @@ describe EM::Protocols::Redis do
++@@ -90,7 +90,7 @@
+ end
+ end
+
- - it "should execute sync add and auth" do
- + xit "should execute sync add and auth" do
++- it "should execute sync add and auth", ci_skip: true do
+++ xit "should execute sync add and auth", ci_skip: true do
+ EventMachine.synchrony do
+ redis = EM::Protocols::Redis.connect
+ redis.auth('abc')
diff --cc debian/patches/disable-synchrony-failing-test.patch
index 90f284f,0000000..a62550f
mode 100644,000000..100644
--- a/debian/patches/disable-synchrony-failing-test.patch
+++ b/debian/patches/disable-synchrony-failing-test.patch
@@@ -1,16 -1,0 +1,16 @@@
+Description: Disable failing tests
+ Debian specific patch. Troubleshooting help welcome.
+Author: Pirate Praveen <praveen at debian.org>
- Last-Updated: 2014-05-04
++Last-Update: 2016-07-06
+
+--- a/spec/synchrony_spec.rb
++++ b/spec/synchrony_spec.rb
+@@ -18,7 +18,7 @@
+ end
+
+ describe "#next_tick" do
+- it "should wrap next_tick into a Fiber context" do
++ xit "should wrap next_tick into a Fiber context" do
- Fiber.new {
- df = EM::DefaultDeferrable.new
-
++ EM.synchrony {
++ begin
++ fired = false
diff --cc debian/patches/no-amqp-client.patch
index 0000000,0000000..457a8b4
new file mode 100644
--- /dev/null
+++ b/debian/patches/no-amqp-client.patch
@@@ -1,0 -1,0 +1,17 @@@
++Decription: remove usage of client in AMQP, as it has disappeared since amqp 1.1.x
++Bug: https://github.com/igrigorik/em-synchrony/issues/178
++Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818258
++Author: Cédric Boutillier <boutil at debian.org>
++Last-Update: 2016-07-06
++
++
++--- a/lib/em-synchrony/amqp.rb
+++++ b/lib/em-synchrony/amqp.rb
++@@ -186,7 +186,6 @@
++ module_eval(code, __FILE__, line)
++ end
++ end
++- ::AMQP.client = ::EM::Synchrony::AMQP::Session
++ end
++ end
++ end
diff --cc debian/patches/series
index d80753e,0000000..348f7e5
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,11 -1,0 +1,11 @@@
+remove-relative-require-from-tests.patch
- fix-tests-with-new-rspec-syntax.patch
+disable-hiredis-tests.patch
+disable-amqp.patch
+disable-connection-pool-tests.patch
+disable-em-mongo-test.patch
+disable-mongo-tests.patch
+disable-synchrony-failing-test.patch
+disable-network-tests.patch
+disable-redis-auth.test
+disable-failing-activerecord-tests.patch
++no-amqp-client.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-em-synchrony.git
More information about the Pkg-ruby-extras-commits
mailing list