dnsomatic 0.1.1 → 0.2.2

data/bin/dnsomatic

@@ -3,51 +3,53 @@
 begin
   require 'dnsomatic'
 rescue LoadError => e
-  # a small hack in the case where we aren't a gem
+  # a small hack in the case we aren't a gem
   $: << File.join(File.dirname($0), '..', 'lib')
   retry
 end
 
 begin
-  $opts = DNSOMatic::Opts.instance
-  $opts.parse(ARGV)
+  opts = DNSOMatic::Opts.instance
+  opts.parse(ARGV)
 
-  c = DNSOMatic::Config.new($opts.cf)
+  c = DNSOMatic::Config.new(opts.cf)
 
-  if $opts.showcf
-    $stdout.puts "This is your configuration after merging in the defaults."
-    $stdout.puts "It has been pruned to only display the stanza named: #{$opts.name}" if $opts.name
-    $stdout.puts c.merged_config($opts.name)
+  if opts.showcf
+    msg = "This is your configuration after merging in the defaults.\n"
+    msg += "It has been pruned to only display the stanza named: #{opts.name}" if opts.name
+    msg += c.merged_config(opts.name)
+    DNSOMatic::Logger.log(msg)
     exit
   end
 
-  if $opts.stanza and $opts.verbose
-    $stdout.puts "Will only update #{$opts.name}."
-  end
+  DNSOMatic::Logger.log("Will only update #{opts.name}.") if opts.stanza
 
-  updaters = c.updaters($opts.name)
+  updaters = c.updaters(opts.name)
 
   updaters.each_pair do |name, obj|
-    $stdout.puts "Working with host update definition: #{name}" if $opts.verbose
-    if $opts.print
-      puts obj
+    DNSOMatic::Logger.log("Working with host update definition: #{name}")
+    if opts.print
+      DNSOMatic::Logger.warn(obj.to_s)
     else
-      obj.send( $opts.force ? 'update!' : 'update')
+      obj.send( opts.force ? 'update!' : 'update')
     end
   end
-rescue DNSOMatic::Error => e
-  $stderr.puts e
-  if $opts.debug
-    $stderr.puts "Backtrace:"
-    $stderr.puts e.backtrace
-  end
 rescue => e
-  $stderr.puts "Rescued an unhandled exception of type: #{e.class}"
-  $stderr.puts "The exception contains the following message:"
-  $stderr.puts e.message
-  if $opts.debug
-    $stderr.puts "Backtrace:"
-    $stderr.puts e.backtrace
+  if e.kind_of?(DNSOMatic::Error)
+    msg = e
+  else
+    msg = "Rescued an unhandled exception of type: #{e.class}\n"
+  end
+
+  msg += "The exception contains the following message:\n"
+  msg += e.message
+
+  if opts.debug
+    msg += "Backtrace:\n"
+    msg += e.backtrace.to_s
+  else
+    msg += "If you want to see where this error was generated, use -x"
   end
+  DNSOMatic::Logger.warn(msg)
   exit 1
 end

data/lib/dnsomatic.rb

@@ -106,7 +106,7 @@ require 'open-uri'
 #   -h, --help                       Display this help text
 
 module DNSOMatic
-  VERSION = '0.1.1'
+  VERSION = '0.2.2'
   USERAGENT = "Ruby_DNS-o-Matic/#{VERSION}"
 
   # We provide our easily distinguishable exception class so that we can easily

data/lib/dnsomatic/iplookup.rb

@@ -11,6 +11,7 @@ module DNSOMatic
     UNCHANGED = false
 
     attr_reader :ip
+    @@opts = Opts.instance
 
     # A URL must be provided that returns the IP of the system that requests
     # the URL.  A commonly used example is http://www.whatismyip.org
@@ -52,8 +53,8 @@ module DNSOMatic
 
     private
     def min_elapsed?
-      if Time.now - @last_update <= $opts.minimum
-	Logger::log("Minimum lookup interval not expired.")
+      if Time.now - @last_update <= @@opts.minimum
+	Logger::log("Minimum lookup interval (#{@@opts.minimum}s) not expired.")
 	true
       else
 	false
@@ -61,8 +62,8 @@ module DNSOMatic
     end
 
     def max_elapsed?
-      if Time.now - @last_update >= $opts.maximum
-	Logger::log("Maximum interval between updates has elapsed.  Update will be forced.")
+      if Time.now - @last_update >= @@opts.maximum
+	Logger::log("Maximum update interval (#{@@opts.maximum}s) has elapsed.  Update will be forced.")
 	true
       else
 	false
@@ -122,7 +123,11 @@ module DNSOMatic
       #because an access for a key that doesn't exist returns and inserts
       #a new IPStatus object, we don't differntiate between seen and unseen
       #here.
-      (@cache[url] ||= IPStatus.new(url)).update
+      if @cache[url]
+	@cache[url].update
+      else
+	@cache[url] = IPStatus.new(url)
+      end
 
       save()  #ensure that we get spooled to disk.
       @cache[url]

data/lib/dnsomatic/logger.rb

@@ -2,20 +2,21 @@ module DNSOMatic
   # A simple class to provide consistent logging throughout the various other
   # classes.  All methods are class methods, so no instance is required.
   class Logger
+    @@opts = Opts.instance
     # Output a message to stdout if the user specified the verbose command
     # line option.
     def self.log(msg)
-      $stdout.puts msg if $opts.verbose
+      $stdout.puts msg if @@opts.verbose
     end
 
-    # Output a message to stderr regardless of verbose command line option.
+    # Output a message to regardless of verbose command line option.
     def self.warn(msg)
-      $stderr.puts msg
+      $stdout.puts msg
     end
   
     # Output a message to stdout if either verbose or alert was specified.
     def self.alert(msg)
-      $stdout.puts msg if $opts.verbose or $opts.alert
+      $stdout.puts msg if @@opts.verbose or @@opts.alert
     end
   end
 end

data/lib/dnsomatic/opts.rb

@@ -62,15 +62,18 @@ module DNSOMatic
 	  end
 
 	  o.on('-V', '--version', 'Display version and exit') do
-	    $stdout.puts DNSOMatic::VERSION
-	    exit 0
+	    DNSOMatic::Logger.warn(DNSOMatic::VERSION)
+	    exit
 	  end
 
 	  o.on('-x', '--debug', 'Output additional info in error situations') do
 	    @@opts.debug = true
 	  end
 
-	  o.on('-h', '--help', 'Display this help text') { puts o; exit; }
+	  o.on('-h', '--help', 'Display this help text') do
+	    DNSOMatic::Logger.warn(o)
+	    exit
+	  end
 	end
 	opts.parse!(args)
 

data/tests/test_opts.rb

@@ -74,5 +74,4 @@ class TestOpts < Test::Unit::TestCase
   def test_extra_args_raise_exception
     assert_raise(DNSOMatic::Error) { $opts.parse(%w(somearg)) }
   end
-
 end

data/tests/test_updater.rb

@@ -9,6 +9,7 @@ require 'dnsomatic'
 class TestUpdater < Test::Unit::TestCase
   def setup
     $opts = DNSOMatic::Opts.instance
+    $opts.parse([]) #just to override any values setup by previous tests
     $fp = File.join('/tmp', 'dnsomatic.testcache-' + Process.pid.to_s)
     $iplookup = DNSOMatic::IPLookup.instance
     $iplookup.setcachefile($fp)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsomatic
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Ben Walton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 -04:00
+date: 2008-08-27 00:00:00 -04:00
 default_executable: dnsomatic
 dependencies: []