eac_envs-http 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26e1482ff58e47b7a780079016d86be8ebc34f24abce6b72884490a82a2f9cdb
-  data.tar.gz: b8c417ee8ea17f08c445308d0a613ed0ce368836ddbf0c3737d22feaa796a023
+  metadata.gz: 16767658ee6f6609ff953b37bb509445f81c9664f1c2bda6c2e940d3e8dd10c9
+  data.tar.gz: 2e8371d49916ab7e55270a207ea9260886a2725a104352e206d1ce2ab9240562
 SHA512:
-  metadata.gz: f6b78b5edb1f9bee713d93851a87ee9c9874e99ea689bb795d5726632663060bb4b6c2269e1108cdd2384db13c7d2b7bc7281c31dddd41a31a60a46c087b8830
-  data.tar.gz: 36b9871a50b8f8d8de845eff995955dbbeef82c12e0fbb743a47a5d5f4b8177b74ab03489feb1c0bfe7cf3d06cff5c523e218a71e618dcfe619ec4af0f475280
+  metadata.gz: 4025c5127852ff0ce7bf17d42765a2d1a65c0d71c71e63f83c55b3a9e62091fdd29f37039682b8eb096639f46f97037af870f7296a8fe5da6a943c9798dbb17f
+  data.tar.gz: 1ccd594cde8ad9d49cff75525be6c538dc526b52ab006dc88ebca8d510ba1cdced0d4a06f1ccc0de3ec947262f944fb1f64d4e1963b4a21f63d0590cac393abf

data/lib/eac_envs/http/rspec/echo_server/http_server.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'eac_envs/http/rspec/echo_server/webrick_servlet'
+require 'eac_ruby_utils/core_ext'
+require 'webrick'
+# require 'webrick/https'
+
+module EacEnvs
+  module Http
+    module Rspec
+      class EchoServer
+        class HttpServer < ::WEBrick::HTTPServer
+          def initialize(options)
+            super
+            mount '/', ::EacEnvs::Http::Rspec::EchoServer::WebrickServlet
+          end
+
+          def on_running(&block)
+            ::Thread.abort_on_exception = true
+            servlet_thread = ::Thread.new { start }
+            begin
+              sleep 0.001 while status != :Running
+              block.call
+            ensure
+              shutdown
+              servlet_thread.join
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_envs/http/rspec/echo_server.rb

@@ -2,6 +2,7 @@
 
 require 'addressable'
 require 'eac_ruby_utils/core_ext'
+require 'random-port'
 require 'webrick'
 require 'webrick/https'
 
@@ -11,8 +12,8 @@ module EacEnvs
       class EchoServer
         HOSTNAME = 'localhost'
         SCHEMES = {
-          http: { Port: 8080 },
-          https: { Port: 8443, SSLEnable: true, SSLCertName: [['CN', HOSTNAME]] }
+          http: {},
+          https: { SSLEnable: true, SSLCertName: [['CN', HOSTNAME]] }
         }.freeze
 
         class << self
@@ -27,15 +28,8 @@ module EacEnvs
         common_constructor :scheme, :webrick_options
 
         def on_active(&block)
-          servlet = webrick_servlet
-          ::Thread.abort_on_exception = true
-          servlet_thread = ::Thread.new { servlet.start }
-          begin
-            sleep 0.001 while servlet.status != :Running
-            block.call
-          ensure
-            servlet.shutdown
-            servlet_thread.join
+          on_aquired_port do
+            http_server.on_running(&block)
           end
         end
 
@@ -43,17 +37,30 @@ module EacEnvs
           ::Addressable::URI.new(
             scheme: scheme.to_s,
             host: ::EacEnvs::Http::Rspec::EchoServer::HOSTNAME,
-            port: webrick_options.fetch(:Port)
+            port: port!
           )
         end
 
-        private
+        protected
+
+        attr_accessor :port
+
+        # @return [EacEnvs::Http::Rspec::EchoServer::HttpServer]
+        def http_server
+          ::EacEnvs::Http::Rspec::EchoServer::HttpServer.new(webrick_options.merge(Port: port!))
+        end
+
+        def on_aquired_port(&block)
+          ::RandomPort::Pool.new.acquire do |port|
+            self.port = port
+            block.call
+            self.port = nil
+          end
+        end
 
-        # @return [EacEnvs::Http::Rspec::EchoServer::WebrickServlet]
-        def webrick_servlet
-          r = ::WEBrick::HTTPServer.new(webrick_options)
-          r.mount '/', ::EacEnvs::Http::Rspec::EchoServer::WebrickServlet
-          r
+        # @return [Integer]
+        def port!
+          port.presence || raise('Port unsetted')
         end
 
         require_sub __FILE__

data/lib/eac_envs/http/version.rb

@@ -2,6 +2,6 @@
 
 module EacEnvs
   module Http
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_envs-http
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-03 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_fs
@@ -132,6 +132,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: random-port
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +186,7 @@ files:
 - lib/eac_envs/http/response/statuses.rb
 - lib/eac_envs/http/rspec.rb
 - lib/eac_envs/http/rspec/echo_server.rb
+- lib/eac_envs/http/rspec/echo_server/http_server.rb
 - lib/eac_envs/http/rspec/echo_server/request_processor.rb
 - lib/eac_envs/http/rspec/echo_server/webrick_servlet.rb
 - lib/eac_envs/http/version.rb