cucumber-sshd 2.0.0.pre5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4fc1f7d9977497a8e980b168f4fd208711ce56ffe64b32d276aeebc1b9baabb
-  data.tar.gz: 943a900e9f029576fe9d9954129c6926b8c5f893eda6ad6eee44f3b699d01517
+  metadata.gz: 4d1490ecfcce254e9252d001b2d5230a4b9d5a80c8fc8d75cfc181552d1776be
+  data.tar.gz: 563447c5cc35e66a6a01d36e59f551af08cf6202b6a97f48372e7e154861609d
 SHA512:
-  metadata.gz: b32c97654027cbe8c7cebeacaf992d7a382a014c4c182e7adc1f2bc523ca999cc837dfb49addab9bd2090b7e4b5dff1bfb73ae0010dee4daa8414e6a5b821f16
-  data.tar.gz: 034c163a3488953f71227f5597dadf354992bcde25ab90523b3256a43a3c156ae40d38badfafdc43a9b78ce3cf3820070e9cd8fbad41a69aa0f34b4b8e92bc10
+  metadata.gz: 03bec6dd3ece7de26b87dd1511c15311b4940366d1fe6e40dd56c9373e11e79e35f36490c0c060bee97b5a5c0a9219c17b4650dbb4e6b7b9ea318ec866d60389
+  data.tar.gz: ee7046516b62d961fb02490e58107f885c35e28d8b363143cae78449b427909e4b68b84233a2e6b482802219de67ec6759d32338e8089cbd9182a8c32cfacbac

data/lib/cucumber/sshd/cucumber.rb

@@ -3,12 +3,11 @@ require 'cucumber/sshd/server'
 Before '@sshd' do
   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')
+      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')
   end
 
   if !$_sshd && ENV.key?('CUCUMBER_SSHD_PERSIST')

data/lib/cucumber/sshd/server.rb

@@ -1,27 +1,27 @@
 module Cucumber
   module SSHD
     class Server
-      HOST                  = 'some_host.test'.freeze
-      HOSTNAME              = 'localhost'.freeze
-      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_hosts'.freeze
-      SFTP_SERVER_PATHS     = %w[
+      HOST = 'some_host.test'.freeze
+      HOSTNAME = 'localhost'.freeze
+      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_hosts'.freeze
+      SFTP_SERVER_PATHS = %w[
         /usr/libexec/sftp-server
         /usr/lib/openssh/sftp-server
       ].freeze
 
-      KEY = <<-eoh.freeze
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJbQy3yg9iU4xFvia9DWKWuhMzI5QGncR6OUldAOSIe7oAoGCCqGSM49
-AwEHoUQDQgAEJpS8Sknl2X6PNurToQCNu5lX/scaJLr3FkiufD+p67epbwIjiyzo
-qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
------END EC PRIVATE KEY-----
+      KEY = <<~eoh.freeze
+        -----BEGIN EC PRIVATE KEY-----
+        MHcCAQEEIJbQy3yg9iU4xFvia9DWKWuhMzI5QGncR6OUldAOSIe7oAoGCCqGSM49
+        AwEHoUQDQgAEJpS8Sknl2X6PNurToQCNu5lX/scaJLr3FkiufD+p67epbwIjiyzo
+        qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
+        -----END EC PRIVATE KEY-----
       eoh
       KEY_PUB =
         'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNT' \
@@ -40,14 +40,13 @@ qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
       attr_reader :home
 
       def initialize(
-        home:, addr:, port:, debug: false, persist: false, wait_ready: false
+        home:, addr:, port:, debug: false, persist: false
       )
-        @home       = home
-        @addr       = addr
-        @port       = port
-        @debug      = debug
-        @persist    = persist
-        @wait_ready = wait_ready
+        @home = home
+        @addr = addr
+        @port = port
+        @debug = debug
+        @persist = persist
       end
 
       def configure
@@ -68,7 +67,7 @@ qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
           end
         end
         print_server_info if debug?
-        wait_ready! if wait_ready?
+        wait_ready
       end
 
       def stop
@@ -78,7 +77,7 @@ qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
 
     private
 
-      attr_reader :addr, :port, :debug, :persist, :wait_ready, :pid
+      attr_reader :addr, :port, :debug, :persist, :pid
 
       def command
         [
@@ -91,10 +90,10 @@ qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
 
       def configure_client
         write_file_secure SSH_CONFIG_PATH, <<-eoh
-Host                    #{HOST}
-  HostName              #{HOSTNAME}
-  Port                  #{port}
-  UserKnownHostsFile    #{File.expand_path home}/#{SSH_KNOWN_HOSTS_PATH}
+Host #{HOST}
+  HostName #{HOSTNAME}
+  Port #{port}
+  UserKnownHostsFile #{File.expand_path home}/#{SSH_KNOWN_HOSTS_PATH}
         eoh
         write_file_secure SSH_KNOWN_HOSTS_PATH, "[#{HOSTNAME}]:2222 #{KEY_PUB}"
       end
@@ -108,7 +107,6 @@ ListenAddress #{addr}
 Protocol 2
 HostKey #{File.expand_path home}/#{KEY_PATH}
 PidFile /dev/null
-UsePrivilegeSeparation no
 Subsystem sftp #{sftp_server_path}
 ForceCommand HOME=#{File.expand_path home} sh -c "cd ~; [ -f .ssh/rc ] && . .ssh/rc; $SSH_ORIGINAL_COMMAND"
         eoh
@@ -132,7 +130,6 @@ CUCUMBER SSHD STARTING ---------------------------------------------------------
 HOME:       #{home}
 LISTEN:     #{addr}:#{port}
 PERSIST:    #{persist}
-WAIT_READY: #{wait_ready}
 --------------------------------------------------------------------------------
         eoh
       end
@@ -141,17 +138,13 @@ WAIT_READY: #{wait_ready}
         SFTP_SERVER_PATHS.detect { |e| File.exist? e }
       end
 
-      def wait_ready!
+      def wait_ready
         TCPSocket.new HOSTNAME, port
       rescue Errno::ECONNREFUSED
-        sleep 0.05
+        sleep 0.005
         retry
       end
 
-      def wait_ready?
-        !!wait_ready
-      end
-
       def write_file_secure path, content
         File.open File.join(home, path), ?w, 0600 do |file|
           file.write content

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-sshd
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre5
+  version: 2.0.0
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-17 00:00:00.000000000 Z
+date: 2022-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -61,7 +61,6 @@ files:
 - lib/cucumber/sshd.rb
 - lib/cucumber/sshd/cucumber.rb
 - lib/cucumber/sshd/server.rb
-- lib/cucumber/sshd/version.rb
 homepage: https://rubygems.org/gems/cucumber-sshd
 licenses:
 - BSD-3-Clause
@@ -77,11 +76,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: Cucumber sshd helpers

data/lib/cucumber/sshd/version.rb

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