Merge pull request #115 from mocktools/develop

Ruby DnsMock v1.5.16

.circleci/config.yml

@@ -8,29 +8,16 @@ defaults: &defaults
     - image: cimg/ruby:<< parameters.ruby-version >>
 
 orbs:
-  ruby: circleci/ruby@2.0.0
+  ruby: circleci/ruby@2.1.0
 
 references:
-  restore_bundle_cache: &restore_bundle_cache
-    restore_cache:
-      keys:
-        - ruby-dns-mock-{{ checksum "dns_mock.gemspec" }}
-      paths:
-        - ~/vendor/bundle
-
   bundle_install: &bundle_install
     run:
       name: Installing gems
       command: |
             bundle config set --local path '~/vendor/bundle'
             bundle install
 
-  save_bundle_cache: &save_bundle_cache
-    save_cache:
-      key: ruby-dns-mock-{{ checksum "dns_mock.gemspec" }}
-      paths:
-        - ~/vendor/bundle
-
   install_linters: &install_linters
     run:
       name: Installing bunch of linters
@@ -49,6 +36,11 @@ references:
             curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
             chmod +x ./cc-test-reporter
 
+  use_latest_bundler: &use_latest_bundler
+    run:
+      name: Using latest bundler
+      command: gem install bundler
+
   use_latest_gemspec: &use_latest_gemspec
     run:
       name: Using latest gemspec
@@ -70,10 +62,9 @@ jobs:
     steps:
       - checkout
 
+      - <<: *use_latest_bundler
       - <<: *use_latest_gemspec
-      - <<: *restore_bundle_cache
       - <<: *bundle_install
-      - <<: *save_bundle_cache
       - <<: *install_linters
 
       - run:
@@ -106,10 +97,9 @@ jobs:
     steps:
       - checkout
 
+      - <<: *use_latest_bundler
       - <<: *use_latest_gemspec
-      - <<: *restore_bundle_cache
       - <<: *bundle_install
-      - <<: *save_bundle_cache
       - <<: *install_codeclimate_reporter
 
       - run:
@@ -154,6 +144,20 @@ jobs:
           name: Running compatibility tests
           command: bundle exec rspec
 
+  rubygems-deps-ruby:
+    parameters:
+      ruby-version:
+        type: string
+
+    <<: *defaults
+
+    steps:
+      - checkout
+
+      - run:
+          name: Building rubygems dependencies from default gemspec on minimal Ruby version
+          command: bundle install
+
   releasing-gem-from-ruby:
     parameters:
       ruby-version:
@@ -187,11 +191,16 @@ workflows:
           matrix:
             parameters:
               ruby-version: ["2.5", "2.6", "2.7", "3.0", "3.1"]
+      - rubygems-deps-ruby:
+          matrix:
+            parameters:
+              ruby-version: ["2.5"]
       - releasing-gem-from-ruby:
           requires:
             - linters-ruby
             - tests-ruby
             - compatibility-ruby
+            - rubygems-deps-ruby
           matrix:
             parameters:
               ruby-version: ["2.5"]

.circleci/gemspecs/latest

@@ -19,16 +19,16 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
   spec.add_development_dependency 'bundler-audit', '~> 0.9.1'
-  spec.add_development_dependency 'fasterer', '~> 0.10.0'
-  spec.add_development_dependency 'ffaker', '~> 2.21'
+  spec.add_development_dependency 'fasterer', '~> 0.10.1'
+  spec.add_development_dependency 'ffaker', '~> 2.23'
   spec.add_development_dependency 'net-ftp', '~> 0.2.0'
   spec.add_development_dependency 'pry-byebug', '~> 3.10', '>= 3.10.1'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
-  spec.add_development_dependency 'reek', '~> 6.1', '>= 6.1.3'
+  spec.add_development_dependency 'reek', '~> 6.1', '>= 6.1.4'
   spec.add_development_dependency 'rspec', '~> 3.12'
   spec.add_development_dependency 'rspec-dns', '~> 0.1.8'
-  spec.add_development_dependency 'rubocop', '~> 1.42'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.15', '>= 1.15.2'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.16'
+  spec.add_development_dependency 'rubocop', '~> 1.56', '>= 1.56.4'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.19', '>= 1.19.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.24', '>= 2.24.1'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
 end

.circleci/linter_configs/.rubocop.yml

@@ -88,6 +88,9 @@ Layout/EmptyLineAfterGuardClause:
 Gemspec/RequireMFA:
   Enabled: false
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 # Performance -----------------------------------------------------------------
 
 Performance/MethodObjectAsBlock:
@@ -127,3 +130,6 @@ RSpec/StubbedMock:
 
 RSpec/VerifiedDoubleReference:
   Enabled: false
+
+RSpec/IndexedLet:
+  Enabled: false

.codeclimate.yml

@@ -9,7 +9,7 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-1-42
+    channel: rubocop-1-56
     config:
       file: .circleci/linter_configs/.rubocop.yml
 

.reek.yml

@@ -11,35 +11,35 @@ detectors:
   UtilityFunction:
     exclude:
       - DnsMock::Server::RecordsDictionaryBuilder#build_records_instances_by_type
-      - DnsMock::RecordsDictionaryHelper#hostname_records_by_type
-      - DnsMock::DnsMessageHelper#to_dns_name
-      - DnsMock::ContextGeneratorHelper#random_dns_record_type
-      - DnsMock::ContextGeneratorHelper#random_hostname
-      - DnsMock::ContextGeneratorHelper#create_dns_name
-      - DnsMock::ContextGeneratorHelper#random_ip_v4_address
-      - DnsMock::ContextGeneratorHelper#random_ip_v6_address
-      - DnsMock::ContextGeneratorHelper#random_txt_record_context
-      - DnsMock::ContextGeneratorHelper#to_punycode_hostname
-      - DnsMock::RecordsDictionaryHelper#create_records_dictionary_by_records
-      - DnsMock::ServerHelper#start_random_server
-      - DnsMock::ServerHelper#stop_all_running_servers
-      - DnsMock::ContextGeneratorHelper#random_port_number
+      - DnsMock::RspecHelper::RecordsDictionary#hostname_records_by_type
+      - DnsMock::RspecHelper::DnsMessage#to_dns_name
+      - DnsMock::RspecHelper::ContextGenerator#random_dns_record_type
+      - DnsMock::RspecHelper::ContextGenerator#random_hostname
+      - DnsMock::RspecHelper::ContextGenerator#create_dns_name
+      - DnsMock::RspecHelper::ContextGenerator#random_ip_v4_address
+      - DnsMock::RspecHelper::ContextGenerator#random_ip_v6_address
+      - DnsMock::RspecHelper::ContextGenerator#random_txt_record_context
+      - DnsMock::RspecHelper::ContextGenerator#to_punycode_hostname
+      - DnsMock::RspecHelper::RecordsDictionary#create_records_dictionary_by_records
+      - DnsMock::RspecHelper::Server#start_random_server
+      - DnsMock::RspecHelper::Server#stop_all_running_servers
+      - DnsMock::RspecHelper::ContextGenerator#random_port_number
       - DnsMock::TestFramework::RSpec::Helper#dns_mock_server
-      - DnsMock::ContextGeneratorHelper#to_rdns_hostaddress
+      - DnsMock::RspecHelper::ContextGenerator#to_rdns_hostaddress
 
   DuplicateMethodCall:
     exclude:
-      - DnsMock::ContextGeneratorHelper#create_records
+      - DnsMock::RspecHelper::ContextGenerator#create_records
 
   ControlParameter:
     exclude:
       - DnsMock::Error::Helper#raise_unless
       - DnsMock::Server#initialize
-      - DnsMock::ContextGeneratorHelper#to_punycode_hostname
+      - DnsMock::RspecHelper::ContextGenerator#to_punycode_hostname
 
   MissingSafeMethod:
     exclude:
-      - DnsMock::PortInUseHelper::TransportService
+      - DnsMock::RspecHelper::PortInUse::TransportService
       - DnsMock::Server
 
   TooManyStatements:

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.5.16] - 2023-10-05
+
+### Updated
+
+- Updated gemspecs
+- Updated gem version
+
 ## [1.5.15] - 2023-01-11
 
 ### Added

CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at admin@bestweb.com.ua. All
+reported by contacting the project team at <admin@bestweb.com.ua>. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

dns_mock.gemspec

@@ -22,13 +22,17 @@ Gem::Specification.new do |spec|
     'bug_tracker_uri' => 'https://github.com/mocktools/ruby-dns-mock/issues'
   }
 
+  current_ruby_version = ::Gem::Version.new(::RUBY_VERSION)
+  ffaker_version = current_ruby_version >= ::Gem::Version.new('3.0.0') ? '~> 2.23' : '~> 2.21'
+
   spec.required_ruby_version = '>= 2.5.0'
   spec.files = `git ls-files -z`.split("\x0").select { |f| f.match(%r{^(bin|lib)/|.ruby-version|dns_mock.gemspec|LICENSE}) }
   spec.require_paths = %w[lib]
 
   spec.add_runtime_dependency 'simpleidn', '~> 0.2.1'
 
-  spec.add_development_dependency 'ffaker', '~> 2.21'
+  spec.add_development_dependency 'ffaker', ffaker_version
+  spec.add_development_dependency 'net-ftp', '~> 0.2.0' if current_ruby_version >= ::Gem::Version.new('3.1.0')
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_development_dependency 'rspec', '~> 3.12'
   spec.add_development_dependency 'rspec-dns', '~> 0.1.8'

lib/dns_mock/test_framework/rspec.rb

@@ -2,8 +2,8 @@
 
 require 'rspec/core'
 require_relative '../../dns_mock'
-require_relative './rspec/interface'
-require_relative './rspec/helper'
+require_relative 'rspec/interface'
+require_relative 'rspec/helper'
 
 RSpec.configure do |config|
   config.before(:suite) { DnsMock::TestFramework::RSpec::Interface.start_server }

lib/dns_mock/test_framework/rspec/helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './interface'
+require_relative 'interface'
 
 module DnsMock
   module TestFramework

lib/dns_mock/version.rb

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

spec/support/helpers/context_generator_helper_spec.rb → spec/dns_mock/rspec_helper/context_generator_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe DnsMock::ContextGeneratorHelper, type: :helper do # rubocop:disable RSpec/FilePath
+RSpec.describe DnsMock::RspecHelper::ContextGenerator, type: :helper do
   describe 'defined constants' do
     it { expect(described_class).to be_const_defined(:NON_ASCII_WORDS) }
   end

spec/support/helpers/dns_message_helper_spec.rb → spec/dns_mock/rspec_helper/dns_message_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe DnsMock::DnsMessageHelper, type: :helper do # rubocop:disable RSpec/FilePath
+RSpec.describe DnsMock::RspecHelper::DnsMessage, type: :helper do
   describe '#create_request_binary_dns_message' do
     subject(:request_binary_dns_message) { create_request_binary_dns_message(hostname, record_type) }
 

spec/support/helpers/port_in_use_helper_spec.rb → spec/dns_mock/rspec_helper/port_in_use_spec.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-RSpec.describe DnsMock::PortInUseHelper, type: :helper do # rubocop:disable RSpec/FilePath
+RSpec.describe DnsMock::RspecHelper::PortInUse, type: :helper do
   let(:port_number) { 49_978 }
 
   describe '#udp_service' do
     context 'when port number is free' do
       it 'has the same port number' do
-        expect(udp_service(port_number)).to be_an_instance_of(DnsMock::PortInUseHelper::UdpService)
+        expect(udp_service(port_number)).to be_an_instance_of(DnsMock::RspecHelper::PortInUse::UdpService)
         expect(udp_service.port).to eq(port_number)
       end
 
@@ -34,7 +34,7 @@
   describe '#tcp_service' do
     context 'when port number is free' do
       it 'has the same port number' do
-        expect(tcp_service(port_number)).to be_an_instance_of(DnsMock::PortInUseHelper::TcpService)
+        expect(tcp_service(port_number)).to be_an_instance_of(DnsMock::RspecHelper::PortInUse::TcpService)
         expect(tcp_service.port).to eq(port_number)
       end
 

spec/support/helpers/records_dictionary_helper_spec.rb → spec/dns_mock/rspec_helper/records_dictionary_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe DnsMock::RecordsDictionaryHelper, type: :helper do # rubocop:disable RSpec/FilePath
+RSpec.describe DnsMock::RspecHelper::RecordsDictionary, type: :helper do
   describe '#create_records_dictionary' do
     subject(:records_dictionary) { create_records_dictionary(hostname, *options) }
 
@@ -19,7 +19,7 @@
       subject(:records_dictionary) { create_records_dictionary }
 
       it 'returns records dictionary with random hostname and records' do
-        expect(DnsMock::ContextGeneratorHelper).to receive(:random_hostname).and_call_original
+        expect(DnsMock::RspecHelper::ContextGenerator).to receive(:random_hostname).and_call_original
         expect(records_dictionary).to be_an_instance_of(::Hash)
       end
     end

spec/support/helpers/server_helper_spec.rb → spec/dns_mock/rspec_helper/server_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RSpec.describe DnsMock::ServerHelper, type: :helper do # rubocop:disable RSpec/FilePath
+RSpec.describe DnsMock::RspecHelper::Server, type: :helper do
   describe '#start_random_server' do
     let(:server_instance) { instance_double('DnsMockServer') }
 

spec/spec_helper.rb

@@ -19,11 +19,11 @@
   config.disable_monkey_patching!
   config.order = :random
 
-  config.include DnsMock::ContextGeneratorHelper
-  config.include DnsMock::RecordsDictionaryHelper
-  config.include DnsMock::DnsMessageHelper
-  config.include DnsMock::PortInUseHelper
-  config.include DnsMock::ServerHelper
+  config.include DnsMock::RspecHelper::ContextGenerator
+  config.include DnsMock::RspecHelper::RecordsDictionary
+  config.include DnsMock::RspecHelper::DnsMessage
+  config.include DnsMock::RspecHelper::PortInUse
+  config.include DnsMock::RspecHelper::Server
 
   ::Kernel.srand(config.seed)
 end