ddns 0.1.1 → 0.1.2

data/bin/ddns

@@ -8,12 +8,18 @@ require 'resolv'
 require 'socket'
 
 LOGGER = Logger.new($stderr)
+default_gaddress = nil
+
+begin
+  default_gaddress = IPSocket.getaddress(Socket.gethostname)
+rescue SocketError
+end
 
 options = {
   :hostname => Socket.gethostname,
   :address  => '0.0.0.0',
   :port     => 10053,
-  :gaddress => IPSocket.getaddress(Socket.gethostname),
+  :gaddress => default_gaddress,
   :gport    => 10870,
   :sock     => '/tmp/ddns.sock',
   :resolver => Resolv::DNS.new,

data/bin/ddns.orig

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'fileutils'
+require 'drb/drb'
+require 'ddns-server'
+require 'optparse'
+require 'resolv'
+require 'socket'
+
+LOGGER = Logger.new($stderr)
+default_gaddress = nil
+
+begin
+  default_gaddress = IPSocket.getaddress(Socket.gethostname)
+rescue SocketError
+end
+
+options = {
+  :hostname => Socket.gethostname,
+  :address  => '0.0.0.0',
+  :port     => 10053,
+  :gaddress => default_gaddress,
+  :gport    => 10870,
+  :sock     => '/tmp/ddns.sock',
+  :resolver => Resolv::DNS.new,
+  :daemon   => false,
+  :logger   => LOGGER,
+  :loglevel => Logger::INFO
+}
+
+opts = OptionParser.new
+opts.on('-H', '--hostname HOST',       "Own hostname (default #{options[:hostname]})")              {|v| options[:hostname] = v }
+opts.on('-A', '--address ADDRESS'      "Name service ip address (default #{options[:address]})")    {|v| options[:address]  = v }
+opts.on('-P', '--port PORT', Integer,  "Name service port (default #{options[:port]})")             {|v| options[:port]     = v }
+opts.on('-a', '--gaddress ADDRESS'     "Gossip service ip address (default #{options[:gaddress]})") {|v| options[:gaddress] = v }
+opts.on('-p', '--gport PORT', Integer, "Gossip service port (default #{options[:gport]})")          {|v| options[:gport]    = v }
+opts.on('-S', '--socket SOCK',         "Socket file path (default #{options[:sock]})")              {|v| options[:sock]     = v }
+opts.on('-d', '--daemon COMMAND',      "Directive of daemonize (start|stop|restart|status)")        {|v| options[:daemon]   = v }
+opts.on('-r', '--resolver CONF',       "Default resolver (default /etc/resolv.conf)")               {|v| options[:resolver] = Resolv::DNS.new(v) }
+opts.on('-N', '--no-resolver',         "Not use default resolver")                                  {|v| options[:resolver] = nil }
+
+opts.on('-L', '--loglevel LEVEL',
+  [:fatal, :error, :warn, :info, :debug], "Log level (default info)") {|v| options[:loglevel] = Logger.const_get(v.to_s.upcase) }
+
+opts.on('-i', '--initial NODES', "Initial access node list (ex 10.0.0.1,10.0.0.2)") do |v|
+  options[:initial_nodes] = v.split(/\s*,\s*/)
+end
+
+opts.on('-h', '--help', "Display this help") { $stdout.puts opts.help ; exit 1 }
+
+begin
+  opts.parse!(ARGV)
+rescue => e
+  $stderr.puts e.message
+  $stdout.puts opts.help
+  exit 1
+end
+
+#RGossip.debug = true
+RGossip.port = options[:gport]
+DDNS::Attributes.new(options)
+
+LOGGER.info("Name service at #{options[:address]}:#{options[:port]}")
+LOGGER.info("Gossip service at #{options[:gaddress]}:#{options[:gport]}")
+LOGGER.info("Hostname: #{options[:hostname]}")
+
+if options[:daemon] 
+  ARGV.unshift options[:daemon]
+  DDNS.daemonize
+else
+  begin
+    at_exit { FileUtils.rm_f(options[:sock]) }
+    $DDNS_GOSSIP = DRb.start_service("drbunix:#{options[:sock]}", $DDNS_ATTR.gossip)
+  rescue => e
+    $stderr.puts(e.message)
+  end
+
+  DDNS.run
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ddns
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-05-25 00:00:00 +09:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubydns
@@ -41,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 9
-        version: 0.1.9
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id002
 description: 
@@ -60,9 +61,11 @@ extra_rdoc_files: []
 
 files: 
 - README
-- bin/ddnsctl
 - bin/ddns
+- bin/ddns.orig
+- bin/ddnsctl
 - lib/ddns-server.rb
+has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/ddns
 licenses: []
 
@@ -92,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Distributed name server