bunny 1.4.1 → 1.5.0.pre1

data/spec/higher_level_api/integration/connection_spec.rb

@@ -147,6 +147,30 @@ describe Bunny::Session do
       end
     end
 
+    context "initialized with :hosts => [...]" do
+      after :each do
+        subject.close if subject.open?
+      end
+
+      let(:host)    { "192.168.1.10" }
+      let(:hosts)   { [host] }
+      let(:subject) { described_class.new(:hosts => hosts) }
+
+      it "uses hostname = localhost" do
+        subject.host.should == host
+        subject.hostname.should == host
+      end
+
+      it "uses port 5672" do
+        subject.port.should == port
+      end
+
+      it "uses username = guest" do
+        subject.username.should == username
+        subject.user.should == username
+      end
+    end
+
     context "initialized with :channel_max => 4096" do
       after :each do
         subject.close if subject.open?

data/spec/higher_level_api/integration/dead_lettering_spec.rb

@@ -22,7 +22,7 @@ describe "A message" do
     x.publish("")
     sleep 0.2
 
-    delivery_info, _, _ = q.pop(:ack => true)
+    delivery_info, _, _ = q.pop(:manual_ack => true)
     dlq.message_count.should be_zero
     ch.nack(delivery_info.delivery_tag)
 

data/spec/higher_level_api/integration/exchange_unbind_spec.rb

@@ -25,7 +25,7 @@ describe Bunny::Exchange do
     sleep 0.5
 
     queue.message_count.should be == 1
-    queue.pop(:ack => true)
+    queue.pop(:manual_ack => true)
 
     destination.unbind(source)
     source.publish("")

data/spec/higher_level_api/integration/message_properties_access_spec.rb

@@ -21,7 +21,7 @@ describe Bunny::Queue, "#subscribe" do
     t = Thread.new do
       ch = connection.create_channel
       q = ch.queue(queue_name, :auto_delete => true, :durable => false)
-      q.subscribe(:exclusive => true, :ack => false) do |delivery_info, properties, payload|
+      q.subscribe(:exclusive => true, :manual_ack => false) do |delivery_info, properties, payload|
         metadata = properties
         envelope = delivery_info
       end

data/spec/issues/issue78_spec.rb

@@ -27,7 +27,7 @@ unless ENV["CI"]
         ch2 = connection1.create_channel
 
         q   = ch1.queue("", :exclusive => true)
-        q.subscribe(:ack => false, :block => false) do |delivery_info, properties, payload|
+        q.subscribe(:manual_ack => false, :block => false) do |delivery_info, properties, payload|
           delivered_data << payload
         end
         sleep 0.5
@@ -60,7 +60,7 @@ unless ENV["CI"]
         sleep 0.7
         q.message_count.should == 3
 
-        q.subscribe(:ack => false, :block => false) do |delivery_info, properties, payload|
+        q.subscribe(:manual_ack => false, :block => false) do |delivery_info, properties, payload|
           delivered_data << payload
         end
         sleep 0.7

data/spec/spec_helper.rb

@@ -14,8 +14,6 @@ require "rabbitmq/http/client"
 require "amq/protocol/version"
 puts "Using Ruby #{RUBY_VERSION}, amq-protocol #{AMQ::Protocol::VERSION}"
 
-
-
 #
 # Ruby version-specific
 #
@@ -29,21 +27,22 @@ when "1.8.6" then
   raise "Ruby 1.8.6 is not supported. Sorry, pal. Time to move on beyond One True Ruby. Yes, time flies by."
 end
 
-
-
 module RabbitMQ
   module Control
+
+    RABBITMQ_NODENAME = ENV['RABBITMQ_NODENAME'] || 'rabbit'
+
     def rabbitmq_pid
-      $1.to_i if `rabbitmqctl status` =~ /\{pid,(\d+)\}/
+      $1.to_i if `rabbitmqctl -n #{RABBITMQ_NODENAME} status` =~ /\{pid,(\d+)\}/
     end
 
     def start_rabbitmq(delay = 1.0)
       # this is Homebrew-specific :(
-      `rabbitmq-server > /dev/null 2>&1 &`; sleep(delay)
+      `RABBITMQ_NODENAME=#{RABBITMQ_NODENAME} rabbitmq-server > /dev/null 2>&1 &`; sleep(delay)
     end
 
     def stop_rabbitmq(pid = rabbitmq_pid, delay = 1.0)
-      `rabbitmqctl stop`; sleep(delay)
+      `rabbitmqctl -n #{RABBITMQ_NODENAME} stop`; sleep(delay)
     end
 
     def kill_rabbitmq(pid = rabbitmq_pid, delay = 1.0)

data/spec/tls/ca_certificate.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC7jCCAdagAwIBAgIJAO45Jh9JetM2MA0GCSqGSIb3DQEBBQUAMCcxFTATBgNV
+BAMTDE15VGVzdFJvb3RDQTEOMAwGA1UEBxMFODA1NDcwHhcNMTQwOTEyMDg0ODQx
+WhcNMjQwOTA5MDg0ODQxWjAnMRUwEwYDVQQDEwxNeVRlc3RSb290Q0ExDjAMBgNV
+BAcTBTgwNTQ3MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzfvqL+nO
+vDEb3wLFiuRXKbyrBvNbQ4jb1lVQTbagR1kpv0cMHXM8q0kpq2PX+eG1kqcAzMv5
+W2QJm+xU3J6Fl9Lono6/iBasVAGJfOFg7lh79KaUqWg9i/1JqXGS0M5FyaFZfu5N
+c8ZGinjSqbP5de9ZJJIew/e0dSZ2JbshhbLyACIvSySeCZUGdckw0o74CtYIHeJC
++leQ/fWV1PFZbbnQZM+ZSSK8oN5qxsq2KZIRaX/+PkuY0iYLMBbL1EAWxR5cptIi
+s+pdI8nB0juM4wb5yGTHyEDA/wKXXMKiD2xCERO8F0rjJbW7FfGje9UUPXD3w7vQ
+R0ARM3QKxsulRwIDAQABox0wGzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAN
+BgkqhkiG9w0BAQUFAAOCAQEAHdTC6LAh3yLaogfJSpZdJT2eKGjvdU7uSf4xm339
+BqbnKo61w4JCLQA/U2ltsva5H0RfivQk0WqX0lN3YCYerWpjl2O4ovYh0SZfArwG
+CUhYTSYFdDNJMG6hqe7x7nzx32MUgBKR6M7GMhLbdxEkj6OOBi87FlD+Lgq90ruC
+eQRroEzlDwjs1FgK7iYkWN9kHYKdKTwUdBHjIuiF6PTxpyOHAXI6V7abNEX+zdrX
+18eq/MRU47vBQg/C7MZ/pJbTxaCH+BJ6nubk1S/ty4JWGLkJ3RXIwddvNQ2Y6smK
+grPqwejXT2DOhErPN5KKg0TGMxsGLxjoRW3XZIXQwJlWPQ==
+-----END CERTIFICATE-----

data/spec/tls/ca_key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAzfvqL+nOvDEb3wLFiuRXKbyrBvNbQ4jb1lVQTbagR1kpv0cM
+HXM8q0kpq2PX+eG1kqcAzMv5W2QJm+xU3J6Fl9Lono6/iBasVAGJfOFg7lh79KaU
+qWg9i/1JqXGS0M5FyaFZfu5Nc8ZGinjSqbP5de9ZJJIew/e0dSZ2JbshhbLyACIv
+SySeCZUGdckw0o74CtYIHeJC+leQ/fWV1PFZbbnQZM+ZSSK8oN5qxsq2KZIRaX/+
+PkuY0iYLMBbL1EAWxR5cptIis+pdI8nB0juM4wb5yGTHyEDA/wKXXMKiD2xCERO8
+F0rjJbW7FfGje9UUPXD3w7vQR0ARM3QKxsulRwIDAQABAoIBACniRXZEpoLhwXcR
+SzW4xHh6IpShOzd6RqlIY7HJpsGbQb/hJHeAjR+PGuf8v1fSK2eMib8a4rNQnhuU
+bJUHrsZ2XlKPWCbF5XiXb2tzMJCGcX4HuUbRKWKjuCy6KU5IAyzCoD4NGral5IYX
+l05miB0Q9CFZjOPwJEOF9JQrft9+a6O4Wc4DPGwq0OwK25EjPlEgoiC+GNPaEMDg
+RZc4qatfBEMAyDMACsOCoq8cGIAtfPOaeMdjUkwDWhsNi4qsL7+9pv7IYMjGk+XQ
+UDGcootTam9PXuRdmLt2IZGBzfeuMKQrNbPvyvItBfBHMH7k+JgLT1H7wJKxrxXj
+D/U2xkECgYEA/IcYUIuJdUkfmVa3qJ03yTWyb2xeWPUk9UM+kgJ1tqqc1Qn7ATiu
+Pok+Q2nkuT8MmZ8FHcRdwZqiu1GDtlBHDxtJt2z+EyHDW6oqrkVWU7ZBwykhr6qH
+TFyJ7Es2ABeDf6JE53NMdXpOKzDtp5nOfj7UqAu+Omrjh+5w4ETv/ZcCgYEA0ND8
+FgeMgysNtOn5hr+aRtayMQuR8jR6GTHW0ZO8gxBnQcfF0TNgDppOsn2eQ2ANQ9MY
+7x4P7SEybufq50CWWzsS80oN2sITZeaAuTlGbQF4c9n5KwY9X2fmpe1UjEU1ok5O
+d9TgDwn1pCfsarnsn4DmA+1p7BuPLfNnLeIM69ECgYEAr9ZZ5evjoRlzuVAavnwK
+1j5fqxpob8TzIRzbusufr7wJTIaQkv8mxUDHbCWWMC9o1KdX5qxPJHpKiehusEoh
+0LENmX15RVUjNPa+lW6Od+fWztAbNrilUVS2bSTJyzKUTBFvrUIpoTuypnyBX0zH
+7jxN012p7f9zw7kSO/eErK0CgYAqCtmmadCtnB5/XVhi+/LI7nMkEstIs64don44
+5gDfdo8DnIBElY5ygjj0EPyrXgxtqnPruObF/JgV4lXWR5e+OI+hMjjF4atcKeOi
+51g5nEEvOiTDt9blfZrfr4AFWe3phtCfqdmOzZeKfItKFbMBjkdBZSydYBMc0lPk
+1g158QKBgBFCHBAeQ8AHvNXsMv99YmQ4OCJaJWimhcQEvKX0SLb2PCOk4wJ2w2Xi
+41qjdgr4Mqs1v05b2p6gUcRnioJFB1Y9duKpCjI2DRzlF6ohA86cJr86fDG698Li
+b8i1kDyMa3xPYwOvuV0NbN0IvvK5awlK7x3NmmxT1IYMU4RMTPnU
+-----END RSA PRIVATE KEY-----

data/spec/tls/client_cert.pem

@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

data/spec/tls/client_key.pem

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

data/spec/tls/server_cert.pem

@@ -1,18 +1,18 @@
 -----BEGIN CERTIFICATE-----
-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
+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
 -----END CERTIFICATE-----

data/spec/tls/server_key.pem

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0.pre1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -43,7 +43,6 @@ extra_rdoc_files:
 files:
 - .gitignore
 - .rspec
-- .ruby-version
 - .travis.yml
 - .yardopts
 - ChangeLog.md
@@ -103,7 +102,6 @@ files:
 - lib/bunny/authentication/plain_mechanism_encoder.rb
 - lib/bunny/channel.rb
 - lib/bunny/channel_id_allocator.rb
-- lib/bunny/compatibility.rb
 - lib/bunny/concurrent/atomic_fixnum.rb
 - lib/bunny/concurrent/condition.rb
 - lib/bunny/concurrent/continuation_queue.rb
@@ -137,8 +135,8 @@ files:
 - lib/bunny/versioned_delivery_tag.rb
 - profiling/basic_publish/with_4K_messages.rb
 - repl
-- spec/compatibility/queue_declare_spec.rb
-- spec/compatibility/queue_declare_with_default_channel_spec.rb
+- spec/config/enabled_plugins
+- spec/config/rabbitmq.config
 - spec/higher_level_api/integration/basic_ack_spec.rb
 - spec/higher_level_api/integration/basic_cancel_spec.rb
 - spec/higher_level_api/integration/basic_consume_spec.rb
@@ -198,6 +196,8 @@ files:
 - spec/stress/concurrent_publishers_stress_spec.rb
 - spec/stress/connection_open_close_spec.rb
 - spec/stress/long_running_consumer_spec.rb
+- spec/tls/ca_certificate.pem
+- spec/tls/ca_key.pem
 - spec/tls/cacert.pem
 - spec/tls/client_cert.pem
 - spec/tls/client_key.pem
@@ -225,9 +225,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
@@ -235,8 +235,8 @@ signing_key:
 specification_version: 4
 summary: Popular easy to use Ruby client for RabbitMQ
 test_files:
-- spec/compatibility/queue_declare_spec.rb
-- spec/compatibility/queue_declare_with_default_channel_spec.rb
+- spec/config/enabled_plugins
+- spec/config/rabbitmq.config
 - spec/higher_level_api/integration/basic_ack_spec.rb
 - spec/higher_level_api/integration/basic_cancel_spec.rb
 - spec/higher_level_api/integration/basic_consume_spec.rb
@@ -296,6 +296,8 @@ test_files:
 - spec/stress/concurrent_publishers_stress_spec.rb
 - spec/stress/connection_open_close_spec.rb
 - spec/stress/long_running_consumer_spec.rb
+- spec/tls/ca_certificate.pem
+- spec/tls/ca_key.pem
 - spec/tls/cacert.pem
 - spec/tls/client_cert.pem
 - spec/tls/client_key.pem

data/.ruby-version

@@ -1 +0,0 @@
-2.0@rabbitmq

data/lib/bunny/compatibility.rb

@@ -1,24 +0,0 @@
-module Bunny
-  # Helper methods necessary to stay mostly backwards-compatible with legacy (0.7.x, 0.8.x) Bunny
-  # releases that hide channels completely from the API.
-  #
-  # @private
-  module Compatibility
-
-    #
-    # API
-    #
-
-    # @private
-    def channel_from(channel_or_connection)
-      # Bunny 0.8.x and earlier completely hide channels from the API. So, queues and exchanges are
-      # instantiated with a "Bunny object", which is a session. This function coerces two types of input to a
-      # channel.
-      if channel_or_connection.is_a?(Bunny::Session)
-        channel_or_connection.default_channel
-      else
-        channel_or_connection
-      end
-    end
-  end
-end