random-port 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71762c94a8e91f18c8ad99635fccc5a1d970933383788e33ce5c7e727309bb5
-  data.tar.gz: 6615e680ca4ff3307658e32bc259068ec0d18b8855233f7f2f0e4f9677de59dc
+  metadata.gz: 32d50b829c0ddc8747b50eaf9f25bcb4bcbf4d42858e4271ece9b92ac650a6e9
+  data.tar.gz: 034eeff20d6f3d8015fca8d4dada4002c9afeefbb49c8f0a94eaf9db45049562
 SHA512:
-  metadata.gz: 1d682b677cbc3cd75ea175905f7329606deb6bf791e78d7bdad3b011c9c0c2ef2b020cbda389cd83ae6677d57d42cf5dfa3884f78a6e22fd2961abd1c808c04f
-  data.tar.gz: 273fd54dcd45d2acad27ec446eea6cb8570e79318cf92e20144f7dad46000a534a1ff958be7b347e0a20a9c1c8156b2a63e233013a5e064be0e5fa12ad576905
+  metadata.gz: 74b9f7720d63cb7c30bcc0fb3e14a82832a2de8a36eb8e7025261d0b7073d75ea73fd9d7d4a58be5afb350e616bf0a95954cd4e798d1482f6844a87ac537fe9c
+  data.tar.gz: e0532ba0cc8d19fa521f236c1a7ca6d265a603b6207880217b4101c3466f625e1b03029983967c4956a7f163ced06e70c31670665d9224bf7f4c278253a267ad

data/.github/workflows/codecov.yml

@@ -25,7 +25,7 @@ on:
       - master
 jobs:
   codecov:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.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@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

data/.github/workflows/xcop.yml

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

data/Gemfile

@@ -25,8 +25,8 @@ gemspec
 
 gem 'minitest', '5.24.1', 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.65.0', require: false
+gem 'rubocop-rspec', '3.0.3', require: false
 gem 'simplecov', '0.22.0', require: false
-gem 'threads', '0.3.0', require: false
+gem 'threads', '0.4.0', require: false
 gem 'yard', '0.9.36', require: false

data/lib/random-port/pool.rb

@@ -52,13 +52,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 = 0
   end
 
   # Application wide pool of ports
@@ -86,15 +87,17 @@ class RandomPort::Pool
     start = Time.now
     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), in #{format('%.02f', Time.now - start)}s"
       end
       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 +109,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 +134,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.1'
   s.license = 'MIT'
   s.summary = 'Random TCP port'
   s.description = 'Reserves a random TCP port'

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: random-port
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-10 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies: []
 description: Reserves a random TCP port
 email: yegor256@gmail.com