easy-serve 0.10 → 0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d74d8eda371150176555b9637f8e20b237edf068
-  data.tar.gz: ae3c58392fe3da0cb5e316f814a2a3b60e171087
+  metadata.gz: 1ef2c07a293530b91eacbd1630d63507acddedab
+  data.tar.gz: 004b52c5e9f3399f60a882f6302b648e900c8afe
 SHA512:
-  metadata.gz: 299b6abc59f540f9dd71f53d933ff5638cba9757a07fc9290c3bae5599868a3a9414e59c988d126582bd2f87a414fcff3dfcd7bfa3497f209bac8a894ae24919
-  data.tar.gz: fa63d61b24de5644289ac3711d15a25f1b869c547b46bbc733c5da17ca4849a2d280d7d44625f10648aadac6befda81fa35519c1d4a0bd5af6fd9489ce3c5a4d
+  metadata.gz: 6ab412543120bca229865bff3b1f4a66bca28ec4bef4336feacd5c0c392a04a7a9672a6452c93539d49f6344ae8e642c3ed46b92c9773b81a2f0f1dbfa423f88
+  data.tar.gz: ec3d64c1e104eae2f79ed87fb918e992d3bf25ead58374a55cf38da332421b7e8c84c16e2007ca7e8913bd0ad50c5887ad5b47cabc6347bc967c617f72ce60fe

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Joel VanderWerf, vjoel@users.sourceforge.net
+Copyright (c) 2013-2014, Joel VanderWerf, vjoel@users.sourceforge.net
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/lib/easy-serve.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'easy-serve/service'
 
 class EasyServe
-  VERSION = "0.10"
+  VERSION = "0.11"
   
   class EasyFormatter < Logger::Formatter
     Format = "%s: %s: %s\n"
@@ -162,12 +162,26 @@ class EasyServe
   
   def start_services
     if @owner
+      if services_file
+        begin
+          FileUtils.ln_s services_file, ".lock.#{services_file}"
+          # Successful creation of the lock file gives this process the
+          # right to create the services_file itself.
+        rescue Errno::EEXIST
+          raise Errno::EEXIST, "Services at #{services_file} already exist."
+        end
+      end
+
       log.debug {"starting services"}
       yield
 
       if services_file
-        File.open(services_file, "w") do |f|
-          YAML.dump(services, f)
+        begin
+          File.open(services_file, "w") do |f|
+            YAML.dump(services, f)
+          end
+        ensure
+          FileUtils.rm_f ".lock.#{services_file}"
         end
       end
     end
@@ -188,7 +202,7 @@ class EasyServe
     if base
       "#{base}-#{name}"
     else
-      File.join(tmpdir, "sock-#{name}")
+      File.join(tmpdir, "sock-#{name}") ## permissions?
     end
   end
 
@@ -222,6 +236,36 @@ class EasyServe
   
   MAX_TRIES = 10
 
+  # Start a service named +name+. The name is referenced in #child, #local,
+  # and #remote to connect a new process to this service.
+  #
+  # The +proto+ can be either :unix (the default) or :tcp; the value can also
+  # be specifed with the proto: key-value argument.
+  #
+  # Other key-value arguments are:
+  #
+  # :path :: for unix sockets, path to the socket file to be created
+  #
+  # :base :: for unix sockets, a base string for constructing the
+  #          socket filename, if :path option is not provided;
+  #          if neither :path nor :base specified, socket is in a tmp dir
+  #          with filename based on +name+.
+  #
+  # :bind_host :: interface this service listens on, such as:
+  #
+  #       "0.0.0.0", "<any>" (same)
+  #
+  #       "localhost", "127.0.0.1" (same)
+  #
+  #       or a specific hostname.
+  #
+  # :connect_host :: host specifier used by remote clients to connect.
+  #                  By default, this is constructed from the bind_host.
+  #                  For example, with bind_host: "<any>", the default
+  #                  connect_host is the current hostname (see #host_name).
+  #
+  # :port :: port this service listens on; defaults to 0 to choose a free port
+  #
   def service name, proto = nil, **opts
     proto ||= opts.delete(:proto) || :unix
     case proto
@@ -232,7 +276,7 @@ class EasyServe
       opts[:connect_host] ||=
         case opts[:bind_host]
         when nil, "0.0.0.0", /\A<any>\z/i
-          host_name ## maybe local connectors should use "localhost" ?
+          host_name
         when "localhost", "127.0.0.1"
           "localhost"
         end
@@ -270,11 +314,6 @@ class EasyServe
     c
   end
   
-  def client *args, &block
-    warn "EasyServe#client is deprecated; use #child"
-    child *args, &block
-  end
-  
   def local *service_names
     conns = service_names.map {|sn| services[sn].connect}
     yield(*conns) if block_given?

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

@@ -34,7 +34,13 @@ def EasyServe.manage_remote_eval_client msg
         pr = eval "proc do |conns, host, log| #{eval_string}; end"
         pr[conns, host, log]
       rescue => ex
-        puts "ez error", ex, ex.backtrace
+        puts "ez error", ex.inspect
+        lineno = (Integer(ex.backtrace[0][/(\d+):/, 1]) rescue nil)
+        if lineno
+          lines = eval_string.lines
+          puts "    #{lineno-1} --> " + lines[lineno-1]
+        end
+        puts ex.backtrace
       end
     end
     

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

@@ -42,7 +42,7 @@ def EasyServe.manage_remote_run_client msg
         ro = cl.new(conns, host, log, *args)
         ro.run
       rescue => ex
-        puts "ez error", ex, ex.backtrace
+        puts "ez error", ex.inspect, ex.backtrace
       end
     end
     

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: easy-serve
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: '0.11'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-02-23 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 services and connected clients under
@@ -33,30 +33,30 @@ extra_rdoc_files:
 - README.md
 - COPYING
 files:
-- README.md
 - COPYING
-- lib/easy-serve/remote.rb
-- lib/easy-serve/service/accessible.rb
-- lib/easy-serve/service/tunnelled.rb
-- lib/easy-serve/service.rb
-- lib/easy-serve/remote/eval.rb
-- lib/easy-serve/remote/run-mgr.rb
-- lib/easy-serve/remote/run.rb
-- lib/easy-serve/remote/drb.rb
-- lib/easy-serve/remote/eval-mgr.rb
-- lib/easy-serve.rb
-- examples/remote-run.rb
-- examples/remote-multi-server.rb
+- README.md
+- examples/multi.rb
 - examples/passive.rb
-- examples/remote-eval-passive.rb
 - examples/remote-drb.rb
-- examples/remote-run-script.rb
-- examples/multi.rb
+- examples/remote-eval-passive.rb
+- examples/remote-eval.rb
 - examples/remote-manual.rb
+- examples/remote-multi-server.rb
+- examples/remote-run-script.rb
+- examples/remote-run.rb
 - examples/simple.rb
 - examples/tunnel/client.rb
 - examples/tunnel/server.rb
-- examples/remote-eval.rb
+- lib/easy-serve.rb
+- lib/easy-serve/remote.rb
+- lib/easy-serve/remote/drb.rb
+- lib/easy-serve/remote/eval-mgr.rb
+- lib/easy-serve/remote/eval.rb
+- lib/easy-serve/remote/run-mgr.rb
+- lib/easy-serve/remote/run.rb
+- lib/easy-serve/service.rb
+- lib/easy-serve/service/accessible.rb
+- lib/easy-serve/service/tunnelled.rb
 homepage: https://github.com/vjoel/easy-serve
 licenses:
 - BSD
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Framework for starting tcp/unix services and connected clients under one