reverie 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fb63e6f97b5fad26cf7c215a088818b878a0040
-  data.tar.gz: cbaa469c22dfe7a79a20dd502db1e8765b68d649
+  metadata.gz: f0e6d535ee29c82c33b1eeb63db13c8acbd08366
+  data.tar.gz: 5ee709ab0738226460c42dec5c6d4d3c28b92ddd
 SHA512:
-  metadata.gz: c0c8f81f5485be3cfeebc94a1c40b2dd271d7edc2efdc08baf79de5a3b7272ac0c9ce55d97140ed7a587145c390820b63990d888a60a3c4536e81df3636113c2
-  data.tar.gz: b1e8c09e49e09899e1a8cda3a457a72584f7b19999b6fab0a5156bd3c498d47f8f970e93240fdfa24c42137c5c332e40dd7120b971010925c87035a94205514c
+  metadata.gz: d1bc28925e1c9b8f02bfefc5aa510e5a8a8972b812522dfcf413ab8939b15e71e0fa9e7f881681224790a7d828a021ec9de0e7e31139682a8694e6d6d1c274bf
+  data.tar.gz: 6ff0838c163933e574fc21362932c7cbb9fdfd47d3cf26adc50fa2706989f021080efab5f71a6ffd67a14006a0dfb7be091566f4dceba2eed583c4e8937c3d71

data/lib/reverie.rb

@@ -1,165 +1 @@
-# Reverie
-
-# Ported from Ian McKellar's dreamhost-ddns
-# https://github.com/ianloic/dreamhost-ddns
-
-require 'net/http'
-require 'resolv'
-require 'logger'
-require 'yaml'
-require 'configliere'
-
-require_relative 'reverie/configliere'
-require_relative 'reverie/version'
-
-Settings.use :commandline, :config_file, :define
-
-class Reverie
-  attr_accessor :log, :conf, :args
-
-  DH_URI = URI 'https://api.dreamhost.com/'
-  IP_URI = URI 'http://myexternalip.com/raw'
-  CONF   = Configliere::DEFAULT_CONFIG_LOCATION[:user_config][:reverie]
-
-  OPENSSL_V3 = {
-    use_ssl:     true,
-    ssl_version: :SSLv3,
-    verify_mode: OpenSSL::SSL::VERIFY_PEER
-  }
-
-  MSGS = {
-    success:  '%s updated to %s',
-    fail:     '%s failed',
-    found:    'get_ip found %s',
-    too_soon: 'too soon, updated %ds ago',
-    same:     'not updating %s',
-    timeout:  '%s timed out on %s',
-    kv:       '%s: %s',
-    start:    'connecting to %s'
-  }
-
-  Settings.define :conf,
-                  type:        :filename,
-                  description: 'The location of the configuration file',
-                  default:     CONF
-
-  Settings.define :log,
-                  type:        :filename,
-                  description: 'The location of the log file'
-
-  def self.update_dns
-    Reverie.new.tap { |r| r.update_dns }
-  end
-
-  def initialize
-    Settings.resolve!
-
-    init_conf
-    init_log
-    init_args
-  end
-
-  def init_args
-    @args = {
-      key:    Settings[:key],
-      record: Settings[:record],
-      format: 'yaml'
-    }
-  end
-
-  def init_conf
-    @conf = Settings.delete('conf') || CONF
-    Settings.read @conf
-  end
-
-  def init_log
-    @log = Logger.new(Settings.log || STDOUT)
-    @log.level = Settings.delete('debug') ? Logger::DEBUG : Logger::INFO
-    Settings.delete('log') unless Settings.log
-  end
-
-  def settings
-    Settings
-  end
-
-  def update_dns
-    t = Time.now - (Settings[:updated_at] || Time.mktime(0))
-
-    if (t < 900             and d :too_soon, t) ||
-       ((ip = get_ip).nil?  and d :fail, 'get_ip') ||
-       (ip == Settings[:ip] and d :same, Settings[:record]) ||
-       (!replace_record Settings[:record], ip and d :fail, 'replace_record')
-      return
-    end
-
-    Settings.merge! ip: ip, updated_at: Time.now
-    Settings.save! @conf
-    i :success, Settings[:record], ip
-  end
-
-  def replace_record(record, ip)
-    return false unless record && ip
-
-    status, res = api_call :list_records
-    return false unless status == 'success'
-
-    res.detect { |r| r['record'] == record && r['editable'] == 1 }.tap do |r|
-      api_call :remove_record,
-               record: record,
-               type:   r['type'],
-               value:  r['value'] if r
-    end
-
-    status, _ = api_call :add_record,
-                         record:  record,
-                         type:    'A',
-                         value:   ip,
-                         comment: "Reverie (#{ Time.now })"
-    status == 'success'
-  end
-
-  def get_ip
-    d :start, IP_URI
-    ip = Net::HTTP.get_response(IP_URI).body.strip
-    d :found, ip
-    ip if ip =~ Resolv::IPv4::Regex
-  rescue Net::ReadTimeout
-    w :timeout, 'IP Lookup', IP_URI
-  end
-
-  private
-
-  def api_call(cmd, args = {})
-    a = @args.merge(cmd: "dns-#{ cmd }", unique_id: SecureRandom.uuid)
-    a.merge! args
-
-    d(DH_URI.query = URI.encode_www_form(a))
-
-    req = Net::HTTP.start(DH_URI.host, DH_URI.port, OPENSSL_V3) do |http|
-      http.get DH_URI
-    end
-
-    res = YAML.load(req.body)
-    d :kv, a[:cmd], res['result']
-
-    [res['result'], res['data']]
-  rescue Net::ReadTimeout
-    w :timeout, 'Dreamhost API', a[:cmd]
-  end
-
-  def d(msg, *args)
-    __log :debug, msg, *args
-  end
-
-  def w(msg, *args)
-    __log :warn, msg, *args
-  end
-
-  def i(msg, *args)
-    __log :info, msg, *args
-  end
-
-  def __log(level, msg, *args)
-    @log.send level, MSGS[msg] ? MSGS[msg] % args : msg
-  end
-end
+require_relative 'reverie/reverie'

data/lib/reverie/reverie.rb

@@ -0,0 +1,138 @@
+# Reverie
+
+# Ported from Ian McKellar's dreamhost-ddns
+# https://github.com/ianloic/dreamhost-ddns
+
+require 'net/http'
+require 'resolv'
+require 'logger'
+require 'yaml'
+require 'configliere'
+
+require_relative 'configliere'
+require_relative 'version'
+
+Settings.use :commandline, :config_file, :define
+
+class Reverie
+  attr_accessor :log, :conf, :args
+
+  DH_URI = URI 'https://api.dreamhost.com/'
+  IP_URI = URI 'http://myexternalip.com/raw'
+  CONF   = Configliere::DEFAULT_CONFIG_LOCATION[:user_config][:reverie]
+
+  OPENSSL_OPTIONS = {
+    use_ssl:     true,
+    ssl_version: :TLSv1,
+    verify_mode: OpenSSL::SSL::VERIFY_PEER
+  }
+
+  Settings.define :conf,
+                  type:        :filename,
+                  description: 'The location of the configuration file',
+                  default:     CONF
+
+  Settings.define :log,
+                  type:        :filename,
+                  description: 'The location of the log file'
+
+  def self.update_dns
+    Reverie.new.tap { |r| r.update_dns }
+  end
+
+  def initialize
+    Settings.resolve!
+
+    init_conf
+    init_log
+    init_args
+  end
+
+  def init_args
+    @args = {
+      key:    Settings[:key],
+      record: Settings[:record],
+      format: 'yaml'
+    }
+  end
+
+  def init_conf
+    @conf = Settings.delete('conf') || CONF
+    Settings.read conf
+  end
+
+  def init_log
+    @log = Logger.new(Settings.log || STDOUT)
+    log.level = Settings.delete('debug') ? Logger::DEBUG : Logger::INFO
+    Settings.delete('log') unless Settings.log
+  end
+
+  def settings
+    Settings
+  end
+
+  def update_dns
+    last_update = Time.now - (Settings[:updated_at] || Time.mktime(0))
+
+    if (last_update < 900   and log.debug "too soon, updated #{last_update}s ago") ||
+       ((ip = get_ip).nil?  and log.debug "get_ip failed") ||
+       (ip == Settings[:ip] and log.debug "not updating #{Settings[:record]}") ||
+       (!replace_record Settings[:record], ip and log.debug "replace_record failed")
+      return
+    end
+
+    Settings.merge! ip: ip, updated_at: Time.now
+    Settings.save! conf
+    log.info "#{Settings[:record]} updated to #{ip}"
+  end
+
+  def replace_record(record, ip)
+    return false unless record && ip
+
+    status, res = api_call :list_records
+    return false unless status == 'success'
+
+    res.detect { |r| r['record'] == record && r['editable'] == 1 }.tap do |r|
+      api_call :remove_record,
+               record: record,
+               type:   r['type'],
+               value:  r['value'] if r
+    end
+
+    status, _ = api_call :add_record,
+                         record:  record,
+                         type:    'A',
+                         value:   ip,
+                         comment: "Reverie (#{ Time.now })"
+    status == 'success'
+  end
+
+  def get_ip
+    log.debug "connecting to #{IP_URI}"
+    ip = Net::HTTP.get_response(IP_URI).body.strip
+    log.debug "got #{ip}"
+    ip if ip =~ Resolv::IPv4::Regex
+  rescue Net::ReadTimeout
+    log.warn :timeout, 'IP Lookup', IP_URI
+  end
+
+  private
+
+  def api_call(cmd, args = {})
+    a = @args.merge(cmd: "dns-#{ cmd }", unique_id: SecureRandom.uuid)
+    a.merge! args
+
+    log.info(DH_URI.query = URI.encode_www_form(a))
+
+    req = Net::HTTP.start(DH_URI.host, DH_URI.port, OPENSSL_OPTIONS) do |http|
+      http.get DH_URI
+    end
+
+    res = YAML.load(req.body)
+    log.info "#{a[:cmd]}: #{res['result']}"
+
+    [res['result'], res['data']]
+  rescue Net::ReadTimeout
+    log.warn "Dreamhost API timed out on #{a[:cmd]}"
+  end
+end

data/lib/reverie/version.rb

@@ -1,4 +1,4 @@
 # Reverie version
 class Reverie
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverie
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Fission Xuiptz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -39,6 +39,7 @@ files:
 - bin/reverie
 - lib/reverie.rb
 - lib/reverie/configliere.rb
+- lib/reverie/reverie.rb
 - lib/reverie/version.rb
 - reverie.gemspec
 - test/test_reverie.rb
@@ -62,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Dreamhost DNS updater