nslookupot 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a70603270c739e775d3873bcdf853f18dbfb15202627dcde9c21c93d85846241
-  data.tar.gz: 82829d828069a267ce4d312ba18e1b65a1adb5f348dbec57bafbb4c40a2f436b
+  metadata.gz: 327221d555480cece10786485fe2dcdda611e1808b95a4cc4e350a666ac20fa9
+  data.tar.gz: 4132dc893b13642955b4cd830d73e98fadf4779ee03fd909abbf17ab83db3dc2
 SHA512:
-  metadata.gz: 215dfe05b79bf4f5966dc3a505ec4028d4fd5776a7662e7baf145449aeb3409fe666753e95a9afafa8e6f3e1d536f8368e4915241e00081806d8604e5938ebe8
-  data.tar.gz: 9d9cb4a0c11de2290e03758f4033b24c643284b4dc69c841a87113d2fdf1993e49aa7283f1ee827ee3b53f413512380f30b0f4253a865e647421ece81768d3b1
+  metadata.gz: 1bea793a0d39ffd71be4335e6fe67ae87531720ed95761134b016c87b09271de5f0231f181827fc4e3503b208b06154f84f3a700b01ac91492aa2047526588cb
+  data.tar.gz: c902c61d252da40c0467a32a2457ed7976617e78a7de0ac1c47ef76f493c6ae8fdb3cfa87fafad3259c5e302a2475d751385b2a4ed2e28f79a931314e3e946b3

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6.x', '2.7.x']
+        ruby-version: ['2.7.x', '3.0.x', '3.1.x']
     steps:
       - name: Set up Ruby
         uses: actions/setup-ruby@v1

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 
 Style/Documentation:
   Enabled: false

data/lib/nslookupot/cli.rb

@@ -4,6 +4,7 @@ require 'optparse'
 
 module Nslookupot
   class CLI
+    # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/MethodLength
     def parse_options(argv = ARGV)
       op = OptionParser.new
@@ -62,25 +63,26 @@ module Nslookupot
         args = op.parse(argv)
       rescue OptionParser::InvalidOption => e
         warn op.to_s
-        warn "error: #{e.message}"
+        warn "** #{e.message}"
         exit 1
       end
 
       begin
         type = s2typeclass(type)
       rescue NameError
-        warn "error: unknown query type #{type}"
+        warn "** unknown query type: #{type.upcase}"
         exit 1
       end
 
       if args.size != 1
         warn op.to_s
-        warn 'error: number of arguments is not 1'
+        warn '** `name` argument is not specified'
         exit 1
       end
 
       [opts, args[0], type]
     end
+    # rubocop: enable Metrics/AbcSize
     # rubocop: enable Metrics/MethodLength
 
     def s2typeclass(s)
@@ -90,21 +92,37 @@ module Nslookupot
       rr
     end
 
+    # rubocop: disable Metrics/AbcSize
     def run
       opts, name, type = parse_options
 
-      resolver = Nslookupot::Resolver.new(**opts)
-      puts 'Address:'.ljust(16) + opts[:server] + '#' + opts[:port].to_s
-      puts '--'
-      resolver.resolve_resources(name, type).each do |rr|
+      resolver = Resolver.new(**opts)
+      puts 'Server:'.ljust(16) + opts[:server]
+      puts 'Address:'.ljust(16) + "#{opts[:server]}\##{opts[:port]}"
+      puts
+
+      result = nil
+      begin
+        result = resolver.resolve_resources(name, type)
+      rescue Error::DNNotFound
+        t = type.name.split('::').last
+        warn "** Not Found: (domain, type) = (#{name}, #{t})"
+        exit 1
+      rescue Error::DoTServerUnavailable => e
+        warn "** DoT Server Unavailable: #{e.message}"
+        exit 1
+      end
+
+      result.each do |rr|
         puts 'Name:'.ljust(16) + name
         rr.instance_variables.each do |var|
-          k = (var[1..].capitalize + ':').ljust(16)
+          k = "#{var[1..].capitalize}:".ljust(16)
           v = rr.instance_variable_get(var).to_s
           puts k + v
         end
-        puts ''
+        puts
       end
     end
+    # rubocop: enable Metrics/AbcSize
   end
 end

data/lib/nslookupot/error.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Nslookupot
+  module Error
+    # Generic error, common for all classes under Nslookupot::Error module.
+    class Error < StandardError; end
+
+    class DNNotFound < Error; end
+
+    class DoTServerUnavailable < Error; end
+  end
+end

data/lib/nslookupot/resolver.rb

@@ -35,14 +35,26 @@ module Nslookupot
     # @param name [String]
     # @param typeclass [Resolv::DNS::Resource::IN constant]
     #
+    # @raise [Nslookupot::Error]
+    #
     # @return [Array of Resolv::DNS::Resource]
     def resolve_resources(name, typeclass)
-      sock = gen_sock
-      send_msg(sock, name, typeclass)
-      msg = recv_msg(sock)
-      sock.close
+      begin
+        sock = gen_sock
+        send_msg(sock, name, typeclass)
+        msg = recv_msg(sock)
+        sock.close
+      rescue SocketError, Errno::ECONNREFUSED
+        err_msg = "#{@server}\##{@port} connection refused"
+        raise Error::DoTServerUnavailable.new, err_msg
+      rescue OpenSSL::SSL::SSLError => e
+        raise Error::DoTServerUnavailable.new, e.message
+      end
+
+      result = msg.answer.map(&:last)
+      raise Error::DNNotFound if result.empty?
 
-      msg.answer.map(&:last)
+      result
     end
 
     private

data/lib/nslookupot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nslookupot
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/nslookupot.rb

@@ -8,5 +8,6 @@ require 'openssl'
 require 'optparse'
 
 require 'nslookupot/version'
+require 'nslookupot/error'
 require 'nslookupot/resolver'
 require 'nslookupot/cli'

data/nslookupot.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/thekuwayama/nslookupot'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>=2.6.0'
+  spec.required_ruby_version = '>=2.7.0'
 
   spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nslookupot
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - thekuwayama
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - exe/nslookupot
 - lib/nslookupot.rb
 - lib/nslookupot/cli.rb
+- lib/nslookupot/error.rb
 - lib/nslookupot/resolver.rb
 - lib/nslookupot/version.rb
 - nslookupot.gemspec
@@ -102,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="