easy-serve 0.13 → 0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0c7199f4598926d54910efbcc21489ea6b9793
-  data.tar.gz: 46a5d4023cce3f45a79e536c083c1a419da4355f
+  metadata.gz: 54d0c42681120ccf4085716d6641aadb098b1dbd
+  data.tar.gz: 92dd12a3d68e9f19a6f42eb19cac6c9bf587cf30
 SHA512:
-  metadata.gz: 5656ded4b61e2e2b7a20355e8ffe82a5dba46665eabb5d6f79333bc7a67c74b25282d3cc146dfb7bb419640dfafa4dfbcfe8974e2ece491d7bd5b6449d749cc7
-  data.tar.gz: 6e2d92e58745e7bd10ec19fa08a74777df0bc10c460549d703e991364f2ed1891a4d6e350a0751fb668e9c5f46a085021b68f63f840440d608bfde69c5ce85c3
+  metadata.gz: e7744d002ccd22b05fb35f1b6fa6cd54c0ae0f7b75acb36a453f813b93c383f7b15dcbc0093e768925ef34532217cdf58ac2d71b1e504b27204029a84aba2503
+  data.tar.gz: 13333b4f50f55c7b8ec5a7c2f9c57908ca637abf2500a799f1d2e05f757cfaf05ebb76c5008710531c7d13255b2eb75a1cd4fc24b1058e24c6cda00984f9ec87

data/README.md

@@ -21,6 +21,8 @@ EasyServe takes the headache out of:
 
 * Working around poor support for dynamic port forwarding in old versions of OpenSSH.
 
+* Working around a race condition in an old version of OpenSSH.
+
 * Choosing between -L and -R styles of tunneling, depending on whether the remote process starts independently of the services.
 
 * Avoiding race conditions in the service setup phase.

data/examples/remote-multi-server.rb

@@ -108,5 +108,5 @@ EasyServe.start do |ez|
   # 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.
+  # but then interpolation from this script is not possible.
 end

data/lib/easy-serve.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'easy-serve/service'
 
 class EasyServe
-  VERSION = "0.13"
+  VERSION = "0.14"
 
   class ServicesExistError < RuntimeError; end
 
@@ -23,7 +23,7 @@ class EasyServe
     log.formatter = EasyFormatter.new
     log
   end
-  
+
   def self.null_logger
     log = Logger.new('/dev/null')
     log.level = Logger::FATAL
@@ -38,7 +38,7 @@ class EasyServe
 
   # True means do not propagate ^C to child processes.
   attr_reader :interactive
-  
+
   # Is this a sibling process, started by the same parent process that
   # started the services, even if started remotely?
   # Implies not owner, but not conversely.
@@ -84,7 +84,7 @@ class EasyServe
     @ssh_sessions = []
     @tmpdir = nil
     @services = opts[:services] # name => service
-    
+
     unless services
       if services_file
         @services =
@@ -115,14 +115,14 @@ class EasyServe
   def load_service_table_from_io io
     YAML.load(io).tap {@sibling = false}
   end
-  
+
   def init_service_table
     @services ||= begin
       @owner = true
       {}
     end
   end
-  
+
   def cleanup
     handler = trap("INT") do
       trap("INT", handler)
@@ -146,7 +146,7 @@ class EasyServe
         log.debug {"client pid=#{pid} was already waited for"}
       end
     end
-    
+
     if @owner
       services.each do |name, service|
         log.info "stopping #{name}"
@@ -161,10 +161,10 @@ class EasyServe
         end
       end
     end
-    
+
     clean_tmpdir
   end
-  
+
   def start_services
     return unless @owner
 
@@ -174,7 +174,7 @@ class EasyServe
       return
     end
 
-    lock_success = with_lock_file *File.split(services_file) do
+    lock_success = with_lock_file(*File.split(services_file)) do
       # Successful creation of the lock file gives this process the
       # right to check and create the services_file itself.
 
@@ -225,11 +225,11 @@ class EasyServe
       Dir.mktmpdir "easy-serve-"
     end
   end
-  
+
   def clean_tmpdir
     FileUtils.remove_entry @tmpdir if @tmpdir
   end
-  
+
   def choose_socket_filename name, base: nil
     if base
       "#{base}-#{name}"
@@ -241,7 +241,7 @@ class EasyServe
   def self.bump_socket_filename name
     name =~ /-\d+\z/ ? name.succ : name + "-0"
   end
-  
+
   def host_name
     EasyServe.host_name
   end
@@ -265,7 +265,7 @@ class EasyServe
   def EasyServe.ssh_supports_dynamic_ports_forwards
     @ssh_6 ||= (Integer(`ssh -V 2>&1`[/OpenSSH_(\d)/i, 1]) >= 6 rescue false)
   end
-  
+
   MAX_TRIES = 10
 
   # Start a service named +name+. The name is referenced in #child, #local,
@@ -316,11 +316,11 @@ class EasyServe
 
     service = Service.for(name, proto, **opts)
     rd, wr = IO.pipe
-    pid = fork do
+    fork do
       rd.close
       log.progname = name
       log.info "starting"
-      
+
       svr = service.serve(max_tries: MAX_TRIES, log: log)
       yield svr if block_given?
       no_interrupt_if_interactive
@@ -345,7 +345,7 @@ class EasyServe
     (passive ? passive_children : children) << c
     c
   end
-  
+
   # A local client runs in the same process, not a child process.
   def local *service_names
     conns = service_names.map {|sn| services[sn].connect}
@@ -356,7 +356,7 @@ class EasyServe
     end
     log.info "stopped local client"
   end
-  
+
   # ^C in the irb session (parent process) should not kill the
   # service (child process)
   def no_interrupt_if_interactive

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

@@ -23,12 +23,12 @@ class EasyServe
           require 'drb'
           require 'yaml'
           require 'easy-serve'
-          
+
           service_names = #{service_names.inspect}
           services = YAML.load(#{YAML.dump(services).inspect})
           log_level = #{log.level}
           host_uri = #{host_uri.inspect}
-          
+
           EasyServe.start services: services do |ez|
             log = ez.log
             log.level = log_level
@@ -38,7 +38,7 @@ class EasyServe
               begin
                 DRb.start_service(host_uri, {conns: conns})
                 puts DRb.uri
-                
+
                 Thread.new do
                   loop do
                     sleep 1
@@ -49,7 +49,7 @@ class EasyServe
                     end
                   end
                 end
-                
+
                 DRb.thread.join
 
               rescue => ex
@@ -61,10 +61,10 @@ class EasyServe
           puts "ez error", ex, ex.backtrace
         end
       }
-      
+
       ssh.close_write
       result = ssh.gets
-      
+
       if !result
         raise RemoteError, "problem with ssh connection to remote"
       else
@@ -79,7 +79,7 @@ class EasyServe
                 ssh.gets # consume the "."
               end
             end
-          
+
             log.debug "remote is at #{uri}"
             ro = DRbObject.new_with_uri(uri)
             conns = ro[:conns]

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

@@ -12,7 +12,7 @@ def EasyServe.manage_remote_eval_client msg
   services_list.each do |service|
     services[service.name] = service
   end
-  
+
   log_args = msg["log"]
   log =
     case log_args
@@ -29,7 +29,7 @@ def EasyServe.manage_remote_eval_client msg
     log.level = log_level
     log.formatter = nil if $VERBOSE
 
-    ez.local *service_names do |*conns|
+    ez.local(*service_names) do |*conns|
       begin
         pr = eval "proc do |conns, host, log| #{eval_string}; end"
         pr[conns, host, log]
@@ -43,7 +43,7 @@ def EasyServe.manage_remote_eval_client msg
         puts ex.backtrace
       end
     end
-    
+
     log.info "done"
   end
 rescue LoadError, ScriptError, StandardError => ex

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

@@ -15,7 +15,7 @@ def EasyServe.manage_remote_run_client msg
   services_list.each do |service|
     services[service.name] = service
   end
-  
+
 ### opt for tmpdir and send files to it via ssh
   Dir.chdir(dir) if dir
   load file
@@ -36,7 +36,7 @@ def EasyServe.manage_remote_run_client msg
     log.level = log_level
     log.formatter = nil if $VERBOSE
 
-    ez.local *service_names do |*conns|
+    ez.local(*service_names) do |*conns|
       begin
         cl = Object.const_get(class_name)
         ro = cl.new(conns, host, log, *args)
@@ -45,7 +45,7 @@ def EasyServe.manage_remote_run_client msg
         puts "ez error", ex.inspect, ex.backtrace
       end
     end
-    
+
     log.info "done"
   end
 rescue LoadError, ScriptError, StandardError => ex

data/lib/easy-serve/service.rb

@@ -57,7 +57,7 @@ class EasyServe
     SERVICE_CLASS[:unix] = self
 
     attr_reader :path
-    
+
     def initialize name, path: nil
       super name
       @path = path
@@ -67,7 +67,7 @@ class EasyServe
       super.tap do |svr|
         found_path = svr.addr[1]
         log.debug "#{inspect} is listening at #{found_path}"
-      
+
         if found_path != path
           log.error "Unexpected path: #{found_path} != #{path}"
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-serve
 version: !ruby/object:Gem::Version
-  version: '0.13'
+  version: '0.14'
 platform: ruby
 authors:
 - Joel VanderWerf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -98,7 +98,7 @@ 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: Framework for starting tcp/unix services and connected clients under one