net-irc 0.0.2 → 0.0.3

data/examples/wig.rb

@@ -22,7 +22,7 @@ Configuration example for Tiarra ( http://coderepos.org/share/wiki/Tiarra ).
 	wassr {
 		host: localhost
 		port: 16670
-		name: username@example.com athack
+		name: username@example.com athack jabber=username@example.com:jabberpasswd
 		password: password on Wassr
 		in-encoding: utf8
 		out-encoding: utf8
@@ -34,7 +34,7 @@ If `athack` client option specified,
 all nick in join message is leading with @.
 
 So if you complemente nicks (ex. Irssi),
-it's good for twitter like reply command (@nick).
+it's good for Twitter like reply command (@nick).
 
 In this case, you will see torrent of join messages after connected,
 because NAMES list can't send @ leading nick (it interpreted op.)
@@ -96,6 +96,7 @@ if __FILE__ == $0
 		:host  => "localhost",
 		:log   => nil,
 		:debug => false,
+		:foreground => false,
 	}
 
 	OptionParser.new do |parser|
@@ -125,6 +126,15 @@ if __FILE__ == $0
 				opts[:debug] = true
 			end
 
+			on("-f", "--foreground", "run foreground") do |foreground|
+				opts[:log]        = $stdout
+				opts[:foreground] = true
+			end
+
+			on("-n", "--name [login id]") do |name|
+				opts[:name] = name
+			end
+
 			parse!(ARGV)
 		end
 	end
@@ -132,14 +142,14 @@ if __FILE__ == $0
 	opts[:logger] = Logger.new(opts[:log], "daily")
 	opts[:logger].level = opts[:debug] ? Logger::DEBUG : Logger::INFO
 
-	def daemonize(debug=false)
-		return yield if $DEBUG || debug
+	def daemonize(foreground=false)
+		trap("SIGINT")  { exit! 0 }
+		trap("SIGTERM") { exit! 0 }
+		trap("SIGHUP")  { exit! 0 }
+		return yield if $DEBUG || foreground
 		Process.fork do
 			Process.setsid
 			Dir.chdir "/"
-			trap("SIGINT")  { exit! 0 }
-			trap("SIGTERM") { exit! 0 }
-			trap("SIGHUP")  { exit! 0 }
 			File.open("/dev/null") {|f|
 				STDIN.reopen  f
 				STDOUT.reopen f
@@ -150,7 +160,7 @@ if __FILE__ == $0
 		exit! 0
 	end
 
-	daemonize(opts[:debug]) do
+	daemonize(opts[:debug] || opts[:foreground]) do
 		Net::IRC::Server.new(opts[:host], opts[:port], WassrIrcGateway, opts).start
 	end
 end

data/lib/net/irc.rb

@@ -9,7 +9,7 @@ require "monitor"
 module Net; end
 
 module Net::IRC
-	VERSION = "0.0.2"
+	VERSION = "0.0.3"
 	class IRCException < StandardError; end
 
 	module PATTERN # :nodoc:
@@ -129,8 +129,8 @@ module Net::IRC
 		RPL_YOUREOPER         = '381'
 		RPL_REHASHING         = '382'
 		RPL_YOURESERVICE      = '383'
-		RPL_TIM               = '391'
-		RPL_                  = '392'
+		RPL_TIME              = '391'
+		RPL_USERSSTART        = '392'
 		RPL_USERS             = '393'
 		RPL_ENDOFUSERS        = '394'
 		RPL_NOUSERS           = '395'
@@ -201,7 +201,7 @@ module Net::IRC
 		ERR_PASSWDMISMATCH    = '464'
 		ERR_YOUREBANNEDCREEP  = '465'
 		ERR_YOUWILLBEBANNED   = '466'
-		ERR_KEYSE             = '467'
+		ERR_KEYSET            = '467'
 		ERR_CHANNELISFULL     = '471'
 		ERR_UNKNOWNMODE       = '472'
 		ERR_INVITEONLYCHAN    = '473'
@@ -291,8 +291,7 @@ module Net::IRC
 	end
 
 	COMMANDS = Constants.constants.inject({}) {|r,i| # :nodoc:
-		r[Constants.const_get(i)] = i
-		r
+		r.update(Constants.const_get(i) => i)
 	}
 
 	class Prefix < String
@@ -457,9 +456,9 @@ class Net::IRC::Client
 	def start
 		@socket = TCPSocket.open(@host, @port)
 		on_connected
-		post PASS,  @opts.pass if @opts.pass
-		post NICK,  @opts.nick
-		post USER,  @opts.user, "0", "*", @opts.real
+		post PASS, @opts.pass if @opts.pass
+		post NICK, @opts.nick
+		post USER, @opts.user, "0", "*", @opts.real
 		while l = @socket.gets
 			begin
 				@log.debug "RECEIVE: #{l.chomp}"
@@ -671,8 +670,9 @@ class Net::IRC::Client
 	#     post PRIVMSG, "#channel", "foobar"
 	def post(command, *params)
 		m = Message.new(nil, command, params.map {|s|
-			s.gsub(/[\r\n]/, " ")
+			s ? s.gsub(/[\r\n]/, " ") : ""
 		})
+
 		@log.debug "SEND: #{m.to_s.chomp}"
 		@socket << m
 	end
@@ -769,13 +769,11 @@ class Net::IRC::Server
 					@log.debug "RECEIVE: #{l.chomp}"
 					m = Message.parse(l)
 					next if on_message(m) === true
-					if m.command == QUIT
-						on_quit if respond_to?(:on_quit)
-						break
-					else
-						name = "on_#{(COMMANDS[m.command.upcase] || m.command).downcase}"
-						send(name, m) if respond_to?(name)
-					end
+
+					name = "on_#{(COMMANDS[m.command.upcase] || m.command).downcase}"
+					send(name, m) if respond_to?(name)
+
+					break if m.command == QUIT
 				rescue Message::InvalidMessage
 					@log.error "MessageParse: " + l.inspect
 				end
@@ -806,14 +804,13 @@ class Net::IRC::Server
 			@nick = m.params[0]
 		end
 
-
 		# Default USER callback.
-		# Set @user, @real, @host and call inital_message.
+		# Set @user, @real, @host and call initial_message.
 		def on_user(m)
 			@user, @real = m.params[0], m.params[3]
 			@host = @socket.peeraddr[2]
 			@prefix = Prefix.new("#{@nick}!#{@user}@#{@host}")
-			inital_message
+			initial_message
 		end
 
 		# Call when socket connected.
@@ -829,6 +826,11 @@ class Net::IRC::Server
 		def on_message(m)
 		end
 
+		# Default PING callback. Response PONG.
+		def on_ping(m)
+			post server_name, PONG, m.params[0]
+		end
+
 		# Do nothing.
 		# This is for avoiding error on calling super.
 		# So you can always call super at subclass.
@@ -852,7 +854,7 @@ class Net::IRC::Server
 
 		# Call when client connected.
 		# Send RPL_WELCOME sequence. If you want to customize, override this method at subclass.
-		def inital_message
+		def initial_message
 			post server_name, RPL_WELCOME,  @nick, "Welcome to the Internet Relay Network #{@prefix}"
 			post server_name, RPL_YOURHOST, @nick, "Your host is #{server_name}, running version #{server_version}"
 			post server_name, RPL_CREATED,  @nick, "This server was created #{Time.now}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net-irc
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - cho45
@@ -9,7 +9,7 @@ autorequire: ""
 bindir: bin
 cert_chain: []
 
-date: 2008-02-06 00:00:00 +09:00
+date: 2008-06-14 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -30,11 +30,12 @@ files:
 - spec/spec.opts
 - lib/net
 - lib/net/irc.rb
-- examples/client.rb
-- examples/lig.rb
+- examples/sig.rb
+- examples/tig.rb
 - examples/lingr.rb
+- examples/client.rb
 - examples/nig.rb
-- examples/tig.rb
+- examples/lig.rb
 - examples/wig.rb
 has_rdoc: true
 homepage: http://lowreal.rubyforge.org
@@ -69,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lowreal
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: ""