inwxupdate 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c06f99f473dbae0b1bc04925bc1517b199f674a
-  data.tar.gz: 421da2c7128419f5bb3bb46b4a0c9312679dd373
+  metadata.gz: 01e732ecc8b4eb0888b1b0c12a5961c141f55819
+  data.tar.gz: 2fdcfc0a819ff787be13a67348874b38651f7a39
 SHA512:
-  metadata.gz: 3379f90c591b310755134b9f6c84dce0cc53d6edd020e4feded40a33c75faa2c88e3e1b87e1a358cd3a38cd65360fe471c28898dc94a3f562eea2ec6230d4fcc
-  data.tar.gz: fbe9b6a2004703345fb3eceee7c0aa4d7a44f80f034162044da7f95760d601348f4228ffd0c5236d998e2cd78fdfd5b4f06100ff11e448ac581b3928ef8f90be
+  metadata.gz: 94821898e8e59d13f57f92eeaae5e78e7bfea95c38ce97b6dc317bdf6835d8d7308c1c388f1388194dfca85278c75536cd406258606fe6249a467cb1062beae6
+  data.tar.gz: 59a006f5174f0037691b162ddbef67f7e43feef574bcccc74fa9c9136843e347e099b5b55052a5c7f75e92351017d4a9622252374e94586570b89fbee31d2dff

data/bin/inwxupdate

@@ -2,29 +2,4 @@
 
 require 'inwxupdate'
 
-find_config!
-
-Account.login(user: CONFIG[:inwx_user], pass: CONFIG[:inwx_pass], lang: 'en')
-
-JOBS = CONFIG[:jobs]
-JOBS.each do |job|
-  records_to_update = job[:records]
-
-  records_to_update.each do |record_to_update|
-    domains = Nameserver.list['domains']
-    domain = domains.find do |entry|
-      record_to_update[:name].end_with?(entry['domain'])
-    end
-
-    records = Nameserver.info(roId: domain['roId'])['record']
-    matching_record = records.find do |record|
-      record['name'] == record_to_update[:name] && record['type'] == record_to_update[:type]
-    end
-
-    next unless matching_record
-
-    detector = Detector.setup(job[:detector])
-    ip = detector.detect
-    Nameserver.updateRecord(id: matching_record['id'], content: ip)
-  end
-end
+Inwxupdate.new.run

data/lib/inwx.rb

@@ -10,7 +10,9 @@ class INWX
 
   def initialize
     # Create a new client instance
-    @client = XMLRPC::Client.new(CONFIG[:inwx_api], '/xmlrpc/', '443', nil, nil, nil, nil, true, 100)
+    @client = XMLRPC::Client.new(
+      CONFIG[:inwx_api], '/xmlrpc/', '443', nil, nil, nil, nil, true, 100
+    )
   end
 
   def call(object, method, params = {})

data/lib/inwxupdate.rb

@@ -1,19 +1,85 @@
 # frozen_string_literal: true
+
 require_relative 'inwx.rb'
 require_relative 'detectors/detector.rb'
 require_relative 'detectors/ifconfig.rb'
 require_relative 'detectors/ipify.rb'
 
-def find_config!
-  [
-    '/etc/inwxupdate.config.rb',
-    '/usr/local/etc/inwxupdate.config.rb',
-    '~/inwxupdate.config.rb',
-    './inwxupdate.config.rb'
-  ].each do |path|
-    return require(path) if File.exist?(path)
-    next
+require 'simpleidn'
+
+class Inwxupdate
+  def run
+    find_config!
+
+    login
+
+    CONFIG[:jobs].each do |job|
+      process_job(job)
+    end
   end
 
-  raise 'no config found'
+  private
+
+  def find_config!
+    [
+      '/etc/inwxupdate.config.rb',
+      '/usr/local/etc/inwxupdate.config.rb',
+      ENV['HOME'] + '/inwxupdate.config.rb',
+      './inwxupdate.config.rb'
+    ].each do |path|
+      return require(path) if File.exist?(path)
+      next
+    end
+
+    raise 'no config found'
+  end
+
+  def login
+    Account.login(
+      user: CONFIG[:inwx_user],
+      pass: CONFIG[:inwx_pass],
+      lang: 'en'
+    )
+  end
+
+  def process_job(job)
+    job[:records].each do |config_record|
+      matching_record = get_dns_record(config_record)
+
+      next unless matching_record
+
+      ip = Detector.setup(job[:detector]).detect
+      Nameserver.updateRecord(id: matching_record['id'], content: ip)
+    end
+  end
+
+  def get_dns_record(config_record)
+    domain = get_domain_from_name(config_record[:name])
+
+    inwx_records = Nameserver.info(roId: domain['roId'])['record']
+    inwx_records.find do |inwx_record|
+      match?(inwx_record, config_record)
+    end
+  end
+
+  def get_domain_from_name(name)
+    domainlist = Nameserver.list
+
+    raise 'no domainlist from inwx' unless domainlist
+
+    domainlist['domains'].find do |entry|
+      ace(name).end_with?(ace(entry['domain']))
+    end
+  end
+
+  def match?(inwx_record, config_record)
+    return false if ace(inwx_record['name']) != ace(config_record[:name])
+    return false if inwx_record['type'] != config_record[:type]
+
+    true
+  end
+
+  def ace(string)
+    SimpleIDN.to_ascii(string)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inwxupdate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Steffen Schröder
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2016-10-16 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: simpleidn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.7
 description: Updates your inwx-DNS records with the local IPv4/v6 address
 email: steffen@schröder.xyz
 executables: