dns_mock 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48eac73ca0f2e0aef0f0e84a87eb79dc240e44529eb0ac3e3d34417dd2886f1a
-  data.tar.gz: 604d66dbc157a3c0159ba0355eb5b12d97c9a8da78de580902985b1c452e2e42
+  metadata.gz: 7bc358120372b309038c4f457483268e58c22ff6e96667bbdf6a398896248749
+  data.tar.gz: d468e04f015a7bd7f5f535454356d2f2affcf3517eb6e0fcc261bc38ddea388d
 SHA512:
-  metadata.gz: 2b679e4f84f3f465e05e0d4c4c2a7507899fdd2c4acef4ea2f82ff69f837f9086f2a2d238dbf67548d1c5309e4ca715859ab1877de28fdf471c80c33ae79b616
-  data.tar.gz: fe8fd0cf5723bc58c3dc72e1f528e8379546f1c9def076413de47a28e025956a4e972f3ac885f77f6dd51675c6d39a7308b6490f637bf4f53f9b7fc406a6b15c
+  metadata.gz: 318e2a60578aa2a01a0c548fbccd7477b2556f8d0403af15e26d0425e86a10bb2d596616bae764c7ceec8eaa6d89b09437c34bc6ff2ac5cc20890431289177e0
+  data.tar.gz: f74189c81ad853915633bac2ff05f3f48d80a8a52e19198545416b850987fefa8b30475e2db202a8c032ecb7ecf60ab8c4da18645d0c5455620ddee05a0ff73b

data/.codeclimate.yml

@@ -7,7 +7,7 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-1-15
+    channel: rubocop-1-16
 
   reek:
     enabled: true

data/.rubocop.yml

@@ -127,6 +127,15 @@ Style/HashConversion:
 Style/StringChars:
   Enabled: true
 
+Style/InPatternThen:
+  Enabled: true
+
+Style/MultilineInPatternThen:
+  Enabled: true
+
+Style/QuotedSymbols:
+  Enabled: true
+
 Layout/LineLength:
   Max: 150
 
@@ -224,6 +233,9 @@ Lint/SymbolConversion:
 Lint/TripleQuotes:
   Enabled: true
 
+Lint/EmptyInPattern:
+  Enabled: true
+
 Gemspec/DateAssignment:
   Enabled: true
 
@@ -304,3 +316,9 @@ RSpec/MultipleMemoizedHelpers:
 
 RSpec/StubbedMock:
   Enabled: false
+
+RSpec/IdenticalEqualityAssertion:
+  Enabled: true
+
+RSpec/Rails/AvoidSetupHook:
+  Enabled: true

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.0] - 2021-06-14
+
+Detecting random available port via OS features. Thanks [@ioquatix](https://github.com/ioquatix) for [suggestion](https://github.com/mocktools/ruby-dns-mock/issues/42) 🚀
+
+### Removed
+
+- Removed `DnsMock::Server::RandomAvailablePort`
+
+### Changed
+
+- Updated `DnsMock::Server` class
+- Updated tests helpers/tests
+- Updated gem development dependencies
+
+### Fixed
+
+- Test coverage issues
+
 ## [1.2.4] - 2021-05-25
 
 ### Changed
@@ -150,7 +168,7 @@ DnsMock.start_server(exception_if_not_found: true)
 
 ## [0.2.1] - 2021-01-27
 
-### Fixed RDNS lookup representation
+### Fixed
 
 Fixed RDNS lookup representatin for IP address in PTR record feature.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dns_mock (1.2.4)
+    dns_mock (1.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -11,10 +11,10 @@ GEM
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     byebug (11.1.3)
-    childprocess (4.0.0)
+    childprocess (4.1.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
     dnsruby (1.61.5)
       simpleidn (~> 0.1)
@@ -30,9 +30,10 @@ GEM
     json (2.5.1)
     kwalify (0.7.2)
     method_source (1.0.0)
-    overcommit (0.57.0)
+    overcommit (0.58.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
+      rexml (~> 3.2)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
@@ -69,21 +70,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.15.0)
+    rubocop (1.16.1)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.5.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
+    rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     rubocop-performance (1.11.3)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.3.0)
+    rubocop-rspec (2.4.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-progressbar (1.11.0)
@@ -107,21 +108,21 @@ PLATFORMS
   x86_64-darwin-19
 
 DEPENDENCIES
-  bundler (~> 2.2, >= 2.2.17)
+  bundler (~> 2.2, >= 2.2.20)
   bundler-audit (~> 0.8.0)
   dns_mock!
   faker (~> 2.18)
   fasterer (~> 0.9.0)
-  overcommit (~> 0.57.0)
+  overcommit (~> 0.58.0)
   pry-byebug (~> 3.9)
   rake (~> 13.0, >= 13.0.3)
   reek (~> 6.0, >= 6.0.4)
   rspec (~> 3.10)
   rspec-dns (~> 0.1.8)
-  rubocop (~> 1.15)
+  rubocop (~> 1.16, >= 1.16.1)
   rubocop-performance (~> 1.11, >= 1.11.3)
-  rubocop-rspec (~> 2.3)
+  rubocop-rspec (~> 2.4)
   simplecov (~> 0.17.1)
 
 BUNDLED WITH
-   2.2.17
+   2.2.20

data/README.md

@@ -90,7 +90,9 @@ records = {
 # are optional params. By default creates dns mock server with
 # empty records. A free port for server will be randomly assigned
 # in the range from 49152 to 65535, if record not found exception
-# won't raises. Returns current dns mock server
+# won't raises. Please note if you specify zero port number,
+# free port number will be randomly assigned as a server port too.
+# Returns current dns mock server
 dns_mock_server = DnsMock.start_server(records: records) # => DnsMock::Server instance
 
 # returns current dns mock server port

data/dns_mock.gemspec

@@ -31,18 +31,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.17'
+  spec.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.20'
   spec.add_development_dependency 'bundler-audit', '~> 0.8.0'
   spec.add_development_dependency 'faker', '~> 2.18'
   spec.add_development_dependency 'fasterer', '~> 0.9.0'
-  spec.add_development_dependency 'overcommit', '~> 0.57.0'
+  spec.add_development_dependency 'overcommit', '~> 0.58.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.9'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.3'
   spec.add_development_dependency 'reek', '~> 6.0', '>= 6.0.4'
   spec.add_development_dependency 'rspec', '~> 3.10'
   spec.add_development_dependency 'rspec-dns', '~> 0.1.8'
-  spec.add_development_dependency 'rubocop', '~> 1.15'
+  spec.add_development_dependency 'rubocop', '~> 1.16', '>= 1.16.1'
   spec.add_development_dependency 'rubocop-performance', '~> 1.11', '>= 1.11.3'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.3'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.4'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
 end

data/lib/dns_mock/core.rb

@@ -53,6 +53,5 @@ module DnsMock
 
   require_relative '../dns_mock/version'
   require_relative '../dns_mock/server/records_dictionary_builder'
-  require_relative '../dns_mock/server/random_available_port'
   require_relative '../dns_mock/server'
 end

data/lib/dns_mock/server.rb

@@ -4,6 +4,8 @@ module DnsMock
   class Server
     include DnsMock::Error::Helper
 
+    CURRENT_HOST_NAME = 'localhost'
+    CURRENT_HOST_ADDRESS = '127.0.0.1'
     WARMUP_DELAY = 0.1
     PACKET_MAX_BYTES_SIZE = 65_535
 
@@ -12,7 +14,6 @@ module DnsMock
     def initialize( # rubocop:disable Metrics/ParameterLists
       socket = ::UDPSocket.new,
       records_dictionary_builder = DnsMock::Server::RecordsDictionaryBuilder,
-      random_available_port = DnsMock::Server::RandomAvailablePort,
       thread_class = ::Thread,
       records: nil,
       port: nil,
@@ -22,13 +23,14 @@ module DnsMock
       @records_dictionary_builder = records_dictionary_builder
       @thread_class = thread_class
       @records = records_dictionary_builder.call(records || {})
-      @port = port || random_available_port.call
+      @port = port || 0
       @exception_if_not_found = exception_if_not_found
       prepare_server_thread
     end
 
     def run
       prepare_socket_for_session
+      update_server_port
 
       begin
         loop do
@@ -66,6 +68,7 @@ module DnsMock
     private
 
     attr_reader :socket, :records_dictionary_builder, :thread_class, :exception_if_not_found
+    attr_writer :port
     attr_accessor :records, :thread
 
     def prepare_socket_for_session
@@ -76,6 +79,10 @@ module DnsMock
       raise DnsMock::Error::PortInUse.new(DnsMock::Server::CURRENT_HOST_NAME, port)
     end
 
+    def update_server_port
+      self.port = socket.addr[1] if port.zero?
+    end
+
     def prepare_server_thread
       self.thread = thread_class.new { run }
       thread.join(DnsMock::Server::WARMUP_DELAY)

data/lib/dns_mock/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DnsMock
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_mock
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,7 +19,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.17
+        version: 2.2.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.17
+        version: 2.2.20
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.58.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.0
+        version: 0.58.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -174,14 +174,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.16.1
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -208,14 +214,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -296,7 +302,6 @@ files:
 - lib/dns_mock/response/answer.rb
 - lib/dns_mock/response/message.rb
 - lib/dns_mock/server.rb
-- lib/dns_mock/server/random_available_port.rb
 - lib/dns_mock/server/records_dictionary_builder.rb
 - lib/dns_mock/test_framework/rspec.rb
 - lib/dns_mock/test_framework/rspec/helper.rb

data/lib/dns_mock/server/random_available_port.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module DnsMock
-  class Server
-    CURRENT_HOST_NAME = 'localhost'
-    CURRENT_HOST_ADDRESS = '127.0.0.1'
-
-    class RandomAvailablePort
-      ATTEMPTS = 100
-      MIN_DYNAMIC_PORT_NUMBER = 49_152
-      MAX_DYNAMIC_PORT_NUMBER = 65_535
-
-      class << self
-        def call
-          DnsMock::Server::RandomAvailablePort::ATTEMPTS.times do
-            port = rand(
-              DnsMock::Server::RandomAvailablePort::MIN_DYNAMIC_PORT_NUMBER..DnsMock::Server::RandomAvailablePort::MAX_DYNAMIC_PORT_NUMBER
-            )
-            return port if port_free?(port)
-          end
-          raise DnsMock::Error::RandomFreePort, DnsMock::Server::RandomAvailablePort::ATTEMPTS
-        end
-
-        private
-
-        def udp_port_free?(port, socket = ::UDPSocket.new)
-          socket.bind(DnsMock::Server::CURRENT_HOST_NAME, port)
-          socket.close
-          true
-        rescue ::Errno::EADDRINUSE
-          false
-        end
-
-        def tcp_port_free?(port, socket = ::Socket.new(::Socket::AF_INET, ::Socket::SOCK_STREAM, 0))
-          socket.bind(::Socket.sockaddr_in(port, DnsMock::Server::CURRENT_HOST_ADDRESS))
-          socket.close
-          true
-        rescue ::Errno::EADDRINUSE
-          false
-        end
-
-        def port_free?(port)
-          udp_port_free?(port) && tcp_port_free?(port)
-        end
-      end
-    end
-  end
-end