nserver 1.1.0 → 1.1.1

data/History.txt

@@ -1,3 +1,12 @@
+== 1.1.1 / 
+
+* Fixes to incoming IP address checks
+* Read defaults from config file ($HOME/.nserverrc)
+ * It's a YAML file with (:bind_ip, :allowed_client_ips, and :port as keys)
+* Don't explode when no 'RNotify' library present, just don't allow a server
+  to be instanciated.  This lets the 'nclient' work on any machine.
+
+
 == 1.1.0 / 2007-11.07
 
 * Major feature - accept connections from any host

data/bin/nserver

@@ -4,11 +4,22 @@ require 'rubygems'
 require 'daemons'
 require 'nserver'
 require 'getoptlong'
+require 'yaml'
 
 bind_ip = nil
 allowed_client_ips = nil
 port = nil
 
+## Check for config file.
+config_file = File.join( ENV['HOME'], '.nserverrc' )
+
+if File.exists?( config_file )
+  config = YAML.load( File.open(config_file, 'r') {|f| f.read } )
+  bind_ip = config[:bind_ip]
+  allowed_client_ips = config[:allowed_client_ips]
+  port = config[:port]
+end
+
 opts = GetoptLong.new(
   ['--bind-ip', GetoptLong::REQUIRED_ARGUMENT ],
   ['--allowed-client-ips', GetoptLong::REQUIRED_ARGUMENT ],

data/lib/nserver.rb

@@ -1,12 +1,18 @@
-require 'RNotify'
+
+begin
+  require 'RNotifyx'
+  RNOTIFY_FOUND = true
+rescue LoadError
+  RNOTIFY_FOUND = false
+end
+
 require 'gserver'
 require 'socket'
 require 'ipaddr'
 
 module NServer
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
   class Server < GServer
-
     # Create a NServer::Server instance
     #
     # Options:
@@ -28,6 +34,9 @@ module NServer
     # msg_timeout::
     #  Message display timeout.  Default is 5000ms (5s).
     def initialize( opts = {} )
+      unless RNOTIFY_FOUND
+        raise StandardError.new("RNotify library not found.")
+      end
       opts[:port] ||= 10001
       opts[:host] ||= "127.0.0.1"
       
@@ -86,8 +95,8 @@ module NServer
 
     # Get and add a message to the list.  GServer method.
     def serve(io)
-      unless @allowed_clients.include?( IPAddr.new(io.peeraddr.last) )
-        io.puts "#{io.addr.last} is not allowed."
+      unless @allowed_clients.any? {|allowed| allowed.include?(IPAddr.new(io.peeraddr.last)) }
+        io.puts "#{io.peeraddr.last} is not allowed."
         return
       end
       io.puts("Enter message, terminate with line break.")

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.5
 specification_version: 2
 name: nserver
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-11-07 00:00:00 -05:00
+  version: 1.1.1
+date: 2007-11-08 00:00:00 -05:00
 summary: Notification server for ruby using libnotify
 require_paths: 
 - lib