barney 0.5.0 → 0.6.0

data/ChangeLog

@@ -1,3 +1,9 @@
+2011-03-04  Robert Gleeson <rob@flowof.info> v0.6.0
+
+* Objects returned by IO.pipe and the current sequence are enclosed in a Struct referenced by StreamPair. 
+* @shared stores instances of StreamPair in an Array.
+* No longer store objects returned by IO.pipe and the current sequence in a Hash.
+
 2011-03-04  Robert Gleeson <rob@flowof.info> v0.5.0
 
 * Solve Github Issue no. 3

data/README.md

@@ -88,12 +88,11 @@ Okay, now that we've got that out of the way, let's see what using Barney is lik
 **API**  
 
 * [master (git)](http://rubydoc.info/github/robgleeson/Barney/master/)
+* [0.6.0](http://rubydoc.info/gems/barney/0.6.0)
 * [0.5.0](http://rubydoc.info/gems/barney/0.5.0)
 * [0.4.1](http://rubydoc.info/gems/barney/0.4.1)
 * [0.4.0](http://rubydoc.info/gems/barney/0.4.0)
-* [0.3.1](http://rubydoc.info/gems/barney/0.3.1)
-* [0.2.0](http://rubydoc.info/gems/barney/0.2.0)
-* [0.1.0](http://rubydoc.info/gems/barney/0.1.0)
+* …
 
 ## License
 

data/lib/barney/share.rb

@@ -2,6 +2,9 @@ module Barney
 
   class Share
 
+    # @api private
+    StreamPair = Struct.new :seq, :in, :out
+
     @mutex = Mutex.new
 
     class << self
@@ -42,7 +45,9 @@ module Barney
     # @return [Array<Symbol>]     Returns a list of all variables that are being shared.
     def share *variables
       variables.map(&:to_sym).each do |variable|
-        @shared.store variable, (@shared[variable] || {}).merge({ @seq => IO.pipe })
+        if (@shared[variable].nil?) || (not @shared[variable].find { |struct| struct.seq == @seq })
+          @shared.store variable, (@shared[variable] || []) << StreamPair.new(@seq, *IO.pipe)
+        end
       end
       @shared.keys
     end
@@ -73,10 +78,11 @@ module Barney
       @context = blk.binding
       @pid     = Kernel.fork do
         blk.call
-        @shared.each do |variable, pipes|
-          pipes[@seq][0].close  
-          pipes[@seq][1].write Marshal.dump(eval("#{variable}", @context))
-          pipes[@seq][1].close
+        @shared.each do |variable, array|
+          stream = array[-1]
+          stream.in.close  
+          stream.out.write Marshal.dump(eval("#{variable}", @context))
+          stream.out.close
         end
       end
       
@@ -88,17 +94,16 @@ module Barney
     # It will block until the spawned child process has exited. 
     # @return [void]
     def synchronize 
-      @shared.each do |variable, pipes|
-        Barney::Share.mutex.synchronize do
-          min, max = pipes.keys.min, pipes.keys.max
-          min.upto max do |seq|
-            pipes[seq][1].close
-            Barney::Share.value = Marshal.load pipes[seq][0].read
-            pipes[seq][0].close
+      Barney::Share.mutex.synchronize do
+        @shared.each do |variable, array|
+          array.each do |stream|
+            stream.out.close
+            Barney::Share.value = Marshal.load stream.in.read
+            stream.in.close
             object = eval "#{variable} = Barney::Share.value", @context 
-            @history[seq] = (@history[seq] || {}).merge({ variable => object })
-            pipes.delete seq
+            @history[stream.seq] = (@history[stream.seq] || {}).merge!({ variable => object })
           end
+          array.clear
         end
       end
     end

data/lib/barney.rb

@@ -2,7 +2,7 @@ require('barney/share')
 
 module Barney 
 
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 
 end
 

metadata

@@ -2,7 +2,7 @@
 name: barney
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Robert Gleeson