random-port 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71762c94a8e91f18c8ad99635fccc5a1d970933383788e33ce5c7e727309bb5
-  data.tar.gz: 6615e680ca4ff3307658e32bc259068ec0d18b8855233f7f2f0e4f9677de59dc
+  metadata.gz: 7955c6c026633ceb489c05357e4d0383aca879252680a87053339682e014fe0f
+  data.tar.gz: ab010bcab3569cce98f608c38dfe23929ff5d8c94bba8a15e46c1e486aef71d0
 SHA512:
-  metadata.gz: 1d682b677cbc3cd75ea175905f7329606deb6bf791e78d7bdad3b011c9c0c2ef2b020cbda389cd83ae6677d57d42cf5dfa3884f78a6e22fd2961abd1c808c04f
-  data.tar.gz: 273fd54dcd45d2acad27ec446eea6cb8570e79318cf92e20144f7dad46000a534a1ff958be7b347e0a20a9c1c8156b2a63e233013a5e064be0e5fa12ad576905
+  metadata.gz: 5861bf9d24fbb7c4cdc9ca9393736c0d65ee3e30f207a715ac0f7366f8b13ebaf442e5ebff10ae1787515bceab7f257aea44b9592a09c7f9f27d57015805ac2b
+  data.tar.gz: de319e8a9c70bc72a98ea456297079c732a41a3deac2b9c943065a601446ff2f828cfc7bb1a0a25f24327ed72fd6605129021aa06e23defe89095a7257bfe0a8

data/.github/workflows/actionlint.yml

@@ -28,7 +28,7 @@ name: actionlint
       - master
 jobs:
   actionlint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Download actionlint

data/.github/workflows/codecov.yml

@@ -25,7 +25,7 @@ on:
       - master
 jobs:
   codecov:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
@@ -33,6 +33,6 @@ jobs:
           ruby-version: 2.7
       - run: bundle update
       - run: bundle exec rake
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

data/.github/workflows/copyrights.yml

@@ -24,7 +24,7 @@ name: copyrights
   pull_request:
 jobs:
   copyrights:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: yegor256/copyrights-action@0.0.4
+      - uses: yegor256/copyrights-action@0.0.8

data/.github/workflows/markdown-lint.yml

@@ -32,7 +32,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   markdown-lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: articulate/actions-markdownlint@v1

data/.github/workflows/pdd.yml

@@ -28,7 +28,7 @@ on:
       - master
 jobs:
   pdd:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: volodya-lombrozo/pdd-action@master

data/.github/workflows/rake.yml

@@ -31,8 +31,8 @@ jobs:
     name: test
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-12]
-        ruby: [2.7, 3.2]
+        os: [ubuntu-24.04, macos-15]
+        ruby: [2.7, 3.3]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

data/.github/workflows/xcop.yml

@@ -24,7 +24,7 @@ on:
   pull_request:
 jobs:
   xcop:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: g4s8/xcop-action@master

data/.rultor.yml

@@ -19,7 +19,7 @@
 # SOFTWARE.
 ---
 docker:
-  image: yegor256/rultor-image:1.23.1
+  image: yegor256/rultor-ruby
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |-

data/Gemfile

@@ -23,10 +23,10 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'minitest', '5.24.1', require: false
+gem 'minitest', '5.25.4', require: false
 gem 'rake', '13.2.1', require: false
-gem 'rubocop', '1.64.1', require: false
-gem 'rubocop-rspec', '3.0.2', require: false
+gem 'rubocop', '1.69.2', require: false
+gem 'rubocop-rspec', '3.3.0', require: false
 gem 'simplecov', '0.22.0', require: false
-gem 'threads', '0.3.0', require: false
-gem 'yard', '0.9.36', require: false
+gem 'threads', '0.4.1', require: false
+gem 'yard', '0.9.37', require: false

data/lib/random-port/pool.rb

@@ -22,8 +22,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-require 'socket'
 require 'monitor'
+require 'socket'
+require 'tago'
 require_relative 'module'
 
 # Pool of TPC ports.
@@ -52,13 +53,14 @@ class RandomPort::Pool
   attr_reader :limit
 
   # Ctor.
-  # @param [bool] Set it to FALSE if you want this pool to be NOT thread-safe
-  # @param [int] Set the maximum number of ports in the pool
+  # @param [Boolean] sync Set it to FALSE if you want this pool to be NOT thread-safe
+  # @param [Integer] limit Set the maximum number of ports in the pool
   def initialize(sync: true, limit: 65_536)
     @ports = []
     @sync = sync
     @monitor = Monitor.new
     @limit = limit
+    @next = 1024
   end
 
   # Application wide pool of ports
@@ -84,17 +86,21 @@ class RandomPort::Pool
   # is available.
   def acquire(total = 1, timeout: 4)
     start = Time.now
+    attempt = 0
     loop do
       if Time.now > start + timeout
-        raise Timeout, "Can't find a place in the pool of #{@limit} ports \
-for #{total} port(s), in #{format('%.02f', Time.now - start)}s"
+        raise \
+          Timeout,
+          "Can't find a place in the pool of #{@limit} ports " \
+          "for #{total} port(s), after #{attempt} attempts in #{start.ago}"
       end
+      attempt +=  1
       opts = safe do
         next if @ports.count + total > @limit
         opts = Array.new(0, total)
         begin
           (0..(total - 1)).each do |i|
-            opts[i] = i.zero? ? take : take(opts[i - 1] + 1)
+            opts[i] = take(i.zero? ? @next : opts[i - 1] + 1)
           end
         rescue Errno::EADDRINUSE, SocketError
           next
@@ -106,6 +112,8 @@ for #{total} port(s), in #{format('%.02f', Time.now - start)}s"
         opts
       end
       next if opts.nil?
+      @next = opts.max + 1
+      @next = 0 if @next > 65_535
       opts = opts[0] if total == 1
       return opts unless block_given?
       begin
@@ -129,6 +137,9 @@ for #{total} port(s), in #{format('%.02f', Time.now - start)}s"
 
   private
 
+  # Find one possible TCP port.
+  # @param [Integer] opt Suggested port number
+  # @return [Integer] Port found
   def take(opt = 0)
     server = TCPServer.new('127.0.0.1', opt)
     p = server.addr[1]

data/random-port.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>=2.3'
   s.name = 'random-port'
-  s.version = '0.7.0'
+  s.version = '0.7.2'
   s.license = 'MIT'
   s.summary = 'Random TCP port'
   s.description = 'Reserves a random TCP port'
@@ -37,5 +37,6 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split($RS)
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md']
+  s.add_dependency 'tago', '>0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

data/test/test_pool.rb

@@ -115,6 +115,16 @@ class RandomPort::TestPool < Minitest::Test
     assert_equal(total, numbers.uniq.count)
   end
 
+  def test_acquires_unique_numbers_in_block
+    total = 25
+    numbers = (0..total - 1).map do
+      RandomPort::Pool::SINGLETON.acquire do |port|
+        port
+      end
+    end
+    assert_equal(total, numbers.uniq.count)
+  end
+
   def test_raises_when_too_many
     pool = RandomPort::Pool.new(limit: 1)
     pool.acquire

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: random-port
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Yegor Bugayenko
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
-dependencies: []
+date: 2024-12-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tago
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Reserves a random TCP port
 email: yegor256@gmail.com
 executables: []
@@ -45,7 +59,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -62,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Random TCP port
 test_files: []