From 1c34a615aa8108b467703f3136de503da90e5a90 Mon Sep 17 00:00:00 2001 From: Dmytro Milinevskyy Date: Sat, 18 Apr 2015 13:33:35 +0200 Subject: [PATCH 1/4] upgrade to rpec 3.0 --- Gemfile | 1 + celluloid-zmq.gemspec | 2 +- spec/celluloid/zmq_spec.rb | 2 +- spec/spec_helper.rb | 4 +--- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 15d7970..1e283b8 100644 --- a/Gemfile +++ b/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 diff --git a/celluloid-zmq.gemspec b/celluloid-zmq.gemspec index 8d51d01..846a85b 100644 --- a/celluloid-zmq.gemspec +++ b/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 diff --git a/spec/celluloid/zmq_spec.rb b/spec/celluloid/zmq_spec.rb index 1e14f45..13c6cde 100644 --- a/spec/celluloid/zmq_spec.rb +++ b/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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 8940cf4..39d48ef 100644 --- a/spec/spec_helper.rb +++ b/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 From f8f5e68226fe4e55147c2b2eed7eccb5a62cf461 Mon Sep 17 00:00:00 2001 From: Dmytro Milinevskyy Date: Sat, 18 Apr 2015 13:45:29 +0200 Subject: [PATCH 2/4] spec: close socket as in some cases rspec is stuck on destroying the object --- spec/celluloid/zmq/socket_spec.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/celluloid/zmq/socket_spec.rb b/spec/celluloid/zmq/socket_spec.rb index fb6dbcf..fb3c760 100644 --- a/spec/celluloid/zmq/socket_spec.rb +++ b/spec/celluloid/zmq/socket_spec.rb @@ -10,6 +10,7 @@ identity = socket.get(::ZMQ::IDENTITY) expect(identity).to eq("Identity") + socket.close end end From 119c35e554a4419c5c9025986d37e4e7fb07cd89 Mon Sep 17 00:00:00 2001 From: Dmytro Milinevskyy Date: Sat, 18 Apr 2015 13:45:51 +0200 Subject: [PATCH 3/4] fix rspec warning --- lib/celluloid/zmq.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/celluloid/zmq.rb b/lib/celluloid/zmq.rb index 6884340..5b49dfb 100644 --- a/lib/celluloid/zmq.rb +++ b/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 From 67082d2ed477936fca8ba62acbc72fa71a9caa55 Mon Sep 17 00:00:00 2001 From: //de Date: Sat, 18 Apr 2015 09:52:49 -0700 Subject: [PATCH 4/4] Removing jruby as an allowed failure Without the allowed failure for jruby, #47 is going to fail now. @niamster, any idea why? --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6fa327d..16210cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ rvm: matrix: allow_failures: - - rvm: jruby - rvm: rbx-2 - rvm: ruby-head - rvm: jruby-head