tupelo 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7b7dc03d833db67770e720b9bea6ec44cecd57e
-  data.tar.gz: 86bda705a11cd4802746fe77d9f14e7c74537685
+  metadata.gz: 85aab8de585bbe205e0d0646ed13c3c59e6fc364
+  data.tar.gz: d43dd9d8e6dfe6c6b76380d25715cf25d5ea442f
 SHA512:
-  metadata.gz: baa626f2c08643a301200896da84b68e2b6ed0d3d30fa9c296a36c514df660c035608eec8b77ace273093fed35673038dd273d996c8158a868455b70ee8ef850
-  data.tar.gz: 1b18b2f49961bb0741331dc493024f5643db0cf49ed2c0d0029ff05f8b2a2a44b5e98a2be61b6d6034fa49fbc6a901b811d00380106fcd43e83950de95340df9
+  metadata.gz: 4bed46e18b23568aa1a0cb29d4900a279cdc202c7deb8bd43c3c77e69b6de7741ddcf333a929723a1d5cf7e5e913be17ead8af24db0c57783e3faf8c2e80dfed
+  data.tar.gz: 5c858ea811be67a255f09c9fae784a62f7afc993c41c1188280fda67554f8b8884b9928d96dba5b5153b63425ff08495044a1eae2c2a48e86bc4b1c43d4d9bad

data/bin/tspy

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+if ARGV.delete("-h") or ARGV.delete("--help")
+  puts <<-END
+    Usage:
+      #$0 servers_file
+
+      Connect to the tuplespace specified by the servers_file and
+      use the notification api to print out all events.
+      
+      For example, you can start a tup with
+      
+          tup svr
+      
+      and then in another terminal
+      
+          tspy svr
+
+    Options:
+    
+      --debug     set the log level
+      --info
+      --warn      <-- default
+      --error
+      --fatal
+  END
+  exit
+end
+
+require 'tupelo/app'
+
+Tupelo.application do |app|
+  app.local do |client|
+    note = client.notifier
+    client.log "%10s %10s %10s %s" % %w{ status tick client operation }
+    loop do
+      client.log "%10s %10d %10d %p" % note.wait
+    end
+  end
+end

data/bin/tup

@@ -0,0 +1,163 @@
+#!/usr/bin/env ruby
+
+if ARGV.delete("-h") or ARGV.delete("--help")
+  puts <<-END
+    Usage:
+      #$0
+
+      #$0 servers_file
+      #$0 servers_file <script...
+
+      #$0 servers_file unix [path]
+      #$0 servers_file tcp [host [port]]]
+    
+    The first form starts a tuplespace server as a child process. Then it
+    enters an interactive session in which the current object is the proxy to
+    that tuplespace. This form is useful for an isolated tuplespace for
+    simple experiments.
+    
+    The second form tries to open the servers_file. If it cannot, then as in the
+    first form, it starts a tuplespace server child process and writes its
+    address to servers_file. If it can open the servers_file, then it simply
+    connects to the referenced tuplespace server. In either case, as in the
+    first form, an interactive session starts. This form (in its two variants)
+    is useful for starting two sessions operating on the same tuplespace.
+
+    The third form is like the second form, but executes the input instead of
+    starting an interactive session. Output is like irb output, with input lines
+    alternating with their output. This is useful for generating human-readable
+    transcripts.
+
+    The fourth and fifth forms are like the previous, but can be used to expose
+    the server on more or less public sockets with specified addresses. In the
+    tcp case, the servers_file can be copied to other hosts and used with tup
+    to connect to the servers (adjust the host references as needed). The
+    default for unix is, as in the first three forms, a path in a tmpdir. The
+    default for tcp is localhost with port 0, and hence a dynamically chosen
+    port. These forms are only for starting a new server; connecting to an
+    existing server uses the simpler form "#$0 servers_file".
+
+    Options:
+    
+      --debug     set the log level
+      --info
+      --warn      <-- default
+      --error
+      --fatal
+      
+      -v          verbose mode (include time and pid in log messages)
+      
+      --pubsub    publish/subscribe mode; does not keep local tuple store:
+      
+                    * read only works in blocking mode (waiting for new tuple)
+                    * write and pulse work normally
+                    * take does not work
+
+      --marshal   use specified library to serialize objects
+      --yaml
+      --json
+      --msgpack   <-- default
+
+  END
+  exit
+end
+
+require 'easy-serve'
+
+log_level = case
+  when ARGV.delete("--debug"); Logger::DEBUG
+  when ARGV.delete("--info");  Logger::INFO
+  when ARGV.delete("--warn");  Logger::WARN
+  when ARGV.delete("--error"); Logger::ERROR
+  when ARGV.delete("--fatal"); Logger::FATAL
+  else Logger::WARN
+end
+verbose = ARGV.delete("-v")
+pubsub = ARGV.delete("--pubsub")
+
+blob_type = nil
+%w{--marshal --yaml --json --msgpack}.each do |switch|
+  s = ARGV.delete(switch) and
+    blob_type ||= s.delete("--")
+end
+
+ez_opts = {
+  servers_file: ARGV.shift,
+  interactive: $stdin.isatty
+}
+
+addr = ARGV.shift(3)
+
+EasyServe.start ez_opts do |ez|
+  log = ez.log
+  log.level = log_level
+  log.formatter = nil if verbose
+  log.progname = File.basename($0)
+    
+  ez.start_servers do
+    arc_to_seq_sock, seq_to_arc_sock = UNIXSocket.pair
+    arc_to_cseq_sock, cseq_to_arc_sock = UNIXSocket.pair
+    
+    ez.server :seqd, *addr do |svr|
+      require 'funl/message-sequencer'
+      seq_opts = {}
+      seq_opts[:blob_type] = blob_type if blob_type
+      seq = Funl::MessageSequencer.new svr, seq_to_arc_sock, log: log,
+        **seq_opts
+      seq.start ## thwait? or can easy-serve do that?
+    end
+    
+    ez.server :cseqd, *addr do |svr|
+      require 'funl/client-sequencer'
+      cseq = Funl::ClientSequencer.new svr, cseq_to_arc_sock, log: log
+      cseq.start
+    end
+
+    ez.server :arcd, *addr do |svr|
+      require 'tupelo/archiver'
+      arc = Tupelo::Archiver.new svr, seq: arc_to_seq_sock,
+              cseq: arc_to_cseq_sock, log: log
+      arc.start
+    end
+  end
+  
+  ez.local :seqd, :cseqd, :arcd do |seqd, cseqd, arcd|
+    log.progname = "client <starting in #{log.progname}>"
+
+    require 'tupelo/client'
+    class TupClient < Tupelo::Client
+      alias w write_wait
+      alias pl pulse_wait
+      alias t take
+      alias r read_wait
+      alias ra read_all
+      alias tr transaction
+      CMD_ALIASES = %w{ w pl t r ra tr }
+      private *CMD_ALIASES
+    end
+
+    client_opts = {seq: seqd, cseq: cseqd, log: log}
+    if pubsub
+      client_opts[:arc] = nil
+      client_opts[:tuplespace] = TupClient::NullTuplespace
+    else
+      client_opts[:arc] = arcd
+    end
+
+    client = TupClient.new client_opts
+    client.start do
+      log.progname = "client #{client.client_id}"
+    end
+    log.info {
+      "cpu time: %.2fs" % Process.times.inject {|s,x|s+x}
+    }
+    log.info {
+      "starting shell. Commands: #{TupClient::CMD_ALIASES.join(", ")}"
+    }
+
+    require 'irb-shell'
+    IRB.start_session(client)
+
+    client.stop
+  end
+end

data/lib/tupelo/version.rb

@@ -1,3 +1,3 @@
 module Tupelo
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tupelo
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Joel VanderWerf
@@ -26,7 +26,9 @@ dependencies:
         version: '0'
 description: Distributed tuplespace.
 email: vjoel@users.sourceforge.net
-executables: []
+executables:
+- tup
+- tspy
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -96,6 +98,8 @@ files:
 - test/unit/test-mock-seq.rb
 - test/unit/test-mock-queue.rb
 - test/stress/concurrent-transactions.rb
+- bin/tup
+- bin/tspy
 homepage: https://github.com/vjoel/tupelo
 licenses:
 - BSD