cucumber 1.3.14 → 1.3.15

data/History.md

@@ -1,3 +1,8 @@
+## [v1.3.15](https://github.com/cucumber/cucumber/compare/v1.3.14...v1.3.15)
+
+* Fixed intermittent ConcurrencyError seen in JRuby
+  ([671](https://github.com/cucumber/cucumber/issues/670) @cbusbey)
+
 ## [v1.3.14](https://github.com/cucumber/cucumber/compare/v1.3.13...v1.3.14)
 
 * Rerun formatter includes all scenarios when the background fails

data/lib/cucumber/formatter/interceptor.rb

@@ -1,9 +1,10 @@
+require 'thread'
 
 module Cucumber
   module Formatter
     module Interceptor
       class Pipe
-        attr_reader :pipe, :buffer
+        attr_reader :pipe
         def initialize(pipe)
           @pipe = pipe
           @buffer = []
@@ -11,8 +12,16 @@ module Cucumber
         end
 
         def write(str)
-          @buffer << str if @wrapped
-          return @pipe.write(str)
+          lock.synchronize do 
+            @buffer << str if @wrapped
+            return @pipe.write(str)
+          end
+        end
+
+        def buffer
+          lock.synchronize do
+            return @buffer.dup
+          end
         end
 
         def unwrap!
@@ -60,6 +69,11 @@ module Cucumber
             return $stdout
           end
         end
+
+      private
+        def lock
+          @lock||=Mutex.new
+        end
       end
     end
   end

data/lib/cucumber/platform.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 
 module Cucumber
 unless defined?(Cucumber::VERSION)
-  VERSION       = '1.3.14'
+  VERSION       = '1.3.15'
   BINARY        = File.expand_path(File.dirname(__FILE__) + '/../../bin/cucumber')
   LIBDIR        = File.expand_path(File.dirname(__FILE__) + '/../../lib')
   JRUBY         = defined?(JRUBY_VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber
 version: !ruby/object:Gem::Version
-  version: 1.3.14
+  version: 1.3.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -1017,7 +1017,7 @@ rubyforge_project:
 rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
-summary: cucumber-1.3.14
+summary: cucumber-1.3.15
 test_files:
 - features/assertions.feature
 - features/autoformat_profile_output.feature