cucumber-sshd 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66c6692ec00c796550a364e5979acb85e9543c1
-  data.tar.gz: 07bbd717fa000609bc99079929ed82aced1fa9ef
+  metadata.gz: 0ff66620e157ca71c03a36183c8471d5433beb12
+  data.tar.gz: 7881a2de96cb1a4eda8c0d3f8b3823fb40a1393b
 SHA512:
-  metadata.gz: 7b6c63aaada973bbd9f65b7d76bc612d61c4be85f12a586ea4a8d3ee37bbc223e76a91a09c8a8815da24c0ed3d8ead4b2991aadbabf7cb761383a65643816d72
-  data.tar.gz: ac924a78406ec0ddbe5f6a6080e7073343ee35cd2621415bd4c1aeb30d304e99457a499fb2e8be1e541eb764272bfe92173fa19ea3ac5a91195849f82844dbbd
+  metadata.gz: 3d86dc8a1dd4f6cfc28c62e24338fa71e8d27e9d679a51f88c48590e78572cda44b83bfae35a8f28e471a7468d6e5013b69121a74640036a6c58b3cf3ba6ff1e
+  data.tar.gz: 36541831f940b689afa89024747c2af1d8b2835b36ca50f22f8f92cea3cab68ef4431d1693e55a3531ea2ead7a9928f8396e427e43b0861fb82d7bfd56de74f9

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,13 +1,11 @@
 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
@@ -39,14 +37,16 @@ qnLMVQddVitzQP7LEhXbNUuUAzEMfA6rAA==
         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.pre2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-sshd
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - Thibault Jouan