do-dyndns 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec2df7936a50a97b7b9d57b1f25e93c4ba2009bd33935ffa5b8d2cd64b180db
-  data.tar.gz: 4e1808967f7082420bc107301839e8d761568bdf8c79e8370c6f3725ff862e1e
+  metadata.gz: a45320eb7b5dd1d027f5c12daa59498f6e861ca38005b6fc80ec559106ba0f43
+  data.tar.gz: cc4f5886a47dd1f86c5f6cd297d2c90a1b785b8066b4868ca6f5344e2d40ed29
 SHA512:
-  metadata.gz: d5f6e904affc8d598b9ab6f1c6bd310f08aa127c918b6ec77ddfb2f0cbe32bf537c44a6396c650652b48673ecda54a764f04918ce0bf9d9cf40c43626c8a71a8
-  data.tar.gz: 15c243d17f0afedb3a018c1ccf01663cba6c74685df55cdbdcfaf4a574a51c2f4d27a39bdaab4e5d6ff797c84e55a54da6eb400059b7345e0823fed21a12a873
+  metadata.gz: 489d3253a1c6ed719158254bd2a246f6f63a0a79a6ed62f8908d470731825793954656b5603613a8e8e148a60c59f8bac077466185a41888b214cccac6c9108f
+  data.tar.gz: 727165fd149526b1dd4cc6edd28b896361755046a34188331cde0a4a92c19d0af67903bbcd5e4a54dcd3235703e7fd9f71028ed1b5ea2801115eb911592047c3

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "dyndns"
+require "do_dyndns"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/bin/do_dyndns

@@ -17,6 +17,20 @@ config_path = File.expand_path "~/.config/do-dyndns.yml"
 
 if File.exist? config_path
   config = YAML.load_file config_path
+
+  key_missing = false
+  %i[token domains ipv4_commands ipv6_commands].each do |key|
+    unless config.key?(key)
+      key_missing = true
+      $stderr.puts "missing configuration: `:#{key}`"
+    end
+  end
+
+  if key_missing
+    $stderr.puts "\nExample configuration:\n\n```yml\n#{File.read("../config.example.yml")}\n```"
+    exit 1
+  end
+
   DoDyndns::Updater.new(**config, logger: LOG).update_ips
 else
   LOG.warn "No configuration exists @ #{config_path}: Creating file."

data/config.example.yml

@@ -1,4 +1,13 @@
 :token: your_digital_ocean_token_here
+
 :domains:
   example-domain1.com:
     - example-subdomain1
+
+:ipv4_commands:
+  - "dig -4 @ns1-1.akamaitech.net ANY whoami.akamai.net +short"
+  - "dig -4 @ns1.google.com ANY o-o.myaddr.l.google.com +short"
+
+:ipv6_commands:
+  - "dig -6 @resolver1.opendns.com ANY myip.opendns.com +short"
+  - "dig -6 @ns1.google.com ANY o-o.myaddr.l.google.com +short"

data/lib/do_dyndns/updater.rb

@@ -2,9 +2,14 @@ module DoDyndns
   class Updater
     require 'droplet_kit'
 
-    def initialize(token:, domains:, logger: Logger.new($stdout))
+    IPV4_RE = /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/m
+    IPV6_RE = /(?:\:{,2}[A-Z\d]{1,4}\:{,2}){1,8}/im
+
+    def initialize(token:, domains:, ipv4_commands:, ipv6_commands:, logger: Logger.new($stdout))
       @logger = logger
       @domains = domains
+      @ipv4_commands = ipv4_commands
+      @ipv6_commands = ipv6_commands
       @api = DropletKit::Client.new(access_token: token)
     end
 
@@ -57,30 +62,24 @@ module DoDyndns
     end
 
     def wan_ipv4
-      resolve([
-        "dig -4 @resolver1.opendns.com ANY myip.opendns.com +short",
-        "dig -4 @ns1-1.akamaitech.net ANY whoami.akamai.net +short",
-        "dig -4 @ns1.google.com ANY o-o.myaddr.l.google.com +short"
-      ])
+      resolve(@ipv4_commands, regex: IPV4_RE)
     end
 
     def wan_ipv6
-      resolve([
-        "dig -6 @resolver1.opendns.com ANY myip.opendns.com +short",
-        "dig -6 @ns1.google.com ANY o-o.myaddr.l.google.com +short"
-      ])
+      resolve(@ipv6_commands, regex: IPV6_RE)
     end
 
     private
 
     # Try all the commands until one of them works
-    def resolve(commands)
+    def resolve(commands, regex:)
       _ip = nil
-      commands.each do |service|
-        _ip = `#{service}`.chomp.gsub(/[^a-z0-9\:\.]/i, '')
-        _ip = _ip and break unless _ip.empty?
+      commands.each do |command|
+        result = `#{command}`
+        _ip = result[regex]
+        break if _ip
       end
-      _ip.empty? ? nil : _ip
+      _ip
     end
   end
-end
+end

data/lib/do_dyndns/version.rb

@@ -1,3 +1,3 @@
 module DoDyndns
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: do-dyndns
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alex Clink
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: droplet_kit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.18.0
 description: |
   Finds the wan IPv4 address of the server it's running on and
   updates the corresponding DNS records on digital ocean.
@@ -84,11 +84,11 @@ files:
 - lib/do_dyndns.rb
 - lib/do_dyndns/updater.rb
 - lib/do_dyndns/version.rb
-homepage: http://alexclink.com/gems/dyndns
+homepage: https://github.com/SleepingInsomniac/dyndns
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +103,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Automatically update DNS records on DigitalOcean
 test_files: []