cucumber-sshd 2.0.0.pre1 → 2.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f66c6692ec00c796550a364e5979acb85e9543c1
-  data.tar.gz: 07bbd717fa000609bc99079929ed82aced1fa9ef
+SHA256:
+  metadata.gz: c4fc1f7d9977497a8e980b168f4fd208711ce56ffe64b32d276aeebc1b9baabb
+  data.tar.gz: 943a900e9f029576fe9d9954129c6926b8c5f893eda6ad6eee44f3b699d01517
 SHA512:
-  metadata.gz: 7b6c63aaada973bbd9f65b7d76bc612d61c4be85f12a586ea4a8d3ee37bbc223e76a91a09c8a8815da24c0ed3d8ead4b2991aadbabf7cb761383a65643816d72
-  data.tar.gz: ac924a78406ec0ddbe5f6a6080e7073343ee35cd2621415bd4c1aeb30d304e99457a499fb2e8be1e541eb764272bfe92173fa19ea3ac5a91195849f82844dbbd
+  metadata.gz: b32c97654027cbe8c7cebeacaf992d7a382a014c4c182e7adc1f2bc523ca999cc837dfb49addab9bd2090b7e4b5dff1bfb73ae0010dee4daa8414e6a5b821f16
+  data.tar.gz: 034c163a3488953f71227f5597dadf354992bcde25ab90523b3256a43a3c156ae40d38badfafdc43a9b78ce3cf3820070e9cd8fbad41a69aa0f34b4b8e92bc10

data/lib/cucumber/sshd/cucumber.rb

@@ -1,21 +1,27 @@
 require 'cucumber/sshd/server'
 
 Before '@sshd' do
-  start_server = -> home do
-    Cucumber::SSHD::Server.start home, wait_ready: @_sshd_wait_ready
+  start_server = -> do
+    Cucumber::SSHD::Server.start \
+      home:       ENV.fetch('CUCUMBER_SSHD_HOME', 'tmp/home'),
+      addr:       ENV.fetch('CUCUMBER_SSHD_LISTEN', '::1'),
+      port:       ENV.fetch('CUCUMBER_SSHD_PORT', 2222),
+      debug:      ENV.key?('CUCUMBER_SSHD_DEBUG'),
+      persist:    ENV.key?('CUCUMBER_SSHD_PERSIST'),
+      wait_ready: ENV.key?('CUCUMBER_SSHD_WAIT_READY')
   end
 
-  if @_sshd_fast && !$_sshd
-    unless $_sshd
-      $_sshd = start_server.call @_sshd_home
-      at_exit { $_sshd.stop }
-    end
-    @_sshd = $_sshd
+  if !$_sshd && ENV.key?('CUCUMBER_SSHD_PERSIST')
+    $_sshd = start_server.call
+    at_exit { $_sshd.stop }
+  elsif !$_sshd
+    $_sshd = start_server.call
   else
-    @_sshd = start_server.call @_sshd_home
+    $_sshd.configure
+    $_sshd.start unless ENV.key? 'CUCUMBER_SSHD_PERSIST'
   end
 end
 
 After '@sshd' do
-  @_sshd.stop unless @_sshd_fast
+  $_sshd.stop unless ENV.key? 'CUCUMBER_SSHD_PERSIST'
 end

data/lib/cucumber/sshd/server.rb

@@ -1,18 +1,16 @@
 module Cucumber
   module SSHD
     class Server
-      BASE_PATH             = 'tmp/home'.freeze
       HOST                  = 'some_host.test'.freeze
       HOSTNAME              = 'localhost'.freeze
-      LISTEN_ADDR           = '::1'.freeze
-      PORT                  = 2222
       COMMAND               = '/usr/sbin/sshd'.freeze
       COMMAND_ARGS          = '-Deq'.freeze
+      COMMAND_ARGS_DEBUG    = '-De'.freeze
       KEY_PATH              = 'etc/ssh_host_rsa_key'.freeze
       KEY_PUB_PATH          = [KEY_PATH, '.pub'].join.freeze
       SSHD_CONFIG_PATH      = 'etc/sshd_config'.freeze
       SSH_CONFIG_PATH       = '.ssh/config'.freeze
-      SSH_KNOWN_HOSTS_PATH  = '.ssh/known_host'.freeze
+      SSH_KNOWN_HOSTS_PATH  = '.ssh/known_hosts'.freeze
       SFTP_SERVER_PATHS     = %w[
         /usr/libexec/sftp-server
         /usr/lib/openssh/sftp-server
@@ -31,22 +29,24 @@ qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
         'XVYrc0D+yxIV2zVLlAMxDHwOqwA='
 
       class << self
-        def start *args
-          server = new args.shift, *args
+        def start options
+          server = new **options
           server.configure
           server.start
           server
         end
       end
 
-      attr_accessor :base_path, :host, :addr, :port, :pid
+      attr_reader :home
 
-      def initialize base_path, wait_ready: false
-        @base_path  = base_path || BASE_PATH
-        @host       = HOST
-        @addr       = ENV.fetch 'CUCUMBER_SSHD_LISTEN', LISTEN_ADDR
-        @port       = ENV.fetch 'CUCUMBER_SSHD_PORT', PORT
-        @pid        = nil
+      def initialize(
+        home:, addr:, port:, debug: false, persist: false, wait_ready: false
+      )
+        @home       = home
+        @addr       = addr
+        @port       = port
+        @debug      = debug
+        @persist    = persist
         @wait_ready = wait_ready
       end
 
@@ -57,17 +57,17 @@ qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
       end
 
       def start
-        Dir.chdir base_path do
+        Dir.chdir home do
           @pid = fork do
-            $stderr.reopen '/dev/null' unless ENV.key? 'CUCUMBER_SSHD_DEBUG'
+            $stderr.reopen '/dev/null' unless debug?
             exec command
           end
-          if ENV.key? 'CUCUMBER_SSHD_DEBUG'
+          if debug?
             sleep 0.05
             fail "`#{command}` failed" if Process.waitpid pid, Process::WNOHANG
           end
         end
-
+        print_server_info if debug?
         wait_ready! if wait_ready?
       end
 
@@ -78,21 +78,23 @@ qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
 
     private
 
+      attr_reader :addr, :port, :debug, :persist, :wait_ready, :pid
+
       def command
         [
           COMMAND,
           '-f',
           SSHD_CONFIG_PATH,
-          COMMAND_ARGS
+          (debug? ? COMMAND_ARGS_DEBUG : COMMAND_ARGS)
         ].join ' '
       end
 
       def configure_client
         write_file_secure SSH_CONFIG_PATH, <<-eoh
-Host                    #{host}
+Host                    #{HOST}
   HostName              #{HOSTNAME}
   Port                  #{port}
-  UserKnownHostsFile    #{File.expand_path base_path}/#{SSH_KNOWN_HOSTS_PATH}
+  UserKnownHostsFile    #{File.expand_path home}/#{SSH_KNOWN_HOSTS_PATH}
         eoh
         write_file_secure SSH_KNOWN_HOSTS_PATH, "[#{HOSTNAME}]:2222 #{KEY_PUB}"
       end
@@ -104,16 +106,35 @@ Host                    #{host}
 Port #{port}
 ListenAddress #{addr}
 Protocol 2
-HostKey #{File.expand_path base_path}/#{KEY_PATH}
+HostKey #{File.expand_path home}/#{KEY_PATH}
 PidFile /dev/null
 UsePrivilegeSeparation no
 Subsystem sftp #{sftp_server_path}
-ForceCommand HOME=#{File.expand_path base_path} sh -c "cd ~; [ -f .ssh/rc ] && . .ssh/rc; $SSH_ORIGINAL_COMMAND"
+ForceCommand HOME=#{File.expand_path home} sh -c "cd ~; [ -f .ssh/rc ] && . .ssh/rc; $SSH_ORIGINAL_COMMAND"
         eoh
       end
 
       def create_dir_secure path
-        FileUtils.mkdir_p File.join(base_path, path), mode: 0700
+        FileUtils.mkdir_p File.join(home, path), mode: 0700
+      end
+
+      def debug?
+        !!debug
+      end
+
+      def persist?
+        !!persist
+      end
+
+      def print_server_info
+        puts <<-eoh
+CUCUMBER SSHD STARTING ---------------------------------------------------------
+HOME:       #{home}
+LISTEN:     #{addr}:#{port}
+PERSIST:    #{persist}
+WAIT_READY: #{wait_ready}
+--------------------------------------------------------------------------------
+        eoh
       end
 
       def sftp_server_path
@@ -128,11 +149,11 @@ ForceCommand HOME=#{File.expand_path base_path} sh -c "cd ~; [ -f .ssh/rc ] && .
       end
 
       def wait_ready?
-        !!@wait_ready
+        !!wait_ready
       end
 
       def write_file_secure path, content
-        File.open File.join(base_path, path), ?w, 0600 do |file|
+        File.open File.join(home, path), ?w, 0600 do |file|
           file.write content
         end
       end

data/lib/cucumber/sshd/version.rb

@@ -1,5 +1,5 @@
 module Cucumber
   module SSHD
-    VERSION = '2.0.0.pre1'.freeze
+    VERSION = '2.0.0.pre5'.freeze
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-sshd
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre5
 platform: ruby
 authors:
 - Thibault Jouan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2021-10-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +66,7 @@ homepage: https://rubygems.org/gems/cucumber-sshd
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.29
+signing_key:
 specification_version: 4
 summary: Cucumber sshd helpers
 test_files: []