random-port 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 627f7f283d6d1958380c9794dd78a50b7068144afa5e7b6f988d8cca325cf114
-  data.tar.gz: 4559900eed96735698944d63366666130fbb729b1a12a26d79a9e77eb5085bec
+  metadata.gz: 97daaf8ddcb40b28c9702c20272747d85619de8b19301f05a34918c6dd275cca
+  data.tar.gz: 48a06545628a4bfb4c3ee8b59e1880d83cd22cacc5fa22a893717b70225f08a5
 SHA512:
-  metadata.gz: e1bea15f564c1b5f9e4bc292b71501aa799b6b674337b1c9c504cbd7edee6bbd508c4beb4fe3648fdc83a184d3924ca4a595b253b383f9d2cb7d213ee518ae1c
-  data.tar.gz: db5b1ee1490292eaf644eb68567d1289354a355c6a2c768037005db2d44111bc232f120358ffc231964579b005315269e0927de96f547c4ad012a87c84220b65
+  metadata.gz: da44606055d80695de6baea9ef514b98d5b5d0cf82bac7276981edef778f2aabb7d2532d722b576eabffd2d4a58e7d21a8ee8effbb48f7d2c86e1b02dbd9ffed
+  data.tar.gz: 49c67ec4a38bdcf60cf12d7d53078ddbf70370899cd5da8c03cd7ce82a46750ba79bf35242d2b6cf32ab31742c4ebea0bec473ee95448e6b3692c21ec6965393

data/.github/workflows/copyrights.yml

@@ -21,7 +21,11 @@
 name: copyrights
 'on':
   push:
+    branches:
+      - master
   pull_request:
+    branches:
+      - master
 jobs:
   copyrights:
     runs-on: ubuntu-24.04

data/.github/workflows/xcop.yml

@@ -19,9 +19,13 @@
 # SOFTWARE.
 ---
 name: xcop
-on:
+'on':
   push:
+    branches:
+      - master
   pull_request:
+    branches:
+      - master
 jobs:
   xcop:
     runs-on: ubuntu-24.04

data/lib/random-port/pool.rb

@@ -96,25 +96,14 @@ class RandomPort::Pool
           "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] = take(i.zero? ? @next : opts[i - 1] + 1)
-          end
-        rescue Errno::EADDRINUSE, SocketError
-          next
-        end
-        next if opts.any? { |p| @ports.include?(p) }
-        d = total * (total - 1) / 2
-        next unless opts.inject(&:+) - (total * opts.min) == d
-        @ports += opts
-        opts
+      opts = safe { group(total) }
+      if opts.nil?
+        @next += 1
+      else
+        @next = opts.max + 1
       end
-      next if opts.nil?
-      @next = opts.max + 1
       @next = 0 if @next > 65_535
+      next if opts.nil?
       opts = opts[0] if total == 1
       return opts unless block_given?
       begin
@@ -126,6 +115,8 @@ class RandomPort::Pool
   end
 
   # Return it/them back to the pool.
+  # @param [Integer] port TCP port number to release
+  # @return nil
   def release(port)
     safe do
       if port.is_a?(Array)
@@ -138,6 +129,27 @@ class RandomPort::Pool
 
   private
 
+  # Take a group of ports, if possible.
+  # @param [Integer] total How many ports to take
+  # @return [Array<Integer>|nil] Ports found or NIL if impossible now
+  def group(total)
+    return if @ports.count + total > @limit
+    opts = Array.new(0, total)
+    begin
+      (0..(total - 1)).each do |i|
+        port = i.zero? ? @next : opts[i - 1] + 1
+        opts[i] = take(port)
+      end
+    rescue Errno::EADDRINUSE, SocketError
+      return
+    end
+    return if opts.any? { |p| @ports.include?(p) }
+    d = total * (total - 1) / 2
+    return unless opts.inject(&:+) - (total * opts.min) == d
+    @ports += opts
+    opts
+  end
+
   # Find one possible TCP port.
   # @param [Integer] opt Suggested port number
   # @return [Integer] Port found

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.3'
+  s.version = '0.7.4'
   s.license = 'MIT'
   s.summary = 'Random TCP port'
   s.description = 'Reserves a random TCP port'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: random-port
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Yegor Bugayenko