nadoka 0.8.2 → 0.8.3

data/lib/rss_check.rb

@@ -148,20 +148,30 @@ class RSS_Check
   end
 
   def save
+    debug = $DEBUG
+    $DEBUG = false
     @db.transaction{
       @paths.each_with_index{|path, i|
         @db[path] = @rss_files[i]
       }
     } if @db
+  ensure
+    $DEBUG = debug
   end
 
   def load_file file
+    debug = $DEBUG
+    $DEBUG = false
     @db.transaction{
       @db[file]
     } if @db
+  ensure
+    $DEBUG = debug
   end
 
   def clear
+    debug = $DEBUG
+    $DEBUG = false
     if @db
       @db.transaction{
         @db.keys.each{|k|
@@ -169,6 +179,8 @@ class RSS_Check
         }
       }
     end
+  ensure
+    $DEBUG = debug
   end
 end
 

data/nadokarc

@@ -36,6 +36,8 @@ class NADOKA_Config < Nadoka::NDK_ConfigBase
   Client_server_host = nil # You can specify binding host(interface)
   Client_server_pass = 'NadokaPassWord'
   Client_server_acl  = nil
+  Client_server_ssl_cert_file = nil
+  Client_server_ssl_key_file  = nil
 
   # ACL(Access Control List) example:
   # Client_server_acl = %q{
@@ -47,13 +49,20 @@ class NADOKA_Config < Nadoka::NDK_ConfigBase
   # or you can set acl directly like follows:
   #
   # ACL_Object = ::ACL.new(...)
+
+  # Create a self-signed SSL certificate:
+  # $ openssl req -new -days 365 -x509 -nodes -out cert.pem -keyout key.pem
   #
+  # And specify cert files:
+  # Client_server_ssl_cert_file = 'cert.pem'
+  # Client_server_ssl_key_file  = 'key.pem'
 
 
   ###############################################
   # server setting
 
   # IRCnet servers in Japan
+  # see http://www.ircnet.ne.jp/servers.html
   Servers = [
     { :host => 'irc.ircnet.ne.jp',
       :port => 6667,                       # default: 6667

data/ndk/config.rb

@@ -34,6 +34,8 @@ module Nadoka
     Client_server_host = nil
     Client_server_pass = 'NadokaPassWord' # or nil
     Client_server_acl  = nil
+    Client_server_ssl_cert_file = nil
+    Client_server_ssl_key_file  = nil
     ACL_Object = nil
     
     # 
@@ -179,13 +181,13 @@ module Nadoka
 
     def remove_previous_setting
       # remove setting class
-      klass = ConfigClass.shift
-      while k = ConfigClass.shift
+      base_klass = ConfigClass.shift
+      while klass = ConfigClass.shift
         Object.module_eval{
-          remove_const(k.name)
+          remove_const(klass.name)
         }
       end
-      ConfigClass.push(klass)
+      ConfigClass.push(base_klass)
 
 
       # clear required files
@@ -412,7 +414,7 @@ module Nadoka
     end
     
     def canonical_channel_name ch
-      ch = ch.sub(/^\!.{5}/, '!')
+      ch = ch.toeuc.sub(/^\!.{5}/, '!')
       identical_channel_name ch
     end
 

data/ndk/logger.rb

@@ -241,7 +241,7 @@ module Nadoka
     def logging msg
       user = @manager.nick_of(msg)
       rch = msg.params[0]
-      ch_ = ch = @config.canonical_channel_name(rch)
+      ch = @config.canonical_channel_name(rch)
 
       msgobj = make_msgobj(msg)
       msgobj[:ch]   = rch  # should be raw

data/ndk/server.rb

@@ -15,6 +15,10 @@ require 'ndk/error'
 require 'ndk/config'
 require 'ndk/server_state'
 require 'ndk/client'
+begin
+  require 'openssl'
+rescue LoadError
+end
 
 module Nadoka
   Cmd = ::RICE::Command
@@ -163,8 +167,9 @@ module Nadoka
         case q.command
         when '001'
           break
-        when '433'
+        when '433', '437'
           # Nickname is already in use.
+          # 437 Nick/channel is temporarily unavailable
           nick = @state.nick_succ(q.params[1])
           @state.nick = nick
           send_to_server Cmd.nick(nick)
@@ -343,6 +348,13 @@ module Nadoka
                                    @config.client_server_port)
           @logger.slog "Open Client Server Port: #{@cserver.addr.join(' ')}"
           
+          if @config.client_server_ssl_cert_file && @config.client_server_ssl_key_file
+            context = OpenSSL::SSL::SSLContext.new
+            context.cert = OpenSSL::X509::Certificate.new(File.read(@config.client_server_ssl_cert_file))
+            context.key = OpenSSL::PKey::RSA.new(File.read(@config.client_server_ssl_key_file))
+            @cserver = OpenSSL::SSL::SSLServer.new(@cserver, context)
+          end
+          
           while true
             # wait for client connections
             Thread.start(@cserver.accept){|cc|

data/ndk/server_state.rb

@@ -195,7 +195,7 @@ module Nadoka
     def on_join user, rch
       ch = canonical_channel_name(rch)
       if user == nick
-        chs = @current_channels[ch] = ChannelState.new(rch)
+        @current_channels[ch] = ChannelState.new(rch)
       else
         if @current_channels.has_key? ch
           @current_channels[ch].on_join(user)

data/ndk/version.rb

@@ -11,7 +11,7 @@
 #
 
 module Nadoka
-  VERSION  = '0.8.2'
+  VERSION  = '0.8.3'
   NDK_Version  = VERSION.dup
   NDK_Created  = Time.now
 
@@ -33,7 +33,7 @@ module Nadoka
     $LOAD_PATH.each{|path|
       path = path + '/ChangeLog'
       if FileTest.exist?(path)
-        if /^\# ChangeLog of Nadoka\(\$Rev: (\d+) \$\)$/ =~ open(path){|f| s = f.gets}
+        if /^\# ChangeLog of Nadoka\(\$Rev: (\d+) \$\)$/ =~ open(path){|f| f.gets}
           rev = "rev: #{$1}"
           break
         end

data/plugins/codesearchbot.nb

@@ -0,0 +1,75 @@
+# -*-ruby; coding: utf-8 -*- vim:set ft=ruby:
+#
+# Copyright (c) 2012 Kazuhiro NISHIYAMA
+#
+# This program is free software with ABSOLUTELY NO WARRANTY.
+# You can re-distribute and/or modify this program under
+# the same terms of the Ruby's license.
+#
+
+require 'open-uri'
+require 'uri'
+require 'nkf'
+
+module CodeSearch
+  ResultRegexp = /number of (regexp results: \d+)<br>\s*number of (source results: \d+)/
+
+  # https://code.google.com/p/codesearch/
+  EngineURI = {
+    'debian' => 'http://codesearch.debian.net/',
+  }
+
+  def codesearch_result engine, key
+    engine ||= 'debian'
+    key_uri = URI.encode(NKF.nkf('-w', key))
+    engine_uri = EngineURI[engine.downcase]
+    return "unknown engine: #{engine}" unless engine_uri 
+
+    url = "#{engine_uri}search?q=#{key_uri}"
+    open(url){|f|
+      result = f.read
+      if ResultRegexp =~ result
+        "#{$~.captures.join(', ')} for #{key} - #{url}"
+      else
+        "#{key} - not found in #{engine} codesearch"
+      end
+    }
+  end
+end
+
+if __FILE__ == $0
+  if ARGV.empty?
+    abort("usage: #{$0} keyword")
+  end
+  include CodeSearch
+  puts codesearch_result('debian', ARGV.join(' '))
+  exit
+end
+
+class CodeSearchBot < Nadoka::NDK_Bot
+  include CodeSearch
+
+  def bot_initialize
+    if @bot_config.key?(:channels)
+      channels = '\A(?:' + @bot_config[:channels].collect{|ch|
+        Regexp.quote(ch)
+      }.join('|') + ')\z'
+      @available_channel = Regexp.compile(channels)
+    else
+      @available_channel = @bot_config[:ch] || //
+    end
+
+    @bot_name = @bot_config[:bot_name] || 'CodeSearchBot'
+    @open_search = OpenSearch.new(@bot_config)
+    @ch_kcode = @bot_config[:ch_kcode]
+  end
+
+  def on_privmsg prefix, ch, msg
+    return unless /\Acodesearch(\:([a-z]+))?>\s*(.+)/ =~ msg
+    msg = "codesearch#$1 bot: #{codesearch_result($2, $3.toutf8)}"
+    if @ch_kcode == :jis
+      msg = msg.tojis
+    end
+    send_notice ch, msg
+  end
+end

data/plugins/titlebot.nb

@@ -81,32 +81,34 @@ module URL2Title
 
 
         # encoding
-        begin
-          if charset
-            # ok
-          elsif /charset=[\'\"]?([^;\'\">]+)/ni =~ body
-            charset = $1
-          end
-          case charset
-          when /shift_jis/i
-            charset = "cp932"
-          when /euc-jp/i # euc-jp, x-euc-jp
-            charset = "eucjp-ms"
-          end
-          if /\Autf-8\z/i =~ charset
-            # avoid #<ArgumentError: invalid byte sequence in UTF-8>
-            # or Iconv::IllegalSequence
-            body = NKF.nkf("-Wwm0x", body)
-          elsif charset
-            charset.sub!(/\Ax-?/i, '')
+        if charset
+          # ok
+        elsif /charset=[\'\"]?([^;\'\">]+)/ni =~ body
+          charset = $1
+        end
+        case charset
+        when /shift_jis/i
+          charset = "cp932"
+        when /euc-jp/i # euc-jp, x-euc-jp
+          charset = "eucjp-ms"
+        end
+        if /\Autf-8\z/i =~ charset
+          # avoid #<ArgumentError: invalid byte sequence in UTF-8>
+          # or Iconv::IllegalSequence
+          body = NKF.nkf("-Wwm0x", body)
+        elsif charset
+          charset.sub!(/\Ax-?/i, '')
+          begin
             body = Iconv.conv("utf-8", charset, body)
-          else
+          rescue Iconv::IllegalSequence => e
+            info[:errors] << e
+            body = NKF.nkf("-wm0x", body)
+          rescue Iconv::InvalidEncoding => e
+            info[:errors] << e
             body = NKF.nkf("-wm0x", body)
           end
-        rescue Iconv::IllegalSequence => e
-          info[:errors] << e
-        rescue Iconv::InvalidEncoding => e
-          info[:errors] << e
+        else
+          body = NKF.nkf("-wm0x", body)
         end
 
         title = nil

data/plugins/twitterbot.nb

@@ -44,6 +44,7 @@
 #
 require 'time'
 require 'rubygems'
+require 'user_stream'
 require 'rubytter'
 require 'json'
 
@@ -85,22 +86,56 @@ class TwitterBot < Nadoka::NDK_Bot
       @bot_config.fetch(:access_token_secret,  nil))
     @rt = OAuthRubytter.new(access_token)
     @current_id = -1
-  end
 
-  def on_timer(t)
-    @rt.friends_timeline.each do |status|
-      id = status.id.to_i
-      next unless @current_id < id
-      @current_id = id
-      time = Time.parse(status.created_at)
-      next if time + 5 * 60 < Time.now
-      text = status.text.tr("\r\n", ' ')
-      text = NKF.nkf('--ic=UTF-8 --oc=' + @nkf_encoding, text) if @nkf_encoding
-      send_notice @ch, "#{time.strftime('%H:%M')} #{status.user.screen_name}: #{text}"
+    UserStream.configure do |config|
+      config.consumer_key = @bot_config.fetch(:consumer_key,  nil)
+      config.consumer_secret = @bot_config.fetch(:consumer_secret,  nil)
+      config.oauth_token = @bot_config.fetch(:access_token,  nil)
+      config.oauth_token_secret = @bot_config.fetch(:access_token_secret,  nil)
     end
-  rescue Errno::ETIMEDOUT, Timeout::Error, SocketError
-  rescue Exception => err
-    puts_error_message(err)
+
+    @streamer = Thread.new do
+      UserStream.client.user do |status|
+        case # https://dev.twitter.com/docs/streaming-apis/messages
+        when status[:delete]
+        when status[:scrub_geo]
+        when status[:limit]
+        when status[:status_withheld]
+        when status[:user_withheld]
+        when status[:friends]
+        when status[:event]
+        when status[:for_user]
+        when status[:control]
+        when status[:warning]
+          screen_name = status[:code]
+          time = Time.parse(status[:created_at])
+          send_notice @ch, "#{time.strftime('%H:%M')} #{screen_name}: #{status.text}"
+        else
+          begin
+            screen_name = status[:user][:screen_name]
+            if status[:retweeted_status]
+              status = status[:retweeted_status]
+              screen_name << ":"
+              screen_name << status[:user][:screen_name]
+            end
+            time = Time.parse(status[:created_at])
+            text = status.text.tr("\r\n", ' ')
+            text = NKF.nkf('--ic=UTF-8 --oc=' + @nkf_encoding, text) if @nkf_encoding
+            send_notice @ch, "#{time.strftime('%H:%M')} #{screen_name}: #{text}"
+          rescue => e
+            slog e.backtrace
+            slog e.inspect
+            slog status.inspect
+          end
+        end
+      end
+    end
+  end
+
+  def bot_destruct
+    @streamer.kill
+    @streamer.join
+  rescue Timeout::Error
   end
 
   def on_client_privmsg(client, ch, message)
@@ -125,11 +160,8 @@ class TwitterBot < Nadoka::NDK_Bot
 
   private
   def puts_error_message(err)
-    if err.is_a?(Rubytter::APIError)
+    if err.is_a?(Rubytter::APIError) || err.is_a?(JSON::ParserError)
       @logger.slog "%s: %s (%s) %s" % [err.backtrace[0], err.message, err.class, err.response]
-    elsif err.is_a?(JSON::ParserError)
-      sleep 180
-      return
     else
       @logger.slog "%s: %s (%s)" % [err.backtrace[0], err.message, err.class]
     end

data/rice/irc.rb

@@ -200,9 +200,11 @@ module RICE
         end
         sleep retry_wait
         retry
-      ensure
+      rescue Exception
+        @main_th.kill
+        raise
+      else
         @main_th.join
-        nil
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nadoka
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-29 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies: []
 description: Nadoka is a tool for monitoring and logging IRC conversations and responding
   to specially formatted requests. You define and customize these responses in Ruby.
@@ -23,11 +23,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- ChangeLog.old
 - Gemfile
 - README.md
 - Rakefile
 - bin/nadoka
+- doc/ChangeLog.old
 - lib/rss_check.rb
 - lib/tagparts.rb
 - nadoka.gemspec
@@ -46,6 +46,7 @@ files:
 - plugins/autoop.nb
 - plugins/backlogbot.nb
 - plugins/checkbot.nb
+- plugins/codesearchbot.nb
 - plugins/cronbot.nb
 - plugins/dictbot.nb
 - plugins/drbcl.rb