net-irc 0.0.7 → 0.0.8

data/ChangeLog

@@ -1,3 +1,9 @@
+2009-08-08  SATOH Hiroh <cho45@lowreal.net>
+
+	* [bug]:
+		Fixed to work on ruby1.9.1 (now can send iso-2022-jp)
+	* Released 0.0.8
+
 2009-02-19  SATOH Hiroh <cho45@lowreal.net>
 
 	* [bug]:

data/README

@@ -4,7 +4,7 @@
 
 == Description
 
-IRC library. This is mostly conform to RFC1459 but partly not for convenience.
+IRC library. This is mostly conform to RFC 1459 but partly not for convenience.
 
 
 == Installation
@@ -44,49 +44,48 @@ So, be careful to use @channels instance variable and call super surely.
 
 === Server
 
-see example/lig.rb
+see example/tig.rb
 
 
 == IRC Gateways
 
 There are some gateways connecting to webservices.
 
-* Lingr
 * Twitter
 * Wassr
+* Hatena Haiku
+* Hatena Star
 
 If you want to run it, type following:
 
 	$ cd `ruby -rubygems -e 'print Gem.searcher.find("net/irc").full_gem_path+"/examples"'`
 
-Lingr:
-	$ sudo gem install pit # for configuration
-	$ ./lig.rb
-
 Twitter:
-	$ ./tig.rb
+	$ ./tig.rb -f >> /dev/null 2>&1
 
 Wassr:
 	$ ./wig.rb
 
 Run as daemon in default. If you want to help:
 
-	$ ./lig.rb --help
-	Usage: ./lig.rb [opts]
+	$ ./tig.rb --help
+	Usage: tig.rb [opts]
 	
 	
 	Options:
-	    -p, --port [PORT=16669]          listen port number
-	    -h, --host [HOST=localhost]      listen host
+	    -p, --port [PORT=16668]          port number to listen
+	    -h, --host [HOST=localhost]      host name or IP address to listen
 	    -l, --log LOG                    log file
-	    -a, --api_key API_KEY            Your api key on Lingr
 	        --debug                      Enable debug mode
+	    -f, --foreground                 run foreground
+	    -n [user name or email address]
+	        --name
 
 
 == Copyright
 
-This library is based on RICE ( http://arika.org/ruby/rice ) written by akira yamada.
+This library is based on RICE <http://arika.org/ruby/rice> written by akira yamada.
 
 Author::    cho45 <cho45@lowreal.net>
-Copyright:: Copyright (c) 2008 cho45
+Copyright:: Copyright (c) 2008-2009 cho45
 License::   Ruby's

data/Rakefile

@@ -22,7 +22,7 @@ DESCRIPTION       = "library for implementing IRC server and client"
 RUBYFORGE_PROJECT = "lowreal"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = Net::IRC::VERSION
+VERS              = Net::IRC::VERSION.dup
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/examples/client.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+# vim:fileencoding=UTF-8:
 
 $LOAD_PATH << "lib"
 $LOAD_PATH << "../lib"

data/examples/echo_bot.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-
+# vim:fileencoding=UTF-8:
 
 $LOAD_PATH << "lib"
 $LOAD_PATH << "../lib"

data/examples/gmail.rb

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
+# vim:fileencoding=UTF-8:
 
 $LOAD_PATH << "lib"
 $LOAD_PATH << "../lib"
 
-$KCODE = "u" # json use this
+$KCODE = "u" if RUBY_VERSION < "1.9" # json use this
 
 require "rubygems"
 require "net/irc"

data/examples/hatena-star-stream.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# vim:fileencoding=UTF-8:
 =begin
 
-
 ## Licence
 
 Ruby's by cho45
@@ -11,7 +11,7 @@ Ruby's by cho45
 $LOAD_PATH << "lib"
 $LOAD_PATH << "../lib"
 
-$KCODE = "u" # json use this
+$KCODE = "u" if RUBY_VERSION < "1.9" # json use this
 
 require "rubygems"
 require "json"
@@ -20,6 +20,8 @@ require "mechanize"
 require "sdbm"
 require "tmpdir"
 require "nkf"
+require "hpricot"
+WWW::Mechanize.html_parser = Hpricot
 
 class HatenaStarStream < Net::IRC::Server::Session
 	def server_name
@@ -101,25 +103,34 @@ class HatenaStarStream < Net::IRC::Server::Session
 					db = SDBM.open("#{Dir.tmpdir}/#{@real}.db", 0666)
 					entries.reverse_each do |entry|
 						next if stars[entry].empty?
-						s, quoted = stars[entry].select {|star|
-							id = "#{entry}::#{star.values_at("name", "quote").inspect}"
+						i = 0
+						s = stars[entry].select {|star|
+							id = "#{entry}::#{i}"
+							i += 1
 							if db.include?(id)
 								false
 							else
 								db[id] = "1"
 								true
 							end
-						}.partition {|star| star["quote"].empty? }
-						post server_name, NOTICE, main_channel, "#{entry} #{title(entry)}" if s.length + quoted.length > 0
-						post server_name, NOTICE, main_channel, s.map {|star| "id:#{star["name"]}" }.join(" ") unless s.empty?
-
-						quoted.each do |star|
-							post server_name, NOTICE, main_channel, "id:#{star["name"]} '#{star["quote"]}'"
+						}
+
+						post server_name, NOTICE, main_channel, "↓ #{entry} #{title(entry)}" if s.length > 0
+
+						s.each do |star|
+							post server_name, NOTICE, main_channel, "id:%s \x03%d%s%s\x030 %s" % [
+								star.name,
+								Star::Colors[star.color],
+								((star.color == "normal") ? "☆" : "★") * ([star.count, 10].min),
+								(star.count > 10) ? "(...#{star.count})" : "",
+								star.quote
+							]
 						end
 					end
 
 				rescue Exception => e
 					@log.error e.inspect
+					@log.error e.backtrace
 				ensure
 					db.close rescue nil
 				end
@@ -138,7 +149,25 @@ class HatenaStarStream < Net::IRC::Server::Session
 			if i["stars"].any? {|star| star.kind_of? Numeric }
 				i = JSON.load(@ua.get("http://s.hatena.ne.jp/entry.json?uri=#{URI.escape(i["uri"])}").body)["entries"].first
 			end
-			r.update(i["uri"] => i["stars"])
+			stars = []
+
+			if i["colored_stars"]
+				i["colored_stars"].each do |s|
+					s["stars"].each do |j|
+						stars << Star.new(j, s["color"])
+					end
+				end
+			end
+
+			i["stars"].each do |j|
+				star = Star.new(j)
+				if star.quote.empty? && stars.last && stars.last.name == star.name && stars.last.color == "normal"
+					stars.last.count += 1
+				else
+					stars << star
+				end
+			end
+			r.update(i["uri"] => stars)
 		}
 		if n < entries.length
 			ret.update retrive_stars(entries, n)
@@ -185,6 +214,22 @@ class HatenaStarStream < Net::IRC::Server::Session
 			finish
 		end
 	end
+
+	class Star < OpenStruct
+		Colors = {
+			"purple" => 6,
+			"blue"   => 2,
+			"green"  => 3,
+			"red"    => 4,
+			"normal" => 8,
+		}
+
+		def initialize(obj, col="normal")
+			super(obj)
+			self.count = obj["count"].to_i  + 1
+			self.color = col
+		end
+	end
 end
 
 if __FILE__ == $0

data/examples/hig.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# vim:encoding=utf-8:
+# vim:fileencoding=UTF-8:
 =begin
 # hig.rb
 
@@ -90,7 +90,7 @@ Ruby's by cho45
 $LOAD_PATH << "lib"
 $LOAD_PATH << "../lib"
 
-$KCODE = "u" # json use this
+$KCODE = "u" if RUBY_VERSION < "1.9" # json use this
 
 require "rubygems"
 require "net/irc"
@@ -142,7 +142,6 @@ class HaikuIrcGateway < Net::IRC::Server::Session
 		super
 		@channels   = {}
 		@user_agent = "#{self.class}/#{server_version} (hig.rb)"
-		@map        = nil
 		@counters   = {} # for jabber fav
 	end
 
@@ -228,7 +227,7 @@ class HaikuIrcGateway < Net::IRC::Server::Session
 	end
 
 	def on_privmsg(m)
-		return on_ctcp(m[0], ctcp_decoding(m[1])) if m.ctcp?
+		return m[1].ctcps.each {|ctcp| on_ctcp(m[0], ctcp) } if m.ctcp?
 		retry_count = 3
 		ret = nil
 		target, message = *m.params
@@ -242,17 +241,24 @@ class HaikuIrcGateway < Net::IRC::Server::Session
 			else
 				channel = "" if "##{channel}" == main_channel
 				rid = rid_for(reply) if reply
-				ret = api("statuses/update", {"status" => message, "in_reply_to_status_id" => rid, "keyword" => channel})
+				if @typo
+					log "typo mode. requesting..."
+					message.gsub!(/\\n/, "\n")
+					file = Net::HTTP.get(URI("http://lab.lowreal.net/test/haiku.rb/?text=" + URI.escape(message)))
+					ret = api("statuses/update", {"file" => file, "in_reply_to_status_id" => rid, "keyword" => channel})
+				else
+					ret = api("statuses/update", {"status" => message, "in_reply_to_status_id" => rid, "keyword" => channel})
+				end
 				log "Status Updated via API"
 			end
 			raise ApiFailed, "API failed" unless ret
 			check_timeline
 		rescue => e
-			@log.error [retry_count, e.inspect].inspect
+			@log.error [retry_count, e.message, e.inspect, e.backtrace].inspect
 			if retry_count > 0
 				retry_count -= 1
 				@log.debug "Retry to setting status..."
-				retry
+				# retry
 			else
 				log "Some Error Happened on Sending #{message}. #{e}"
 			end
@@ -315,10 +321,13 @@ class HaikuIrcGateway < Net::IRC::Server::Session
 			else
 				post nil, NOTICE, main_channel, "No such id #{tid}"
 			end
+		when "typo"
+			@typo = !@typo
+			post nil, NOTICE, main_channel, "typo mode: #{@typo}"
 		end
 	rescue ApiFailed => e
 		log e.inspect
-	end
+	end; private :on_ctcp
 
 	def on_whois(m)
 		nick = m.params[0]
@@ -553,7 +562,32 @@ class HaikuIrcGateway < Net::IRC::Server::Session
 		req = nil
 		if require_post?(path)
 			req = Net::HTTP::Post.new(uri.path)
-			req.body = uri.query
+			if q["file"]
+				boundary = (rand(0x1_00_00_00_00_00) + 0x1_00_00_00_00_00).to_s(16)
+				@log.info boundary
+				req["content-type"] = "multipart/form-data; boundary=#{boundary}"
+
+				body = ""
+				q.each do |k, v|
+					body << "--#{boundary}\r\n"
+					if k == "file"
+						body << "Content-Disposition: form-data; name=\"#{k}\"; filename=\"temp.png\";\r\n"
+						body << "Content-Transfer-Encoding: binary\r\n"
+						body << "Content-Type: image/png\r\n"
+					else
+						body << "Content-Disposition: form-data; name=\"#{k}\";\r\n"
+					end
+					body << "\r\n"
+					body << v.to_s
+					body << "\r\n"
+				end
+				body << "--#{boundary}--\r\n"
+
+				req.body = body
+				uri.query = ""
+			else
+				req.body = uri.query
+			end
 		else
 			req = Net::HTTP::Get.new(uri.request_uri)
 		end
@@ -604,20 +638,18 @@ class HaikuIrcGateway < Net::IRC::Server::Session
 	end
 
 	class TypableMap < Hash
-		Roma = %w|k g ky gy s z sh j t d ch n ny h b p hy by py m my y r ry w v q|.unshift("").map {|consonant|
-			case
-			when consonant.size > 1, consonant == "y"
-				%w|a u o|
-			when consonant == "q"
-				%w|a i e o|
-			else
-				%w|a i u e o|
+		Roman = %w[
+			k g ky gy s z sh j t d ch n ny h b p hy by py m my y r ry w v q
+		].unshift("").map do |consonant|
+			case consonant
+			when "y", /\A.{2}/ then %w|a u o|
+			when "q"           then %w|a i e o|
+			else                    %w|a i u e o|
 			end.map {|vowel| "#{consonant}#{vowel}" }
-		}.flatten
+		end.flatten
 
-		def initialize(size=1)
-			@seq  = Roma
-			@map  = {}
+		def initialize(size = 1)
+			@seq  = Roman
 			@n    = 0
 			@size = size
 		end
@@ -635,7 +667,7 @@ class HaikuIrcGateway < Net::IRC::Server::Session
 			id = generate(@n)
 			self[id] = obj
 			@n += 1
-			@n = @n % (@seq.size ** @size)
+			@n %= @seq.size ** @size
 			id
 		end
 		alias << push

data/examples/iig.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# vim:fileencoding=UTF-8:
 =begin
 
 # iig.rb
@@ -22,7 +23,7 @@ Configuration example for Tiarra <http://coderepos.org/share/wiki/Tiarra>.
 	identica {
 		host: localhost
 		port: 16672
-		name: username@example.com athack tid ratio=32:1 replies=6
+		name: username@example.com athack tid ratio=77:1:12 replies
 		password: password on Identi.ca
 		in-encoding: utf8
 		out-encoding: utf8
@@ -64,7 +65,6 @@ Apply ID to each message for make favorites by CTCP ACTION.
 	14 => grey
 	15 => lightgrey    silver
 
-
 ### jabber=<jid>:<pass>
 
 If `jabber=<jid>:<pass>` option specified,
@@ -89,61 +89,41 @@ Use IM instead of any APIs (e.g. post)
 
 ### checkrls=<interval seconds>
 
+## Feed
+
+<http://coderepos.org/share/log/lang/ruby/net-irc/trunk/examples/iig.rb?limit=100&mode=stop_on_copy&format=rss>
+
 ## License
 
 Ruby's by cho45
 
 =end
 
-$LOAD_PATH << "lib"
-$LOAD_PATH << "../lib"
-
-$KCODE = "u" # json use this
+$LOAD_PATH << "lib" << "../lib"
+$KCODE = "u" if RUBY_VERSION < "1.9" # json use this
 
 require "rubygems"
 require "net/irc"
 require "net/http"
 require "uri"
-require "json"
 require "socket"
 require "time"
 require "logger"
 require "yaml"
 require "pathname"
 require "cgi"
-
-Net::HTTP.version_1_2
+require "json"
 
 class IdenticaIrcGateway < Net::IRC::Server::Session
-	def server_name
-		"identicagw"
-	end
-
-	def server_version
-		"0.0.0"
-	end
-
-	def main_channel
-		"#Identi.ca"
-	end
+	def server_name;    "identicagw"                 end
+	def server_version; "0.0.0"                      end
+	def main_channel;   "#Identi.ca"                 end
+	def api_base;       URI("http://identi.ca/api/") end
+	def api_source;     "iig.rb"                     end
+	def jabber_bot_id;  "update@identi.ca"           end
+	def hourly_limit;   100                          end
 
-	def api_base
-		URI("http://identi.ca/api/")
-	end
-
-	def api_source
-		"iig.rb"
-	end
-
-	def jabber_bot_id
-		"update@identi.ca"
-	end
-
-	def hourly_limit
-		60
-	end
-
-	class ApiFailed < StandardError; end
+	class APIFailed < StandardError; end
 
 	def initialize(*args)
 		super
@@ -151,7 +131,6 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 		@channels   = [] # joined channels (groups)
 		@user_agent = "#{self.class}/#{server_version} (#{File.basename(__FILE__)})"
 		@config     = Pathname.new(ENV["HOME"]) + ".iig"
-		@map        = nil
 		load_config
 	end
 
@@ -201,7 +180,7 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 			loop do
 				begin
 					check_friends
-				rescue ApiFailed => e
+				rescue APIFailed => e
 					@log.error e.inspect
 				rescue Exception => e
 					@log.error e.inspect
@@ -221,7 +200,7 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 				begin
 					check_timeline
 					# check_direct_messages
-				rescue ApiFailed => e
+				rescue APIFailed => e
 					@log.error e.inspect
 				rescue Exception => e
 					@log.error e.inspect
@@ -240,7 +219,7 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 			loop do
 				begin
 					check_replies
-				rescue ApiFailed => e
+				rescue APIFailed => e
 					@log.error e.inspect
 				rescue Exception => e
 					@log.error e.inspect
@@ -254,15 +233,15 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 	end
 
 	def on_disconnected
-		@check_friends_thread.kill    rescue nil
-		@check_replies_thread.kill    rescue nil
-		@check_timeline_thread.kill   rescue nil
-		@im_thread.kill               rescue nil
-		@im.disconnect                rescue nil
+		@check_friends_thread.kill  rescue nil
+		@check_replies_thread.kill  rescue nil
+		@check_timeline_thread.kill rescue nil
+		@im_thread.kill             rescue nil
+		@im.disconnect              rescue nil
 	end
 
 	def on_privmsg(m)
-		return on_ctcp(m[0], ctcp_decoding(m[1])) if m.ctcp?
+		return m[1].ctcps.each {|ctcp| on_ctcp(m[0], ctcp) } if m.ctcp?
 		retry_count = 3
 		ret = nil
 		target, message = *m.params
@@ -278,7 +257,7 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 				# direct message
 				ret = api("direct_messages/new", {"user" => target, "text" => message})
 			end
-			raise ApiFailed, "API failed" unless ret
+			raise APIFailed, "API failed" unless ret
 			log "Status Updated"
 		rescue => e
 			@log.error [retry_count, e.inspect].inspect
@@ -363,9 +342,9 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 			location = location.empty? ? "nowhere" : "in #{location}"
 			post server_name, NOTICE, main_channel, "You are #{location} now."
 		end
-	rescue ApiFailed => e
+	rescue APIFailed => e
 		log e.inspect
-	end
+	end; private :on_ctcp
 
 	def on_whois(m)
 		nick = m.params[0]
@@ -667,19 +646,19 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 		when Net::HTTPOK # 200
 			ret = JSON.parse(ret.body.gsub(/'(y(?:es)?|no?|true|false|null)'/, '"\1"'))
 			if ret.kind_of?(Hash) && !opt[:avoid_error] && ret["error"]
-				raise ApiFailed, "Server Returned Error: #{ret["error"]}"
+				raise APIFailed, "Server Returned Error: #{ret["error"]}"
 			end
 			ret
 		when Net::HTTPNotModified # 304
 			[]
 		when Net::HTTPBadRequest # 400
 			# exceeded the rate limitation
-			raise ApiFailed, "#{ret.code}: #{ret.message}"
+			raise APIFailed, "#{ret.code}: #{ret.message}"
 		else
-			raise ApiFailed, "Server Returned #{ret.code} #{ret.message}"
+			raise APIFailed, "Server Returned #{ret.code} #{ret.message}"
 		end
 	rescue Errno::ETIMEDOUT, JSON::ParserError, IOError, Timeout::Error, Errno::ECONNRESET => e
-		raise ApiFailed, e.inspect
+		raise APIFailed, e.inspect
 	end
 
 	def message(sender, target, str)
@@ -692,7 +671,7 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 	end
 
 	def log(str)
-		str.gsub!(/\r?\n|\r/, " ")
+		str.gsub!(/\r\n|[\r\n]/, " ")
 		post server_name, NOTICE, main_channel, str
 	end
 
@@ -712,20 +691,18 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 	end
 
 	class TypableMap < Hash
-		Roman = %w|k g ky gy s z sh j t d ch n ny h b p hy by py m my y r ry w v q|.unshift("").map {|consonant|
-			case
-			when consonant.size > 1, consonant == "y"
-				%w|a u o|
-			when consonant == "q"
-				%w|a i e o|
-			else
-				%w|a i u e o|
+		Roman = %w[
+			k g ky gy s z sh j t d ch n ny h b p hy by py m my y r ry w v q
+		].unshift("").map do |consonant|
+			case consonant
+			when "y", /\A.{2}/ then %w|a u o|
+			when "q"           then %w|a i e o|
+			else                    %w|a i u e o|
 			end.map {|vowel| "#{consonant}#{vowel}" }
-		}.flatten
+		end.flatten
 
 		def initialize(size = 1)
 			@seq  = Roman
-			@map  = {}
 			@n    = 0
 			@size = size
 		end
@@ -743,7 +720,7 @@ class IdenticaIrcGateway < Net::IRC::Server::Session
 			id = generate(@n)
 			self[id] = obj
 			@n += 1
-			@n = @n % (@seq.size ** @size)
+			@n %= @seq.size ** @size
 			id
 		end
 		alias << push
@@ -814,27 +791,27 @@ if __FILE__ == $0
 	opts[:logger] = Logger.new(opts[:log], "daily")
 	opts[:logger].level = opts[:debug] ? Logger::DEBUG : Logger::INFO
 
-#	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 "/"
-#			File.open("/dev/null") {|f|
-#				STDIN.reopen  f
-#				STDOUT.reopen f
-#				STDERR.reopen f
-#			}
-#			yield
-#		end
-#		exit! 0
-#	end
-
-#	daemonize(opts[:debug] || opts[:foreground]) do
+	#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 "/"
+	#		File.open("/dev/null") {|f|
+	#			STDIN.reopen  f
+	#			STDOUT.reopen f
+	#			STDERR.reopen f
+	#		}
+	#		yield
+	#	end
+	#	exit! 0
+	#end
+
+	#daemonize(opts[:debug] || opts[:foreground]) do
 		Net::IRC::Server.new(opts[:host], opts[:port], IdenticaIrcGateway, opts).start
-#	end
+	#end
 end
 
 # Local Variables: