dizby 1.5.1 → 2.0.0

data/lib/dizby/protocol/refined.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public

data/{gemfiles/Gemfile.ci → lib/dizby/protocol/structs.rb}

@@ -1,12 +1,11 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-eval_gemfile File.expand_path('../Gemfile', __dir__)
-
-group :development do
-  gem 'codecov', require: false
+module Dizby
+  ServerArguments = Struct.new(:uri, :front, :config)
+  ClientArguments = Struct.new(:uri, :options)
+  SpawnArguments = Struct.new(:uri, :command, :options)
 end

data/lib/dizby/protocols/dead.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -15,15 +14,15 @@ module Dizby
     self.scheme = ''
 
     refine(:server, '') do |_, config|
-      fail NonAcceptingServer, Server.new(config)
+      raise NonAcceptingServer, Server.new(config)
     end
 
     class Server < AbstractServer
       # A DeadProtocol server doesn't allow backwards connections
       # therefore, making a distributed object goes against that.
       def make_distributed(*_)
-        fail DistributedError,
-             'distributed objects not supported from DeadProtocol'
+        raise DistributedError,
+              'distributed objects not supported from DeadProtocol'
       end
     end
   end

data/lib/dizby/protocols/secure.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -10,6 +9,7 @@ require 'dizby/stream/client'
 require 'dizby/stream/connection'
 require 'dizby/server/basic'
 require 'dizby/tunnel/basic'
+require 'dizby/tunnel/basic_spawn'
 require 'dizby/tunnel/factory'
 
 require 'socket'
@@ -20,30 +20,36 @@ module Dizby
 
     self.scheme = 'drbsec'
 
-    refine(:spawn,
-           "#{scheme}://%{user}?%{host}%{port}?%{query}?"
-          ) do |server, command, (user, host, port, query)|
+    refine(
+      :spawn,
+      "#{scheme}://%{user}?%{host}%{port}?%{query}?"
+    ) do |args, server, (user, host, port, query)|
+      port &&= port.to_i
+
       factory = TunnelFactory.new(server, port)
-      tunnel = factory.create(BasicSpawnTunnel).with(command, user, host)
+      tunnel = factory.create(BasicSpawnTunnel).with(user, host, args)
 
       socket = TCPSocket.open('localhost', tunnel.local_port)
       TCProtocol.apply_sockopt(socket)
 
       delegate = delegatable_tunnel(factory, server, tunnel)
-      client = BasicClient.new(delegate, socket,
-                               "#{scheme}://#{host}:#{tunnel.remote_port}")
+      client = BasicClient.new(
+        delegate, socket, "#{scheme}://#{host}:#{tunnel.remote_port}"
+      )
+
       query &&= QueryRef.new(query)
 
       [client, query]
     end
 
-    refine(:client,
-           "#{scheme}://%{user}?%{host}%{port}%{query}?"
-          ) do |server, (user, host, port, query)|
+    refine(
+      :client,
+      "#{scheme}://%{user}?%{host}%{port}%{query}?"
+    ) do |args, server, (user, host, port, query)|
       port &&= port.to_i
 
       factory = TunnelFactory.new(server, port)
-      tunnel = factory.create(BasicTunnel).with(user, host)
+      tunnel = factory.create(BasicTunnel).with(user, host, args)
 
       socket = TCPSocket.open('localhost', tunnel.local_port)
       TCProtocol.apply_sockopt(socket)
@@ -63,7 +69,7 @@ module Dizby
       end
     end
 
-    class DirectTunnel < Delegator
+    class DirectTunnel < PolyDelegate::Delegator
       def initialize(server, tunnel)
         super(server)
 

data/lib/dizby/protocols/tcp.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -18,17 +17,19 @@ module Dizby
 
     self.scheme = 'drb'
 
-    refine(:server,
-           "#{scheme}://%{host}?%{port}?"
-          ) do |front, config, (host, port)|
+    refine(
+      :server,
+      "#{scheme}://%{host}?%{port}?"
+    ) do |args, (host, port)|
       port &&= port.to_i
 
-      Server.new front, config, host, port
+      Server.new args, host, port
     end
 
-    refine(:client,
-           "#{scheme}://%{host}?%{port}?%{query}?"
-          ) do |server, (host, port, query)|
+    refine(
+      :client,
+      "#{scheme}://%{host}?%{port}?%{query}?"
+    ) do |_args, server, (host, port, query)|
       port &&= port.to_i
 
       socket = TCPSocket.open(host, port)
@@ -53,9 +54,7 @@ module Dizby
     end
 
     class Server < BasicServer
-      include PolymorphicDelegated
-
-      def initialize(front, config, host, port)
+      def initialize(args, host, port)
         port ||= 0
 
         if host.empty?
@@ -65,9 +64,10 @@ module Dizby
           socket = TCPServer.open(host, port)
         end
 
-        port = socket.addr[1] if port == 0
+        port = socket.addr[1] if port.zero?
 
-        super("drb://#{host}:#{port}", front, socket, config)
+        args.uri = "drb://#{host}:#{port}"
+        super(args, socket)
 
         TCProtocol.apply_sockopt(socket)
 
@@ -89,10 +89,14 @@ module Dizby
       end
 
       config_reader :tcp_acl
+      private :tcp_acl
 
       def self.open_socket_inaddr_any(host, port)
-        infos = Socket.getaddrinfo(host, nil, Socket::AF_UNSPEC,
-                                   Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE)
+        infos = Socket.getaddrinfo(
+          host, nil, Socket::AF_UNSPEC,
+          Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE
+        )
+
         families = Hash[*infos.map { |af, *_| af }.uniq.zip([]).flatten]
         return TCPServer.open('0.0.0.0', port) if families.key?('AF_INET')
         return TCPServer.open('::', port) if families.key?('AF_INET6')

data/lib/dizby/protocols/unix.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -13,7 +12,7 @@ require 'dizby/server/basic'
 require 'socket'
 require 'tempfile'
 
-fail LoadError, 'UNIXServer is required' unless defined?(UNIXServer)
+raise LoadError, 'UNIXServer is required' unless defined?(UNIXServer)
 
 module Dizby
   class UnixProtocol
@@ -21,15 +20,17 @@ module Dizby
 
     self.scheme = 'drbunix'
 
-    refine(:server,
-           "#{scheme}:%{file}?"
-          ) do |front, config, (filename)|
-      Server.new front, config, filename
+    refine(
+      :server,
+      "#{scheme}:%{file}?"
+    ) do |args, (filename)|
+      Server.new args, filename
     end
 
-    refine(:client,
-           "#{scheme}:%{file}%{query}?"
-          ) do |server, (filename, query)|
+    refine(
+      :client,
+      "#{scheme}:%{file}%{query}?"
+    ) do |_args, server, (filename, query)|
       socket = UNIXSocket.open(filename)
       UnixProtocol.apply_sockopt(socket)
 
@@ -44,11 +45,9 @@ module Dizby
     end
 
     class Server < BasicServer
-      include PolymorphicDelegated
-
-      def initialize(front, config, filename)
+      def initialize(args, filename)
         unless filename
-          temp = Tempfile.new(%w( dizby-unix .socket ))
+          temp = Tempfile.new(%w(dizby-unix .socket))
           filename = temp.path
           temp.close!
         end
@@ -56,9 +55,10 @@ module Dizby
         socket = UNIXServer.open(filename)
         UnixProtocol.apply_sockopt(socket)
 
-        super("drbunix:#{filename}", front, socket, config)
+        args.uri = "drbunix:#{filename}"
+        super(args, socket)
 
-        self.class.set_permissions(filename, config)
+        self.class.set_permissions(filename, args.config)
       end
 
       def close

data/lib/dizby/server/abstract.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -10,8 +9,11 @@ require 'dizby/distributed/object'
 require 'dizby/utility/configurable'
 require 'dizby/utility/log'
 
+require 'poly_delegate'
+
 module Dizby
   class AbstractServer
+    include PolyDelegate::Delegated
     extend Configurable
 
     def initialize(config, &log_transform)
@@ -22,12 +24,12 @@ module Dizby
     attr_reader :log
     config_reader :load_limit
 
-    def connect_to(uri)
-      ProtocolManager.open_client(self, uri)
+    def connect_to(client_args)
+      ProtocolManager.open_client(self, client_args)
     end
 
-    def spawn_on(command, uri)
-      ProtocolManager.spawn_server(self, command, uri)
+    def spawn_on(spawn_args)
+      ProtocolManager.spawn_server(self, spawn_args)
     end
 
     def shutdown; end

data/lib/dizby/server/basic.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -6,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 require 'dizby/stream/query_ref'
-require 'dizby/utility/polymorphic_delegated'
 require 'dizby/utility/self_pipe'
 require 'dizby/utility/monitor'
 
@@ -14,13 +12,11 @@ require 'io/wait'
 
 module Dizby
   class BasicServer < AbstractServer
-    extend ClassicAttributeAccess
+    def initialize(args, stream)
+      super(args.config) { |msg| "#{args.uri} : #{msg}" }
 
-    def initialize(uri, front, stream, config)
-      super(config) { |msg| "#{uri} : #{msg}" }
-
-      @uri = uri
-      @front = front
+      @uri = args.uri
+      @front = args.front
       @stream = stream
 
       @exported_uri = Dizby.monitor([@uri])
@@ -45,7 +41,7 @@ module Dizby
 
     def accept
       readables, = IO.select([stream, shutdown_pipe.read])
-      fail LocalServerShutdown if readables.include? shutdown_pipe.read
+      raise LocalServerShutdown if readables.include? shutdown_pipe.read
       log.debug('Accepting connection')
       stream.accept
     end

data/lib/dizby/server/registration.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public

data/lib/dizby/service.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -12,10 +11,11 @@ require 'dizby/utility/log'
 
 module Dizby
   class Service
-    def initialize(uri = '', front = nil, config = {})
+    def initialize(uri: '', front: nil, **config)
       config = DEFAULT_CONFIG.merge(config)
 
-      self.server = ProtocolManager.open_server(uri, front, config)
+      args = ServerArguments.new(uri, front, config)
+      self.server = ProtocolManager.open_server(args)
     rescue NonAcceptingServer => err
       # This is to allow servers that don't accept connections
       # Not all servers will allow connections back to them, so don't allow it
@@ -27,12 +27,14 @@ module Dizby
       Dizby.register_server(@server)
     end
 
-    def connect_to(uri)
-      ObjectProxy.new(*@server.connect_to(uri))
+    def connect_to(uri:, **options)
+      args = ClientArguments.new(uri, options)
+      ObjectProxy.new(*@server.connect_to(args))
     end
 
-    def spawn_on(command, uri)
-      ObjectProxy.new(*@server.spawn_on(command, uri))
+    def spawn_on(uri:, command:, **options)
+      args = SpawnArguments.new(uri, command, options)
+      ObjectProxy.new(*@server.spawn_on(args))
     end
 
     def close
@@ -59,7 +61,7 @@ module Dizby
     private
 
     def server=(srvr)
-      fail DistributedError, 'server could not be opened' unless srvr
+      raise DistributedError, 'server could not be opened' unless srvr
       @server = srvr
     end
   end

data/lib/dizby/stream/client.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public

data/lib/dizby/stream/connection.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -26,7 +25,7 @@ module Dizby
       ref, msg, argc = Array.new(3) { read }
 
       @server.log.debug("called through proxy: #{ref} #{msg}")
-      fail ConnectionError, 'too many arguments' if @server.argc_limit < argc
+      raise ConnectionError, 'too many arguments' if @server.argc_limit < argc
 
       argv = Array.new(argc) { read }
       block = read
@@ -59,7 +58,7 @@ module Dizby
 
     def wait_for_stream
       readable, = IO.select([@stream, shutdown_pipe.read])
-      fail RemoteServerShutdown if readable.include?(shutdown_pipe.read)
+      raise RemoteServerShutdown if readable.include?(shutdown_pipe.read)
     rescue IOError
       raise RemoteServerShutdown
     end

data/lib/dizby/stream/messenger.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public

data/lib/dizby/stream/query_ref.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public

data/lib/dizby/stream/readable.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # Copyright (c) 2016 Nathan Currier
 
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -13,10 +12,10 @@ module Dizby
       sz = check_packet_size(load_size)
       str = load_packet(sz)
 
-      fail ConnectionError, 'connection closed' unless str
+      raise ConnectionError, 'connection closed' unless str
 
       if str.size < sz
-        fail ConnectionError, 'premature marshal format(can\'t read)'
+        raise ConnectionError, 'premature marshal format(can\'t read)'
       end
 
       load_obj(str)
@@ -54,15 +53,15 @@ module Dizby
     end
 
     def check_packet_size(sz)
-      fail RemoteServerShutdown unless sz
-      fail ConnectionError, 'premature header' if sz.size < 4
+      raise RemoteServerShutdown unless sz
+      raise ConnectionError, 'premature header' if sz.size < 4
 
       sz = sz.unpack('N')[0]
 
       # load_limit must be greater than the size of the packet
       # or the load_limit can be 0 or less to be considered "infinite"
       if @server.load_limit.between?(0, sz)
-        fail ConnectionError, "too large packet for #{sz}"
+        raise ConnectionError, "too large packet for #{sz}"
       end
 
       sz