Move "server" logic to new "server" class

zachahn · Dec 4, 2024 · 6b6c7cf · 6b6c7cf
1 parent b202ad5
commit 6b6c7cf
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 33 deletions.
diff --git a/exe/disqualified b/exe/disqualified
@@ -3,4 +3,5 @@
 require_relative "../lib/disqualified"
 require_relative "../lib/disqualified/cli"
 
-Disqualified::CLI.run
+cli = Disqualified::CLI.new
+cli.run
diff --git a/lib/disqualified.rb b/lib/disqualified.rb
@@ -20,4 +20,5 @@ module Disqualified
 require_relative "disqualified/main"
 require_relative "disqualified/pool"
 require_relative "disqualified/sequence"
+require_relative "disqualified/server"
 require_relative "disqualified/version"
diff --git a/lib/disqualified/cli.rb b/lib/disqualified/cli.rb
@@ -2,13 +2,6 @@
 
 class Disqualified::CLI
   extend T::Sig
-  include Disqualified::Logging
-
-  sig { void }
-  def self.run
-    cli = new(ARGV)
-    cli.run
-  end
 
   class ServerEngine < Rails::Engine
     config.before_initialize do
@@ -28,31 +21,8 @@ def run
     option_parser.parse(@original_argv)
 
     server_options = T.must(Disqualified.server_options)
-    delay_range = server_options.delay_range
-    error_hooks = server_options.error_hooks
-    logger = server_options.logger
-    pool_size = server_options.pool_size
-
-    # standard:disable Style/StringLiterals
-    logger.info { '    ____  _                        ___ _____          __' }
-    logger.info { '   / __ \(_)________ ___  ______ _/ (_) __(_)__  ____/ /' }
-    logger.info { '  / / / / / ___/ __ `/ / / / __ `/ / / /_/ / _ \/ __  /' }
-    logger.info { ' / /_/ / (__  ) /_/ / /_/ / /_/ / / / __/ /  __/ /_/ /' }
-    logger.info { '/_____/_/____/\__, /\__,_/\__,_/_/_/_/ /_/\___/\__,_/' }
-    logger.info { '                /_/' + "v#{Disqualified::VERSION}".rjust(32, " ") }
-    # standard:enable Style/StringLiterals
-    logger.info { Disqualified.server_options.to_s }
-
-    pool = Disqualified::Pool.new(delay_range:, pool_size:, error_hooks:, logger:) do |args|
-      args => {promise_index:}
-      logger.debug { format_log("Disqualified::CLI#run <block>", "##{promise_index}") }
-      Disqualified::Main.new(error_hooks:, logger:).call
-    end
-    pool.run!
-  rescue Interrupt
-    pool&.shutdown
-    puts
-    puts "Gracefully quitting..."
+    server = Disqualified::Server.new(server_options)
+    server.run
   end
 
   private

diff --git a/lib/disqualified/server.rb b/lib/disqualified/server.rb
@@ -0,0 +1,44 @@
+# typed: strict
+
+class Disqualified::Server
+  extend T::Sig
+  include Disqualified::Logging
+
+  sig { params(server_options: Disqualified::ServerConfiguration).void }
+  def initialize(server_options)
+    @server_options = server_options
+  end
+
+  sig { returns(Disqualified::ServerConfiguration) }
+  attr_reader :server_options
+
+  sig { void }
+  def run
+    delay_range = server_options.delay_range
+    error_hooks = server_options.error_hooks
+    logger = server_options.logger
+    pool_size = server_options.pool_size
+
+    # standard:disable Style/StringLiterals
+    logger.info { '    ____  _                        ___ _____          __' }
+    logger.info { '   / __ \(_)________ ___  ______ _/ (_) __(_)__  ____/ /' }
+    logger.info { '  / / / / / ___/ __ `/ / / / __ `/ / / /_/ / _ \/ __  /' }
+    logger.info { ' / /_/ / (__  ) /_/ / /_/ / /_/ / / / __/ /  __/ /_/ /' }
+    logger.info { '/_____/_/____/\__, /\__,_/\__,_/_/_/_/ /_/\___/\__,_/' }
+    logger.info { '                /_/' + "v#{Disqualified::VERSION}".rjust(32, " ") }
+    # standard:enable Style/StringLiterals
+    logger.info { Disqualified.server_options.to_s }
+
+    pool = Disqualified::Pool.new(delay_range:, pool_size:, error_hooks:, logger:) do |args|
+      args => {promise_index:}
+      logger.debug { format_log("Disqualified::CLI#run <block>", "##{promise_index}") }
+      Disqualified::Main.new(error_hooks:, logger:).call
+    end
+    pool.run!
+  rescue Interrupt
+    puts
+    puts "Gracefully quitting..."
+    pool&.shutdown
+    puts "Bye!"
+  end
+end