dyndyndong 0.0.2 → 0.0.3

data/bin/dyndyndong

@@ -40,14 +40,26 @@ USAGE: #{$0} [-d|-h|-1] [-c <config file>] [-D <delay>] [-s <service> <service a
   -s|--service  Start to parse a service, no defaults, you have to choose between:
     - afraid    For freedns.afraid.org
         AVAILABLE ARGUMENTS:
-          -H|-host        Set a single host or more hosts separated with ',' (comma), it can be repeated
-    - dyndns    Fro dyndns.com
+          -H|--host       Set a single host or more hosts separated with ',' (comma), it can be repeated
+    - dyndns    For dyndns.com
+      AVAILABLE ARGUMENTS:
+          -u|--username   Set username for login, it can't be repeated
+          -p|--password   Set password for login, it can't be repeated
+          -H|--host       Set a single host or more hosts separated with ',' (comma), it can be repeated
+          -o|--offline    Set a single host or more hosts separated with ',' (comma) to make offline, it
+                            can be repeated
+    - no-ip     For no-ip-com
       AVAILABLE ARGUMENTS:
           -u|--username   Set username for login, it can't be repeated
           -p|--password   Set password for login, it can't be repeated
           -H|--host       Set a single host or more hosts separated with ',' (comma), it can be repeated
           -o|--offline    Set a single host or more hosts separated with ',' (comma) to make offline, it
                             can be repeated
+    - zoneedit  For zoneedit.com
+      AVAILABLE ARGUMENTS:
+          -u|--username   Set username for login, it can't be repeated
+          -p|--password   Set password for login, it can't be repeated
+          -H|--host       Set a single host or more hosts separated with ',' (comma), it can be repeated
       Parsing of services' arguments stop when an unrelated argument is given.
 HELP
   exit 0
@@ -114,7 +126,7 @@ while i < ARGV.size
     end
 
     case service
-    when 'dyndns'
+    when 'dyndns', 'no-ip'
       srv = {:hosts => [], :offline => []}
       while (i += 1) < ARGV.size
         parsed = true
@@ -154,6 +166,40 @@ while i < ARGV.size
       end
       srv[:hosts].flatten!
       srv[:offline].flatten!
+    when 'zoneedit'
+      srv = {:hosts => []}
+      while (i += 1) < ARGV.size
+        parsed = true
+        case ARGV[i]
+        when /^-u/, '--username'
+          die "Can't add more than one username" if srv[:username]
+
+          if %w{-u --username}.include?(ARGV[1])
+            srv[:username] = ARGV[i += 1]
+          else
+            srv[:username] = ARGV[i].gsub(/^-u/, '')
+          end
+        when /^-p/, '--password'
+          die "Can't add more than one password" if srv[:password]
+
+          if %w{-p --password}.include?(ARGV[1])
+            srv[:password] = ARGV[i += 1]
+          else
+            srv[:password] = ARGV[i].gsub(/^-p/, '')
+          end
+        when /^-H/, '--host'
+          if %w{-H --host}.include?(ARGV[i])
+            srv[:hosts] << ARGV[i += 1].split(',')
+          else
+            srv[:hosts] << ARGV[i].gsub(/^-H/, '').split(',')
+          end
+        else
+          parsed = false
+          break
+        end
+      end
+      srv[:hosts].flatten!
+      srv[:offline].flatten!
     when 'afraid'
       srv = []
 
@@ -180,10 +226,10 @@ while i < ARGV.size
     parsed = true
 
     case service
-    when 'dyndns'
-      SERVICES[service.to_sym] << srv
     when 'afraid'
       SERVICES[service.to_sym] += srv
+    else
+      SERVICES[service.to_sym] << srv
     end
   end
 
@@ -220,6 +266,27 @@ if SERVICES != {:dyndns=>[],:afraid=>[]}
         die "Respect the syntax of afraid please."
       end
     }
+
+    SERVICES[:zoneedit],each {|zoneedit|
+      z = DynDynDong::ZoneEdit.new
+      z.username = zoneedit[:username]
+      z.password = zoneedit[:password]
+      zoneedit[:hosts].each {|host|
+        z.host host
+      }
+    }
+
+    SERVICES[:'no-ip'].each {|noip|
+      n = DynDynDong::NoIp.new
+      n.username = noip[:username]
+      n.password = noip[:password]
+      noip[:hosts].each {|host|
+        n.host host
+      }
+      noip[:offline].each {|offline|
+        n.offline offline
+      }
+    }
   else
     die "You can't use a configure file with custom services"
   end

data/lib/dyndyndong/services.rb

@@ -17,8 +17,6 @@
 # along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-$DEBUG = true
-
 module DynDynDong
 
 class Service
@@ -91,6 +89,6 @@ end
 
 end
 
-%w{afraid dyndns zoneedit}.each {|s|
+%w{generic afraid dyndns zoneedit no-ip}.each {|s|
   require "dyndyndong/services/#{s}"
 }

data/lib/dyndyndong/services/dyndns.rb

@@ -17,14 +17,10 @@
 # along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
 #++
 
-require 'net/http'
-require 'resolv'
-
 module DynDynDong
 
-class DynDNS < Service
-  def MSGTABLE(x)
-    {
+class DynDNS < Generic
+  set :MSGTABLE, {
       'badauth'         => 'The username and password pair do not match a real user.',
       '!donator'        => 'Option available only to credited users.',
       'good'            => 'The update was successful, and the hostname is now updated.',
@@ -37,84 +33,9 @@ class DynDNS < Service
       'good 127.0.0.1'  => 'Request was ignored because of agent that does not follow our specifications.',
       'dnserr'          => 'DNS error encountered.',
       '911'             => 'There is a problem or scheduled maintenance on our side.'
-    }[x]
-  end
-
-  def initialize(*args)
-    @user = nil
-    @pass = nil
-    @ip = getip
-    super(*args)
-  end
-
-  def username(u)
-    @user = u.to_s
-  end
-
-  def password(p)
-    @pass = p.to_s
-  end
-
-  alias username= username
-  alias password= password
-
-  def host(h)
-    begin
-      @hosts << [h.to_s, getip(h)]
-    rescue Exception => e
-      STDERR.puts "Ip detection error: #{e}, skipping..."
-    end
-  end
-
-  def offline(h)
-    begin
-      @hosts << [h.to_s, getip(h), true]
-    rescue Exception => e
-      STDERR.puts "Ip detection error: #{e}, skipping..."
-    end
-  end
-
-  def prefetch
-    if !(@user and @pass)
-      raise "username or password ungiven"
-    end
-  end
-
-  def alias_host(h, ip, offline = false)
-    return "Nothing to update." if ip == @ip
-
-    Net::HTTP.start(update_host) {|http|
-      req = Net::HTTP::Get.new('/nic/update?hostname=%s&myip=%s&offline=%s' % [
-          URI.escape(h), @ip, offline?(offline)])
-      req.basic_auth @user, @pass
-      x = http.request(req).body.gsub(/#{Regexp.escape(@ip)}/, '').strip
-      self::MSGTABLE(x)
     }
-  end
-
-private
-  def update_host
-    'members.dyndns.org'
-  end
-
-  def offline?(offline)
-    offline ? 'YES' : 'NOCHG'
-  end
-
-  def getip(h = nil)
-    if h
-      hosts = ""
-      Resolv.new.each_address(h){|ho| hosts = ho }
-      return hosts
-    end
-    str = Net::HTTP.get(URI.parse('http://checkip.dyndns.org/')).
-      match(/<body>(.+?)<\/body>/)[1] rescue ""
-    if str =~ /^Current IP Address: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
-      return str.gsub(/^Current IP Address: /, '')
-    else
-      raise "Couldn't retrieve ip."
-    end
-  end
+  set :OFFLINE, 'YES', 'NOCHG'
+  set :UPDATE_HOST, 'members.dyndns.org'
 end
 
 end

data/lib/dyndyndong/services/generic.rb

@@ -0,0 +1,132 @@
+#--
+# Copyleft shura. [shura1991@gmail.com]
+#
+# This file is part of DynDynDong.
+#
+# DynDynDong is free software: you can redistribute it and/or modify 
+# it under the terms of the GNU Affero General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# DynDynDong is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with dyndyndong. If not, see <http://www.gnu.org/licenses/>.
+#++
+
+require 'net/http'
+require 'resolv'
+
+module DynDynDong
+
+class Generic < Service
+  def initialize(*args)
+    @user = nil
+    @pass = nil
+    @ip = getip
+    super(*args)
+  end
+
+  def username(u)
+    @user = u.to_s
+  end
+
+  def password(p)
+    @pass = p.to_s
+  end
+
+  alias username= username
+  alias password= password
+
+  def host(h)
+    @hosts << [h.to_s]
+  end
+
+  def offline(h)
+    @hosts << [h.to_s, true]
+  end
+
+  def prefetch
+    raise "username or password ungiven" if !(@user and @pass)
+    @ip = getip
+  end
+
+  def alias_host(h, offline = false)
+    Net::HTTP.start(update_host) {|http|
+      req = Net::HTTP::Get.new('/nic/update?hostname=%s&myip=%s&offline=%s' % [
+          URI.escape(h), getip(h), offline?(offline)])
+      req.basic_auth @user, @pass
+      x = http.request(req).body.gsub(/#{Regexp.escape(@ip)}/, '').strip
+      MSGTABLE(x)
+    }
+  end
+
+  def self.set(*args)
+    sym = args.shift.to_s.downcase
+    case sym
+    when 'msgtable'
+      raise ArgumentError, "wrong number of arguments (#{args.size} for 1)" if args.size != 1
+      raise ArgumentError, "wrong type" if !args.first.is_a?(Hash)
+      self.class_eval %Q{
+        def MSGTABLE(x)
+          #{args.first.inspect}[x]
+        end
+      }
+    when 'update_host'
+      raise ArgumentError, "wrong number of arguments (#{args.size} for 1)" if args.size != 1
+      raise ArgumentError, "wrong type" if !args.first.is_a?(String)
+      self.class_eval %Q{
+        def update_host
+          #{args.first.inspect}
+        end
+      }
+    when 'offline'
+      raise ArgumentError, "wrong number of arguments (#{args.size} for 2)" if args.size != 2
+      raise ArgumentError, "wrong type" if !args[0].is_a?(String) or !args[1].is_a?(String)
+      self.class_eval %Q{
+        def offlines(what)
+          {
+            'YES' => #{args[0].inspect},
+            'NO'  => #{args[1].inspect}
+          }[what]
+        end
+      }
+    end
+  end
+
+private
+
+  def offlines(what)
+    {
+      'YES' => 'YES',
+      'NO'  => 'NO'
+    }[what]
+  end
+  
+  def offline?(offline)
+    offline ? offlines('YES') : offlines('NO')
+  end
+
+  def getip(h = nil)
+    if h
+      hosts = ""
+      Resolv.new.each_address(h) {|ho|
+        hosts = ho
+      }
+      return hosts
+    end
+
+    str = Net::HTTP.get(URI.parse('http://checkip.dyndns.org/')).
+      match(/<body>(.+?)<\/body>/)[1] rescue ""
+    if str =~ /^Current IP Address: \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
+      return str.gsub(/^Current IP Address: /, '')
+    else
+      raise "Couldn't retrieve ip."
+    end
+  end
+end
+
+end

data/lib/dyndyndong/services/no-ip.rb

@@ -20,8 +20,7 @@
 module DynDynDong
 
 class NoIp < DynDNS
-  def MSGTABLE(x)
-    {
+  set :MSGTABLE, {
       'good'      => 'DNS hostname update successful.',
       'nochg'     => 'IP address is current, no update performed.',
       'nohost'    => 'Hostname supplied does not exist under specified account.',
@@ -31,17 +30,7 @@ class NoIp < DynDNS
       'abuse'     => 'Username is blocked due to abuse.',
       '911'       => 'A fatal error on our side such as a database outage.'
     }
-  end
-
-private
-
-  def update_host
-    'dynupdate.no-ip.com'
-  end
-
-  def offline?(offline)
-    super(offline).gsub(/CHG$/, '')
-  end
+  set :UPDATE_HOST, 'dynupdate.no-ip.com'
 end
 
 end

data/lib/dyndyndong/version.rb

@@ -19,6 +19,6 @@
 
 module DynDynDong
 
-VERSION = '0.0.2'
+VERSION = '0.0.3'
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - shura
@@ -44,6 +44,7 @@ files:
 - lib/dyndyndong/services.rb
 - lib/dyndyndong/services/zoneedit.rb
 - lib/dyndyndong/services/dyndns.rb
+- lib/dyndyndong/services/generic.rb
 - lib/dyndyndong/services/afraid.rb
 - lib/dyndyndong/services/no-ip.rb
 - lib/dyndyndong/daemon.rb