easy-serve 0.6 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a487294a367906ad889c41aa146e1c375a92772
-  data.tar.gz: 15e2f87eab48f97ee3951e48cba3da16ae0eb9ea
+  metadata.gz: df13d8d57aa30fecfea71c7f1c0b3415e3384aaf
+  data.tar.gz: fad37a85f05878d484889783e6c49387380300fe
 SHA512:
-  metadata.gz: 41cbaef23f61255f51832d0a66c20d1161bcc51e198f3a81b8807eb9a044dfdc75f6197568249d8999ae2b48ae4342c1c32ba24a59b1f28a9ab1d1d12020904c
-  data.tar.gz: 0763f23a003a734e7f00b523964b7f5c297bb4fb242d93d2d84775834cf544a224e9189468b3a52427fc44f757432b95d6951a84a4ffbd1b59ae456dd7638332
+  metadata.gz: 65b1b16bb7305ef869cc00ad481f621a104c680d0940e1ca2351e5b0ec19fbb6cc423dea5037d57f87f4ab7ccadf228ba526fb6188723be4062f3c67d3506e75
+  data.tar.gz: 820382890ef5249a837f5a1c71faf2650c1925c3d4f282a5cc24ee70a9d37f7091d7579adbcd63f4d4dea551ad32b69731e45b0aa29f5b16e0966ad345125d64

data/examples/remote-eval.rb

@@ -1,11 +1,12 @@
 require 'easy-serve/remote'
 
+tunnel = ARGV.delete("--tunnel")
 addr_there = ARGV.shift
 
 unless addr_there
   abort <<-END
 
-    Usage: #$0 addr_there
+    Usage: #$0 addr_there [--tunnel]
 
     The 'addr_there' is the remote address on which client code will run.
     It must be a destination accepted by ssh, optionally including a user name:
@@ -14,6 +15,10 @@ unless addr_there
     
     The 'hostname' may by any valid hostname or ssh alias.
 
+    If --tunnel is specified, use the ssh connection to tunnel the tupelo
+    traffic. Otherwise, just use tcp. (Always use ssh to start the remote
+    process.)
+
   END
 end
 
@@ -23,7 +28,8 @@ EasyServe.start do |ez|
   log.formatter = nil if $VERBOSE
 
   ez.start_servers do
-    ez.server "simple-server", :tcp, nil, 0 do |svr|
+    host = tunnel ? "localhost" : nil # no need to expose port if tunnelled
+    ez.server "simple-server", :tcp, host, 0 do |svr|
       Thread.new do
         loop do
           Thread.new(svr.accept) do |conn|
@@ -40,7 +46,8 @@ EasyServe.start do |ez|
     end
   end
 
-  ez.remote "simple-server", host: addr_there, log: true, eval: %{
+  ez.remote "simple-server", host: addr_there, tunnel: tunnel, log: true,
+    eval: %{
     conn = conns[0]
     # this code is executed on the remote host, connected by conn, not drb
     log.progname = "eval remote on \#{host}"

data/examples/remote-multi-server.rb

@@ -0,0 +1,112 @@
+require 'easy-serve/remote'
+
+tunnel = ARGV.delete("--tunnel")
+address_there = ARGV.shift
+
+unless address_there
+  abort <<-END
+
+    Usage: #$0 address_there [--tunnel]
+
+    The 'address_there' is the remote address on which client code will run.
+    It must be a destination accepted by ssh, optionally including a user name:
+
+      [user@]hostname
+    
+    The 'hostname' may by any valid hostname or ssh alias.
+
+    If --tunnel is specified, use the ssh connection to tunnel the tupelo
+    traffic. Otherwise, just use tcp. (Always use ssh to start the remote
+    process.)
+
+  END
+end
+
+EasyServe.start do |ez|
+  log = ez.log
+  log.level = Logger::INFO
+  log.formatter = nil if $VERBOSE
+
+  ez.start_servers do
+    host = tunnel ? "localhost" : nil # no need to expose port if tunnelled
+
+    ez.server "adder", :tcp, host, 0 do |svr|
+      Thread.new do
+        loop do
+          Thread.new(svr.accept) do |conn|
+            begin
+              log.info "accepted connection from #{conn.inspect}"
+              sum = 0
+              while input = conn.gets and not input.empty?
+                log.info "read input: #{input.inspect}"
+                begin
+                  sum += Integer(input)
+                rescue
+                  log.error "bad input: #{input}"
+                  raise
+                end
+              end
+              conn.puts sum
+              log.info "wrote sum: #{sum}"
+            ensure
+              conn.close
+            end
+          end
+        end
+      end
+    end
+
+    ez.server "multiplier", :tcp, host, 0 do |svr|
+      Thread.new do
+        loop do
+          Thread.new(svr.accept) do |conn|
+            begin
+              log.info "accepted connection from #{conn.inspect}"
+              prod = 1
+              while input = conn.gets and not input.empty?
+                log.info "read input: #{input.inspect}"
+                begin
+                  prod *= Integer(input)
+                rescue
+                  log.error "bad input: #{input}"
+                  raise
+                end
+              end
+              conn.puts prod
+              log.info "wrote product: #{prod}"
+            ensure
+              conn.close
+            end
+          end
+        end
+      end
+    end
+  end
+
+  ez.remote "adder", "multiplier",
+            host: address_there, tunnel: tunnel, log: true, eval: %{
+    log.progname = "client on \#{host}"
+    adder, multiplier = conns
+
+    adder.puts 5
+    adder.puts 6
+    adder.puts 7
+    adder.close_write
+    log.info "reading from \#{adder.inspect}"
+    sum = Integer(adder.read)
+    log.info "sum = \#{sum}"
+    adder.close
+
+    multiplier.puts sum
+    multiplier.puts 10
+    multiplier.close_write
+    log.info "reading from \#{multiplier.inspect}"
+    prod = Integer(multiplier.read)
+    log.info "prod = \#{prod}"
+    multiplier.close
+  }
+  # Note use of \#{} to interpolate variables that are only available
+  # in the binding where the code is eval-ed. Alternately, use
+  #   eval: %Q{...}
+  # but then interpolation from this script is not posssible.
+end

data/examples/remote-run.rb

@@ -1,11 +1,12 @@
 require 'easy-serve/remote'
 
+tunnel = ARGV.delete("--tunnel")
 addr_there = ARGV.shift
 
 unless addr_there
   abort <<-END
 
-    Usage: #$0 addr_there
+    Usage: #$0 addr_there [--tunnel]
 
     The 'addr_there' is the remote address on which client code will run.
     It must be a destination accepted by ssh, optionally including a user name:
@@ -14,6 +15,10 @@ unless addr_there
     
     The 'hostname' may by any valid hostname or ssh alias.
 
+    If --tunnel is specified, use the ssh connection to tunnel the tupelo
+    traffic. Otherwise, just use tcp. (Always use ssh to start the remote
+    process.)
+
     Note: you must set up the remote by doing
     
       scp examples/remote-run-script.rb addr_there:/tmp/
@@ -27,7 +32,8 @@ EasyServe.start do |ez|
   log.formatter = nil if $VERBOSE
 
   ez.start_servers do
-    ez.server "simple-server", :tcp, nil, 0 do |svr|
+    host = tunnel ? "localhost" : nil # no need to expose port if tunnelled
+    ez.server "simple-server", :tcp, host, 0 do |svr|
       Thread.new do
         loop do
           Thread.new(svr.accept) do |conn|
@@ -44,7 +50,7 @@ EasyServe.start do |ez|
     end
   end
 
-  ez.remote "simple-server", host: addr_there,
+  ez.remote "simple-server", host: addr_there, tunnel: tunnel,
     dir: "/tmp",
     file: "remote-run-script.rb",
       # 'file' passed to load, so can be rel to dir or ruby's $LOAD_PATH

data/lib/easy-serve.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'fileutils'
 
 class EasyServe
-  VERSION = "0.6"
+  VERSION = "0.7"
 
   class Server
     attr_reader :name, :pid, :addr

data/lib/easy-serve/accessible-servers.rb

@@ -0,0 +1,29 @@
+class EasyServe
+  # Returns list of [name, pid, addr] that are accessible from host, setting
+  # up ssh tunnel if specified. Note that OpenSSH 6.0 or later is required
+  # for the tunnel option.
+  def accessible_servers host, tunnel: false
+    if tunnel and host != "localhost" and host != "127.0.0.1"
+      servers.map do |n, s|
+        _, local_port = s.addr
+        fwd = "0:localhost:#{local_port}"
+        out = `ssh -O forward -R #{fwd} #{host}`
+
+        begin
+          remote_port = Integer(out)
+        rescue
+          log.error "Unable to set up dynamic ssh port forwarding. " +
+            "Please check if ssh -v is at least 6.0."
+          raise
+        end
+
+        at_exit {system "ssh -O cancel -R #{fwd} #{host}"}
+
+        [s.name, s.pid, ["localhost", remote_port]]
+      end
+
+    else
+      servers.map {|n, s| [s.name, s.pid, s.addr]}
+    end
+  end
+end

data/lib/easy-serve/remote-eval-mgr.rb

@@ -1,7 +1,7 @@
 require 'msgpack'
 require 'easy-serve'
 
-def manage_remote_eval_client msg
+def EasyServe.manage_remote_eval_client msg
   $VERBOSE = msg["verbose"]
   server_names, servers_list, log_level, eval_string, host =
     msg.values_at(*%w{server_names servers_list log_level eval_string host})
@@ -44,7 +44,7 @@ end
 
 $stdout.sync = true
 
-def handle_remote_eval_messages
+def EasyServe.handle_remote_eval_messages
   unpacker = MessagePack::Unpacker.new($stdin)
   unpacker.each do |msg|
     case

data/lib/easy-serve/remote-eval.rb

@@ -1,4 +1,5 @@
 require 'msgpack'
+require 'easy-serve/accessible-servers'
 
 class EasyServe
   # useful simple cases in testing and in production, but long eval strings
@@ -6,26 +7,27 @@ class EasyServe
   # the ssh connection.
   #
   # Note, unlike #local and #child, by default logging goes to the null logger.
-  # If you want too see logs from the remote, you need to choose:
+  # If you want to see logs from the remote, you need to choose:
   #
   # 1. Log to remote file: pass log: [args...] with args as in Logger.new
   #
   # 2. Log back over ssh: pass log: true.
   #
-  def remote_eval *server_names, host: nil, passive: false, **opts
+  def remote_eval *server_names,
+                  host: nil, passive: false, tunnel: false, **opts
     child_pid = fork do
       log.progname = "remote_eval #{host}"
 
       IO.popen [
           "ssh", host, "ruby",
           "-r", "easy-serve/remote-eval-mgr",
-          "-e", "handle_remote_eval_messages"
+          "-e", "EasyServe.handle_remote_eval_messages"
         ],
         "w+" do |ssh|
 
         ssh.sync = true
+        servers_list = accessible_servers(host, tunnel: tunnel)
 
-        servers_list = servers.map {|n, s| [s.name, s.pid, s.addr]}
         MessagePack.pack(
           {
             verbose:      $VERBOSE,

data/lib/easy-serve/remote-run-mgr.rb

@@ -1,7 +1,7 @@
 require 'msgpack'
 require 'easy-serve'
 
-def manage_remote_run_client msg
+def EasyServe.manage_remote_run_client msg
   $VERBOSE = msg["verbose"]
   server_names, servers_list, log_level, host, dir, file, class_name, args =
     msg.values_at(*%w{
@@ -14,6 +14,7 @@ def manage_remote_run_client msg
     servers[name] = EasyServe::Server.new(name, pid, addr)
   end
   
+### opt for tmpdir and send files to it via ssh
   Dir.chdir(dir) if dir
   load file
 
@@ -51,7 +52,7 @@ end
 
 $stdout.sync = true
 
-def handle_remote_run_messages
+def EasyServe.handle_remote_run_messages
   unpacker = MessagePack::Unpacker.new($stdin)
   unpacker.each do |msg|
     case

data/lib/easy-serve/remote-run.rb

@@ -1,30 +1,31 @@
 require 'msgpack'
+require 'easy-serve/accessible-servers'
 
 class EasyServe
   # useful in production, though it requires remote lib files to be set up.
   # Returns pid of child managing the ssh connection.
   #
   # Note, unlike #local and #child, by default logging goes to the null logger.
-  # If you want too see logs from the remote, you need to choose:
+  # If you want to see logs from the remote, you need to choose:
   #
   # 1. Log to remote file: pass log: [args...] with args as in Logger.new
   #
   # 2. Log back over ssh: pass log: true.
   #
-  def remote_run *server_names, host: nil, passive: false, **opts
+  def remote_run *server_names, host: nil, passive: false, tunnel: false, **opts
     child_pid = fork do
       log.progname = "remote_run #{host}"
 
       IO.popen [
           "ssh", host, "ruby",
           "-r", "easy-serve/remote-run-mgr",
-          "-e", "handle_remote_run_messages"
+          "-e", "EasyServe.handle_remote_run_messages"
         ],
         "w+" do |ssh|
 
         ssh.sync = true
+        servers_list = accessible_servers(host, tunnel: tunnel)
 
-        servers_list = servers.map {|n, s| [s.name, s.pid, s.addr]}
         MessagePack.pack(
           {
             verbose:      $VERBOSE,

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: easy-serve
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: '0.7'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   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: Framework for starting tcp/unix servers and connected clients under one
@@ -35,50 +35,52 @@ extra_rdoc_files:
 files:
 - README.md
 - COPYING
-- lib/easy-serve.rb
-- lib/easy-serve/remote-eval-mgr.rb
+- lib/easy-serve/remote.rb
 - lib/easy-serve/remote-run.rb
 - lib/easy-serve/remote-drb.rb
-- lib/easy-serve/remote.rb
-- lib/easy-serve/remote-eval.rb
+- lib/easy-serve/accessible-servers.rb
 - lib/easy-serve/remote-run-mgr.rb
-- examples/simple.rb
-- examples/remote-manual.rb
-- examples/multi.rb
-- examples/remote-eval-passive.rb
+- lib/easy-serve/remote-eval-mgr.rb
+- lib/easy-serve/remote-eval.rb
+- lib/easy-serve.rb
 - examples/remote-run.rb
+- examples/remote-multi-server.rb
+- examples/passive.rb
+- examples/remote-eval-passive.rb
 - examples/remote-drb.rb
 - examples/remote-run-script.rb
+- examples/multi.rb
+- examples/remote-manual.rb
+- examples/simple.rb
 - examples/remote-eval.rb
-- examples/passive.rb
 homepage: https://github.com/vjoel/easy-serve
 licenses:
 - BSD
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --quiet
-- --line-numbers
-- --inline-source
-- --title
+- "--quiet"
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - easy-serve
-- --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.0.4
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Framework for starting tcp/unix servers and connected clients under one parent