tupelo 0.21 → 0.22

data/lib/tupelo/client/tuplestore.rb

@@ -31,7 +31,7 @@ class Tupelo::Client
       end
     end
   end
-  
+
   # Tuplestore that stores nothing. Very efficient for large stores!
   # Useful for clients that don't need to take or read the stored tuples.
   # The write, pulse, and blocking read operations all work correctly.
@@ -45,7 +45,7 @@ class Tupelo::Client
     def find_distinct_matches_for(*); raise; end
     def find_match_for(*); raise; end
     def clear; end
-    
+
     ## should store space metadata, so outgoing writes can be tagged
   end
 end

data/lib/tupelo/client/worker.rb

@@ -17,7 +17,6 @@ class Tupelo::Client
     attr_reader :msg_reader_thread
     attr_reader :worker_thread
     attr_reader :cmd_queue
-    attr_reader :tuplestore
     attr_reader :message_class
     attr_reader :blobber
     attr_reader :read_waiters
@@ -34,7 +33,7 @@ class Tupelo::Client
       def initialize writes, pulses, takes, reads
         @writes, @pulses, @takes, @reads = writes, pulses, takes, reads
       end
-      
+
       NOOP = new([].freeze, [].freeze, [].freeze, [].freeze).freeze
 
       def to_s
@@ -48,11 +47,11 @@ class Tupelo::Client
       end
       alias inspect to_s
     end
-    
+
     class Subspace
       attr_reader :tag, :spec, :pot
       alias template pot
-      
+
       def initialize metatuple, worker
         @metatuple = metatuple
         @tag = metatuple["tag"] || metatuple[:tag]
@@ -61,7 +60,7 @@ class Tupelo::Client
         @spec = Marshal.load(Marshal.dump(template)).freeze
         @pot = worker.pot_for(spec).optimize!.freeze
       end
-      
+
       def === tuple
         @pot === tuple
       end
@@ -91,16 +90,18 @@ class Tupelo::Client
       @notify_waiters = []
       @stopping = false
       @subspaces = []
+
+      @worker_thread = nil
     end
 
     def log *args
       if args.empty?
         @log
       else
-        @log.unknown *args
+        @log.unknown(*args)
       end
     end
-    
+
     def tuplestore
       @tuplestore ||= begin
         if client.tuplestore.respond_to? :new
@@ -353,7 +354,7 @@ class Tupelo::Client
         log.debug {"inserting #{op.writes}; deleting #{take_tuples}"}
         tuplestore.transaction inserts: write_tuples, deletes: take_tuples,
           tick: @global_tick
-      
+
         op.writes.each do |tuple|
           sniff_meta_tuple tuple
         end
@@ -539,7 +540,7 @@ class Tupelo::Client
           read_waiters << waiter
         end
       else
-        tuplestore.each {|tuple| waiter.gloms tuple}
+        tuplestore.each {|t| waiter.gloms t}
         read_waiters << waiter
       end
     end
@@ -582,7 +583,7 @@ class Tupelo::Client
       pulses = transaction.pulses
       takes = transaction.take_tuples_for_remote.compact
       reads = transaction.read_tuples_for_remote.compact
-      
+
       unless msg.tags
         tags = nil
         [takes, reads].compact.flatten(1).each do |tuple|

data/lib/tupelo/util/bin-circle.rb

@@ -29,31 +29,31 @@ class BinCircle
   KEY_BITS = 30
   KEY_MAX = 2**KEY_BITS - 1
   DEFAULT_REPS = 10
-  
+
   attr_accessor :default_reps
 
   def initialize reps: DEFAULT_REPS
     @tree = MultiRBTree.new # hashed_bin_id => bin_id
     @default_reps = reps
   end
-  
+
   # +id+ should be an identifier for your bin, typically a number or string.
   # Uses id.to_s, so +id+ should not contain a hash (which would not determine
   # a unique string).
   def add_bin id, reps: default_reps
     rep_id = "#{id} 0000"
-    reps.times do |i|
+    reps.times do
       key = key_for_string(rep_id)
       @tree[key] = id
       rep_id.succ!
     end
   end
-  
+
   # Returns the set of bin ids now in the circle.
   def bins
     Set.new @tree.values
   end
-  
+
   def inspect
     "#<#{self.class} bins=#{bins.to_a}>"
   end
@@ -64,19 +64,19 @@ class BinCircle
   def key_for_string str
     Digest::MD5.hexdigest(str).to_i(16) & KEY_MAX
   end
-  
+
   # Delete the bin specified by +id+ (same as argument to #add_bin).
   def delete_bin id
     @tree.delete_if {|k,v| v == id}
   end
-  
+
   # +id+ should be an identifier for your object, typically a number or string.
   # Uses id.to_s, so +id+ should not contain a hash (which would not determine
   # a unique string). It is not necessary for +id+ to be unique across objects.
   def find_bin obj
     find_bin_by_key(key_for_string(obj.to_s))
   end
-  
+
   def find_bin_by_key key
     _, id = @tree.lower_bound(key) || @tree.first
     id

data/lib/tupelo/util/boolean.rb

@@ -10,7 +10,7 @@ class Tupelo::Client
       templates.any? {|template| template === obj}
     end
   end
-  
+
   def or *templates
     Or.new(worker, templates)
   end

data/lib/tupelo/version.rb

@@ -1,3 +1,3 @@
 module Tupelo
-  VERSION = "0.21"
+  VERSION = "0.22"
 end

data/test/lib/mock-client.rb

@@ -25,16 +25,16 @@ class MockClient
   def update
     worker.update
   end
-  
+
   def make_queue
     MockQueue.new
   end
-  
-  def will &block
-    (@will_do ||= []) << Fiber.new { instance_eval &block }
+
+  def will(&block)
+    (@will_do ||= []) << Fiber.new { instance_eval(&block) }
     self
   end
-  
+
   def step
     loop do
       fiber = @will_do[0] or raise IsDone, "nothing to do"
@@ -49,7 +49,7 @@ class MockClient
       @will_do.shift
     end
   end
-  
+
   def run limit: 100
     loop do
       fiber = @will_do[0] or raise IsDone, "nothing to do"
@@ -77,7 +77,7 @@ class MockClient
       @will_do.shift
     end
   end
-  
+
   def run_until_blocked limit: 100, &block
     begin
       run limit: limit, &block
@@ -86,9 +86,9 @@ class MockClient
     end
     raise IsDone, "run_until_blocked never blocked"
   end
-  
+
   def now limit: 100, &block
-    fiber = Fiber.new { instance_eval &block }
+    fiber = Fiber.new { instance_eval(&block) }
     val = nil
     count = 0
     update
@@ -106,7 +106,7 @@ class MockClient
     end
     val
   end
-  
+
   def subscribed_all
     true
   end

data/test/system/test-archiver.rb

@@ -4,9 +4,9 @@ Tupelo.application do
   expected = [[1], [2], [3]]
 
   local do
-    write *expected
+    write(*expected)
   end
-      
+
   child_pid = child do
     # Test that tuples written before this client started are readable.
     a = read_all [Integer]

data/test/unit/test-ops.rb

@@ -40,14 +40,14 @@ class TestOps < Minitest::Test
   def make_clients n
     n.times.map {|i| make_client i}
   end
-  
+
   def test_one_client
     client = make_client "one"
 
     client.update; writer = client.write_nowait [1]
     client.update; writer.wait
     client.update; assert_equal 1, writer.global_tick
-    
+
     reader = Fiber.new do
       client.read [nil]
     end
@@ -55,11 +55,11 @@ class TestOps < Minitest::Test
     client.update; reader.resume
     client.update; assert_equal [1], reader.resume
   end
-  
+
   def test_read_existing
     t = ["foo"]
     cl = make_clients(2)
-    
+
     w = cl[0].now {write t}
     assert_equal 1, w.global_tick
 
@@ -129,7 +129,7 @@ class TestOps < Minitest::Test
   def test_take_waiting
     t = ["bar"]
     taker, writer = make_clients(2)
-    
+
     taker.will {take [nil]}.run_until_blocked
 
     w = writer.now {write t}
@@ -142,14 +142,14 @@ class TestOps < Minitest::Test
       assert_empty c.run
     end
   end
-  
+
   def test_transaction_existing
     r = [0]; w = [1]; t = [2]
     writer, transactor = make_clients(2)
 
     w_op = writer.now {write r, t}
     assert_equal 1, w_op.global_tick
-    
+
     transactor.will do
       transaction do
         write w
@@ -164,7 +164,7 @@ class TestOps < Minitest::Test
       assert_equal [r, w], c.run
     end
   end
-  
+
   def test_transaction_waiting
     r = [0]; w = [1]; t = [2]
     writer, transactor = make_clients(2)
@@ -179,7 +179,7 @@ class TestOps < Minitest::Test
 
     w_op = writer.now {write r, t}
     assert_equal 1, w_op.global_tick
-    
+
     assert_equal [r, t], transactor.run
 
     [writer, transactor].each do |c|
@@ -187,12 +187,12 @@ class TestOps < Minitest::Test
       assert_equal [r, w], c.run
     end
   end
-  
+
   def test_transaction_take_two
     x = [0]; y = [1]
     c = make_client(1)
 
-    w_op = c.now {write x, y}
+    c.now {write x, y}
 
     c.will do
       transaction do
@@ -202,12 +202,12 @@ class TestOps < Minitest::Test
 
     assert_equal [x, y].sort, c.run.sort
   end
-  
+
   def test_transaction_take_read
     x = [0]
     c = make_client(1)
 
-    w_op = c.now {write x}
+    c.now {write x}
 
     c.will do
       transaction do
@@ -217,7 +217,7 @@ class TestOps < Minitest::Test
 
     assert_equal [x, nil], c.run
   end
-  
+
   def test_transaction_write_read
     x = [0]
     c = make_client(1)
@@ -255,7 +255,7 @@ class TestOps < Minitest::Test
     assert_equal nil, transactor.run
     assert_equal 0, transactor.worker.global_tick
   end
-  
+
   def test_transaction_cancel
     w = [1]; t = [2]
     writer, transactor = make_clients(2)
@@ -283,11 +283,11 @@ class TestOps < Minitest::Test
       assert_equal [t], c.run
     end
   end
-  
+
   def test_transaction_fail_retry
     winner, loser = make_clients(2)
     winner.now {write ["token", 1]}
-    
+
     run_count = 0
     result = nil
     loser.will do
@@ -304,7 +304,7 @@ class TestOps < Minitest::Test
     end
     loser.run_until_blocked
     assert_equal 1, run_count
-    
+
     winner.will do
       take ["token", 1]
     end
@@ -316,14 +316,14 @@ class TestOps < Minitest::Test
 
     winner.now {write ["token", 2]}
     assert_raises(MockClient::IsBlocked) {loser.run}
-    
+
     winner.now {write ["token", 1]}
     assert_equal [["token", 1], ["token", 2]], loser.run
-    
+
     result = winner.now {read_all [nil, nil]}
     assert_equal [["test", 1], ["test", 2], ["test", 3]], result
   end
-  
+
   def test_pulse
     t = ["c0"]
     reader, pulser = make_clients(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tupelo
 version: !ruby/object:Gem::Version
-  version: '0.21'
+  version: '0.22'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-19 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atdo
@@ -95,17 +95,14 @@ files:
 - example/balance-xfer.rb
 - example/barrier.rb
 - example/bingo/bingo-v1.rb
-- example/bingo/bingo-v2.rb
 - example/boolean-match.rb
 - example/bounded-retry.rb
 - example/broker-locking.rb
 - example/broker-optimistic-v2.rb
 - example/broker-optimistic.rb
-- example/broker-queue.rb
 - example/cancel.rb
 - example/chat/chat-nohistory.rb
 - example/chat/chat.rb
-- example/child-of-child.rb
 - example/concurrent-transactions.rb
 - example/consistent-hash.rb
 - example/counters/lock.rb
@@ -113,7 +110,6 @@ files:
 - example/counters/optimistic.rb
 - example/custom-class.rb
 - example/custom-search.rb
-- example/dataflow.rb
 - example/deadlock.rb
 - example/dedup.rb
 - example/dphil-optimistic-v2.rb
@@ -144,7 +140,6 @@ files:
 - example/observer.rb
 - example/optimist.rb
 - example/parallel.rb
-- example/pregel/dist-opt.rb
 - example/pregel/distributed.rb
 - example/pregel/pagerank.rb
 - example/pregel/pregel.rb
@@ -159,7 +154,7 @@ files:
 - example/riemann/producer.rb
 - example/riemann/v1/expirer.rb
 - example/riemann/v1/riemann.rb
-- example/riemann/v2/event-sql.rb
+- example/riemann/v2/event-template.rb
 - example/riemann/v2/expirer.rb
 - example/riemann/v2/hash-store.rb
 - example/riemann/v2/http-mode.rb
@@ -174,16 +169,12 @@ files:
 - example/sqlite/poi-template.rb
 - example/sqlite/poi-v2.rb
 - example/sqlite/poi.rb
-- example/sqlite/tmp/poi-sqlite.rb
-- example/subspaces/addr-book-v1.rb
-- example/subspaces/addr-book-v2.rb
 - example/subspaces/addr-book.rb
 - example/subspaces/pubsub.rb
 - example/subspaces/ramp.rb
 - example/subspaces/shop/shop-v1.rb
 - example/subspaces/shop/shop-v2.rb
 - example/subspaces/simple.rb
-- example/subspaces/sorted-set-space-OLD.rb
 - example/subspaces/sorted-set-store.rb
 - example/take-many.rb
 - example/take-nowait-caution.rb
@@ -193,6 +184,8 @@ files:
 - example/timeout.rb
 - example/tiny-client.rb
 - example/tiny-service.rb
+- example/tiny-tcp-client.rb
+- example/tiny-tcp-service.rb
 - example/transaction-logic.rb
 - example/uniq-id.rb
 - example/wait-interrupt.rb
@@ -220,9 +213,6 @@ files:
 - lib/tupelo/client/transaction.rb
 - lib/tupelo/client/tuplestore.rb
 - lib/tupelo/client/worker.rb
-- lib/tupelo/tuplets/persistent-archiver.rb
-- lib/tupelo/tuplets/persistent-archiver/tuplespace.rb
-- lib/tupelo/tuplets/persistent-archiver/worker.rb
 - lib/tupelo/util/bin-circle.rb
 - lib/tupelo/util/boolean.rb
 - lib/tupelo/version.rb
@@ -256,9 +246,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -266,13 +256,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Distributed tuplespace
 test_files:
-- test/unit/test-ops.rb
-- test/unit/test-mock-client.rb
 - test/unit/test-mock-seq.rb
 - test/unit/test-mock-queue.rb
+- test/unit/test-ops.rb
+- test/unit/test-mock-client.rb
 has_rdoc: