amqp-spec 0.3.4 → 0.3.5

data/.gitignore

@@ -15,7 +15,14 @@ tmtags
 
 ## PROJECT::GENERAL
 coverage
+config
 rdoc
 pkg
+log
+.idea
+.rvmrc
+.bundle
+Gemfile.lock
 
 ## PROJECT::SPECIFIC
+spec/amqp.yml

data/HISTORY

@@ -73,3 +73,7 @@
 == 0.3.4 / 2010-11-26
 
 * amqp_before/after hooks added
+
+== 0.3.5 / 2011-01-07
+
+* Drop-in support for legacy em-spec based examples added

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/lib/amqp-spec/rspec.rb

@@ -1,5 +1,5 @@
-require_relative 'amqp'
-require_relative 'evented_example'
+require 'amqp-spec/amqp'
+require 'amqp-spec/evented_example'
 
 # You can include one of the following modules into your example groups:
 # AMQP::SpecHelper,
@@ -207,4 +207,10 @@ module AMQP
       end
     end
   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_legacy_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe 'Legacy EM-Spec based examples should run unmodified' do
+  describe EM::SpecHelper, ' when included' do
+    include EM::SpecHelper
+
+    it "should not require a call to done when #em is not used" do
+      1.should == 1
+    end
+
+    it "should have timers" do
+      start = Time.now
+      em do
+        EM.add_timer(0.5) {
+          (Time.now-start).should be_close(0.5, 0.1)
+          done
+        }
+      end
+    end
+
+    it "should be possible to set spec timeouts as a number of seconds" do
+      start = Time.now
+      expect {
+        em(0.5) do
+          EM.add_timer(1) { done }
+        end
+      }.to raise_error SpecTimeoutExceededError
+      (Time.now-start).should be_close(0.5, 0.1)
+    end
+
+    it "should be possible to set spec timeout as an option (amqp interface compatibility)" do
+      start = Time.now
+      expect {
+        em(0.5) do
+          EM.add_timer(1) { done }
+        end
+      }.to raise_error SpecTimeoutExceededError
+      (Time.now-start).should be_close(0.5, 0.1)
+    end
+  end
+
+  describe EM::Spec, ' when included' do
+    include EM::Spec
+
+    it_should_behave_like 'Spec examples'
+  end
+
+  describe RSPEC, " when running an example group after groups that uses EM specs " do
+    it "should work normally" do
+      :does_not_hang.should_not be_false
+    end
+  end
+end
+

data/spec/problematic_rspec_spec.rb

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

data/spec/rspec_em_spec.rb

@@ -18,7 +18,7 @@ describe 'Plain EM, no AMQP' do
       end
     end
 
-    it "should be possible to set spec timeouts as a number of secounds" do
+    it "should be possible to set spec timeouts as a number of seconds" do
       start = Time.now
       expect {
         em(0.5) do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Arvicco
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +03:00
+date: 2011-01-07 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ dependencies:
         version: 0.6.7
   type: :runtime
   version_requirements: *id003
-description: Simple API for writing asynchronous EventMachine/AMQP specs. Supports RSpec and RSpec2.
+description: Simple API for writing asynchronous EventMachine and AMQP specs. Runs legacy EM-Spec based examples. Supports RSpec and RSpec2.
 email: arvitallian@gmail.com
 executables: []
 
@@ -78,9 +78,9 @@ files:
 - lib/amqp-spec/rspec.rb
 - lib/amqp-spec.rb
 - lib/version.rb
-- spec/amqp.yml
 - spec/em_defaults_spec.rb
 - spec/em_hooks_spec.rb
+- spec/em_legacy_spec.rb
 - spec/em_metadata_spec.rb
 - spec/failing_rspec_spec.rb
 - spec/problematic_rspec_spec.rb
@@ -139,9 +139,9 @@ signing_key:
 specification_version: 3
 summary: Simple API for writing asynchronous EventMachine/AMQP specs. Supports RSpec and RSpec2.
 test_files: 
-- spec/amqp.yml
 - spec/em_defaults_spec.rb
 - spec/em_hooks_spec.rb
+- spec/em_legacy_spec.rb
 - spec/em_metadata_spec.rb
 - spec/failing_rspec_spec.rb
 - spec/problematic_rspec_spec.rb

data/spec/amqp.yml

@@ -1,28 +0,0 @@
-# AMQP client configuration file
-
-# These values will be used to configure the ampq gem, any values
-# omitted will let the gem use it's own defaults.
-
-# The configuration specifies the following keys:
-# * user - Username for the broker
-# * pass - Password for the broker
-# * host     - Hostname where the broker is running
-# * vhost    - Vhost to connect to
-# * port     - Port where the broker is running
-# * ssl      - Use ssl or not
-# * timeout  - Timeout
-
-defaults: &defaults
-  user: guest
-  pass: guest
-  host: 10.211.55.2
-  vhost: /
-
-development:
-  <<: *defaults
-
-test:
-  <<: *defaults
-
-production:
-  <<: *defaults