reverie 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a16fb53c6a3336f4e30f595f703462173159ae46
-  data.tar.gz: b353004ce2dd8796f981f9080e2faefa0308e133
+  metadata.gz: 2fb22911434d9be837fe65b4501636427a964ffd
+  data.tar.gz: 9021a07c63cc95a0e3c5b15fb59e523ddb6930b4
 SHA512:
-  metadata.gz: c4d53f9ff6e597d11a8e98a6581f5441d708a4eb765e09bfb0774b051d6cd1cfe72823b45e4d8c2f0fbb589bd425af5533a2d189562ae83c87784c9e1948e617
-  data.tar.gz: d54c9d8093a4b067fd1dc4e6baa8c007c31f5c143e894ac593fa57a1a55a010672c24110580d3d668a3733396d354e7947eb07cfe5a8232202f2194cc4577b18
+  metadata.gz: 2c0ff4ad9779d50c494aca3cd16c879822f8ef107f8680bda4f10aa088c5770da335ab0f4e5766dfb5aa3429619d192d5dfab3d6454bf2db034c3c5e0cd2d85c
+  data.tar.gz: 4630eda64eb8711f3627a096cb295b4c6ad7814dc2f9e7d58a9b3d35248c346593389893c22d5b99e2a7905ab0be8dd9b7ae0a0758655a062f1bdd8919ba70a4

data/Rakefile

@@ -1,7 +1,7 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-task :default => :test
+task default: :test
 
 Rake::TestTask.new do |t|
   t.libs.push 'lib'

data/lib/reverie/version.rb

@@ -1,3 +1,4 @@
+# Reverie version
 class Reverie
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/reverie.rb

@@ -1,5 +1,5 @@
 # Reverie
-#
+
 # Ported from Ian McKellar's dreamhost-ddns
 # https://github.com/ianloic/dreamhost-ddns
 
@@ -16,41 +16,67 @@ class Reverie
   DH_URI = URI 'https://api.dreamhost.com/'
   IP_URI = URI 'http://myexternalip.com/raw'
 
-  Settings.define :conf, type: :filename, description: 'The location of the configuration file',
-                  default: Configliere::DEFAULT_CONFIG_LOCATION[:user].call('reverie')
-  Settings.define :log, type: :filename, description: 'The location of the log file'
-
-  attr_accessor :options, :args
+  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'
+  }
+
+  Settings.define :conf,
+                  type:        :filename,
+                  description: 'The location of the configuration file',
+                  default:     Configliere::DEFAULT_CONFIG_LOCATION[:user].call('reverie')
+
+  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
-    @options = Settings
-    @options.resolve!
-    @options.read(@conf = @options.delete('conf'))
+    Settings.resolve!
+    Settings.read(@conf = Settings.delete('conf'))
+
+    @log = Logger.new(Settings.log || STDOUT)
+    @log.level = Settings.delete('debug') ? Logger::DEBUG : Logger::INFO
+    Settings.delete('log') unless Settings.log
 
-    @log = Logger.new(@options.log || STDOUT)
-    @log.level = @options.delete('debug') ? Logger::DEBUG : Logger::INFO
-    @options.delete('log') unless @options.log
+    @args = {
+      key:    Settings[:key],
+      record: Settings[:record],
+      format: 'yaml'
+    }
+  end
 
-    @args = { key:    @options[:key],
-              record: @options[:record],
-              format: 'yaml' }
+  def settings
+    Settings
   end
 
   def update_dns
-    t = Time.now - (@options[:updated_at] || Time.mktime(0))
-    return if
-      (t < 900                               and @log.debug "too soon, updated #{ t.to_int }s ago") ||
-      ((ip = get_ip).nil?                    and @log.debug 'get_ip failed') ||
-      (ip == @options[:ip]                   and @log.debug "not updating #{ @options[:record ]}") ||
-      (!replace_record @options[:record], ip and @log.debug 'replace_record failed')
-
-    @options.merge! ip: ip, updated_at: Time.now
-    @options.save! @conf
-    @log.info "#{ @options[:record] } updated to #{ ip }"
+    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)
@@ -59,41 +85,62 @@ class Reverie
     status, res = api_call :list_records
     return false unless status == 'success'
 
-    res.detect { |r| r['record'] == record && r['editable'] == 1 }.tap { |r|
-      api_call :remove_record, record: record, type: r['type'], value: r['value'] if r
-    }
-
-    status, res = api_call :add_record, record: record, type: 'A', value: ip, comment: "Reverie (#{ Time.now })"
+    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
-    ip = Net::HTTP.get_response(IP_URI).body.chomp
-    @log.debug "get_ip found #{ ip }"
+    ip = Net::HTTP.get_response(IP_URI).body.strip
+    d :found, ip
     ip if ip =~ Resolv::IPv4::Regex
   rescue Net::ReadTimeout
-    @log.warn 'IP lookup timed out'
+    w :timeout, 'IP Lookup', IP_URI
   end
 
-private
+  private
 
   def api_call(cmd, args = {})
-    a = @args.merge cmd: "dns-#{ cmd }", unique_id: SecureRandom.uuid
+    a = @args.merge(cmd: "dns-#{ cmd }", unique_id: SecureRandom.uuid)
     a.merge! args
 
-    DH_URI.query = URI.encode_www_form a
-    @log.debug DH_URI.query
+    d(DH_URI.query = URI.encode_www_form(a))
 
-    opts = {
-      use_ssl:     true,
-      ssl_version: :SSLv3,
-      verify_mode: OpenSSL::SSL::VERIFY_PEER
-    }
-    res = YAML.load(Net::HTTP.start(DH_URI.host, DH_URI.port, opts) { |http| http.get DH_URI }.body)
-    @log.debug "#{ a[:cmd] }: #{ res['result'] }"
+    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']
 
     return res['result'], res['data']
   rescue Net::ReadTimeout
-    @log.warn "Dreamhost API timed out on #{ a[:cmd] }"
+    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

data/reverie.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
   s.summary     = 'Dreamhost DNS updater'
   s.description = 'A ruby script to update Dreamhost DNS'
 
-  s.files       = `git ls-files`.split $/
-  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename f }
-  s.test_files  = s.files.grep(%r{^(test|spec|features)/})
+  s.files       = `git ls-files`.split "\n"
+  s.executables = s.files.grep(/^bin\//) { |f| File.basename f }
+  s.test_files  = s.files.grep(/^(test|spec|features)\//)
   s.require_paths = ['lib']
 
   s.add_runtime_dependency 'configliere', '~> 0.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverie
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Fission Xuiptz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere