diff -Nru ruby-amqp-1.5.1/amqp.gemspec ruby-amqp-1.6.0/amqp.gemspec --- ruby-amqp-1.5.1/amqp.gemspec 2015-09-06 10:32:45.000000000 +0000 +++ ruby-amqp-1.6.0/amqp.gemspec 2016-04-06 09:39:32.000000000 +0000 @@ -9,9 +9,8 @@ s.version = AMQP::VERSION s.authors = ["Aman Gupta", "Jakub Stastny aka botanicus", "Michael S. Klishin"] s.homepage = "http://rubyamqp.info" - s.summary = "Widely used, feature-rich asynchronous RabbitMQ client with batteries included" - # RubyGems will emit warnings if summary is the same as description. I have no idea why but lets trick it. MK. - s.description = "Widely used, feature-rich asynchronous RabbitMQ client with batteries included." + s.summary = "Mature EventMachine-based RabbitMQ client" + s.description = "Mature EventMachine-based RabbitMQ client." s.email = ["bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=\n", "c3Rhc3RueUAxMDFpZGVhcy5jeg==\n"].map { |i| Base64.decode64(i) } s.licenses = ["Ruby"] @@ -24,7 +23,7 @@ # Dependencies s.add_dependency "eventmachine" - s.add_dependency "amq-protocol", "~> 1.9" + s.add_dependency "amq-protocol", ">= 2.0.1" s.rubyforge_project = "amqp" end diff -Nru ruby-amqp-1.5.1/ChangeLog.md ruby-amqp-1.6.0/ChangeLog.md --- ruby-amqp-1.5.1/ChangeLog.md 2015-09-06 10:32:45.000000000 +0000 +++ ruby-amqp-1.6.0/ChangeLog.md 2016-04-06 09:39:32.000000000 +0000 @@ -1,3 +1,31 @@ +## Changes Between 1.5.x and 1.6.0 (Apr 4th, 2016) + +### amq-protocol Update + +Minimum `amq-protocol` version is now `2.0.1`. + +### Provide More Details in TCP Connection Failure Exception + +Contributed by Neil Hooey. + +GH issue: [#222](https://github.com/ruby-amqp/amqp/issues/222). + + +### Ensures frameset is cleared after an unhandled exception + +Ensures frameset is cleared after an unhandled exception. +This avoids confusing exceptions such as + +``` +undefined method `method_class' for # +``` + +Contributed by Michael Lutsiuk. + +GH issue: [#218](https://github.com/ruby-amqp/amqp/issues/218) + + + ## Changes Between 1.4.x and 1.5.0 ### Only Await basic.consume-ok If nowait is false diff -Nru ruby-amqp-1.5.1/debian/changelog ruby-amqp-1.6.0/debian/changelog --- ruby-amqp-1.5.1/debian/changelog 2016-03-13 16:31:50.000000000 +0000 +++ ruby-amqp-1.6.0/debian/changelog 2016-04-06 12:12:38.000000000 +0000 @@ -1,3 +1,11 @@ +ruby-amqp (1.6.0-1) unstable; urgency=medium + + * New upstream version + * d/control: Update BD (prepare to enable tests) + * d/patches: Remove 001_bump-amq-protocol patch (Closes: #818153) + + -- Sebastien Badia Wed, 06 Apr 2016 14:12:19 +0200 + ruby-amqp (1.5.1-4) unstable; urgency=medium * Team upload. diff -Nru ruby-amqp-1.5.1/debian/control ruby-amqp-1.6.0/debian/control --- ruby-amqp-1.5.1/debian/control 2016-03-13 16:31:50.000000000 +0000 +++ ruby-amqp-1.6.0/debian/control 2016-04-06 12:12:38.000000000 +0000 @@ -7,7 +7,10 @@ gem2deb, rake, ruby-amq-protocol (>= 1.9), +#ruby-effin-utf8, +#ruby-evented-spec, ruby-eventmachine, + ruby-multi-json, ruby-rspec Standards-Version: 3.9.7 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-amqp.git diff -Nru ruby-amqp-1.5.1/debian/patches/001_bump-amq-protocol.patch ruby-amqp-1.6.0/debian/patches/001_bump-amq-protocol.patch --- ruby-amqp-1.5.1/debian/patches/001_bump-amq-protocol.patch 2016-03-13 16:31:50.000000000 +0000 +++ ruby-amqp-1.6.0/debian/patches/001_bump-amq-protocol.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Pin to amq-protocol 2.0 -Author: Michael Klishin -Origin: upstream, https://github.com/ruby-amqp/amqp/commit/c665bdca4bf36db761d7e87f3e2e73244b684e25.patch -Reviewed-By: Sebastien Badia -Last-Update: 2016-03-11 - ---- ruby-amqp-1.5.1.orig/amqp.gemspec -+++ ruby-amqp-1.5.1/amqp.gemspec -@@ -24,7 +24,7 @@ Gem::Specification.new do |s| - - # Dependencies - s.add_dependency "eventmachine" -- s.add_dependency "amq-protocol", "~> 1.9" -+ s.add_dependency "amq-protocol", ">= 2.0" - - s.rubyforge_project = "amqp" - end diff -Nru ruby-amqp-1.5.1/debian/patches/series ruby-amqp-1.6.0/debian/patches/series --- ruby-amqp-1.5.1/debian/patches/series 2016-03-13 16:31:50.000000000 +0000 +++ ruby-amqp-1.6.0/debian/patches/series 2016-04-06 12:12:38.000000000 +0000 @@ -1,2 +1 @@ -001_bump-amq-protocol.patch 002_remove-bundler-usage.patch diff -Nru ruby-amqp-1.5.1/lib/amqp/channel.rb ruby-amqp-1.6.0/lib/amqp/channel.rb --- ruby-amqp-1.5.1/lib/amqp/channel.rb 2015-09-06 10:32:45.000000000 +0000 +++ ruby-amqp-1.6.0/lib/amqp/channel.rb 2016-04-06 09:39:32.000000000 +0000 @@ -342,7 +342,7 @@ old_id = @id # must release after we allocate a new id, otherwise we will end up # with the same value. MK. - @id = self.class.next_channel_id + @id = @connection.next_channel_id @connection.release_channel_id(old_id) @channel_is_open_deferrable.fail @@ -1184,14 +1184,10 @@ @consumers end # consumers - # @return [Array] Collection of queues that were declared on this channel. - def queues - @queues.values - end - # @return [Array] Collection of exchanges that were declared on this channel. + # @return [Hash] Collection of exchanges that were declared on this channel. def exchanges - @exchanges.values + @exchanges end @@ -1414,7 +1410,7 @@ end - RECOVERY_EVENTS = [:after_connection_interruption, :before_recovery, :after_recovery].freeze + RECOVERY_EVENTS = [:after_connection_interruption, :before_recovery, :after_recovery, :error].freeze # @api plugin diff -Nru ruby-amqp-1.5.1/lib/amqp/session.rb ruby-amqp-1.6.0/lib/amqp/session.rb --- ruby-amqp-1.5.1/lib/amqp/session.rb 2015-09-06 10:32:45.000000000 +0000 +++ ruby-amqp-1.6.0/lib/amqp/session.rb 2016-04-06 09:39:32.000000000 +0000 @@ -635,7 +635,7 @@ def unbind(exception = nil) if !@tcp_connection_established && !@had_successfully_connected_before && !@intentionally_closing_connection @tcp_connection_failed = true - logger.error "[amqp] Detected TCP connection failure" + logger.error "[amqp] Detected TCP connection failure: #{exception}" self.tcp_connection_failed end diff -Nru ruby-amqp-1.5.1/lib/amqp/version.rb ruby-amqp-1.6.0/lib/amqp/version.rb --- ruby-amqp-1.5.1/lib/amqp/version.rb 2015-09-06 10:32:45.000000000 +0000 +++ ruby-amqp-1.6.0/lib/amqp/version.rb 2016-04-06 09:39:32.000000000 +0000 @@ -6,5 +6,5 @@ # # @see AMQ::Protocol::VERSION # @return [String] AMQP gem version - VERSION = '1.5.1' + VERSION = '1.6.0' end diff -Nru ruby-amqp-1.5.1/metadata.yml ruby-amqp-1.6.0/metadata.yml --- ruby-amqp-1.5.1/metadata.yml 2015-09-06 10:32:45.000000000 +0000 +++ ruby-amqp-1.6.0/metadata.yml 1970-01-01 00:00:00.000000000 +0000 @@ -1,332 +0,0 @@ ---- !ruby/object:Gem::Specification -name: amqp -version: !ruby/object:Gem::Version - version: 1.5.1 -platform: ruby -authors: -- Aman Gupta -- Jakub Stastny aka botanicus -- Michael S. Klishin -autorequire: -bindir: bin -cert_chain: [] -date: 2015-08-26 00:00:00.000000000 Z -dependencies: -- !ruby/object:Gem::Dependency - name: eventmachine - requirement: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -- !ruby/object:Gem::Dependency - name: amq-protocol - requirement: !ruby/object:Gem::Requirement - requirements: - - - "~>" - - !ruby/object:Gem::Version - version: '1.9' - type: :runtime - prerelease: false - version_requirements: !ruby/object:Gem::Requirement - requirements: - - - "~>" - - !ruby/object:Gem::Version - version: '1.9' -description: Widely used, feature-rich asynchronous RabbitMQ client with batteries - included. -email: -- michael@novemberain.com -- stastny@101ideas.cz -executables: [] -extensions: [] -extra_rdoc_files: -- README.md -- docs/08Migration.textile -- docs/AMQP091ModelExplained.textile -- docs/Bindings.textile -- docs/Clustering.textile -- docs/ConnectingToTheBroker.textile -- docs/ConnectionEncryptionWithTLS.textile -- docs/DocumentationGuidesIndex.textile -- docs/Durability.textile -- docs/ErrorHandling.textile -- docs/Exchanges.textile -- docs/GettingStarted.textile -- docs/PatternsAndUseCases.textile -- docs/Queues.textile -- docs/RabbitMQVersions.textile -- docs/RunningTests.textile -- docs/TestingWithEventedSpec.textile -- docs/Troubleshooting.textile -- docs/VendorSpecificExtensions.textile -files: -- ".gitignore" -- ".rspec" -- ".ruby-version" -- ".travis.yml" -- ".yardopts" -- ChangeLog.md -- Gemfile -- README.md -- Rakefile -- amqp.gemspec -- bin/ci/before_build.sh -- bin/cleanify.rb -- bin/docup -- bin/irb -- bin/set_test_suite_realms_up.sh -- docs/08Migration.textile -- docs/AMQP091ModelExplained.textile -- docs/Bindings.textile -- docs/Clustering.textile -- docs/ConnectingToTheBroker.textile -- docs/ConnectionEncryptionWithTLS.textile -- docs/DocumentationGuidesIndex.textile -- docs/Durability.textile -- docs/ErrorHandling.textile -- docs/Exchanges.textile -- docs/GettingStarted.textile -- docs/PatternsAndUseCases.textile -- docs/Queues.textile -- docs/RabbitMQVersions.textile -- docs/RunningTests.textile -- docs/TestingWithEventedSpec.textile -- docs/Troubleshooting.textile -- docs/VendorSpecificExtensions.textile -- docs/diagrams/001_hello_world_example_routing.png -- docs/diagrams/002_blabbr_example_routing.png -- docs/diagrams/003_weathr_example_routing.png -- docs/diagrams/004_fanout_exchange.png -- docs/diagrams/005_direct_exchange.png -- docs/diagrams/006_amqp_091_message_acknowledgements.png -- docs/diagrams/007_rabbitmq_publisher_confirms.png -- docs/diagrams/redhat/direct_exchange.png -- docs/diagrams/redhat/fanout_exchange.png -- docs/diagrams/redhat/topic_exchange.png -- examples/channels/open_channel_with_one_arity_callback.rb -- examples/channels/open_channel_without_assignment.rb -- examples/channels/prefetch_as_constructor_argument.rb -- examples/channels/qos_aka_prefetch.rb -- examples/channels/qos_aka_prefetch_without_callback.rb -- examples/connection/connect_and_immediately_disconnect.rb -- examples/error_handling/automatic_recovery_of_channel_and_queues.rb -- examples/error_handling/automatically_recovering_hello_world_consumer.rb -- examples/error_handling/automatically_recovering_hello_world_consumer_that_uses_a_server_named_queue.rb -- examples/error_handling/basic_connection_failover.rb -- examples/error_handling/channel_level_exception.rb -- examples/error_handling/channel_level_exception_with_multiple_channels_involved.rb -- examples/error_handling/connection_level_exception.rb -- examples/error_handling/connection_level_exception_with_objects.rb -- examples/error_handling/connection_loss_handler.rb -- examples/error_handling/global_channel_level_exception_handler.rb -- examples/error_handling/handling_authentication_failure_with_a_callback.rb -- examples/error_handling/handling_authentication_failure_with_a_rescue_block.rb -- examples/error_handling/handling_vhost_misconfiguration_with_a_rescue_block.rb -- examples/error_handling/hello_world_producer.rb -- examples/error_handling/insufficient_permissions.rb -- examples/error_handling/manual_connection_and_channel_recovery.rb -- examples/error_handling/queue_exclusivity_violation.rb -- examples/error_handling/queue_name_violation.rb -- examples/error_handling/reopening_a_channel_after_channel_level_exception.rb -- examples/error_handling/tcp_connection_failure_handling_with_a_rescue_block.rb -- examples/error_handling/tcp_connection_failure_with_a_callback.rb -- examples/exchanges/autodeletion_of_exchanges.rb -- examples/exchanges/declare_an_exchange_without_assignment.rb -- examples/extensions/rabbitmq/connection_blocking.rb -- examples/extensions/rabbitmq/per_queue_message_ttl.rb -- examples/extensions/rabbitmq/publisher_confirmations_with_transient_messages.rb -- examples/extensions/rabbitmq/using_alternate_exchanges.rb -- examples/guides/getting_started/01_hello_world.rb -- examples/guides/getting_started/02_hello_world_dslified.rb -- examples/guides/getting_started/03_blabbr.rb -- examples/guides/getting_started/04_weathr.rb -- examples/guides/queues/01a_declaring_a_server_named_queue_using_queue_constructor.rb -- examples/guides/queues/01b_declaring_a_queue_using_queue_constructor.rb -- examples/guides/queues/02a_declaring_a_durable_shared_queue.rb -- examples/guides/queues/02b_declaring_a_durable_shared_queue.rb -- examples/guides/queues/03a_declaring_a_temporary_exclusive_queue.rb -- examples/guides/queues/03b_declaring_a_temporary_exclusive_queue.rb -- examples/guides/queues/04_bind_a_queue_using_exchange_instance.rb -- examples/guides/queues/05_bind_a_queue_using_exchange_name.rb -- examples/guides/queues/06_subscribe_to_receive_messages.rb -- examples/guides/queues/07_fetch_a_message_from_the_queue.rb -- examples/guides/queues/08_unsubscribing_a_consumer.rb -- examples/guides/queues/09_unbinding_from_exchange.rb -- examples/guides/queues/10_purge_a_queue.rb -- examples/guides/queues/11_deleting_a_queue.rb -- examples/guides/queues/12_objects_that_consume_messages.rb -- examples/guides/queues/13_objects_that_consume_messages_take_two.rb -- examples/hello_world.rb -- examples/hello_world_with_an_empty_string.rb -- examples/hello_world_with_eventmachine_in_a_separate_thread.rb -- examples/hello_world_with_large_payload.rb -- examples/inspecting_server_information.rb -- examples/issues/amq_client_issue_7.rb -- examples/issues/amq_protocol_issue_14.rb -- examples/issues/issue_121.rb -- examples/issues/issue_75.rb -- examples/issues/issue_79.rb -- examples/issues/issue_80.rb -- examples/issues/issue_93.rb -- examples/issues/issue_94.rb -- examples/patterns/command/consumer.rb -- examples/patterns/command/producer.rb -- examples/patterns/event/consumer.rb -- examples/patterns/event/producer.rb -- examples/patterns/request_reply/client.rb -- examples/patterns/request_reply/server.rb -- examples/publishing/publishing_a_one_off_message.rb -- examples/publishing/publishing_callback.rb -- examples/publishing/returned_messages.rb -- examples/publishing/simplistic_scatter_gather.rb -- examples/queues/accessing_message_metadata.rb -- examples/queues/automatic_binding_for_default_direct_exchange.rb -- examples/queues/basic_get.rb -- examples/queues/cancel_default_consumer.rb -- examples/queues/declare_a_queue_without_assignment.rb -- examples/queues/declare_and_bind_a_server_named_queue.rb -- examples/queues/queue_status.rb -- examples/queues/rejecting_messages_without_requeueuing.rb -- examples/queues/using_explicit_acknowledgements.rb -- examples/rack/publish_a_message_on_request/thin.ru -- examples/routing/fanout_routing.rb -- examples/routing/headers_routing.rb -- examples/routing/pubsub.rb -- examples/routing/round_robin_with_direct_exchange.rb -- examples/routing/round_robin_with_the_default_exchange.rb -- examples/routing/unroutable_mandatory_message_is_returned.rb -- examples/routing/weather_updates.rb -- examples/tls/using_tls.rb -- examples/tls_certificates/client/cert.pem -- examples/tls_certificates/client/key.pem -- examples/tls_certificates/client/keycert.p12 -- examples/tls_certificates/client/req.pem -- examples/tls_certificates/server/cert.pem -- examples/tls_certificates/server/key.pem -- examples/tls_certificates/server/keycert.p12 -- examples/tls_certificates/server/req.pem -- examples/tls_certificates/testca/cacert.cer -- examples/tls_certificates/testca/cacert.pem -- examples/tls_certificates/testca/certs/01.pem -- examples/tls_certificates/testca/certs/02.pem -- examples/tls_certificates/testca/index.txt -- examples/tls_certificates/testca/index.txt.attr -- examples/tls_certificates/testca/index.txt.attr.old -- examples/tls_certificates/testca/index.txt.old -- examples/tls_certificates/testca/openssl.cnf -- examples/tls_certificates/testca/private/cakey.pem -- examples/tls_certificates/testca/serial -- examples/tls_certificates/testca/serial.old -- lib/amq/protocol/get_response.rb -- lib/amqp.rb -- lib/amqp/auth_mechanism_adapter.rb -- lib/amqp/auth_mechanism_adapter/external.rb -- lib/amqp/auth_mechanism_adapter/plain.rb -- lib/amqp/bit_set.rb -- lib/amqp/broker.rb -- lib/amqp/callbacks.rb -- lib/amqp/channel.rb -- lib/amqp/channel_id_allocator.rb -- lib/amqp/compatibility/ruby187_patchlevel_check.rb -- lib/amqp/consumer.rb -- lib/amqp/consumer_tag_generator.rb -- lib/amqp/deferrable.rb -- lib/amqp/entity.rb -- lib/amqp/exceptions.rb -- lib/amqp/exchange.rb -- lib/amqp/extensions/rabbitmq.rb -- lib/amqp/framing/string/frame.rb -- lib/amqp/handlers_registry.rb -- lib/amqp/header.rb -- lib/amqp/int_allocator.rb -- lib/amqp/integration/rails.rb -- lib/amqp/openable.rb -- lib/amqp/queue.rb -- lib/amqp/session.rb -- lib/amqp/settings.rb -- lib/amqp/utilities/event_loop_helper.rb -- lib/amqp/utilities/server_type.rb -- lib/amqp/version.rb -- repl -- spec/integration/authentication_spec.rb -- spec/integration/automatic_binding_for_default_direct_exchange_spec.rb -- spec/integration/automatic_recovery_predicate_spec.rb -- spec/integration/basic_get_spec.rb -- spec/integration/basic_publish_with_message_framing_spec.rb -- spec/integration/basic_return_spec.rb -- spec/integration/channel_close_spec.rb -- spec/integration/channel_level_exception_handling_spec.rb -- spec/integration/channel_level_exception_with_multiple_channels_spec.rb -- spec/integration/concurrent_publishing_on_a_shared_channel_spec.rb -- spec/integration/connection_close_spec.rb -- spec/integration/connection_level_exception_handling_spec.rb -- spec/integration/declare_and_immediately_bind_a_server_named_queue_spec.rb -- spec/integration/declare_one_hundred_server_named_queues_spec.rb -- spec/integration/direct_exchange_routing_spec.rb -- spec/integration/exchange_declaration_spec.rb -- spec/integration/exchange_to_exchange_binding_spec.rb -- spec/integration/extensions/rabbitmq/publisher_confirmations_spec.rb -- spec/integration/fanout_exchange_routing_spec.rb -- spec/integration/headers_exchange_routing_spec.rb -- spec/integration/hello_world_spec.rb -- spec/integration/mandatory_messages_spec.rb -- spec/integration/message_acknowledgement_spec.rb -- spec/integration/message_metadata_access_spec.rb -- spec/integration/multiple_consumers_per_queue_spec.rb -- spec/integration/ordering_of_published_messages_spec.rb -- spec/integration/queue_declaration_spec.rb -- spec/integration/queue_exclusivity_spec.rb -- spec/integration/queue_redeclaration_with_incompatible_attributes_spec.rb -- spec/integration/queue_status_spec.rb -- spec/integration/recovery/per_channel_automatic_recovery_on_graceful_broker_shutdown_spec.rb -- spec/integration/recovery/per_channel_automatic_recovery_spec.rb -- spec/integration/redelivery_of_unacknowledged_messages_spec.rb -- spec/integration/regressions/concurrent_publishing_on_the_same_channel_spec.rb -- spec/integration/regressions/empty_message_body_spec.rb -- spec/integration/regressions/issue66_spec.rb -- spec/integration/remove_individual_binding_spec.rb -- spec/integration/reply_queue_communication_spec.rb -- spec/integration/store_and_forward_spec.rb -- spec/integration/stress/publishing_of_messages_with_incrementing_sizes_spec.rb -- spec/integration/topic_subscription_spec.rb -- spec/integration/tx_commit_spec.rb -- spec/integration/tx_rollback_spec.rb -- spec/spec_helper.rb -- spec/unit/amqp/channel_id_allocation_spec.rb -- spec/unit/amqp/client_spec.rb -- spec/unit/amqp/connection_spec.rb -homepage: http://rubyamqp.info -licenses: -- Ruby -metadata: {} -post_install_message: -rdoc_options: -- "--include=examples --main README.md" -require_paths: -- lib -required_ruby_version: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -required_rubygems_version: !ruby/object:Gem::Requirement - requirements: - - - ">=" - - !ruby/object:Gem::Version - version: '0' -requirements: [] -rubyforge_project: amqp -rubygems_version: 2.4.8 -signing_key: -specification_version: 4 -summary: Widely used, feature-rich asynchronous RabbitMQ client with batteries included -test_files: [] -has_rdoc: diff -Nru ruby-amqp-1.5.1/README.md ruby-amqp-1.6.0/README.md --- ruby-amqp-1.5.1/README.md 2015-09-06 10:32:45.000000000 +0000 +++ ruby-amqp-1.6.0/README.md 2016-04-06 09:39:32.000000000 +0000 @@ -203,13 +203,6 @@ -## Migration from amqp gem 0.6.x and 0.7.x - -Upgrading from amqp gem 0.6.x and 0.7.x to 0.8.0+ is straightforward, please see [amqp gem 0.8.0 migration guide](http://rubyamqp.info/articles/08_migration/). -The same guide explains amqp gem versions history and why you would want to upgrade. - - - ## Maintainer Information amqp gem is maintained by [Michael Klishin](http://twitter.com/michaelklishin). diff -Nru ruby-amqp-1.5.1/.ruby-version ruby-amqp-1.6.0/.ruby-version --- ruby-amqp-1.5.1/.ruby-version 2015-09-06 10:32:45.000000000 +0000 +++ ruby-amqp-1.6.0/.ruby-version 2016-04-06 09:39:32.000000000 +0000 @@ -1 +1 @@ -2.0.0@rabbitmq \ No newline at end of file +2.2 \ No newline at end of file