bunny 1.7.0 → 2.17.0

data/Gemfile

@@ -11,7 +11,7 @@ extend Module.new {
 
     local_path = File.expand_path("../vendor/#{name}", __FILE__)
     if File.exist?(local_path)
-      super name, options.merge(:path => local_path).
+      super name, options.merge(path: local_path).
         delete_if { |key, _| [:git, :branch].include?(key) }
     else
       super name, *args
@@ -19,23 +19,23 @@ extend Module.new {
   end
 }
 
-gem "SystemTimer", "~> 1.2.3", :platform => :ruby_18
-
-gem "rake", ">= 10.0.4"
-gem "effin_utf8"
+gem "rake", ">= 12.3.1"
 
 group :development do
   gem "yard"
 
-  gem "redcarpet", :platform => :mri
-  gem "ruby-prof", :platform => :mri
+  gem "redcarpet", platform: :mri
+  gem "ruby-prof", platform: :mri
 
-  gem "json",      :platform => :ruby_18
+  gem "ripl"
+  gem "ripl-multi_line"
+  gem "ripl-irb"
 end
 
 group :test do
-  gem "rspec", "~> 2.13.0"
-  gem "rabbitmq_http_api_client", "~> 1.2.0"
+  gem "rspec", "~> 3.9.0"
+  gem "rabbitmq_http_api_client", "~> 1.13.0", require: "rabbitmq/http/client"
+  gem "toxiproxy", "~> 1.0.3"
 end
 
 gemspec
@@ -45,11 +45,11 @@ gemspec
 def custom_gem(name, options = Hash.new)
   local_path = File.expand_path("../vendor/#{name}", __FILE__)
   if File.exist?(local_path)
-    # puts "Using #{name} from #{local_path}..."
-    gem name, options.merge(:path => local_path).delete_if { |key, _| [:git, :branch].include?(key) }
+    puts "Using #{name} from #{local_path}..."
+    gem name, options.merge(path: local_path).delete_if { |key, _| [:git, :branch].include?(key) }
   else
     gem name, options
   end
 end
 
-custom_gem "amq-protocol", :git => "git://github.com/ruby-amqp/amq-protocol.git", :branch => "master"
+custom_gem "amq-protocol", git: "https://github.com/ruby-amqp/amq-protocol", branch: "master"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 – 2014 Chris Duncan, Jakub Stastny aka botanicus,
+Copyright (c) 2009–2019 Chris Duncan, Jakub Stastny aka botanicus,
 Michael S. Klishin, Eric Lindvall, Stefan Kaes and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining

data/README.md

@@ -12,8 +12,8 @@ have any heavyweight dependencies.
 
 ## What is Bunny Good For?
 
-One can use amqp gem to make Ruby applications interoperate with other
-applications (both Ruby and not). Complexity and size may vary from
+One can use Bunny to make Ruby applications interoperate with other
+applications (both built in Ruby and not). Complexity and size may vary from
 simple work queues to complex multi-stage data processing workflows that involve
 many applications built with all kinds of technologies.
 
@@ -43,44 +43,45 @@ Specific examples:
    Web applications that display that information in the real time.
 
 
-
 ## Supported Ruby Versions
 
-Bunny 0.9 and more recent versions support
+Modern Bunny versions support
 
- * CRuby 2.1, CRuby 2.0, 1.9.3, 1.9.2, and 1.8.7
- * Rubinius 2.0+
+ * CRuby 2.3 through 2.7 (inclusive)
 
 Bunny works sufficiently well on JRuby but there are known
-JRuby bugs that cause high CPU burn. JRuby users should
+JRuby bugs in versions prior to JRuby 9000 that cause high CPU burn. JRuby users should
 use [March Hare](http://rubymarchhare.info).
 
+Bunny `1.7.x` was the last version to support CRuby 1.9.3 and 1.8.7
+
 
 ## Supported RabbitMQ Versions
 
-Bunny `1.5.0` (including previews) and later versions only support RabbitMQ `3.3+`.
-Bunny `1.4.x` and supports RabbitMQ 2.x and 3.x.
+Bunny `1.5.0` and later versions only support RabbitMQ `3.3+`.
+Bunny `1.4.x` and earlier supports RabbitMQ 2.x and 3.x.
 
 
-## Project Maturity
+## Change Log
 
 Bunny is a mature library (started in early 2009) with
 a stable public API.
 
-Before version 0.9, **a lot** of functionality was missing.  Version
-0.9 can be considered to be a "second birthday" for Bunny as it was
-rewritten from scratch with over a dozen of preview releases over the
-course of about a year.
+Change logs per release series:
+
+ * [master](https://github.com/ruby-amqp/bunny/blob/master/ChangeLog.md)
+ * [2.16.x](https://github.com/ruby-amqp/bunny/blob/2.16.x-stable/ChangeLog.md)
+ * [2.15.x](https://github.com/ruby-amqp/bunny/blob/2.15.x-stable/ChangeLog.md)
+ * [2.14.x](https://github.com/ruby-amqp/bunny/blob/2.14.x-stable/ChangeLog.md)
+ * [2.13.x](https://github.com/ruby-amqp/bunny/blob/2.13.x-stable/ChangeLog.md)
 
-We (the maintainers) made our best effort to keep the new version as
-backwards compatible as possible but within reason.
 
 
 ## Installation & Bundler Dependency
 
 ### Most Recent Release
 
-[![Gem Version](https://badge.fury.io/rb/bunny.png)](http://badge.fury.io/rb/bunny)
+[![Gem Version](https://badge.fury.io/rb/bunny.svg)](http://badge.fury.io/rb/bunny)
 
 ### With Rubygems
 
@@ -95,7 +96,7 @@ gem install bunny
 To use Bunny in a project managed with Bundler:
 
 ``` ruby
-gem "bunny", "~> 1.4.0"
+gem "bunny", ">= 2.16.1"
 ```
 
 
@@ -161,88 +162,53 @@ Other documentation guides are available at [rubybunny.info](http://rubybunny.in
 
 ### Mailing List
 
-[Bunny has a mailing list](http://groups.google.com/group/ruby-amqp). We encourage you
-to also join the [RabbitMQ mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users) mailing list. Feel free to ask any questions that you may have.
+[Bunny has a mailing list](http://groups.google.com/group/ruby-amqp). Please use it for all questions,
+investigations, and discussions. GitHub issues should be used for specific, well understood, actionable
+maintainers and contributors can work on.
 
+We encourage you to also join the [RabbitMQ mailing list](https://groups.google.com/forum/#!forum/rabbitmq-users)
+mailing list. Feel free to ask any questions that you may have.
 
-### IRC
 
-For more immediate help, please join `#rabbitmq` on `irc.freenode.net`.
+## Continuous Integration
+
+[![Build Status](https://travis-ci.org/ruby-amqp/bunny.svg)](https://travis-ci.org/ruby-amqp/bunny/)
 
 
 ### News & Announcements on Twitter
 
 To subscribe for announcements of releases, important changes and so on, please follow [@rubyamqp](https://twitter.com/#!/rubyamqp) on Twitter.
 
-More detailed announcements can be found in the blogs
-
-* [RabbitMQ Ruby clients blog](http://blog.rubyrabbitmq.info)
-* [Bunny Blog](http://bunnyamqp.wordpress.com)
+More detailed announcements can be found in the [RabbitMQ Ruby clients blog](http://blog.rubyrabbitmq.info).
 
 
 ### Reporting Issues
 
-If you find a bug, poor default, missing feature or find any part of
-the API inconvenient, please [file an
-issue](http://github.com/ruby-amqp/bunny/issues) on GitHub.  When
-filing an issue, please specify which Bunny and RabbitMQ versions you
-are using, provide recent RabbitMQ log file contents if possible, and
-try to explain what behavior you expected and why. Bonus points for
-contributing failing test cases.
-
-
-### Running the specs
-
-The cleanest way to get the specs running is by starting a clean rabbitmq server
-node on your machine specifically for the bunny specs.
-
-Make sure you have a recent version of RabbitMQ (> 3.2) and run the following command
-from the base directory of the gem:
-
-`RABBITMQ_NODENAME=bunny RABBITMQ_CONFIG_FILE=./spec/config/rabbitmq RABBITMQ_ENABLED_PLUGINS_FILE=./spec/config/enabled_plugins rabbitmq-server`
-
-> The specs use the Rabbitmq management plugin and require an SSL port to be available. The config files in the spec/config directory enable these. Please note that this config uses verify_none because the certificates are expired.
+If you find a bug you understand well, poor default, incorrect or unclear piece of documentation,
+or missing feature, please [file an
+issue](http://github.com/ruby-amqp/bunny/issues) on GitHub.
 
-Next up you'll need to prepare your node for the specs (Only once):
+Please use [Bunny's mailing list](http://groups.google.com/group/ruby-amqp) for questions,
+investigations, and discussions. GitHub issues should be used for specific, well understood, actionable
+maintainers and contributors can work on.
 
-`RABBITMQ_NODENAME=bunny ./bin/ci/before_build.sh`
+When filing an issue, please specify which Bunny and RabbitMQ versions you
+are using, provide recent RabbitMQ log file contents, full exception stack traces,
+and steps to reproduce (or failing test cases).
 
-And then run the specs:
-
-`RABBITMQ_NODENAME=bunny rspec`
 
 ## Other Ruby RabbitMQ Clients
 
-Other widely used Ruby RabbitMQ clients are [March
-Hare](http://rubymarchhare.info) (JRuby-only) and [amqp
-gem](http://rubyamqp.info).  Both are mature libraries and require
-RabbitMQ 2.x or 3.x.
+The other widely used Ruby RabbitMQ client is [March Hare](http://rubymarchhare.info) (JRuby-only).
+It's a mature library that require RabbitMQ 3.3.x or later.
 
 
 ## Contributing
 
-First, clone the repository and run
-
-    bundle install --binstubs
-
-then set up RabbitMQ vhosts with
-
-    ./bin/ci/before_build.sh
-
-(if needed, set `RABBITMQCTL` env variable to point to `rabbitmqctl` you want to use)
-
-and then run tests with
-
-    CI=true ./bin/rspec -cfs spec
-
-After that create a branch and make your changes on it. Once you are done with your changes and all tests pass, submit a pull request
-on GitHub.
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for more information
+about running various test suites.
 
 
 ## License
 
 Released under the MIT license.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ruby-amqp/bunny/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/Rakefile

@@ -0,0 +1,54 @@
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:integration) do |t|
+  # excludes unit tests as those involve many iterations
+  # and sometimes suffer from obscure interference from integration tests (!)
+  t.pattern    = ["spec/higher_level_api/integration", "spec/lower_level_api/integration", "spec/issues"].
+    map { |dir| Dir.glob(File.join(dir, "**", "*_spec.rb")) }.reduce(&:+) - ["spec/higher_level_api/integration/tls_connection_spec.rb"]
+
+  t.rspec_opts = "--format progress"
+end
+
+RSpec::Core::RakeTask.new(:integration_without_recovery) do |t|
+  # same as :integration but excludes client connection recovery tests.
+  # useful for sanity checking edge RabbitMQ builds, for instance.
+  t.pattern    = ["spec/higher_level_api/integration", "spec/lower_level_api/integration", "spec/issues"].
+    map { |dir| Dir.glob(File.join(dir, "**", "*_spec.rb")) }.reduce(&:+) -
+    ["spec/higher_level_api/integration/tls_connection_spec.rb",
+     "spec/higher_level_api/integration/connection_recovery_spec.rb"]
+
+  t.rspec_opts = "--format progress"
+end
+
+RSpec::Core::RakeTask.new(:unit) do |t|
+  t.pattern    = Dir.glob("spec/unit/**/*_spec.rb")
+
+  t.rspec_opts = "--format progress --backtrace"
+end
+
+RSpec::Core::RakeTask.new(:recovery_integration) do |t|
+  # otherwise all examples will be skipped
+  ENV.delete("CI")
+  t.pattern    = ["spec/higher_level_api/integration/connection_recovery_spec.rb"]
+
+  t.rspec_opts = "--format progress --backtrace"
+end
+
+RSpec::Core::RakeTask.new(:stress) do |t|
+  # excludes unit tests as those involve many iterations
+  # and sometimes suffer from obscure interference from integration tests (!)
+  t.pattern    = ["spec/stress/**/*_spec.rb"]
+
+  t.rspec_opts = "--format progress"
+end
+
+task :default => :integration
+
+namespace :tls do
+  desc "Checks the certificates and keys in BUNNY_CERTIFICATE_DIR with openssl s_client"
+  task :s_client do
+    dir = ENV["BUNNY_CERTIFICATE_DIR"]
+    sh "openssl s_client -tls1_2 -connect 127.0.0.1:5671 -cert #{dir}/client_certificate.pem -key #{dir}/client_key.pem -CAfile #{dir}/ca_certificate.pem"
+  end
+end

data/bunny.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "Popular easy to use Ruby client for RabbitMQ"
   s.description = "Easy to use, feature complete Ruby client for RabbitMQ 3.3 and later versions."
   s.license = "MIT"
+  s.required_ruby_version = Gem::Requirement.new(">= 2.2")
 
   # Sorted alphabetically.
   s.authors = [
@@ -20,21 +21,14 @@ Gem::Specification.new do |s|
     "Michael S. Klishin",
     "Stefan Kaes"]
 
-  s.email = [
-    "Y2VsbGRlZUBnbWFpbC5jb20=\n",
-    "ZXJpY0A1c3RvcHMuY29t\n",
-    "c3Rhc3RueUAxMDFpZGVhcy5jeg==\n",
-    "bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=\n",
-    "c2thZXNAcmFpbHNleHByZXNzLmRl\n"].
-    map { |mail| Base64.decode64(mail) }
+  s.email = ["michael.s.klishin@gmail.com"]
 
   # Dependencies
-  s.add_dependency "amq-protocol", ">= 1.9.2"
+  s.add_runtime_dependency 'amq-protocol', '~> 2.3', '>= 2.3.1'
 
   # Files.
-  s.has_rdoc = true
   s.extra_rdoc_files = ["README.md"]
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n").reject { |f| f.match(%r{^bin/ci/}) }
   s.test_files    = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ["lib"]
 end

data/docker-compose.yml

@@ -0,0 +1,28 @@
+version: '3.7'
+services:
+  rabbitmq:
+    build: ./docker
+    container_name: bunny_rabbitmq
+    environment:
+      RABBITMQ_NODENAME: bunny
+      # see CONTRIBUTING.md
+      BUNNY_RABBITMQ_HOSTNAME: mercurio
+      # link to spec specific configuration
+      RABBITMQ_CONFIG_FILE: /spec/config/rabbitmq.conf
+      RABBITMQ_ENABLED_PLUGINS_FILE: /spec/config/enabled_plugins
+      # send logs to stdout
+      RABBITMQ_LOGS: '-'
+      RABBITMQ_SASL_LOGS: '-'
+    ports:
+      - 5671-5672:5671-5672
+      - 15672:15672
+    volumes:
+      - ./spec:/spec:ro
+  toxiproxy:
+    container_name: toxiproxy
+    image: shopify/toxiproxy
+    ports:
+      - 8474:8474
+      - 11111:11111
+    depends_on:
+      - rabbitmq

data/docker/Dockerfile

@@ -0,0 +1,24 @@
+FROM ubuntu:18.04
+
+RUN apt-get update -y
+RUN apt-get install -y gnupg2 wget
+RUN wget -O - "https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc" | apt-key add -
+
+COPY apt/sources.list.d/bintray.rabbitmq.list /etc/apt/sources.list.d/bintray.rabbitmq.list
+COPY apt/preferences.d/erlang                 /etc/apt/preferences.d/erlang
+
+RUN apt-get update -y && apt-get upgrade -y
+
+RUN apt-get install -y erlang-base \
+                       erlang-asn1 erlang-crypto erlang-eldap erlang-ftp erlang-inets \
+                       erlang-mnesia erlang-os-mon erlang-parsetools erlang-public-key \
+                       erlang-runtime-tools erlang-snmp erlang-ssl \
+                       erlang-syntax-tools erlang-tftp erlang-tools erlang-xmerl
+
+RUN apt-get install -y rabbitmq-server
+
+COPY docker-entrypoint.sh /
+
+ENTRYPOINT /docker-entrypoint.sh
+
+EXPOSE 5671 5672 15672

data/docker/apt/preferences.d/erlang

@@ -0,0 +1,3 @@
+Package: erlang*
+Pin: release o=Bintray
+Pin-Priority: 1000

data/docker/apt/sources.list.d/bintray.rabbitmq.list

@@ -0,0 +1,2 @@
+deb http://dl.bintray.com/rabbitmq-erlang/debian bionic erlang
+deb http://dl.bintray.com/rabbitmq/debian bionic main

data/docker/docker-entrypoint.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+server=rabbitmq-server
+ctl=rabbitmqctl
+delay=5
+
+echo 'Starting a RabbitMQ node'
+$server -detached
+
+echo "Waiting for RabbitMQ to finish startup..."
+
+$ctl await_startup --timeout 15
+
+$ctl add_user bunny_gem bunny_password
+$ctl add_user bunny_reader reader_password
+
+$ctl add_vhost bunny_testbed
+
+$ctl set_permissions -p / guest '.*' '.*' '.*'
+$ctl set_permissions -p bunny_testbed bunny_gem '.*' '.*' '.*'
+$ctl set_permissions -p bunny_testbed guest '.*' '.*' '.*'
+$ctl set_permissions -p bunny_testbed bunny_reader '^---$' '^---$' '.*'
+
+$ctl shutdown --timeout 10
+
+echo 'Starting a RabbitMQ node in foreground (use Ctrl-C to stop)'
+exec $server

data/docker/rabbitmq.conf

@@ -0,0 +1,29 @@
+listeners.tcp.1 = 0.0.0.0:5672
+
+listeners.ssl.default = 5671
+
+ssl_options.cacertfile = /spec/tls/ca_certificate.pem
+ssl_options.certfile   = /spec/tls/server_certificate.pem
+ssl_options.keyfile    = /spec/tls/server_key.pem
+ssl_options.verify               = verify_none
+ssl_options.fail_if_no_peer_cert = false
+
+ssl_options.honor_cipher_order   = true
+ssl_options.honor_ecc_order      = true
+ssl_options.client_renegotiation = false
+ssl_options.secure_renegotiate   = true
+
+ssl_options.ciphers.1  = ECDHE-ECDSA-AES256-GCM-SHA384
+ssl_options.ciphers.2  = ECDHE-RSA-AES256-GCM-SHA384
+ssl_options.ciphers.3  = ECDH-ECDSA-AES256-GCM-SHA384
+ssl_options.ciphers.4  = ECDH-RSA-AES256-GCM-SHA384
+ssl_options.ciphers.5  = DHE-RSA-AES256-GCM-SHA384
+ssl_options.ciphers.6  = DHE-DSS-AES256-GCM-SHA384
+ssl_options.ciphers.7  = ECDHE-ECDSA-AES128-GCM-SHA256
+ssl_options.ciphers.8  = ECDHE-RSA-AES128-GCM-SHA256
+ssl_options.ciphers.9  = ECDH-ECDSA-AES128-GCM-SHA256
+ssl_options.ciphers.10 = ECDH-RSA-AES128-GCM-SHA256
+ssl_options.ciphers.11 = DHE-RSA-AES128-GCM-SHA256
+ssl_options.ciphers.12 = DHE-DSS-AES128-GCM-SHA256
+
+loopback_users = none