From a609b19ad2915859feee99c85af05aed32a75c8f Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 19 Apr 2011 09:48:54 +0100 Subject: [PATCH 1/3] updated Buffer spec comments and pending test with new info about JRuby, 1.8.x, and 1.9.x --- spec/buffer_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/buffer_spec.rb b/spec/buffer_spec.rb index cf6ce0b..dc050c3 100644 --- a/spec/buffer_spec.rb +++ b/spec/buffer_spec.rb @@ -119,9 +119,9 @@ describe Redistat::Buffer do describe "Thread-Safety" do it "should read/write to buffer queue in a thread-safe manner" do - # This spec passes wether thread safety is enabled or not. In short I need - # better specs for thread-safety, and personally a better understanding of - # thread-safety in general. + # Setting thread_safe to false only makes the spec fail with + # JRuby. 1.8.x and 1.9.x both pass fine for some reason + # regardless of what the thread_safe option is set to. Redistat.thread_safe = true key = mock('Key', :to_s => "Scope/labelx:2011") @@ -150,7 +150,7 @@ describe Redistat::Buffer do threads.each { |t| t.join } end - it "should have better specs that actually fail when thread-safety is off" + it "should have specs that fail on 1.8.x/1.9.x when thread_safe is disabled" end From 39dc4d90e8cf3d90ea28218799cc219a75bf9990 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 22 Jun 2011 14:37:46 +0100 Subject: [PATCH 2/3] added rake to development dependencies --- redistat.gemspec | 1 + 1 file changed, 1 insertion(+) diff --git a/redistat.gemspec b/redistat.gemspec index baafaae..8f2b703 100644 --- a/redistat.gemspec +++ b/redistat.gemspec @@ -24,6 +24,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency 'redis', '>= 2.1.0' s.add_runtime_dependency 'time_ext', '>= 0.2.9' + s.add_development_dependency 'rake', '>= 0.8.7' s.add_development_dependency 'rspec', '>= 2.1.0' s.add_development_dependency 'rcov', '>= 0.9.9' s.add_development_dependency 'yard', '>= 0.6.3' From 77c6db0d4eef2c430ca8af3ab1461266a2f22c60 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Wed, 22 Jun 2011 14:39:15 +0100 Subject: [PATCH 3/3] added custom config for travis-ci.org --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9592f40 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +rvm: + - 1.8.7 + - 1.9.2 + - jruby + - ree