reverie 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fb22911434d9be837fe65b4501636427a964ffd
-  data.tar.gz: 9021a07c63cc95a0e3c5b15fb59e523ddb6930b4
+  metadata.gz: 5fb63e6f97b5fad26cf7c215a088818b878a0040
+  data.tar.gz: cbaa469c22dfe7a79a20dd502db1e8765b68d649
 SHA512:
-  metadata.gz: 2c0ff4ad9779d50c494aca3cd16c879822f8ef107f8680bda4f10aa088c5770da335ab0f4e5766dfb5aa3429619d192d5dfab3d6454bf2db034c3c5e0cd2d85c
-  data.tar.gz: 4630eda64eb8711f3627a096cb295b4c6ad7814dc2f9e7d58a9b3d35248c346593389893c22d5b99e2a7905ab0be8dd9b7ae0a0758655a062f1bdd8919ba70a4
+  metadata.gz: c0c8f81f5485be3cfeebc94a1c40b2dd271d7edc2efdc08baf79de5a3b7272ac0c9ce55d97140ed7a587145c390820b63990d888a60a3c4536e81df3636113c2
+  data.tar.gz: b1e8c09e49e09899e1a8cda3a457a72584f7b19999b6fab0a5156bd3c498d47f8f970e93240fdfa24c42137c5c332e40dd7120b971010925c87035a94205514c

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle

data/lib/reverie/configliere.rb

@@ -0,0 +1,5 @@
+module Configliere
+  DEFAULT_CONFIG_LOCATION[:user_config] = -> scope do
+    Pathname(ENV['HOME'] || '/').join('.config').join(scope.to_s).join('conf')
+  end
+end

data/lib/reverie/version.rb

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

data/lib/reverie.rb

@@ -8,13 +8,18 @@ require 'resolv'
 require 'logger'
 require 'yaml'
 require 'configliere'
-require 'reverie/version'
+
+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,
@@ -29,13 +34,14 @@ class Reverie
     too_soon: 'too soon, updated %ds ago',
     same:     'not updating %s',
     timeout:  '%s timed out on %s',
-    kv:       '%s: %s'
+    kv:       '%s: %s',
+    start:    'connecting to %s'
   }
 
   Settings.define :conf,
                   type:        :filename,
                   description: 'The location of the configuration file',
-                  default:     Configliere::DEFAULT_CONFIG_LOCATION[:user].call('reverie')
+                  default:     CONF
 
   Settings.define :log,
                   type:        :filename,
@@ -47,12 +53,13 @@ class Reverie
 
   def initialize
     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
+    init_conf
+    init_log
+    init_args
+  end
 
+  def init_args
     @args = {
       key:    Settings[:key],
       record: Settings[:record],
@@ -60,6 +67,17 @@ class Reverie
     }
   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
@@ -101,6 +119,7 @@ class Reverie
   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
@@ -123,24 +142,24 @@ class Reverie
     res = YAML.load(req.body)
     d :kv, a[:cmd], res['result']
 
-    return res['result'], res['data']
+    [res['result'], res['data']]
   rescue Net::ReadTimeout
     w :timeout, 'Dreamhost API', a[:cmd]
   end
 
   def d(msg, *args)
-    log :debug, msg, *args
+    __log :debug, msg, *args
   end
 
   def w(msg, *args)
-    log :warn, msg, *args
+    __log :warn, msg, *args
   end
 
   def i(msg, *args)
-    log :info, msg, *args
+    __log :info, msg, *args
   end
 
-  def log(level, msg, *args)
+  def __log(level, msg, *args)
     @log.send level, MSGS[msg] ? MSGS[msg] % args : msg
   end
 end

data/test/test_reverie.rb

@@ -0,0 +1,29 @@
+require 'minitest/autorun'
+require_relative '../lib/reverie'
+
+r = Reverie.new
+
+describe Reverie do
+  describe 'reverie' do
+    it 'inits a log' do
+      r.instance_exec { @log.must_be_instance_of Logger }
+    end
+
+    it 'inits a conf' do
+      r.instance_exec { @conf.must_equal ENV['HOME'] + '/.config/reverie/conf' }
+    end
+
+    it 'inits an args hash' do
+      r.instance_exec do
+        @args.must_be_instance_of Hash
+        @args.keys.must_include :key
+        @args.keys.must_include :record
+        @args[:format].must_equal 'yaml'
+      end
+    end
+
+    it 'gets an ip address' do
+      r.get_ip.must_match Resolv::IPv4::Regex
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reverie
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Fission Xuiptz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-20 00:00:00.000000000 Z
+date: 2014-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configliere
@@ -38,8 +38,10 @@ files:
 - Rakefile
 - bin/reverie
 - lib/reverie.rb
+- lib/reverie/configliere.rb
 - lib/reverie/version.rb
 - reverie.gemspec
+- test/test_reverie.rb
 homepage: http://github.com/fissionxuiptz/reverie
 licenses:
 - MIT
@@ -64,4 +66,5 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Dreamhost DNS updater
-test_files: []
+test_files:
+- test/test_reverie.rb