Merge 67082d2 into 4a5cc8c

.travis.yml

@@ -11,7 +11,6 @@ rvm:
 
 matrix:
   allow_failures:
-    - rvm: jruby
     - rvm: rbx-2
     - rvm: ruby-head
     - rvm: jruby-head

Gemfile

@@ -2,6 +2,7 @@ source 'http://rubygems.org'
 
 gem 'coveralls', require: false
 gem 'celluloid', github: 'celluloid/celluloid', branch: 'master'
+gem 'transpec', github: 'yujinakayama/transpec', tag: 'v3.1.0'
 
 # Specify your gem's dependencies in celluloid-zmq.gemspec
 gemspec

celluloid-zmq.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "ffi-rzmq"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec", "~> 2.14.0"
+  gem.add_development_dependency "rspec", "~> 3.0"
 
   # Files
   ignores = File.read(".gitignore").split(/\r?\n/).reject{ |f| f =~ /^(#.+|\s*)$/ }.map {|f| Dir[f] }.flatten

lib/celluloid/zmq.rb

@@ -23,8 +23,7 @@ def included(klass)
 
       # Obtain a 0MQ context
       def init(worker_threads = 1)
-        return @context if @context
-        @context = ::ZMQ::Context.new(worker_threads)
+        @context ||= ::ZMQ::Context.new(worker_threads)
       end
 
       def context

spec/celluloid/zmq/socket_spec.rb

@@ -10,6 +10,7 @@
     identity = socket.get(::ZMQ::IDENTITY)
 
     expect(identity).to eq("Identity")
+    socket.close
   end
 
 end

spec/celluloid/zmq_spec.rb

@@ -146,7 +146,7 @@ def close_socket
       client.recv_string(message)
       expect(message).to eq("hello world")
 
-      expect(result.value).to be_true
+      expect(result.value).to be_truthy
     end
   end
 end

spec/spec_helper.rb

@@ -10,10 +10,8 @@
 Celluloid.shutdown_timeout = 1
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-
   config.around do |ex|
-    Celluloid::ZMQ.init(1) unless example.metadata[:no_init]
+    Celluloid::ZMQ.init(1) unless ex.metadata[:no_init]
     Celluloid.boot
     ex.run
     Celluloid.shutdown