amqp 0.8.0.rc8 → 0.8.0.rc9

data/.gitignore

@@ -12,3 +12,4 @@ vendor
 
 .yardoc/*
 doc/*
+tmp/*

data/.travis.yml

@@ -3,8 +3,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - ree
-  - rbx
   - jruby
+  - rbx
 gemfile:
   - Gemfile
   - gemfiles/eventmachine-pre

data/Gemfile

@@ -25,6 +25,10 @@ group(:development) do
 
   custom_gem "nake",         :platform => :ruby_19
   custom_gem "contributors", :platform => :ruby_19
+
+  # To test event loop helper and various Rack apps
+  gem "thin"
+  gem "unicorn", :platform => :ruby
 end
 
 group(:test) do

data/amqp.gemspec

@@ -11,21 +11,18 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/ruby-amqp/amqp"
   s.summary = "AMQP client implementation in Ruby/EventMachine."
   s.description = "Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included"
-  s.cert_chain = nil
   s.email = ["bWljaGFlbEBub3ZlbWJlcmFpbi5jb20=\n", "c3Rhc3RueUAxMDFpZGVhcy5jeg==\n"].map { |i| Base64.decode64(i) }
 
   # files
   s.files = `git ls-files`.split("\n").reject { |file| file =~ /^vendor\// || file =~ /^gemfiles\// }
   s.require_paths = ["lib"]
 
-  # RDoc
-  s.has_rdoc = true
   s.rdoc_options = '--include=examples --main README.textile'
   s.extra_rdoc_files = ["README.textile"] + Dir.glob("docs/*")
 
   # Dependencies
   s.add_dependency "eventmachine"
-  s.add_dependency "amq-client", ">= 0.7.0.alpha20"
+  s.add_dependency "amq-client", ">= 0.7.0.alpha21"
 
   begin
     require "changelog"

data/docs/GettingStarted.textile

@@ -236,7 +236,7 @@ EventMachine.run do
       }
     end
 
-    channel.direct("").publish "Hello, world!", :routing_key => queue.name
+    channel.direct("").publish "Hello, world!", :routing_key => "amqpgem.examples.helloworld"
   end
 end
 </code>

data/examples/guides/getting_started/03_babblr.rb

@@ -22,8 +22,8 @@ AMQP.start("amqp://dev.rabbitmq.com:5672/") do |connection|
 
   exchange.publish("BOS 101, NYK 89").publish("ORL 85, ALT 88")
 
-  # disconnect & exit after 1 second
-  EventMachine.add_timer(1) do
+  # disconnect & exit after 2 seconds
+  EventMachine.add_timer(2) do
     exchange.delete
 
     connection.close {

data/examples/rack/publish_a_message_on_request/thin.ru

@@ -0,0 +1,36 @@
+use Rack::CommonLogger
+
+require "bundler"
+Bundler.setup
+
+$:.unshift(File.expand_path("../../../../lib", __FILE__))
+
+require 'amqp'
+require 'amqp/utilities/event_loop_helper'
+
+puts "EventMachine.reactor_running? => #{EventMachine.reactor_running?.inspect}"
+
+AMQP::Utilities::EventLoopHelper.run do
+  AMQP.start
+
+  exchange          = AMQP.channel.fanout("amq.fanout")
+
+  q = AMQP.channel.queue("", :auto_delete => true, :exclusive => true)
+  q.bind(exchange)
+  AMQP::channel.default_exchange.publish("Started!", :routing_key => q.name)
+end
+
+app = proc do |env|
+  AMQP.channel.fanout("amq.fanout").publish("Served a request at (#{Time.now.to_i})")
+
+  [
+    200,          # Status code
+    {             # Response headers
+      'Content-Type' => 'text/html',
+      'Content-Length' => '2',
+    },
+    ['hi']        # Response body
+  ]
+end
+
+run app

data/lib/amqp/connection.rb

@@ -38,6 +38,7 @@ module AMQP
   def self.start(connection_options_or_string = {}, other_options = {}, &block)
     EM.run do
       @connection ||= connect(connection_options_or_string, other_options, &block)
+      @channel      = Channel.new(@connection)
       @connection
     end
   end
@@ -59,8 +60,15 @@ module AMQP
     return if @connection.nil? || self.closing?
 
     EM.next_tick do
+      if AMQP.channel and AMQP.channel.open? and AMQP.channel.connection.open?
+        AMQP.channel.close
+      end
+      AMQP.channel = nil
+
+
       shim = Proc.new {
         block.call
+
         AMQP.connection = nil
       }
       @connection.disconnect(reply_code, reply_text, &shim)
@@ -95,6 +103,26 @@ module AMQP
     @connection
   end
 
+  # "Default channel". A placeholder for apps that only want to use one channel. This channel is not global, *not* used
+  # under the hood by methods like {AMQP::Exchange#initialize} and only shared by exchanges/queues you decide on.
+  # To reiterate: this is only a conventience accessor, since many apps (especially Web apps) can get by with just one
+  # connection and one channel.
+  #
+  # @api public
+  def self.channel
+    @channel
+  end
+
+  # A placeholder for applications that only need one channel. If you use {AMQP.start} to set up default connection,
+  # {AMQP.channel} is open on that connection, but can be replaced by your application.
+  #
+  #
+  # @see AMQP.channel
+  # @api public
+  def self.channel=(value)
+    @channel = value
+  end
+
   # Sets global connection object.
   # @api public
   def self.connection=(value)
@@ -176,7 +204,8 @@ module AMQP
   # To handle it, pass a callable object (a proc, a lambda, an instance of a class that responds to #call)
   # with :on_possible_authentication_failure option.
   #
-  # @note This method assumes that EventMachine even loop is already running. If it is not the case or you are not sure, we recommend you use {AMQP.start} instead. It takes exactly the same parameters.
+  # @note This method assumes that EventMachine even loop is already running. If it is not the case or you are not sure, we recommend you use {AMQP.start} instead.
+  #       It takes exactly the same parameters.
   # @return [AMQP::Session]
   # @api public
   def self.connect(connection_options_or_string = {}, other_options = {}, &block)

data/lib/amqp/queue.rb

@@ -642,7 +642,7 @@ module AMQP
     # @deprecated
     # @api public
     def publish(data, opts = {})
-      exchange.publish(data, opts)
+      exchange.publish(data, opts.merge(:routing_key => self.name))
     end
 
     # Resets queue state. Useful for error handling.

data/lib/amqp/utilities/event_loop_helper.rb

@@ -1,8 +1,21 @@
 require "eventmachine"
 require "amqp/utilities/server_type"
 
+require "thread"
+
 module AMQP
   module Utilities
+
+    # A helper that starts EventMachine reactor the optimal way depending on what Web server
+    # (if any) you are running. It should not be considered a 100% safe, general purpose EventMachine
+    # reactor "on/off switch" but is very useful in Web applications and some stand-alone applications.
+    #
+    # This helper was inspired by Qusion project by Dan DeLeo.
+    #
+    # h2. Key methods
+    #
+    # * {EventLoopHelper.run}
+    # * {EventLoopHelper.server_type}
     class EventLoopHelper
 
       def self.eventmachine_thread
@@ -13,36 +26,61 @@ module AMQP
         EventMachine.reactor_running?
       end # self.reactor_running?
 
+      # Type of server (if any) that is running.
+      #
+      # @see AMQP::Utilities::ServerType.detect
       def self.server_type
         @server_type ||= ServerType.detect
       end # self.server_type
 
-      def self.run(in_a_worker_process = false)
-        # TODO: make reentrant
-
-        @eventmachine_thread  = case self.server_type
-                                when :thin, :goliath, :evented_mongrel then
-                                  Thread.current
-                                when :unicorn, :passenger then
-                                  EventMachine.stop if in_a_worker_process
+      # A helper that detects what app server (if any) is running and starts
+      # EventMachine reactor in the most optimal way. For event-driven servers like
+      # Thin and Goliath, this means relying on them starting the reactor but delaying
+      # execution of a block you pass to {EventLoopHelper.run} until reactor is actually running.
+      #
+      # For Unicorn, Passenger, Mongrel and other servers and standalone apps EventMachine is started
+      # in a separate thread.
+      #
+      # @example Using EventLoopHelper.run to start EventMachine reactor the optimal way without blocking current thread
+      #
+      #   AMQP::Utilities::EventLoopHelper.run do
+      #     # Sets up default connection, accessible via AMQP.connection, and opens a channel
+      #     # accessible via AMQP.channel for convenience
+      #     AMQP.start
+      #
+      #     exchange          = AMQP.channel.fanout("amq.fanout")
+      #
+      #     AMQP.channel.queue("", :auto_delete => true, :exclusive => true).bind(exchange)
+      #     AMQP::channel.default_exchange.publish("Started!", :routing_key => AMQP::State.queue.name)
+      #   end
+      #
+      # @return [Thread] A thread EventMachine event loop will be started in (there is no guarantee it is already running).
+      #
+      #
+      # @note This method, unlike EventMachine.run, DOES NOT block current thread.
+      def self.run(&block)
+        @eventmachine_thread  ||= begin
+                                    case self.server_type
+                                    when :thin, :goliath, :evented_mongrel then
+                                      EventMachine.next_tick { block.call }
+                                      Thread.current
+                                    when :unicorn, :passenger, :mongrel, :scgi, :webrick, nil then
+                                      t = Thread.new { EventMachine.run(&block) }
+                                      # give EventMachine reactor some time to start
+                                      sleep(0.25)
 
-                                  t = Thread.new { EventMachine.run }
-                                  # give EventMachine reactor some time to start
-                                  sleep(0.25)
+                                      t
+                                    else
+                                      t = Thread.new { EventMachine.run(&block) }
+                                      # give EventMachine reactor some time to start
+                                      sleep(0.25)
 
-                                  t
-                                when :mongrel, :scgi, :webrick, nil then
-                                  t = Thread.new { EventMachine.run }
-                                  # give EventMachine reactor some time to start
-                                  sleep(0.25)
-
-                                  t
-                                end
+                                      t
+                                    end
+                                  end
       end # self.run
 
-      def self.stop
-        EventMachine.stop
-      end
+
     end # EventLoopHelper
   end # Utilities
 end # AMQP

data/lib/amqp/utilities/server_type.rb

@@ -23,7 +23,25 @@
 
 module AMQP
   module Utilities
+    # A helper that detects Web server that may be running (if any). Partially derived
+    # from Qusion project by Daniel DeLeo.
     class ServerType
+
+      # Return a symbol representing Web server that is running (if any).
+      #
+      # Possible values are:
+      #
+      #  * :thin for Thin
+      #  * :unicorn for Unicorn
+      #  * :passenger for Passenger (Apache mod_rack)
+      #  * :goliath for PostRank's Goliath
+      #  * :evented_mongrel for Swiftiply's Evented Mongrel
+      #  * :mongrel for Mongrel
+      #  * :scgi for SCGI
+      #  * :webrick for WEBrick
+      #  * nil: none of the above (the case for non-Web application, for example)
+      #
+      # @return [Symbol]
       def self.detect
         if defined?(::PhusionPassenger)
           :passenger

data/lib/amqp/version.rb

@@ -6,5 +6,5 @@ module AMQP
   #
   # @see AMQ::Protocol::VERSION
   # @return [String] AMQP gem version
-  VERSION = '0.8.0.rc8'
+  VERSION = '0.8.0.rc9'
 end

data/spec/integration/exchange_declaration_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe AMQP do
+describe AMQP::Channel do
 
   #
   # Environment
@@ -10,13 +10,15 @@ describe AMQP do
 
   include EventedSpec::AMQPSpec
 
-  default_timeout 10
+  default_timeout 2
+
 
   amqp_before do
     @channel = AMQP::Channel.new
   end
 
 
+
   #
   # Examples
   #
@@ -26,7 +28,7 @@ describe AMQP do
       it 'declares a new direct exchange with that name' do
         @channel.direct('name').name.should == 'name'
 
-        done
+        done(0.3)
       end
 
       it "declares direct exchange as transient (non-durable)" do
@@ -35,7 +37,7 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
-        done
+        done(0.3)
       end
 
       it "declares direct exchange as non-auto-deleted" do
@@ -43,7 +45,7 @@ describe AMQP do
 
         exchange.should_not be_auto_deleted
 
-        done
+        done(0.3)
       end
     end
 
@@ -51,7 +53,7 @@ describe AMQP do
     context "when exchange name is omitted" do
       it 'uses amq.direct' do
         @channel.direct.name.should == 'amq.direct'
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -64,7 +66,7 @@ describe AMQP do
     EOF
         @channel.direct("") do |exchange|
           exchange.name.should_not be_empty
-          done
+          done(0.3)
         end
       end
     end # context
@@ -80,7 +82,7 @@ describe AMQP do
 
           exchange.should == original_exchange
 
-          done
+          done(0.3)
         end # it
       end
 
@@ -92,7 +94,7 @@ describe AMQP do
             exchange = @channel.direct("direct exchange declared at #{Time.now.to_i}", :passive => true)
           }.to raise_error
 
-          done
+          done(0.3)
         end # it
       end # context
     end # context
@@ -104,7 +106,7 @@ describe AMQP do
         exchange.should be_durable
         exchange.should_not be_transient
 
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -115,7 +117,7 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -125,7 +127,7 @@ describe AMQP do
         exchange = @channel.direct("a new auto-deleted direct exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -135,7 +137,7 @@ describe AMQP do
         exchange = @channel.direct("a new non-auto-deleted direct exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -145,7 +147,7 @@ describe AMQP do
         exchange = @channel.direct("a new non-auto-deleted direct exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -158,7 +160,7 @@ describe AMQP do
           @channel.direct("previously.declared.durable.direct.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
-        done
+        done(0.3)
       end # it
     end # context
   end # describe
@@ -175,7 +177,7 @@ describe AMQP do
 
         exchange.name.should == name
 
-        done
+        done(0.3)
       end
     end # context
 
@@ -185,7 +187,7 @@ describe AMQP do
         exchange.name.should == "amq.fanout"
         exchange.name.should_not == "amq.fanout2"
 
-        done
+        done(0.3)
       end
     end # context
 
@@ -199,7 +201,7 @@ describe AMQP do
 
           exchange.should == original_exchange
 
-          done
+          done(0.3)
         end # it
       end
 
@@ -211,7 +213,7 @@ describe AMQP do
             exchange = @channel.fanout("fanout exchange declared at #{Time.now.to_i}", :passive => true)
           }.to raise_error
 
-          done
+          done(0.3)
         end # it
       end # context
     end # context
@@ -223,7 +225,7 @@ describe AMQP do
         exchange.should be_durable
         exchange.should_not be_transient
 
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -234,7 +236,7 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -244,7 +246,7 @@ describe AMQP do
         exchange = @channel.fanout("a new auto-deleted fanout exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -254,7 +256,7 @@ describe AMQP do
         exchange = @channel.fanout("a new non-auto-deleted fanout exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -264,7 +266,7 @@ describe AMQP do
         exchange = @channel.fanout("a new non-auto-deleted fanout exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -277,7 +279,7 @@ describe AMQP do
           @channel.fanout("previously.declared.durable.topic.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
-        done
+        done(0.3)
       end # it
     end # context
   end # describe
@@ -293,7 +295,7 @@ describe AMQP do
         exchange = @channel.topic(name)
         exchange.name.should == name
 
-        done
+        done(0.3)
       end
     end # context
 
@@ -303,7 +305,7 @@ describe AMQP do
         exchange.name.should == "amq.topic"
         exchange.name.should_not == "amq.topic2"
 
-        done
+        done(0.3)
       end
     end # context
 
@@ -317,7 +319,7 @@ describe AMQP do
 
           exchange.should == original_exchange
 
-          done
+          done(0.3)
         end # it
       end
 
@@ -329,7 +331,7 @@ describe AMQP do
             exchange = @channel.topic("topic exchange declared at #{Time.now.to_i}", :passive => true)
           }.to raise_error
 
-          done
+          done(0.3)
         end # it
       end # context
     end # context
@@ -341,7 +343,7 @@ describe AMQP do
         exchange.should be_durable
         exchange.should_not be_transient
 
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -352,7 +354,7 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -362,7 +364,7 @@ describe AMQP do
         exchange = @channel.topic("a new auto-deleted topic exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -372,7 +374,7 @@ describe AMQP do
         exchange = @channel.topic("a new non-auto-deleted topic exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -382,7 +384,7 @@ describe AMQP do
         exchange = @channel.topic("a new non-auto-deleted topic exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -402,7 +404,7 @@ describe AMQP do
           channel.topic("previously.declared.durable.topic.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
-        done
+        done(0.3)
       end # it
     end # context
   end # describe
@@ -419,7 +421,7 @@ describe AMQP do
 
         exchange.name.should == name
 
-        done
+        done(0.3)
       end
     end # context
 
@@ -433,7 +435,7 @@ describe AMQP do
         exchange.name.should == "amq.match"
         exchange.name.should_not == "amq.headers"
 
-        done
+        done(0.3)
       end
     end # context
 
@@ -447,7 +449,7 @@ describe AMQP do
 
           exchange.should == original_exchange
 
-          done
+          done(0.3)
         end # it
       end
 
@@ -459,7 +461,7 @@ describe AMQP do
             exchange = @channel.headers("headers exchange declared at #{Time.now.to_i}", :passive => true)
           }.to raise_error
 
-          done
+          done(0.3)
         end # it
       end # context
     end # context
@@ -471,7 +473,7 @@ describe AMQP do
         exchange.should be_durable
         exchange.should_not be_transient
 
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -482,7 +484,7 @@ describe AMQP do
         exchange.should_not be_durable
         exchange.should be_transient
 
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -492,7 +494,7 @@ describe AMQP do
         exchange = @channel.headers("a new auto-deleted headers exchange", :auto_delete => true)
 
         exchange.should be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -502,7 +504,7 @@ describe AMQP do
         exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -512,7 +514,7 @@ describe AMQP do
         exchange = @channel.headers("a new non-auto-deleted headers exchange", :auto_delete => false)
 
         exchange.should_not be_auto_deleted
-        done
+        done(0.3)
       end # it
     end # context
 
@@ -529,7 +531,7 @@ describe AMQP do
           @channel.headers("previously.declared.durable.topic.exchange", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
-        done
+        done(0.3)
       end # it
     end # context
   end # describe

data/spec/integration/queue_declaration_spec.rb

@@ -16,6 +16,10 @@ describe AMQP do
     @channel = AMQP::Channel.new
   end
 
+  after(:all) do
+    AMQP.cleanup_state
+    done(0.3)
+  end
 
   #
   # Examples
@@ -28,13 +32,13 @@ describe AMQP do
       it "declares a new queue with that name" do
         queue = @channel.queue(name)
         queue.name.should == name
-        done
+        done(0.3)
       end
 
       it "caches that queue" do
         queue = @channel.queue(name)
         @channel.queue(name).object_id.should == queue.object_id
-        done
+        done(0.3)
       end
     end # context
 
@@ -68,7 +72,7 @@ describe AMQP do
             @channel.queue(name, different_options)
           }.to raise_error(AMQP::IncompatibleOptionsError)
           @queue.delete
-          done(0.2)
+          done(0.3)
         end
       end
     end
@@ -83,7 +87,7 @@ describe AMQP do
 
           queue.should == original_queue
 
-          done
+          done(0.3)
         end # it
       end
 
@@ -95,7 +99,7 @@ describe AMQP do
             exchange = @channel.queue("queue declared at #{Time.now.to_i}", :passive => true)
           }.to raise_error
 
-          done
+          done(0.3)
         end # it
       end # context
     end # context
@@ -111,7 +115,7 @@ describe AMQP do
           @channel.queue("previously.declared.durable.queue", :durable => false)
         }.to raise_error(AMQP::IncompatibleOptionsError)
 
-        done
+        done(0.3)
       end # it
     end # context
   end # describe

data/spec/unit/amqp/connection_spec.rb

@@ -74,49 +74,4 @@ describe AMQP, 'class object' do
       end
     end
   end # .start
-
-
-
-
-  describe '.stop' do
-    context "when connection is not established" do
-      it 'is a no-op' do
-        AMQP.stop
-        AMQP.stop
-
-        @res = AMQP.stop
-        @res.should be_nil
-      end # it
-    end # context
-
-
-    context 'with established AMQP connection' do
-
-      #
-      #
-      #
-
-      include EventedSpec::EMSpec
-      default_options AMQP_OPTS
-      #
-      # Examples
-      #
-
-      it 'properly closes AMQP broker connection and fires a callback. Mind the delay!' do
-        AMQP.start(AMQP_OPTS) do
-          AMQP.connection.should be_connected
-
-          @block_has_fired = false
-
-          AMQP.stop do
-            @block_has_fired = true
-          end
-          AMQP.connection.should_not be_nil
-          done(0.1) do
-            @block_has_fired.should be_true
-          end
-        end
-      end # it
-    end # context
-  end # describe
 end # describe AMQP

metadata

@@ -1,65 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: amqp
-version: !ruby/object:Gem::Version 
-  hash: 977940489
-  prerelease: true
-  segments: 
-  - 0
-  - 8
-  - 0
-  - rc8
-  version: 0.8.0.rc8
+version: !ruby/object:Gem::Version
+  version: 0.8.0.rc9
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Aman Gupta
 - Jakub Stastny aka botanicus
 - Michael S. Klishin
 autorequire: 
 bindir: bin
-cert_chain: 
-date: 2011-05-09 00:00:00 +04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain: []
+date: 2011-05-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152811580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: amq-client
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2152811580
+- !ruby/object:Gem::Dependency
+  name: amq-client
+  requirement: &2152833600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1369095468
-        segments: 
-        - 0
-        - 7
-        - 0
-        - alpha20
-        version: 0.7.0.alpha20
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.0.alpha21
   type: :runtime
-  version_requirements: *id002
-description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries included
-email: 
+  prerelease: false
+  version_requirements: *2152833600
+description: Widely used, feature-rich asynchronous AMQP 0.9.1 client with batteries
+  included
+email:
 - michael@novemberain.com
 - stastny@101ideas.cz
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
 - docs/08Migration.textile
 - docs/Bindings.textile
@@ -75,7 +58,7 @@ extra_rdoc_files:
 - docs/RabbitMQVersions.textile
 - docs/Routing.textile
 - docs/VendorSpecificExtensions.textile
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -88,7 +71,6 @@ files:
 - amqp.gemspec
 - bin/cleanify.rb
 - bin/irb
-- bin/jenkins.sh
 - bin/set_test_suite_realms_up.sh
 - docs/08Migration.textile
 - docs/Bindings.textile
@@ -151,6 +133,7 @@ files:
 - examples/queues/declare_a_queue_without_assignment.rb
 - examples/queues/declare_and_bind_a_server_named_queue.rb
 - examples/queues/queue_status.rb
+- examples/rack/publish_a_message_on_request/thin.ru
 - examples/real-world/task-queue/README.textile
 - examples/real-world/task-queue/consumer.rb
 - examples/real-world/task-queue/producer.rb
@@ -220,41 +203,29 @@ files:
 - spec/unit/amqp/basic_spec.rb
 - spec/unit/amqp/connection_spec.rb
 - tasks.rb
-has_rdoc: true
 homepage: http://github.com/ruby-amqp/amqp
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --include=examples --main README.textile
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: amqp
-rubygems_version: 1.3.7
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: AMQP client implementation in Ruby/EventMachine.
 test_files: []
-

data/bin/jenkins.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-echo -e "\n\n==== Setup ===="
-source /etc/profile
-git fetch && git reset origin/master --hard
-
-# FIXME: Jenkins user doesn't have permissions to run it.
-# PATH=/usr/sbin:$PATH ./bin/set_test_suite_realms_up.sh
-echo "~ NOT running ./bin/set_test_suite_realms_up.sh"
-
-echo -e "\n\n==== Ruby 1.9.2 Head ===="
-rvm use 1.9.2-head@ruby-amqp
-gem install bundler --no-ri --no-rdoc
-bundle install --path vendor/bundle/1.9.2 --without development; echo
-bundle update; echo
-bundle exec rspec spec
-return_status=$?
-
-echo -e "\n\n==== Ruby 1.8.7 ===="
-rvm use 1.8.7@ruby-amqp
-gem install bundler --no-ri --no-rdoc
-bundle install --path vendor/bundle/1.8.7 --without development; echo
-bundle update; echo
-bundle exec rspec spec
-return_status=$(expr $return_status + $?)
-
-test $return_status -eq 0