amqp-spec 0.3.7 → 0.3.8

data/.gitignore

@@ -14,6 +14,8 @@ tmtags
 *.swp
 
 ## PROJECT::GENERAL
+*.rbc
+*.class
 coverage
 config
 rdoc

data/HISTORY

@@ -85,3 +85,7 @@
 == 0.3.7 / 2011-01-07
 
 * Changed Gemspec to avoid circular dependency on AMQP
+
+== 0.3.8 / 2011-01-25
+
+* MRI 1.8.7 support added

data/README.rdoc

@@ -1,10 +1,11 @@
 = amqp-spec
 by: Arvicco
-url: http://github.com/arvicco/amqp-spec
+url: http://github.com/ruby-amqp/amqp-spec
 
 == Summary
 
 Simple API for writing asynchronous EventMachine/AMQP specs. Supports RSpec and RSpec2.
+Should work under MRI 1.8.7, 1.9.2 (and JRuby 1.6.0 - work in progress!)
 
 == Description
 
@@ -21,17 +22,17 @@ has several drawbacks. First, it is not easy to manage both EM.run and AMQP.star
 at the same time. Second, AMQP is not properly stopped and deactivated upon exceptions and
 timeouts, resulting in state leak between examples and multiple mystereous failures.
 
-AMQP-Spec is based on EM-Spec code but makes it easier to test AMQP event loops
-specifically. API is very similar to EM-Spec's, only a bit extended. The final goal is to
+AMQP-Spec is based on EM-Spec code but extends it to support AMQP event loops (as well as
+RSpec2). API is very similar to EM-Spec's, only a bit extended. The final goal is to
 make writing AMQP specs reasonably pleasant experience and dispel the notion that evented
-AMQP-based libs are impossible to unit-test.
+libs are impossible to unit-test.
 
 Mind you, you still have to properly manage your AMQP broker in order to prevent broker
 state from leaking between examples. You can try to combine AMQP-Spec and
 Moqueue[http://github.com/danielsdeleo/moqueue] if you want to abstract away actual broker
 interactions, but still specify some event-based expectations.
 
-==Rspec
+== Rspec
 
 There are several ways to use amqp-spec. To use it as a helper, include AMQP::SpecHelper
 in your describe block. You then use either #amqp or #em methods to wrap your evented
@@ -50,9 +51,9 @@ In order to setup/teardown EM state before/after your examples, you'll need to u
 If you are using #amqp method, *em_before* hook will run just BEFORE AMQP connection is
 attempted, and *em_after* is run after AMQP is stopped.
 
-Sometimes, may want to setup/teardown state inside AMQP connection (inside block given to
-AMQP.start): for example, to make sure that the connection is established before your
-example runs, or pre-declare some queues and exchanges common for all examples.
+Sometimes, you may want to setup/teardown state inside AMQP connection (inside block given
+to AMQP.start): for example, to make sure that the connection is established before your
+examples run, or to pre-declare some queues and exchanges common for all examples.
 In this case, please use *amqp_before* and *amqp_after* hooks. These hooks run inside
 the AMQP.start block just before/after your example block.
 
@@ -61,11 +62,20 @@ the AMQP.start block just before/after your example block.
   describe AMQP do
     include AMQP::SpecHelper
   
-    default_options = {:host => 'my.amqp.broker.org', :port => '21118'}
     # Can be used to set default options for your amqp{} event loops
+    default_options {:host => 'my.amqp.broker.org', :port => '21118'}
 
-    default_timeout = 1
     # Can be used to set default :spec_timeout for your evented specs
+    default_timeout 1
+
+    # Runs inside the EM event loop before each block given to #amqp or #em
+    em_before { @start = Time.now }
+
+    # Runs inside the AMQP.start before each block given to #amqp
+    amqp_before do
+      @channel = AMQP::Channel.new
+      @queue = @channel.queue('my_queue')
+    end
 
     it "works normally when not using #amqp or #em" do
       1.should == 1
@@ -73,10 +83,8 @@ the AMQP.start block just before/after your example block.
   
     it "makes testing evented code easy with #em" do
       em do
-        start = Time.now
-
         EM.add_timer(0.5){
-          (Time.now-start).should be_close( 0.5, 0.1 )
+          (Time.now - @start).should be_close( 0.5, 0.1 )
           done
         }
       end
@@ -85,13 +93,16 @@ the AMQP.start block just before/after your example block.
     it "runs AMQP.start loop with options given to #amqp" do
       amqp(:host => 'my.amqp.broker.org', :port => '21118')do
         AMQP.conn.should be_connected
+        @queue.name.should == 'my_queue'
         done
       end
     end
 
     it "optionally raises timeout exception if your loop hangs for some reason" do
       proc {
-        amqp(:spec_timeout => 0.5){}
+        amqp(:spec_timeout => 0.5) do
+        # no done!
+        end
       }.should raise_error SpecTimeoutExceededError
     end
 
@@ -106,17 +117,16 @@ tear down using these hooks will be lost as example itself will run in a differe
 
 In short, you should avoid using *before*/*after* if you include AMQP::Spec - instead, use
 *em_before*/*em_after* or *amqp_before*/*amqp_after* hooks that run inside the EM event
-loop.
-
-One more note: you don't need to call #done inside evented hooks, otherwise it'll shut down
-the EM reactor.
+loop. You don't need to call #done inside these evented hooks, otherwise you'll shut down
+the EM reactor before your example runs.
 
+  require 'amqp-spec'
 
   describe AMQP do
     include AMQP::Spec
 
-    default_options = {:host => 'my.amqp.broker.org', :port => '21118'}
-    default_timeout = 1
+    default_options {:host => 'my.amqp.broker.org', :port => '21118'}
+    default_timeout 1
 
     em_before { @start = Time.now }
 
@@ -128,7 +138,7 @@ the EM reactor.
     it "runs test code in an amqp block automatically" do
 
       EM.add_timer(0.5){
-        (Time.now-@start).should be_close( 0.5, 0.1 )
+        (Time.now - @start).should be_close( 0.5, 0.1 )
         done
       }
     end
@@ -139,14 +149,16 @@ the EM reactor.
     end
 
     it "raises timeout exception ONLY if default_timeout was set" do
-      proc{}.should raise_error SpecTimeoutExceededError
+      proc do
+        # no done!
+        end.should raise_error SpecTimeoutExceededError
     end
   end
 
 Finally, you can include AMQP::EMSpec in your describe block. This will run all the group
 examples inside em block instead of amqp. Non-evented *before*/*after* hooks should be
 finished with #done, same as when including AMQP::Spec, and same caution about using them
-applies.
+applies - use *em_before*/*em_after* instead.
 
   describe AMQP do
     include AMQP::EMSpec
@@ -168,16 +180,7 @@ applies.
     end
   end
 
-
-==Bacon
-
-...
-
-==Test::Unit
-
-...
-
-==General notes
+== General notes
 
 For a developer new to evented specs, it is not easy to internalize that the blocks given
 to asynchronous methods are turned into real callbacks, intended to fire some time later.
@@ -193,7 +196,8 @@ Take the following spec as an example:
         msg.should_not == 'data'
       end
       MQ.queue('queue_name').publish 'data'
-      q.unsubscribe; q.delete
+      q.unsubscribe
+      q.delete
       done
     end
   end
@@ -232,19 +236,38 @@ Something like this will do the trick:
     @subscribe_fired.should be_true
   end
 
-==Limitations
+== Legacy EM-Spec based specs support
+
+In order to run your existing EM-Spec based specs unmodified, instead of require 'em-spec':
+
+  require 'amqp-spec'
+  require 'amqp-spec/em_spec_shim'
+
+Please note that in amqp-spec default options and default timeout are local for each
+example group and inherited by its nested groups, unconnected example groups DO NOT
+share defaults. This is different from EM-Spec where default_timeout is effectively
+a global setting. So please make sure you're setting default_timeout early on,
+in your outermost example group in order to get same behavior as in EM-Spec.
+
+== Extending library to spec other types of event loops
+
+AMQP-Spec extends EM-Spec code to cover different types of event loops.
+Initially, vanilla EM and AMQP event loops are supported, but the lib can be extended
+quite easily to spec any other type of event loop, not necesarily EM-based (such as
+Cool.io, ZMQMachine and whatnot). All you need to do is just write appropriate
+EventedExample subclass (with minimal interface of just #run and #done to start and
+stop your loop) and RSpec wrapper for it similar to SpecHelper#em or SpecHelper#amqp.
+You can then call your wrapper in RSpec examples in a way similar to #em or #amqp.
+
+== Limitations
 
 AMQP-Spec can be currently used with Rspec only. I suppose, it is not that difficult to
 extend EM-Spec's Test::Unit and Bacon support, I just do not have experience doing it.
 
-Another limitation, library uses 1.9 syntax and therefore not compatible with Ruby 1.8.
-Again, it seems possible to rewrite it in 1.8-compatible style, with string evals and
-all such, but I'd rather leave this work to someone else.
-
 Any help improving this library is greatly appreciated...
 
 == LICENSE:
-Copyright (c) 2010 Arvicco.
+Copyright (c) 2010-2011 Arvicco.
 Original EM-Spec code copyright (c) 2008 Aman Gupta (tmm1)
 
 See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/lib/amqp-spec.rb

@@ -1,24 +1,6 @@
 require 'version'
 
-module AMQP
-  module Spec
-
-    # Requires ruby source file(s). Accepts either single filename/glob or Array of filenames/globs.
-    # Accepts following options:
-    # :*file*:: Lib(s) required relative to this file - defaults to __FILE__
-    # :*dir*:: Required lib(s) located under this dir name - defaults to gem name
-    #
-    def self.require_libs(libs, opts={})
-      file = Pathname.new(opts[:file] || __FILE__)
-      [libs].flatten.each do |lib|
-        name = file.dirname + (opts[:dir] || file.basename('.*')) + lib.gsub(/(?<!.rb)$/, '.rb')
-        Pathname.glob(name.to_s).sort.each { |rb| require rb }
-      end
-    end
-  end
-end
-
-# Require all ruby source files located under directory lib/amqp-spec
-# If you need files in specific order, you should specify it here before the glob
-AMQP::Spec.require_libs %W[rspec]
+__dir = File.expand_path(File.dirname(__FILE__))
+$:.unshift(__dir) unless $:.include?(__dir)
 
+require "amqp-spec/rspec"

data/lib/amqp-spec/em_spec_shim.rb

@@ -0,0 +1,6 @@
+# Monkey patching EM to provide drop-in experience for legacy EM-Spec based examples.
+# Remember: monkey patching is dangerous, confusing and will come to haunt you.
+module EventMachine
+  Spec = AMQP::EMSpec
+  SpecHelper = AMQP::SpecHelper
+end

data/lib/amqp-spec/evented_example.rb

@@ -8,7 +8,7 @@ module AMQP
     class EventedExample
 
       # Create new evented example
-      def initialize opts = {}, example_group_instance, &block
+      def initialize(opts, example_group_instance, &block)
         @opts, @example_group_instance, @block = opts, example_group_instance, block
       end
 
@@ -30,7 +30,7 @@ module AMQP
       #
       # Please redefine it inside descendant class and call super.
       #
-      def done delay=nil, &block
+      def done(delay=nil, &block)
         if delay
           EM.add_timer delay, &block
         else
@@ -40,7 +40,7 @@ module AMQP
 
       # Runs hooks of specified type (hopefully, inside the event loop)
       #
-      def run_em_hooks type
+      def run_em_hooks(type)
         @example_group_instance.class.em_hooks[type].each do |hook|
           if @example_group_instance.respond_to? :instance_eval_without_event_loop
             @example_group_instance.instance_eval_without_event_loop(&hook)
@@ -105,7 +105,7 @@ module AMQP
       # Breaks the EM event loop and finishes the spec.
       # Done yields to any given block first, then stops EM event loop.
       #
-      def done(delay=nil)
+      def done(delay = nil)
         super(delay) do
           yield if block_given?
           EM.next_tick do
@@ -122,7 +122,7 @@ module AMQP
       # Run @block inside the AMQP.start loop
       def run
         run_em_loop do
-          AMQP.start_connection @opts, do
+          AMQP.start_connection(@opts) do
             run_em_hooks :amqp_before
             @block.call
           end
@@ -132,7 +132,7 @@ module AMQP
       # Breaks the event loop and finishes the spec. It yields to any given block first,
       # then stops AMQP, EM event loop and cleans up AMQP state.
       #
-      def done(delay=nil)
+      def done(delay = nil)
         super(delay) do
           yield if block_given?
           EM.next_tick do

data/lib/amqp-spec/rspec.rb

@@ -53,39 +53,39 @@ module AMQP
       # Sets/retrieves default timeout for running evented specs for this
       # example group and its nested groups.
       #
-      def default_timeout spec_timeout=nil
+      def default_timeout(spec_timeout = nil)
         default_options[:spec_timeout] = spec_timeout || default_options[:spec_timeout]
       end
 
       # Sets/retrieves default AMQP.start options for this example group
       # and its nested groups.
       #
-      def default_options opts=nil
+      def default_options(opts = nil)
         metadata[:em_defaults] ||= {}
         metadata[:em_defaults][self] ||= (superclass.default_options.dup rescue {})
         metadata[:em_defaults][self] = opts || metadata[:em_defaults][self]
       end
 
       # Add before hook that will run inside EM event loop
-      def em_before scope = :each, &block
+      def em_before(scope = :each, &block)
         raise ArgumentError, "em_before only supports :each scope" unless :each == scope
         em_hooks[:em_before] << block
       end
 
       # Add after hook that will run inside EM event loop
-      def em_after scope = :each, &block
+      def em_after(scope = :each, &block)
         raise ArgumentError, "em_after only supports :each scope" unless :each == scope
         em_hooks[:em_after].unshift block
       end
 
       # Add before hook that will run inside AMQP connection (AMQP.start loop)
-      def amqp_before scope = :each, &block
+      def amqp_before(scope = :each, &block)
         raise ArgumentError, "amqp_before only supports :each scope" unless :each == scope
         em_hooks[:amqp_before] << block
       end
 
       # Add after hook that will run inside AMQP connection (AMQP.start loop)
-      def amqp_after scope = :each, &block
+      def amqp_after(scope = :each, &block)
         raise ArgumentError, "amqp_after only supports :each scope" unless :each == scope
         em_hooks[:amqp_after].unshift block
       end
@@ -94,14 +94,16 @@ module AMQP
       def em_hooks
         metadata[:em_hooks] ||= {}
         metadata[:em_hooks][self] ||=
-            {em_before: (superclass.em_hooks[:em_before].clone rescue []),
-             em_after: (superclass.em_hooks[:em_after].clone rescue []),
-             amqp_before: (superclass.em_hooks[:amqp_before].clone rescue []),
-             amqp_after: (superclass.em_hooks[:amqp_after].clone rescue [])}
+            {
+              :em_before   => (superclass.em_hooks[:em_before].clone rescue []),
+              :em_after    => (superclass.em_hooks[:em_after].clone rescue []),
+              :amqp_before => (superclass.em_hooks[:amqp_before].clone rescue []),
+              :amqp_after  => (superclass.em_hooks[:amqp_after].clone rescue [])
+            }
       end
     end
 
-    def self.included example_group
+    def self.included(example_group)
       unless example_group.respond_to? :default_timeout
         example_group.extend GroupMethods
       end
@@ -131,7 +133,7 @@ module AMQP
     # to force spec to timeout if something goes wrong and EM/AMQP loop hangs for some
     # reason. SpecTimeoutExceededError is raised if it happens.
     #
-    def amqp opts={}, &block
+    def amqp(opts = {}, &block)
       opts = default_options.merge opts
       @evented_example = AMQPExample.new(opts, self, &block)
       @evented_example.run
@@ -144,8 +146,8 @@ module AMQP
     # For compatibility with EM-Spec API, em method accepts either options Hash
     # or numeric timeout in seconds.
     #
-    def em opts = {}, &block
-      opts = default_options.merge(opts.is_a?(Hash) ? opts : {spec_timeout: opts})
+    def em(opts = {}, &block)
+      opts = default_options.merge(opts.is_a?(Hash) ? opts : { :spec_timeout =>  opts })
       @evented_example = EMExample.new(opts, self, &block)
       @evented_example.run
     end
@@ -159,13 +161,13 @@ module AMQP
     # that your (default or explicit) spec timeout may fire before your delayed done
     # callback is due, leading to SpecTimeoutExceededError
     #
-    def done *args, &block
+    def done(*args, &block)
       @evented_example.done *args, &block
     end
 
     # Manually sets timeout for currently running example
     #
-    def timeout *args
+    def timeout(*args)
       @evented_example.timeout *args
     end
 
@@ -208,9 +210,3 @@ module AMQP
     end
   end
 end
-
-# Monkey patching EM to provide drop-in experience for legacy EM-Spec based examples
-module EventMachine
-  Spec = AMQP::EMSpec
-  SpecHelper = AMQP::SpecHelper
-end

data/spec/em_hooks_spec.rb

@@ -1,7 +1,9 @@
 require 'spec_helper'
 
-def hook symbol=nil, reactor, connection
-  @hooks_called << symbol.to_sym if symbol
+# Registers specific hook type as being called,
+# sets expectations about EM reactor and AMQP connection state
+def hook(type, reactor, connection)
+  @hooks_called << type.to_sym if type
   if :reactor_running == reactor
     EM.reactor_running?.should be_true
   else
@@ -88,7 +90,7 @@ describe AMQP::SpecHelper, ".em_before/.em_after" do
     context 'for non-evented specs' do
       after {
         @hooks_called.should == [:before]
-        hook :reactor_not_running, :amqp_not_connected }
+        hook :after, :reactor_not_running, :amqp_not_connected }
 
       it 'should NOT execute em_before or em_after' do
         @hooks_called.should_not include :em_before
@@ -109,7 +111,7 @@ describe AMQP::SpecHelper, ".em_before/.em_after" do
     context 'for evented specs' do #, pending: true do
       after {
         @hooks_called.should include :before, :em_before, :em_after
-        hook :reactor_not_running, :amqp_not_connected }
+        hook :after, :reactor_not_running, :amqp_not_connected }
 
       context 'with em block' do
 
@@ -143,7 +145,7 @@ describe AMQP::SpecHelper, ".em_before/.em_after" do
                                                :context_em_before,
                                                :context_em_after,
                                                :em_after
-          hook :reactor_not_running, :amqp_not_connected
+          hook :after, :reactor_not_running, :amqp_not_connected
           }
 
           it_should_behave_like 'hooked em specs'
@@ -200,7 +202,7 @@ describe AMQP::SpecHelper, ".em_before/.em_after" do
                                            :amqp_after,
                                            :amqp_context_em_after,
                                            :em_after]
-          hook :reactor_not_running, :amqp_not_connected }
+          hook :after, :reactor_not_running, :amqp_not_connected }
 
           it_should_behave_like 'hooked amqp specs'
 

data/spec/em_legacy_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+require 'amqp-spec/em_spec_shim'
+
 describe 'Legacy EM-Spec based examples should run unmodified' do
   describe EM::SpecHelper, ' when included' do
     include EM::SpecHelper
@@ -12,7 +14,7 @@ describe 'Legacy EM-Spec based examples should run unmodified' do
       start = Time.now
       em do
         EM.add_timer(0.5) {
-          (Time.now-start).should be_close(0.5, 0.1)
+          (Time.now-start).should be_within(0.1).of(0.5)
           done
         }
       end
@@ -25,7 +27,7 @@ describe 'Legacy EM-Spec based examples should run unmodified' do
           EM.add_timer(1) { done }
         end
       }.to raise_error SpecTimeoutExceededError
-      (Time.now-start).should be_close(0.5, 0.1)
+      (Time.now-start).should be_within(0.5).of(0.1)
     end
 
     it "should be possible to set spec timeout as an option (amqp interface compatibility)" do
@@ -35,7 +37,7 @@ describe 'Legacy EM-Spec based examples should run unmodified' do
           EM.add_timer(1) { done }
         end
       }.to raise_error SpecTimeoutExceededError
-      (Time.now-start).should be_close(0.5, 0.1)
+      (Time.now-start).should be_within(0.1).of(0.5)
     end
   end
 

data/spec/rspec_em_spec.rb

@@ -12,7 +12,7 @@ describe 'Plain EM, no AMQP' do
       start = Time.now
       em do
         EM.add_timer(0.5) {
-          (Time.now-start).should be_close(0.5, 0.1)
+          (Time.now-start).should be_within(0.1).of(0.5)
           done
         }
       end
@@ -25,7 +25,7 @@ describe 'Plain EM, no AMQP' do
           EM.add_timer(1) { done }
         end
       }.to raise_error SpecTimeoutExceededError
-      (Time.now-start).should be_close(0.5, 0.1)
+      (Time.now-start).should be_within(0.1).of(0.5)
     end
 
     it "should be possible to set spec timeout as an option (amqp interface compatibility)" do
@@ -35,7 +35,7 @@ describe 'Plain EM, no AMQP' do
           EM.add_timer(1) { done }
         end
       }.to raise_error SpecTimeoutExceededError
-      (Time.now-start).should be_close(0.5, 0.1)
+      (Time.now-start).should be_within(0.1).of(0.5)
     end
   end
 

data/spec/shared_examples.rb

@@ -16,7 +16,7 @@ shared_examples_for 'SpecHelper examples' do
     start = Time.now
     amqp do
       EM.add_timer(0.5) {
-        (Time.now-start).should be_close(0.5, 0.1)
+        (Time.now-start).should be_within(0.1).of(0.5)
         done
       }
     end
@@ -85,7 +85,7 @@ shared_examples_for 'done examples' do
       done(0.2) { @block_called = true; EM.reactor_running?.should == true }
     end
     @block_called.should == true
-    (Time.now-start).should be_close(0.2, 0.1)
+    (Time.now-start).should be_within(0.1).of(0.2)
   end
 
   it 'should have delayed done (when em is used)' do
@@ -94,7 +94,7 @@ shared_examples_for 'done examples' do
       done(0.2) { @block_called = true; EM.reactor_running?.should == true }
     end
     @block_called.should == true
-    (Time.now-start).should be_close(0.2, 0.1)
+    (Time.now-start).should be_within(0.1).of(0.2)
   end
 end
 
@@ -104,7 +104,7 @@ shared_examples_for 'timeout examples' do
   it 'should timeout before reaching done because of default spec timeout' do
     expect { amqp { EM.add_timer(2) { done } } }.
         to raise_error SpecTimeoutExceededError
-    (Time.now-@start).should be_close(1.0, 0.1)
+    (Time.now-@start).should be_within(0.1).of(1.0)
   end
 
   it 'should timeout before reaching done because of explicit in-loop timeout' do
@@ -114,19 +114,19 @@ shared_examples_for 'timeout examples' do
         EM.add_timer(0.5) { done }
       end
     }.to raise_error SpecTimeoutExceededError
-    (Time.now-@start).should be_close(0.2, 0.1)
+    (Time.now-@start).should be_within(0.1).of(0.2)
   end
 
   specify "spec timeout given in amqp options has higher priority than default" do
     expect { amqp(:spec_timeout => 0.2) {} }.
         to raise_error SpecTimeoutExceededError
-    (Time.now-@start).should be_close(0.2, 0.1)
+    (Time.now-@start).should be_within(0.1).of(0.2)
   end
 
   specify "but timeout call inside amqp loop has even higher priority" do
     expect { amqp(:spec_timeout => 0.5) { timeout(0.2) } }.
         to raise_error SpecTimeoutExceededError
-    (Time.now-@start).should be_close(0.2, 0.1)
+    (Time.now-@start).should be_within(0.1).of(0.2)
   end
 
   specify "AMQP connection should not leak between examples" do
@@ -138,7 +138,7 @@ shared_examples_for 'timeout examples' do
 
     specify 'default timeout should be 0.2' do
       expect { em { EM.add_timer(2) { done } } }.to raise_error SpecTimeoutExceededError
-      (Time.now-@start).should be_close(0.2, 0.1)
+      (Time.now-@start).should be_within(0.1).of(0.2)
     end
 
     context 'deeply embedded context can set up separate defaults' do
@@ -146,7 +146,7 @@ shared_examples_for 'timeout examples' do
 
       specify 'default timeout should be 0.5' do
         expect { amqp { EM.add_timer(2) { done } } }.to raise_error SpecTimeoutExceededError
-        (Time.now-@start).should be_close(0.5, 0.1)
+        (Time.now-@start).should be_within(0.1).of(0.5)
       end
     end
   end
@@ -167,7 +167,7 @@ shared_examples_for 'Spec examples' do
     start = Time.now
 
     EM.add_timer(0.2) {
-      (Time.now-start).should be_close(0.2, 0.1)
+      (Time.now-start).should be_within(0.1).of(0.2)
       done
     }
   end
@@ -178,7 +178,7 @@ shared_examples_for 'Spec examples' do
 
     timer = EM.add_periodic_timer(0.2) {
       if (num += 1) == 2
-        (Time.now-start).should be_close(0.5, 0.1)
+        (Time.now-start).should be_within(0.1).of(0.5)
         EM.cancel_timer timer
         done
       end

data/spec/spec_helper.rb

@@ -18,31 +18,36 @@ end
 def done
 end
 
-RSPEC = rspec2? ? RSpec : Spec
+RSPEC       = rspec2? ? RSpec : Spec
 
 amqp_config = File.dirname(__FILE__) + '/amqp.yml'
 
-if File.exists? amqp_config
-  class Hash
-    def symbolize_keys
-      self.inject({}) { |result, (key, value)|
-        new_key = case key
-                    when String then
-                      key.to_sym
-                    else
-                      key
+AMQP_OPTS   = unless File.exists? amqp_config
+                {:user  => 'guest',
+                 :pass  => 'guest',
+                 :host  => '10.211.55.2',
+                 :vhost => '/'}
+              else
+                class Hash
+                  def symbolize_keys
+                    self.inject({}) { |result, (key, value)|
+                      new_key         = case key
+                                          when String then
+                                            key.to_sym
+                                          else
+                                            key
+                                        end
+                      new_value       = case value
+                                          when Hash then
+                                            value.symbolize_keys
+                                          else
+                                            value
+                                        end
+                      result[new_key] = new_value
+                      result
+                    }
                   end
-        new_value = case value
-                      when Hash then
-                        value.symbolize_keys
-                      else
-                        value
-                    end
-        result[new_key] = new_value
-        result
-      }
-    end
-  end
-
-  AMQP_OPTS = YAML::load_file(amqp_config).symbolize_keys[:test]
-end
+                end
+
+                YAML::load_file(amqp_config).symbolize_keys[:test]
+              end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 7
-  version: 0.3.7
+  - 8
+  version: 0.3.8
 platform: ruby
 authors: 
 - Arvicco
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 +03:00
+date: 2011-01-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - lib/amqp-spec/amqp.rb
+- lib/amqp-spec/em_spec_shim.rb
 - lib/amqp-spec/evented_example.rb
 - lib/amqp-spec/rspec.rb
 - lib/amqp-spec.rb
@@ -83,7 +84,6 @@ files:
 - spec/em_legacy_spec.rb
 - spec/em_metadata_spec.rb
 - spec/failing_rspec_spec.rb
-- spec/problematic_rspec_spec.rb
 - spec/rspec_amqp_spec.rb
 - spec/rspec_em_spec.rb
 - spec/shared_examples.rb
@@ -144,7 +144,6 @@ test_files:
 - spec/em_legacy_spec.rb
 - spec/em_metadata_spec.rb
 - spec/failing_rspec_spec.rb
-- spec/problematic_rspec_spec.rb
 - spec/rspec_amqp_spec.rb
 - spec/rspec_em_spec.rb
 - spec/shared_examples.rb

data/spec/problematic_rspec_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe '!!!!!!!!! LEAKING OR PROBLEMATIC EXAMPLES !!!!!!!!!' do
-  describe 'None' do
-
-  end
-end