ddig 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f89a50e96e5fb9468cb699e1f034c999ee1e063441d70a95e17aa2bb93b57878
-  data.tar.gz: fd2c8ede252e8b56756f0e5859f999aa3dadff4016bf005b41dbe388a291ff0d
+  metadata.gz: d93fb27dc9867081364927eec31f893777d413c599ec112c563ef071c11d3e4e
+  data.tar.gz: 190b3a707eb4f844e60e8b47ec498a7c10c98338ad3d686371e7fd3e59c08e68
 SHA512:
-  metadata.gz: 44f6e9dd26e26964dd52d0ce0b9e94e60d66b9a9b1c4d7299ec49b130c20465e3a413058860895d272f89dec80108b8b9e6cde75236ba04c63b3207f536a783e
-  data.tar.gz: 19d7a1c4e7660b8cbb0f4aa5d7e4e10ac32a8c1b817e15646161d948e342c700b8c0de36cb931e70ded9cede816edbefb82f82dd57ae86c6026e1b3b6e6e9048
+  metadata.gz: 0655d40f0f9971c9b324e768c2f27cb2ee8536b2869681c5c084f37726d5d04e40c0b525e2eab2230daf27af661778d5f23b33cf00e77012613d0eff279cc5d2
+  data.tar.gz: 56f7054def0155579a087e1d16aa1755c5b8fb84d03581807d37b3914d02b9c5d9d9c0de600acf136c09febd68ed9c850ad811d953fb2306a1b80e1df2cb512f

data/lib/ddig/cli.rb

@@ -86,7 +86,8 @@ module Ddig
       @ddig = Ddig.lookup(@hostname, nameservers: @options[:nameserver], use_ipv4: @use_ipv4, use_ipv6: @use_ipv6)
 
       if @options[:format] == 'json'
-        # TODO: to_json
+        puts @ddig.to_json
+
       else
         unless @ddig[:do53][:ipv4].nil?
           puts "# Do53 (IPv4)"

data/lib/ddig/ddr/designated_resolver.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Ddig
   class Ddr
     class DesignatedResolver
@@ -61,6 +63,27 @@ module Ddig
         end
       end
 
+      def as_json(*)
+        {
+          unencrypted_resolver: @unencrypted_resolver,
+          target: @target,
+          protocol: @protocol,
+          port: @port,
+          dohpath: @dohpath,
+          address: @address,
+          ip: @ip,
+          verify: @verify_cert&.verify,
+          hostname: @hostname,
+          a: @a,
+          aaaa: @aaaa,
+          errors: @errors,
+        }
+      end
+
+      def to_json(*args)
+        as_json.to_json
+      end
+
       def to_cli
         @resolver.to_cli
       end
@@ -77,9 +100,7 @@ module Ddig
       # ref: https://www.rfc-editor.org/rfc/rfc9461.html#section-4.2
       def set_default_port
         case @protocol
-        when 'http/1.1'
-          @port = 80
-        when 'h2', 'h3'
+        when 'http/1.1', 'h2', 'h3'
           @port = 443
         when 'dot', 'doq'
           @port = 853

data/lib/ddig/ddr.rb

@@ -1,4 +1,5 @@
 require 'resolv'
+require 'json'
 
 require_relative "ddr/verify_cert"
 require_relative "ddr/designated_resolver"
@@ -129,6 +130,19 @@ module Ddig
       end
     end
 
+    def as_json(*)
+      {
+        designated_resolvers: @designated_resolvers.map { |designated_resolver| designated_resolver.as_json },
+        hostname: @hostname,
+        nameservers: @nameservers,
+        ip: @ip,
+      }
+    end
+
+    def to_json(*args)
+      as_json.to_json
+    end
+
     def to_cli
       @designated_resolvers.each do |designated_resolver|
         puts designated_resolver.to_s

data/lib/ddig/resolver/do53.rb

@@ -1,4 +1,5 @@
 require 'resolv'
+require 'json'
 
 module Ddig
   module Resolver
@@ -33,6 +34,20 @@ module Ddig
         self
       end
 
+      def as_json(*)
+        {
+          a: @a,
+          aaaa: @aaaa,
+          hostname: @hostname,
+          nameservers: @nameservers,
+          ip: @ip,
+        }
+      end
+
+      def to_json(*args)
+        as_json.to_json
+      end
+
       def to_cli
         @a.each do |address|
           rr_type = 'A'

data/lib/ddig/resolver/doh_h1.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'resolv'
 require 'base64'
+require 'json'
 
 require_relative 'dns_message'
 
@@ -57,6 +58,22 @@ module Ddig
         end
       end
 
+      def as_json(*)
+        {
+          a: @a,
+          aaaa: @aaaa,
+          hostname: @hostname,
+          server: @server,
+          address: @address,
+          dohpath: @dohpath,
+          port: @port,
+        }
+      end
+
+      def to_json(*args)
+        as_json.to_json
+      end
+
       def to_cli
         @a.each do |address|
           rr_type = 'A'

data/lib/ddig/resolver/dot.rb

@@ -1,5 +1,6 @@
 require 'openssl'
 require 'resolv'
+require 'json'
 
 require_relative 'dns_message'
 
@@ -75,6 +76,21 @@ module Ddig
         end
       end
 
+      def as_json(*)
+        {
+          a: @a,
+          aaaa: @aaaa,
+          hostname: @hostname,
+          server: @server,
+          server_name: @server_name,
+          port: @port,
+        }
+      end
+
+      def to_json(*args)
+        as_json.to_json
+      end
+
       def to_cli
         @a.each do |address|
           rr_type = 'A'

data/lib/ddig/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ddig
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddig
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Taketo Takashima
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-13 00:00:00.000000000 Z
+date: 2024-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resolv
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: DNS lookup utility for Ruby