chore: fix rubocop offenses

lib/syskit/cli/log_runtime_archive.rb

@@ -3,7 +3,7 @@
 require "archive/tar/minitar"
 require "sys/filesystem"
 require "syskit/process_managers/remote/protocol"
-require 'net/ftp'
+require "net/ftp"
 
 module Syskit
     module CLI
@@ -177,11 +177,12 @@ def self.connect_to_remote_server(server_params)
                 ftp = Net::FTP.new
                 ftp.connect(server_params[:interface], server_params[:port])
                 ftp.login(server_params[:user], server_params[:password])
+                ftp.passive = true
                 ftp
             end
 
             def self.disconnect_from_remote_server(ftp)
-                ftp.close if ftp
+                ftp&.close
             end
 
             # Find all dataset-looking folders within a root log folder

lib/syskit/cli/log_runtime_archive_main.rb

@@ -109,7 +109,7 @@ def transfer_server( # rubocop:disable Metrics/ParameterLists
                 )
             end
 
-            no_commands do
+            no_commands do # rubocop:disable Metrics/BlockLength
                 def validate_directory_exists(dir)
                     dir = Pathname.new(dir)
                     unless dir.directory?
@@ -124,8 +124,9 @@ def make_archiver(root_dir, target_dir: nil)
                     logger = Logger.new($stdout)
 
                     Syskit::CLI::LogRuntimeArchive.new(
-                        root_dir, target_dir: target_dir,
-                        logger: logger, max_archive_size: options[:max_size] * (1024**2)
+                        root_dir,
+                        target_dir: target_dir, logger: logger,
+                        max_archive_size: options[:max_size] * (1024**2)
                     )
                 end
 
@@ -138,6 +139,7 @@ def create_server( # rubocop:disable Metrics/ParameterLists
                         interface: interface, port: port
                     )
                     server.run
+                    server
                 end
             end
         end

lib/syskit/roby_app/log_transfer_server/spawn_server.rb

@@ -85,7 +85,7 @@ def wait_until_stopped
                     puts "FTP server started.  Press ENTER or c-C to stop it"
                     $stdout.flush
                     begin
-                        gets
+                        $stdin.readline
                     rescue Interrupt
                         puts "Interrupt"
                     end

test/cli/test_log_runtime_archive.rb

@@ -534,7 +534,7 @@ def should_archive_dataset(dataset, archive_basename, full:)
 
                 it "transfers datasets" do
                     ftp = connect_to_server
-                    
+
                     datasets = [
                         make_valid_folder("20220434-2023"),
                         make_valid_folder("20220434-2024"),
@@ -554,8 +554,8 @@ def create_server
                     thread = Thread.new do
                         server = RobyApp::LogTransferServer::SpawnServer.new(
                             @target_dir, @params[:user], @params[:password],
-                            @params[:certfile_path], interface: @params[:interface],
-                            port: @params[:port]
+                            @params[:certfile_path],
+                            interface: @params[:interface], port: @params[:port]
                         )
                         server.run
                     end

test/cli/test_log_runtime_archive_main.rb

@@ -129,22 +129,48 @@ def call_archive(root_path, archive_path, low_limit, freed_limit)
                 end
             end
 
+            describe "#transfer_server" do
+                before do
+                    @tgt_log_dir = make_tmppath
+                    interface = "127.0.0.1"
+                    ca = RobyApp::TmpRootCA.new(interface)
+
+                    server_params = {
+                        user: "nilvo", password: "nilvo123",
+                        certfile_path: ca.private_certificate_path,
+                        interface: interface, port: 0
+                    }
+                end
+            end
+
             describe "#watch_transfer" do
                 before do
                     @base_log_dir = make_tmppath
                     @tgt_log_dir = make_tmppath
                     interface = "127.0.0.1"
-                    port = 0
                     ca = RobyApp::TmpRootCA.new(interface)
-                    user = "nilvo"
-                    password = "nilvo123"
 
                     @server_params = {
-                        user: user, password: password,
+                        user: "nilvo", password: "nilvo123",
                         certfile_path: ca.private_certificate_path,
-                        interface: interface, port: port
+                        interface: interface, port: 0
                     }
-                    server = spawn_server
+                    @threads = []
+                    server = nil
+                    flexmock(RobyApp::LogTransferServer::SpawnServer)
+                        .should_receive(:new)
+                        .with_any_args
+                        .pass_thru do |arg|
+                            server = arg
+                        end
+                    call_create_server
+                    @server = server
+                end
+
+                after do
+                    @server.stop
+                    @server.join
+                    @threads.each(&:kill)
                 end
 
                 it "calls transfer with the specified period" do
@@ -167,13 +193,17 @@ def call_archive(root_path, archive_path, low_limit, freed_limit)
                             *@server_params.values,
                             "--period", 0.5
                         ]
-                        pp "***", args
                         LogRuntimeArchiveMain.start(args)
                     end
 
                     assert called == 3
                     assert_operator(Time.now - tic, :>, 0.9)
                 end
+
+                def call_create_server
+                    cli = LogRuntimeArchiveMain.new
+                    cli.create_server(@tgt_log_dir, *@server_params.values)
+                end
             end
 
             describe "#transfer" do
@@ -213,15 +243,6 @@ def mock_available_space(total_available_disk_space)
                     end
             end
 
-            def spawn_server
-                args = [
-                    "transfer_server",
-                    @tgt_log_dir,
-                    *@server_params.values
-                ]
-                LogRuntimeArchiveMain.start(args)
-            end
-
             def assert_deleted_files(deleted_files)
                 if deleted_files.empty?
                     files = @archive_dir.each_child.select(&:file?)