dizby 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38bb5b303f7f0773cd06e2cfaaa4f155444d046f
-  data.tar.gz: 72c687978802a978963575d4269c1f1dfa85eb9b
+  metadata.gz: 0b885bb489fe18e78bb9813c27dc0f3ebfac80f6
+  data.tar.gz: 93737792f91064f3100c5a82447acd49e6987f21
 SHA512:
-  metadata.gz: a5a08a6e1f17ee01d269167cb3e1ffeec8a4dd32471ca6cd4965b3819681e4c1be564fafdca6ce58a0663ef96733d1560bd3f81c5c2d3b845d45eda9a8c86a36
-  data.tar.gz: c94f327e1100ee6eb4361686dbd5fe15f10e2961ad8ea0226657f2c95e0de2afbb6af32c4b7f7eb3815137baf0bafa00f4bf35043815c25430190c10abcdd98e
+  metadata.gz: dacc04d4adc114372d745b41757386e22b9f3f6b8fe7407ae0c52095eaaf6e423cc00e52d53a10bcc8b7f6c185371901579322d0dcaab1020c152998a747ab8e
+  data.tar.gz: fa557fb76b9aae31c94061820e880f423dc4b44b64e3359079dfe0903f9954e2914f12a4dd3c75c984d2e03c0791b84fbd0773c5d77cdee49aa36cf4107f8036

data/lib/dizby/distributed/object.rb

@@ -30,7 +30,7 @@ module Dizby
     end
     # rubocop:enable Style/MethodMissing
 
-    def respond_to_missing?(msg_id, priv = false)
+    def respond_to?(msg_id, priv = false)
       responds =
         case msg_id
         when :_dump
@@ -45,6 +45,10 @@ module Dizby
       responds
     end
 
+    # rubocop:disable Style/Alias
+    alias_method(:respond_to_missing?, :respond_to?)
+    # rubocop:enable Style/Alias
+
     undef :to_s
   end
 end

data/lib/dizby/distributed/proxy.rb

@@ -28,10 +28,14 @@ module Dizby
     end
     # rubocop:enable Style/MethodMissing
 
-    def respond_to_missing?(msg_id, priv = false)
+    def respond_to?(msg_id, priv = false)
       method_missing(:respond_to?, msg_id, priv)
     end
 
+    # rubocop:disable Style/Alias
+    alias_method(:respond_to_missing?, :respond_to?)
+    # rubocop:enable Style/Alias
+
     undef :to_s
   end
 

data/lib/dizby/protocols/secure.rb

@@ -24,7 +24,7 @@ module Dizby
       :spawn,
       "#{scheme}://%{user}?%{host}%{port}?%{query}?"
     ) do |args, server, (user, host, port, query)|
-      port &&= port.to_i
+      port = port.to_i
 
       factory = TunnelFactory.new(server, port)
       tunnel = factory.create(BasicSpawnTunnel).with(user, host, args)
@@ -46,7 +46,7 @@ module Dizby
       :client,
       "#{scheme}://%{user}?%{host}%{port}%{query}?"
     ) do |args, server, (user, host, port, query)|
-      port &&= port.to_i
+      port = port.to_i
 
       factory = TunnelFactory.new(server, port)
       tunnel = factory.create(BasicTunnel).with(user, host, args)

data/lib/dizby/tunnel/abstract.rb

@@ -14,16 +14,7 @@ module Dizby
       @config = [host, user, ssh_config]
       @strategy = strategy
 
-      reader, writer = IO.pipe
-
-      @thread =
-        Thread.start(Net::SSH.start(*@config)) do |ssh|
-          loop_ssh(ssh, writer)
-          writer.close
-        end
-
-      read_ports(reader)
-      reader.close
+      open_ssh_tunnel
     end
 
     # wait(ssh) is not defined in this class
@@ -31,6 +22,7 @@ module Dizby
       get_and_write_ports(ssh, output)
       wait(ssh)
     ensure
+      output.close
       ssh.close if ssh
     end
 
@@ -42,8 +34,24 @@ module Dizby
       @strategy.write(ssh, output)
     end
 
+    def open_ssh_tunnel
+      reader, writer = IO.pipe
+
+      @thread =
+        Thread.start(Net::SSH.start(*@config)) do |ssh|
+          loop_ssh(ssh, writer)
+        end
+
+      read_ports(reader)
+    rescue
+      @thread.abort_on_exception = true
+      close
+    ensure
+      reader.close
+    end
+
     def close
-      @thread.join
+      @thread.join if @thread && @thread.alive?
     end
 
     attr_reader :local_port, :remote_port

data/lib/dizby/tunnel/basic_spawn.rb

@@ -16,7 +16,7 @@ module Dizby
     end
 
     def get_and_write_ports(ssh, output)
-      @command.set_dynamic_mode unless @tunnel.server_port
+      @command.set_dynamic_mode if @strategy.server_port.zero?
 
       @channel =
         ssh.open_channel do |ch|
@@ -39,7 +39,7 @@ module Dizby
       ch[:triggered] = false
 
       ch.on_data { |_, data| ch[:data] << data }
-      ch.on_extended_data { |_, _, data| @server.log(data.inspect) }
+      ch.on_extended_data { |_, _, data| @server.log.error(data.inspect) }
 
       ch.on_process do |_|
         if !ch[:triggered] && ch[:data] =~ /Running on port (\d+)\./

data/lib/dizby/tunnel/bidirectional_strategy.rb

@@ -17,6 +17,8 @@ module Dizby
       @client_port = client_port
     end
 
+    attr_reader :server_port
+
     def write(ssh, stream)
       local_tunnel = create_local_tunnel(ssh, @server_port)
       remote_tunnel = create_remote_tunnel(ssh, @client_port)

data/lib/dizby/tunnel/local_strategy.rb

@@ -14,6 +14,8 @@ module Dizby
       @server_port = server_port
     end
 
+    attr_reader :server_port
+
     def write(ssh, stream)
       local_tunnel = create_local_tunnel(ssh, @server_port)
 

data/lib/dizby/tunnel/spawn_command.rb

@@ -4,14 +4,12 @@
 # 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}".freeze
 
-    def initialize(data, config = {})
+    def initialize(data, **config)
       @data = data
       @ruby_cmd = 'ruby'
       @uri = 'drb://'
@@ -30,9 +28,12 @@ module Dizby
     attr_accessor :ruby_cmd, :config, :uri
 
     def to_cmd
-      # TODO: needs a lot of work...
-      args = [@mode, @uri.shellescape, @config.inspect, @data.shellescape]
-      [@ruby_cmd, '-e', %("#{TEMPLATE % args}")].join ' '
+      <<~EOF
+        #{@ruby_cmd} -e "$(cat <<DIZBY
+        #{format(TEMPLATE, @mode, @uri, @config.inspect, @data)}
+        DIZBY
+        )"
+      EOF
     end
     alias to_s to_cmd
 

data/lib/dizby/tunnel/spawned.rb

@@ -16,7 +16,8 @@ module Dizby
 
     def self.dynamic(uri, config, &block)
       handle_spawned(uri, config, block) do |service|
-        $stdout.puts "Running on port #{service.server.port}."
+        port = service.instance_variable_get(:@server).port
+        $stdout.puts "Running on port #{port}."
       end
     end
 
@@ -29,7 +30,7 @@ module Dizby
         service.close if service
       end
 
-      service = Service.new(uri, obj, Marshal.load(config))
+      service = Service.new(uri: uri, front: obj, **config)
       yield service if block_given?
     ensure
       service.wait if service

data/lib/dizby/version.rb

@@ -5,5 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 module Dizby
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dizby
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Nathan Currier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-13 00:00:00.000000000 Z
+date: 2016-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh