dizby 1.5.1 → 2.0.0

data/lib/dizby/stream/writable.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/tunnel/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
@@ -9,37 +8,30 @@ require 'net/ssh'
 
 module Dizby
   class AbstractTunnel
-    def initialize(server, strategy, user, host)
+    def initialize(server, strategy, user, host, **options)
       @server = server
-      @config = [user, host, @server.config[:ssh_config]]
+      ssh_config = options[:ssh] || @server.config[:ssh] || {}
+      @config = [host, user, ssh_config]
       @strategy = strategy
 
       reader, writer = IO.pipe
 
       @thread =
-        Thread.start do
-          open_ssh(writer)
+        Thread.start(Net::SSH.start(*@config)) do |ssh|
+          loop_ssh(ssh, writer)
           writer.close
         end
 
-      @thread.abort_on_exception = true
-
       read_ports(reader)
       reader.close
     end
 
     # wait(ssh) is not defined in this class
-    def open_ssh(output)
-      ssh = nil
-      begin
-        ssh = Net::SSH.start(*@config)
-
-        get_and_write_ports(ssh, output)
-
-        wait(ssh)
-      ensure
-        ssh.close if ssh
-      end
+    def loop_ssh(ssh, output)
+      get_and_write_ports(ssh, output)
+      wait(ssh)
+    ensure
+      ssh.close if ssh
     end
 
     def read_ports(input)

data/lib/dizby/tunnel/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
@@ -9,10 +8,10 @@ require 'dizby/tunnel/abstract'
 
 module Dizby
   class BasicTunnel < AbstractTunnel
-    def initialize(server, strategy, user, host)
+    def initialize(*abstract_args, client_args)
       @working = true
 
-      super(server, strategy, user, host)
+      super(*abstract_args, **client_args.options)
     end
 
     def wait(ssh)

data/lib/dizby/tunnel/basic_spawn.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,10 +9,10 @@ require 'dizby/error'
 
 module Dizby
   class BasicSpawnTunnel < AbstractTunnel
-    def initialize(server, strategy, command, user, host)
-      @command = command
+    def initialize(*abstract_args, spawn_args)
+      @command = spawn_args.command
 
-      super(server, strategy, user, host)
+      super(*abstract_args, **spawn_args.options)
     end
 
     def get_and_write_ports(ssh, output)
@@ -22,7 +21,7 @@ module Dizby
       @channel =
         ssh.open_channel do |ch|
           ch.exec @command.to_cmd do |_, success|
-            fail SpawnError, 'could not spawn host' unless success
+            raise SpawnError, 'could not spawn host' unless success
 
             # it is already triggered if the port is set
             get_remote_server_port(ch) if @command.dynamic?

data/lib/dizby/tunnel/bidirectional_strategy.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/tunnel/factory.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/tunnel/local_strategy.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/tunnel/spawn_command.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/tunnel/spawned.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/tunnel/tunnelable_local.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/tunnel/tunnelable_remote.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,7 +17,7 @@ module Dizby
       ssh.loop { remote_tunnel_port.nil? }
 
       if remote_tunnel_port == :error
-        fail Net::SSH::Exception, 'remote forwarding request failed'
+        raise Net::SSH::Exception, 'remote forwarding request failed'
       end
 
       remote_tunnel_port

data/lib/dizby/utility/configurable.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/utility/io_barrier.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/utility/log.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/utility/monitor.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/utility/self_pipe.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/utility/semi_built.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/utility/string.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/utility/timed_collection.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/utility/timed_state.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/version.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,5 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 module Dizby
-  VERSION = '1.5.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/dizby/worker/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

data/lib/dizby/worker/invoke_method.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
@@ -50,7 +49,7 @@ module Dizby
       when :break
         err.exit_value
       else
-        fail err
+        raise err
       end
     end
 

data/lib/dizby/worker/server.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/test/test_helper.rb

@@ -1,22 +1,9 @@
-# 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 'minitest/autorun'
-
-if ENV['COVERAGE']
-  require 'simplecov'
-  SimpleCov.start do
-    add_filter 'test'
-  end
-
-  if ENV['CI']
-    require 'codecov'
-    SimpleCov.formatter = SimpleCov::Formatter::Codecov
-  end
-end
+require 'rideliner/test_helper'
 
 require 'dizby'

metadata

@@ -1,43 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: dizby
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Nathan Currier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
   name: net-ssh
   prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.beta
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.beta
+- !ruby/object:Gem::Dependency
+  name: poly_delegate
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rideliner
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  name: bundler
+  name: yard_rideliner
   prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard_dizby
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rbnacl
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
+  name: rbnacl-libsodium
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha1
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha1
 description: Distributed Ruby
 email:
 - nathan.currier@gmail.com
@@ -53,8 +137,6 @@ files:
 - LICENSE.md
 - Rakefile
 - dizby.gemspec
-- gemfiles/Gemfile.ci
-- gemfiles/Gemfile.doc
 - lib/dizby.rb
 - lib/dizby/access/control_list.rb
 - lib/dizby/access/entry.rb
@@ -72,6 +154,7 @@ files:
 - lib/dizby/protocol/basic.rb
 - lib/dizby/protocol/manager.rb
 - lib/dizby/protocol/refined.rb
+- lib/dizby/protocol/structs.rb
 - lib/dizby/protocols/dead.rb
 - lib/dizby/protocols/secure.rb
 - lib/dizby/protocols/tcp.rb
@@ -96,14 +179,10 @@ files:
 - lib/dizby/tunnel/spawned.rb
 - lib/dizby/tunnel/tunnelable_local.rb
 - lib/dizby/tunnel/tunnelable_remote.rb
-- lib/dizby/utility/classic_access.rb
 - lib/dizby/utility/configurable.rb
-- lib/dizby/utility/delegator.rb
-- lib/dizby/utility/force_bind.rb
 - lib/dizby/utility/io_barrier.rb
 - lib/dizby/utility/log.rb
 - lib/dizby/utility/monitor.rb
-- lib/dizby/utility/polymorphic_delegated.rb
 - lib/dizby/utility/self_pipe.rb
 - lib/dizby/utility/semi_built.rb
 - lib/dizby/utility/string.rb
@@ -113,10 +192,6 @@ files:
 - lib/dizby/worker/connection.rb
 - lib/dizby/worker/invoke_method.rb
 - lib/dizby/worker/server.rb
-- tasks/ghpages.rake
-- tasks/rubocop.rake
-- tasks/test.rake
-- tasks/yard.rake
 - test/test_helper.rb
 homepage: https://github.com/rideliner/dizby
 licenses:
@@ -138,10 +213,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: Distributed Ruby
 test_files:
 - test/test_helper.rb
-has_rdoc: yard