dnsomatic 0.4.0 → 0.4.1

data/lib/dnsomatic/opts.rb

@@ -22,70 +22,70 @@ module DNSOMatic
     def parse(args)
       setdefaults()
       begin
-	opts = OptionParser.new do |o|
-	  o.on('-m', '--minimum SEC', 'The minimum time between updates (def: 30m)') do |i|
-	    @@opts.minimum = i.to_i
-	  end
-
-	  o.on('-M', '--maximum SEC', 'The maximum time between updates (def: 15d)') do |i|
-	    @@opts.maximum = i.to_i
-	  end
-#
-	  #making this an option (off by default) means we can operate
-	  #completely silently by default.
-	  o.on('-a', '--alert', 'Emit an alert if the IP is updated') do |a|
-	    @@opts.alert = true
-	  end
-
-	  o.on('-n', '--name NAME', 'Only update host stanza NAME') do |n|
-	    @@opts.name = n
-	  end
-
-	  o.on('-d', '--display-config', 'Display the configuration and exit') do 
-	    @@opts.showcf = true
-	  end
-
-	  o.on('-c', '--config FILE', 'Use an alternate config file') do |f|
-	    @@opts.cf = f
-	  end
-
-	  o.on('-f', '--force', 'Force an update, even if IP is unchanged') do
-	    @@opts.force = true
-	  end
-
-	  o.on('-p', '--print', 'Output the update URLs.  No action taken') do
-	    @@opts.print = true
-	  end
-
-	  o.on('-v', '--verbose', 'Display runtime messages') do
-	    @@opts.verbose = true
-	  end
-
-	  o.on('-V', '--version', 'Display version and exit') do
-	    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') do
-	    DNSOMatic::Logger.warn(o)
-	    exit
-	  end
-	end
-	opts.parse!(args)
-
-	if args.size > 0
-	  raise(DNSOMatic::Error, "Extra arguments given: #{args.join(', ')}")
-	end
+        opts = OptionParser.new do |o|
+          o.on('-m', '--minimum SEC', 'The minimum time between updates (def: 30m)') do |i|
+            @@opts.minimum = i.to_i
+          end
+
+          o.on('-M', '--maximum SEC', 'The maximum time between updates (def: 15d)') do |i|
+            @@opts.maximum = i.to_i
+          end
+          #
+          #making this an option (off by default) means we can operate
+          #completely silently by default.
+          o.on('-a', '--alert', 'Emit an alert if the IP is updated') do |a|
+            @@opts.alert = true
+          end
+
+          o.on('-n', '--name NAME', 'Only update host stanza NAME') do |n|
+            @@opts.name = n
+          end
+
+          o.on('-d', '--display-config', 'Display the configuration and exit') do
+            @@opts.showcf = true
+          end
+
+          o.on('-c', '--config FILE', 'Use an alternate config file') do |f|
+            @@opts.cf = f
+          end
+
+          o.on('-f', '--force', 'Force an update, even if IP is unchanged') do
+            @@opts.force = true
+          end
+
+          o.on('-p', '--print', 'Output the update URLs.  No action taken') do
+            @@opts.print = true
+          end
+
+          o.on('-v', '--verbose', 'Display runtime messages') do
+            @@opts.verbose = true
+          end
+
+          o.on('-V', '--version', 'Display version and exit') do
+            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') do
+            DNSOMatic::Logger.warn(o)
+            exit
+          end
+        end
+        opts.parse!(args)
+
+        if args.size > 0
+          raise(DNSOMatic::Error, "Extra arguments given: #{args.join(', ')}")
+        end
 
       rescue OptionParser::ParseError => e
-	msg = "Extra/Unknown arguments used:\n"
-	msg += "\t#{e.message}\n"
-	msg += "Remaining args: #{args.join(', ')}\n" if args.size > 0
-	raise(DNSOMatic::Error, msg)
+        msg = "Extra/Unknown arguments used:\n"
+        msg += "\t#{e.message}\n"
+        msg += "Remaining args: #{args.join(', ')}\n" if args.size > 0
+        raise(DNSOMatic::Error, msg)
       end
     end
 
@@ -106,7 +106,7 @@ module DNSOMatic
       @@opts.print = false
       @@opts.verbose = false
       @@opts.minimum = 1800 #30 minutes
-      @@opts.maximum = 1296000	#15 days
+      @@opts.maximum = 1296000  #15 days
       @@opts.debug = false
       @@opts.alert = false
     end

data/lib/dnsomatic/updater.rb

@@ -24,20 +24,23 @@ module DNSOMatic
     # By default, the we'll honour the changed? status of the IPStatus object
     # returned to us, but if force is set to true, we'll send the update
     # request anyway.
-    def update(force = false) url = upd_url()
+    def update(force = false)
+      url = upd_url()
+
+      DNSOMatic::Logger.log("Updating with URL: #{url}")
 
       if !@ipstatus.changed? and !force
-	Logger::log("No change in IP detected for #{@config['hostname']}.  Not updating.")
+        Logger::log("No change in IP detected for #{@config['hostname']}.  Not updating.")
       else
-	Logger::alert("Updating IP for #{@config['hostname']} to #{@ipstatus.ip}.")
-	update = DNSOMatic::http_fetch(url)
+        Logger::alert("Updating IP for #{@config['hostname']} to #{@ipstatus.ip}.")
+        update = DNSOMatic::http_fetch(url)
 
-	if !update.match(/^good\s+#{@ipstatus.ip}$/)
-	  msg = "Error updating host definition for #{@config['hostname']}\n"
-	  msg += "Results:\n#{update}\n"
-	  msg += "Error codes at: https://www.dnsomatic.com/wiki/api"
-	  raise(DNSOMatic::Error, msg)
-	end
+        if !update.match(/^good\s+#{@ipstatus.ip}$/)
+          msg = "Error updating host definition for #{@config['hostname']}\n"
+          msg += "Results:\n#{update}\n"
+          msg += "Error codes at: https://www.dnsomatic.com/wiki/api"
+          raise(DNSOMatic::Error, msg)
+        end
       end
 
       true
@@ -56,7 +59,7 @@ module DNSOMatic
     def to_s
       upd_url
     end
-	
+
     private
     def upd_url
       opt_params = %w(wildcard mx backmx offline)
@@ -69,9 +72,9 @@ module DNSOMatic
       url = "https://#{u}:#{p}@updates.dnsomatic.com/nic/update?"
       name_ip = "hostname=#{@config['hostname']}&myip=#{@ipstatus.ip}"
       url += opt_params.inject(name_ip) do |params, curp|
-	val = @config[curp]
-	next if val.eql?('') or val.nil?
-	params += "&#{curp}=#{val}"
+        val = @config[curp]
+        next if val.eql?('') or val.nil?
+        params += "&#{curp}=#{val}"
       end
       url
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dnsomatic
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Ben Walton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-01 00:00:00 -04:00
+date: 2009-10-03 00:00:00 -04:00
 default_executable: dnsomatic
 dependencies: []
 
@@ -23,29 +23,30 @@ extra_rdoc_files: []
 
 files: 
 - bin/dnsomatic
+- lib/dnsomatic.rb
 - lib/dnsomatic
-- lib/dnsomatic/updater.rb
 - lib/dnsomatic/logger.rb
 - lib/dnsomatic/iplookup.rb
-- lib/dnsomatic/opts.rb
+- lib/dnsomatic/updater.rb
 - lib/dnsomatic/config.rb
-- lib/dnsomatic.rb
-- tests/test_ipstatus.rb
-- tests/test_opts.rb
-- tests/test_logger.rb
-- tests/test_updater.rb
+- lib/dnsomatic/open-uri.rb
+- lib/dnsomatic/opts.rb
+- tests/test_config.rb
 - tests/all_tests.rb
+- tests/test_opts.rb
+- tests/test_ipstatus.rb
+- tests/test_iplookup.rb
 - tests/confs
 - tests/confs/1_stanza_no_defs_no_u_p.cf
-- tests/confs/working_only_defs.cf
-- tests/confs/defs_with_mx_set.cf
+- tests/confs/3_stanzas_no_def_no_u_p.cf
+- tests/confs/defs_with_bad_mx_set.cf
 - tests/confs/3_good_stanzas.cf
+- tests/confs/defs_with_mx_set.cf
+- tests/confs/working_only_defs.cf
 - tests/confs/empty_conf.cf
 - tests/confs/defs_with_override_ipfetch.cf
-- tests/confs/defs_with_bad_mx_set.cf
-- tests/confs/3_stanzas_no_def_no_u_p.cf
-- tests/test_config.rb
-- tests/test_iplookup.rb
+- tests/test_logger.rb
+- tests/test_updater.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/dnsomatic
 post_install_message: 
@@ -68,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: http://rubyforge.org/projects/dnsomatic
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A DNS-O-Matic Update Client