amq-client 0.5.0 → 0.7.0.alpha1

data/Gemfile

@@ -2,11 +2,21 @@
 
 source :rubygems
 
+# Use local clones if possible.
+def custom_gem(name, options = Hash.new)
+  local_path = File.expand_path("../../#{name}", __FILE__)
+  if ENV["USE_AMQP_CUSTOM_GEMS"] && File.directory?(local_path)
+    gem name, options.merge(:path => local_path).delete_if { |key, _| [:git, :branch].include?(key) }
+  else
+    gem name, options
+  end
+end
+
 gem "eventmachine", "0.12.10" #, "1.0.0.beta.3"
 # cool.io uses iobuffer that won't compile on JRuby
 # (and, probably, Windows)
 gem "cool.io", :platform => :ruby
-gem "amq-protocol", :git => "git://github.com/ruby-amqp/amq-protocol.git", :branch => "master"
+custom_gem "amq-protocol", :git => "git://github.com/ruby-amqp/amq-protocol.git", :branch => "master"
 
 group :development do
   gem "yard"
@@ -23,5 +33,5 @@ end
 group :test do
   gem "rspec", ">=2.0.0"
   gem "autotest"
-  gem "evented-spec", :git => "git://github.com/ruby-amqp/evented-spec.git", :branch => "master"
+  custom_gem "evented-spec", :git => "git://github.com/ruby-amqp/evented-spec.git", :branch => "master"
 end

data/lib/amq/client/version.rb

@@ -1,5 +1,5 @@
 module AMQ
   module Client
-    VERSION = "0.5.0".freeze
+    VERSION = "0.7.0.alpha1"
   end
 end

data/spec/integration/coolio/basic_ack_spec.rb

@@ -16,8 +16,8 @@ describe "AMQ::Client::Coolio", "Basic.Ack", :nojruby => true do
       coolio_amqp_connect do |client|
         channel = AMQ::Client::Channel.new(client, 1)
         channel.open do
-          queue = AMQ::Client::Queue.new(client, channel)
-          queue.declare.bind("amq.fanout")
+          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+          queue.bind("amq.fanout")
 
           queue.consume do |_, consumer_tag|
             queue.on_delivery do |method, header, payload|

data/spec/integration/coolio/basic_get_spec.rb

@@ -34,10 +34,13 @@ describe "AMQ::Client::Coolio", "Basic.Get", :nojruby => true do
               @received_messages << payload
             end
 
-            done(0.5) {
+            delayed(0.5) {
+              # need to delete the queue manually because #get doesn't count as consumption,
+              # hence, no auto-delete
+              queue.delete
+            }
+            done(0.75) {
               @received_messages.should =~ messages
-
-              queue.purge
             }
           end
         end
@@ -61,9 +64,8 @@ describe "AMQ::Client::Coolio", "Basic.Get", :nojruby => true do
             header.should be_nil
             payload.should be_nil
 
-            done {
-              queue.purge
-            }
+            queue.delete
+            done(0.5)
           end # get
         end
       end # em_amqp_connect

data/spec/integration/coolio/basic_return_spec.rb

@@ -15,6 +15,10 @@ describe "AMQ::Client::Coolio", "Basic.Return", :nojruby => true do
         channel.open do
           queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
 
+          # need to delete the queue manually because we don't start consumption,
+          # hence, no auto-delete
+          delayed(0.4) { queue.delete }
+
           exchange = AMQ::Client::Exchange.new(client, channel, "direct-exchange", :direct).declare.on_return do |method|
             @returned_messages << method.reply_text
           end

data/spec/integration/coolio/channel_flow_spec.rb

@@ -9,16 +9,14 @@ describe "AMQ::Client::Coolio", "Channel.Flow", :nojruby => true do
     coolio_amqp_connect do |client|
       channel = AMQ::Client::Channel.new(client, 1)
       channel.open do
-        AMQ::Client::Queue.new(client, channel).declare(false, false, false, true) do |q, _, _, _|
-          channel.flow_is_active?.should be_true
-          channel.flow(false) do |_, flow_active|
-            flow_active.should be_false
-            channel.flow(true) do |_, flow_active|
-              flow_active.should be_true
-            end
+        channel.flow_is_active?.should be_true
+        channel.flow(false) do |_, flow_active|
+          flow_active.should be_false
+          channel.flow(true) do |_, flow_active|
+            flow_active.should be_true
           end
-          done
         end
+        done
       end
     end
   end
@@ -29,16 +27,14 @@ describe "AMQ::Client::Coolio", "Channel.Flow", :nojruby => true do
       channel = AMQ::Client::Channel.new(client, 1)
       expect {
         channel.open do
-          AMQ::Client::Queue.new(client, channel).declare(false, false, false, true) do |q, _, _, _|
-            channel.flow_is_active?.should be_true
+          channel.flow_is_active?.should be_true
+          channel.flow(false) do |_, flow_active|
+            flow_active.should be_false
             channel.flow(false) do |_, flow_active|
               flow_active.should be_false
-              channel.flow(false) do |_, flow_active|
-                flow_active.should be_false
-              end
             end
-            done
           end
+          done
         end
       }.to_not raise_error
     end

data/spec/integration/coolio/tx_rollback_spec.rb

@@ -16,6 +16,7 @@ describe "AMQ::Client::Coolio", "Tx.Rollback", :nojruby => true do
 
 
   it "should cancel all the changes done during transaction" do
+    pending("Need to figure out details with AMQP protocol on that matter")
     received_messages = []
     coolio_amqp_connect do |client|
       channel = AMQ::Client::Channel.new(client, 1)

data/spec/integration/eventmachine/basic_ack_spec.rb

@@ -13,9 +13,7 @@ describe AMQ::Client::EventMachineClient, "Basic.Ack" do
       em_amqp_connect do |client|
         channel = AMQ::Client::Channel.new(client, 1)
         channel.open do
-          queue = AMQ::Client::Queue.new(client, channel)
-          queue.declare
-
+          queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
           queue.bind("amq.fanout")
 
           queue.consume do |amq_method|

data/spec/integration/eventmachine/basic_get_spec.rb

@@ -26,18 +26,22 @@ describe AMQ::Client::EventMachineClient, "Basic.Get" do
             end
 
             queue.get(true) do |method, header, payload|
-              puts "Got #{payload}"              
+              puts "Got #{payload}"
               @received_messages << payload
             end
             queue.get(true) do |method, header, payload|
-              puts "Got #{payload}"              
+              puts "Got #{payload}"
               @received_messages << payload
             end
 
-            done(0.6) {
-              @received_messages.should =~ messages
+            delayed(0.5) {
+              # need to delete the queue manually because #get doesn't count as consumption,
+              # hence, no auto-delete
+              queue.delete
+            }
 
-              queue.purge
+            done(0.75) {
+              @received_messages.should =~ messages
             }
           end
         end
@@ -61,9 +65,8 @@ describe AMQ::Client::EventMachineClient, "Basic.Get" do
             header.should be_nil
             payload.should be_nil
 
-            done {
-              queue.purge
-            }
+            queue.delete
+            done(0.5)
           end # get
         end
       end # em_amqp_connect

data/spec/integration/eventmachine/basic_return_spec.rb

@@ -14,6 +14,9 @@ describe AMQ::Client::EventMachineClient, "Basic.Return" do
         channel = AMQ::Client::Channel.new(client, 1)
         channel.open do
           queue = AMQ::Client::Queue.new(client, channel).declare(false, false, false, true)
+          # need to delete the queue manually because we don't start consumption,
+          # hence, no auto-delete
+          delayed(0.4) { queue.delete }
 
           exchange = AMQ::Client::Exchange.new(client, channel, "direct-exchange", :direct).declare.on_return do |method|
             @returned_messages << method.reply_text

data/spec/integration/eventmachine/channel_flow_spec.rb

@@ -11,19 +11,17 @@ describe AMQ::Client::EventMachineClient, "Channel#flow" do
 
       channel = AMQ::Client::Channel.new(client, 1)
       channel.open do
-        AMQ::Client::Queue.new(client, channel).declare(false, false, false, true) do |amq_method|
-          channel.flow_is_active?.should be_true
+        channel.flow_is_active?.should be_true
 
-          channel.flow(false) do |flow_status1|
-            channel.flow_is_active?.should be_false
-            flow_states << channel.flow_is_active?
+        channel.flow(false) do |flow_status1|
+          channel.flow_is_active?.should be_false
+          flow_states << channel.flow_is_active?
 
-            channel.flow(true) do |flow_status2|
-              channel.flow_is_active?.should be_true
-              flow_states << channel.flow_is_active?
-            end # channel.flow
+          channel.flow(true) do |flow_status2|
+            channel.flow_is_active?.should be_true
+            flow_states << channel.flow_is_active?
           end # channel.flow
-        end # Queue.new
+        end # channel.flow
       end # channel.open
 
       done(0.5) { flow_states.should == [false, true] }

metadata

@@ -1,10 +1,17 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: amq-client
-version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 1552698946208022685
+  prerelease: 6
+  segments: 
+  - 0
+  - 7
+  - 0
+  - alpha
+  - 1
+  version: 0.7.0.alpha1
 platform: ruby
-authors:
+authors: 
 - Jakub Stastny
 - Michael S. Klishin
 - Theo Hultberg
@@ -12,41 +19,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2011-04-17 00:00:00.000000000 +04:00
+date: 2011-04-17 00:00:00 +04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &2152189080 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
   type: :runtime
-  prerelease: false
-  version_requirements: *2152189080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: amq-protocol
-  requirement: &2152188660 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2152188660
-description: ! "  amq-client supports multiple networking adapters (EventMachine,
-  TCP sockets, cool.io) and\n  supposed to back more opinionated AMQP clients (such
-  as amqp gem, bunny, et cetera) or be used directly\n  in cases when access to more
-  advanced AMQP 0.9.1 features is more important that convenient APIs\n"
-email:
+  version_requirements: *id002
+description: "  amq-client supports multiple networking adapters (EventMachine, TCP sockets, cool.io) and\n  supposed to back more opinionated AMQP clients (such as amqp gem, bunny, et cetera) or be used directly\n  in cases when access to more advanced AMQP 0.9.1 features is more important that convenient APIs\n"
+email: 
 - stastny@101ideas.cz
 - michael@novemberain.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.textile
 - doc/_index.html
 - doc/AMQ.html
@@ -57,7 +71,7 @@ extra_rdoc_files:
 - doc/index.html
 - doc/method_list.html
 - doc/top-level-namespace.html
-files:
+files: 
 - .gitignore
 - .gitmodules
 - .rspec
@@ -177,26 +191,38 @@ files:
 has_rdoc: true
 homepage: http://github.com/ruby-amqp/amq-client
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: amq-client
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: amq-client is a fully-featured, low-level AMQP 0.9.1 client
 test_files: []
+