tupelo 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a19d73a0cfead5fa7d4078521ac079bc69b6654
-  data.tar.gz: 24d0e5206aa04688072768f90c630d95bff54636
+  metadata.gz: 241bdc610aa513222cd452c8624bcf69cd9b2686
+  data.tar.gz: 674756c0a1156745007199a4e476df72df7183ef
 SHA512:
-  metadata.gz: c06d448f481f6e18b2d944e2961af9fb3007a2e56eaf69b65fa82975023c622abf5beca87142f3e844af0fa1e4e7eba2905b8c6c83b06c4193309d33345fac21
-  data.tar.gz: 97163417cc8366be36adb87b3ee3b1b1cbfcedf007dc817d579782231790c0cdaf0177c4104abde51fd4034c40ff88d2e90ef836442a66944b4c9a00cee7f9d4
+  metadata.gz: c6b2e338a9d11abfe109ed608b8b51807bc69994a75824978c37f0b2ad00327efc080b8e8ee1eb85303b9fee3961045fbae1b2b9bc6fa5c6776a743e7f818f67
+  data.tar.gz: 026cf80f84292493865f5f644f54ce883defa9351d99c6268c02791d500edd88cbeaa0cc4c25c556d0a96f3cee424f33dea1a4d97d1f421bfd1532803a323d21

data/lib/tupelo/client/worker.rb

@@ -160,14 +160,11 @@ class Tupelo::Client
 
     def read_messages_from_seq
       seq.each do |msg|
-        ## skip msg if tags not relevant
-        ## (and client must apply tags--i.e. not using multicast)
         self << msg
       end
     end
 
     def run_worker_thread
-      update_to_tick @start_tick
       run_request_loop
     rescue => ex
       log.error ex
@@ -222,7 +219,7 @@ class Tupelo::Client
 
       log.info "requesting tuplespace from arc"
       arc << [GET_TUPLESPACE, nil, tick]
-        ## replace nil with template tuples, if any
+        ## replace nil with tags, if any
 
       begin
         arc_tick = arc.read[0]
@@ -256,19 +253,28 @@ class Tupelo::Client
     def handle_message msg
       log.debug {"seq sent #{msg.inspect}"}
 
-      if msg.global_tick != global_tick + 1
-        if msg.global_tick < global_tick + 1
-          log.debug {"discarding redundant message at #{msg.global_tick}"}
-            # due to archiver timing, for example
-          return
-        elsif msg.global_tick > global_tick + 1
-          log.fatal "message out of order: #{msg.inspect}, " +
-            "received at global_tick=#{global_tick}"
-          raise "fatal error"
+      if msg.control?
+        client.handle_ack msg
+        op_type, *args = msg.control_op
+        if op_type == Funl::SUBSCRIBE_ALL
+          update_to_tick msg.global_tick
+        else
+          raise "Unimplemented: #{msg.inspect}"
         end
+        return
+      end
+
+      if !global_tick
+        raise "bug: should have subscribed and received ack before data"
+      end
+
+      if msg.global_tick < global_tick + 1
+        log.debug {"discarding redundant message at #{msg.global_tick}"}
+          # due to archiver timing, for example
+        return
       end
 
-      @global_tick += 1
+      @global_tick = msg.global_tick
       @delta = 0
 
       record_history msg

data/lib/tupelo/client.rb

@@ -27,6 +27,7 @@ module Tupelo
     def start
       super
       worker.start
+      subscribe_all ## for now, but eventually should start without subs
     end
 
     def stop

data/lib/tupelo/version.rb

@@ -1,3 +1,3 @@
 module Tupelo
-  VERSION = "0.8"
+  VERSION = "0.9"
 end

data/test/lib/mock-msg.rb

@@ -44,4 +44,8 @@ class MockMessage
   def hash
     @client_id.hash ^ @local_tick.hash ^ @global_tick.hash
   end
+  
+  def control?
+    false
+  end
 end

data/test/system/test-archiver.rb

@@ -10,8 +10,7 @@ Tupelo.application do |app|
   child_pid = app.child do |client|
     # Test that tuples written before this client started are readable.
     a = client.read_all [Integer]
-    client.write result: a
-    sleep 0.1
+    client.write_wait result: a
   end
 
   # Normally we would wait using tuples, but in this case we want more

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: tupelo
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atdo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: easy-serve
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: funl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: object-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Distributed tuplespace.
@@ -177,28 +177,28 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --quiet
-- --line-numbers
-- --inline-source
-- --title
+- "--quiet"
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - tupelo
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.3
+rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
 summary: Distributed tuplespace