dizby 1.4.0 → 1.5.0

data/lib/dizby/distributed/array.rb

@@ -1,24 +1,32 @@
 # 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/.
+
 require 'dizby/distributed/object'
 require 'dizby/distributed/undumpable'
 
 module Dizby
   class DistributedArray
     def initialize(ary, server)
-      @ary = ary.map do |obj|
-        if obj.is_a? UndumpableObject
-          DistributedObject.new(obj, server)
-        else
-          begin
-            Marshal.dump(obj)
-            obj
-          rescue
+      @ary =
+        ary.map do |obj|
+          if obj.is_a? UndumpableObject
             DistributedObject.new(obj, server)
+          else
+            self.class.distribute_if_necessary(obj)
           end
         end
-      end
+    end
+
+    def self.distribute_if_necessary(obj)
+      Marshal.dump(obj)
+    rescue
+      DistributedObject.new(obj, server)
+    else
+      obj
     end
 
     def self._load(str)

data/lib/dizby/distributed/object.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/distributed/proxy'
 require 'dizby/access/insecure'
 

data/lib/dizby/distributed/proxy.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/distributed/unknown'
 
 module Dizby
@@ -15,15 +19,12 @@ module Dizby
       @conn.send_request(@ref, msg_id, *args, &block)
       succ, result = @conn.recv_reply
 
-      if succ
-        result
-      elsif result.is_a?(UnknownObject)
-        fail result
-      else
-        bt = Dizby.proxy_backtrace(@conn.remote_uri, result)
-        result.set_backtrace(bt + caller)
-        fail result
-      end
+      return result if succ
+      fail result if result.is_a?(UnknownObject)
+
+      bt = Dizby.proxy_backtrace(@conn.remote_uri, result)
+      result.set_backtrace(bt + caller)
+      fail result
     end
 
     undef :to_s

data/lib/dizby/distributed/semi_proxy.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/server/registration'
 require 'dizby/distributed/proxy'
 

data/lib/dizby/distributed/undumpable.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   module UndumpableObject
     def _dump(_)

data/lib/dizby/distributed/unknown.rb

@@ -1,19 +1,22 @@
 # 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/.
+
 require 'dizby/error'
 
 module Dizby
   class UnknownObject
     def initialize(err, buf)
-      case err.to_s
-      when /uninitialized constant (\S+)/
-        @name = $~[1]
-      when %r{undefined class/module (\S+)}
-        @name = $~[1]
-      else
-        @name = nil
-      end
+      @name =
+        case err.to_s
+        when /uninitialized constant (\S+)/
+          $~[1]
+        when %r{undefined class/module (\S+)}
+          $~[1]
+        end
 
       @buf = buf
     end

data/lib/dizby/error.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   class DistributedError < RuntimeError; end
   class ConnectionError < DistributedError; end

data/lib/dizby/protocol/basic.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/protocol/manager'
 require 'dizby/protocol/refined'
 

data/lib/dizby/protocol/manager.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/error'
 
 module Dizby

data/lib/dizby/protocol/refined.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   PROTOCOL_REGEX = {
     user: '(?:(.+?)@)',
@@ -8,7 +12,7 @@ module Dizby
     port: '(?::(\d+))',
     file: '(.+?)',
     query: '(?:\?(.*?))'
-  }
+  }.freeze
 
   class RefinedProtocol
     def initialize(regex, &block)

data/lib/dizby/protocols/dead.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/protocol/basic'
 require 'dizby/server/abstract'
 

data/lib/dizby/protocols/secure.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/protocol/basic'
 require 'dizby/stream/client'
 require 'dizby/stream/connection'

data/lib/dizby/protocols/tcp.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/protocol/basic'
 require 'dizby/stream/client'
 require 'dizby/stream/connection'

data/lib/dizby/protocols/unix.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/protocol/basic'
 require 'dizby/stream/client'
 require 'dizby/stream/connection'

data/lib/dizby/server/abstract.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/protocol/manager'
 require 'dizby/distributed/object'
 require 'dizby/utility/configurable'
@@ -12,7 +16,7 @@ module Dizby
 
     def initialize(config, &log_transform)
       @config = config
-      @log = Dizby.create_logger(config[:log] || {}, &log_transform)
+      @log = Dizby::Logger.new(config[:log] || {}, &log_transform)
     end
 
     attr_reader :log

data/lib/dizby/server/basic.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/stream/query_ref'
 require 'dizby/utility/polymorphic_delegated'
 require 'dizby/utility/self_pipe'

data/lib/dizby/server/registration.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/utility/monitor'
 
 module Dizby

data/lib/dizby/service.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/protocol/manager'
 require 'dizby/converter/simple'
 require 'dizby/worker/server'
@@ -50,7 +54,7 @@ module Dizby
       argc_limit: 256,
       load_limit: 256 * 1024 * 100,
       tcp_acl: nil
-    }
+    }.freeze
 
     private
 

data/lib/dizby/stream/client.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/stream/messenger'
 
 module Dizby
@@ -21,7 +25,7 @@ module Dizby
     end
 
     def recv_reply
-      succ, result = 2.times.map { read }
+      succ, result = Array.new(2) { read }
       [succ, result]
     end
   end

data/lib/dizby/stream/connection.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/stream/messenger'
 require 'dizby/utility/self_pipe'
 
@@ -19,7 +23,7 @@ module Dizby
     def recv_request
       wait_for_stream
 
-      ref, msg, argc = 3.times.map { read }
+      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

data/lib/dizby/stream/messenger.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/stream/readable'
 require 'dizby/stream/writable'
 

data/lib/dizby/stream/query_ref.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   # Acts as an array or hash index to a remote object
   class QueryRef

data/lib/dizby/stream/readable.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/distributed/semi_proxy'
 
 module Dizby

data/lib/dizby/stream/writable.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/distributed/undumpable'
 
 module Dizby

data/lib/dizby/tunnel/abstract.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'net/ssh'
 
 module Dizby
@@ -12,10 +16,11 @@ module Dizby
 
       reader, writer = IO.pipe
 
-      @thread = Thread.start do
-        open_ssh(writer)
-        writer.close
-      end
+      @thread =
+        Thread.start do
+          open_ssh(writer)
+          writer.close
+        end
 
       @thread.abort_on_exception = true
 

data/lib/dizby/tunnel/basic.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/tunnel/abstract'
 
 module Dizby

data/lib/dizby/tunnel/basic_spawn.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/tunnel/abstract'
 require 'dizby/error'
 
@@ -15,14 +19,15 @@ module Dizby
     def get_and_write_ports(ssh, output)
       @command.set_dynamic_mode unless @tunnel.server_port
 
-      @channel = ssh.open_channel do |ch|
-        ch.exec @command.to_cmd do |_, success|
-          fail SpawnError, 'could not spawn host' unless success
+      @channel =
+        ssh.open_channel do |ch|
+          ch.exec @command.to_cmd do |_, success|
+            fail SpawnError, 'could not spawn host' unless success
 
-          # it is already triggered if the port is set
-          get_remote_server_port(ch) if @command.dynamic?
+            # it is already triggered if the port is set
+            get_remote_server_port(ch) if @command.dynamic?
+          end
         end
-      end
 
       ssh.loop { !@channel[:triggered] } if @command.dynamic?
       @channel.eof!

data/lib/dizby/tunnel/bidirectional_strategy.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/tunnel/tunnelable_local'
 require 'dizby/tunnel/tunnelable_remote'
 

data/lib/dizby/tunnel/factory.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/tunnel/local_strategy'
 require 'dizby/tunnel/bidirectional_strategy'
 require 'dizby/utility/semi_built'

data/lib/dizby/tunnel/local_strategy.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 require 'dizby/tunnel/tunnelable_local'
 
 module Dizby

data/lib/dizby/tunnel/spawn_command.rb

@@ -1,11 +1,16 @@
 # 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/.
+
 require 'shellwords'
 
 module Dizby
   class SpawnCommand
-    TEMPLATE = "require'dizby/tunnel/spawned';Dizby::Spawned.%s('%s',%s){%s}"
+    TEMPLATE =
+      "require'dizby/tunnel/spawned';Dizby::Spawned.%s('%s',%s){%s}".freeze
 
     def initialize(data, config = {})
       @data = data
@@ -30,7 +35,7 @@ module Dizby
       args = [@mode, @uri.shellescape, @config.inspect, @data.shellescape]
       [@ruby_cmd, '-e', %("#{TEMPLATE % args}")].join ' '
     end
-    alias_method :to_s, :to_cmd
+    alias to_s to_cmd
 
     class << self
       def text(script)

data/lib/dizby/tunnel/spawned.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 # require the whole package, minimizes command length
 require 'dizby'
 require 'dizby/utility/io_barrier'

data/lib/dizby/tunnel/tunnelable_local.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   module TunnelableLocal
     def create_local_tunnel(ssh, server_port)

data/lib/dizby/tunnel/tunnelable_remote.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   module TunnelableRemote
     def create_remote_tunnel(ssh, client_port)

data/lib/dizby/utility/classic_access.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   module ClassicAttributeAccess
     def attr_reader(*args)

data/lib/dizby/utility/configurable.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   module Configurable
     def config_reader(*args)

data/lib/dizby/utility/delegator.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   class Delegator
     def initialize(obj)

data/lib/dizby/utility/force_bind.rb

@@ -1,9 +1,14 @@
 # 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/.
+
 require 'force_bind' if RUBY_ENGINE == 'ruby'
 
 module Dizby
+  # rubocop:disable Lint/DuplicateMethods
   case RUBY_ENGINE
   when 'rbx'
     def self.force_bind(bound_obj, method)
@@ -18,4 +23,5 @@ module Dizby
   else
     fail "force binding is not supported on #{RUBY_ENGINE}"
   end
+  # rubocop:enable Lint/DuplicateMethods
 end

data/lib/dizby/utility/io_barrier.rb

@@ -1,6 +1,10 @@
 # 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/.
+
 module Dizby
   class IOBarrier
     def initialize(var)