random-port 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e01aea3fa1a1312743cb72b99efb0b681810fb1b55ebd1a485a448b6c02445a
-  data.tar.gz: 6b9ebc0d4c32fb2b5b7169df3a58099aad4c4b3861947737f1409d37a493b250
+  metadata.gz: f52b8bc7d8b8a31486ae04316b4c91491de3df9b617d8c3ef293e6b889edd4b4
+  data.tar.gz: 98f9ac9302aa206669e4a73f19ab0d32e4cec55312214934fd25059e76a25726
 SHA512:
-  metadata.gz: 9f6a0ba81ed19487fd4950a55932820f23bc32b516a7844ca69f55b89129cfe5110a5339c5cee09f41cf6bc87d830f3351ed391d23f94ecaa83e4f3351b1b9b1
-  data.tar.gz: 765c02a047d1e153d41e9325efc481b36f09883536f71d19dc33eab3e1597e4b0b77774c3c29dc6b9544ee82e5c3f938679122e2c188d2fb940503fb2723abc0
+  metadata.gz: c0586b04575f809747b52719f9e614b982d4bbd9960c0b81f426827b6ceafff8b8d9539bad2882e7f3254cf743bf4d4c65aea7cd515ab0033eafc2bcf26ed301
+  data.tar.gz: 6b73af33efeb0b03a691e5113e7611d20f6b9e2597b0ff7431e2bfdb5498a1a5e30efc250fbebcf98e07046008d4b06a2e64340429f1960abcabd6305a014ce2

data/lib/random-port/pool.rb

@@ -73,39 +73,65 @@ module RandomPort
 
     # Acquire a new random TCP port.
     #
+    # You can specify the number of ports to acquire. If it's more than one,
+    # an array will be returned.
+    #
     # You can specify the amount of seconds to wait until a new port
     # is available.
-    def acquire(timeout: 4)
+    def acquire(total = 1, timeout: 4)
       start = Time.now
       loop do
         if Time.now > start + timeout
           raise Timeout, "Can't find a place in the pool of #{@limit} ports \
-in #{format('%.02f', Time.now - start)}s"
+for #{total} port(s), in #{format('%.02f', Time.now - start)}s"
         end
-        next if @ports.count >= @limit
-        server = TCPServer.new('127.0.0.1', 0)
-        port = server.addr[1]
-        server.close
-        safe do
-          next if @ports.include?(port)
-          @ports << port
+        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)
+            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
         end
-        return port unless block_given?
+        next if opts.nil?
+        opts = opts[0] if total == 1
+        return opts unless block_given?
         begin
-          return yield port
+          return yield opts
         ensure
-          safe { @ports.delete(port) }
+          safe { @ports.delete(opts) }
         end
       end
     end
 
-    # Return it back to the pool.
+    # Return it/them back to the pool.
     def release(port)
-      safe { @ports.delete(port) }
+      safe do
+        if port.is_a?(Array)
+          port.each { |p| @ports.delete(p) }
+        else
+          @ports.delete(port)
+        end
+      end
     end
 
     private
 
+    def take(opt = 0)
+      server = TCPServer.new('127.0.0.1', opt)
+      p = server.addr[1]
+      server.close
+      p
+    end
+
     def safe
       if @sync
         @monitor.synchronize { yield }

data/random-port.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '2.3.3'
   s.required_ruby_version = '>=2.3'
   s.name = 'random-port'
-  s.version = '0.4.2'
+  s.version = '0.5.0'
   s.license = 'MIT'
   s.summary = 'Random TCP port'
   s.description = 'Reserves a random TCP port'

data/test/test_pool.rb

@@ -39,6 +39,13 @@ module RandomPort
       pool.release(port)
     end
 
+    def test_acquires_and_releases_three_ports
+      pool = Pool.new
+      ports = pool.acquire(3, timeout: 16)
+      assert_equal(3, ports.count)
+      pool.release(ports)
+    end
+
     def test_acquires_and_releases_in_block
       result = Pool.new.acquire do |port|
         assert(!port.nil?)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: random-port
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: codecov