nadoka 0.8.3 → 0.8.4

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 log/
 pkg/*
+nadoka_fatal_error

data/ndk/server.rb

@@ -353,11 +353,13 @@ module Nadoka
             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)
+            @cserver.start_immediately = false
           end
           
           while true
             # wait for client connections
             Thread.start(@cserver.accept){|cc|
+              cc.accept if OpenSSL::SSL::SSLSocket === cc rescue NameError
               client = nil
               begin
                 if !@config.acl_object || @config.acl_object.allow_socket?(cc)

data/ndk/version.rb

@@ -11,7 +11,7 @@
 #
 
 module Nadoka
-  VERSION  = '0.8.3'
+  VERSION  = '0.8.4'
   NDK_Version  = VERSION.dup
   NDK_Created  = Time.now
 

data/plugins/githubissuesbot.nb

@@ -0,0 +1,141 @@
+# -*-ruby; coding: utf-8 -*- vim:set ft=ruby:
+# Copyright (C) 2013 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.
+#
+
+=begin
+
+== Configuration:
+
+  BotConfig << {
+    :name => :GithubIssuesBot,
+    :bot_name => 'gh',
+    :ch => '#nadoka_check',
+    :tm => 30, # min
+    #:nkf => "--oc=CP50221 --ic=UTF-8 --fb-xml",
+    :owner => "nadoka",
+    :repo => "nadoka",
+  }
+
+=end
+require 'open-uri'
+require 'time'
+begin
+  require 'json'
+rescue LoadError
+  require 'rubygems'
+  require 'json'
+end
+
+module GithubIssues
+  module_function
+
+  def issues(owner, repo, since=nil, state='open')
+    since = since.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+    uri = URI("https://api.github.com/repos/#{owner}/#{repo}/issues?since=#{since}&state=#{state}")
+    issues = JSON.parse(uri.read)
+    issues.each do |issue|
+      comments_uri = URI("#{issue['comments_url']}?since=#{since}")
+      comments = JSON.parse(comments_uri.read)
+      if comments.empty?
+        yield [:issue, issue, issue_to_s(issue)]
+      else
+        comments.each do |comment|
+          yield [:comment, comment, comment_to_s(comment, issue)]
+        end
+      end
+    end
+  end
+
+  def user_to_s(user)
+    return unless user
+    "@#{user['login']} "
+  end
+
+  def time_to_s(time)
+    return unless time
+    time = Time.parse(time)
+    time.localtime.strftime("%H:%M ")
+  end
+
+  def issue_to_s(issue)
+    return unless issue
+    "#{issue['html_url']} [#{issue['state']}] #{time_to_s(issue['updated_at'])}#{user_to_s(issue['user'])}#{issue['title']}"
+  end
+
+  def comment_to_s(comment, issue=nil)
+    return unless comment
+    if issue
+      info = "[#{issue['state']}] "
+    else
+    end
+    "#{comment['html_url']} #{info}#{time_to_s(comment['updated_at'])}#{user_to_s(comment['user'])}#{comment['body']}"
+  end
+end
+
+if __FILE__ == $0
+  owner = "rubima"
+  repo = "rubima"
+  since = Time.now - 60*60*3
+  GithubIssues.issues(owner, repo, since) do |_, _, s|
+    puts s.gsub(/\s+/, ' ')
+  end
+  GithubIssues.issues(owner, repo, since, 'close') do |_, _, s|
+    puts s.gsub(/\s+/, ' ')
+  end
+  exit
+end
+
+require 'nkf'
+
+class GithubIssuesBot < Nadoka::NDK_Bot
+  def bot_initialize
+    @ch = @bot_config.fetch(:ch, '#nadoka_check')
+    @tm = @bot_config.fetch(:tm, 30) # min
+    @prevtm = Time.now
+    @nkf_options = @bot_config.fetch(:nkf, "--oc=CP50221 --ic=UTF-8 --fb-xml")
+    @owner = @bot_config.fetch(:owner, "nadoka")
+    @repo = @bot_config.fetch(:repo, "nadoka")
+  end
+
+  def bot_state
+    nt = Time.at(@prevtm.to_i + @tm * 60)
+    "<#{self.class}: next check at #{nt.asctime}@#{@ch}>" 
+  end
+
+  def send_notice(ch, msg)
+    msg = msg.gsub(/\s+/, ' ')
+    if @nkf_options
+      msg = NKF.nkf(@nkf_options, msg)
+    end
+    super(ch, msg)
+  end
+
+  def on_timer tm
+    check
+  end
+
+  def check
+    tm = Time.now
+    if tm.to_i - @tm * 60 > @prevtm.to_i
+      make_notice tm
+    end
+  end
+
+  def make_notice tm
+    since = @prevtm
+    @prevtm = tm
+    GithubIssues.issues(@owner, @repo, since) do |_, _, s|
+      send_notice @ch, s
+    end
+    GithubIssues.issues(@owner, @repo, since, 'close') do |_, _, s|
+      send_notice @ch, s
+    end
+  rescue Exception => e
+    send_notice(@ch, "rss bot error: #{e}")
+    @manager.ndk_error e
+  end
+end

data/plugins/googlebot.nb

@@ -182,7 +182,16 @@ class GoogleBot < Nadoka::NDK_Bot
       result.gsub!(/<sup>(.+?)<\/sup>/u) { "^(#{$1})" }
       result.gsub!(/<.+?>/u, '')
       result.gsub!(/&\#215;/u, "\303\227")
-      result
+      return result
+    elsif /<[^<>]+ id="cwos"[^<>]*>([^<>]+)</u =~ html
+      result = $1
+      if /<[^<>]+ id="cwles"[^<>]*>([^<>]+)</u =~ html
+        result = "#{$1}#{result}"
+      end
+      #@logger.slog("google_calc>#{result.dump}")
+      result.gsub!(/&nbsp;/u, " ")
+      result.gsub!(/\s+/, " ")
+      return result
     else
       "response error"
     end

data/plugins/tenkibot.nb

@@ -13,18 +13,15 @@
 
 Answer weather information using "Livedoor Weather Web Service / LWWS".
 
-LWWS: http://weather.livedoor.com/weather_hacks/webservice.html
+LWWS: http://weather.livedoor.com/weather_hacks/webservice
 
 
 == Usage
 
   tenki> [CITY] 
-  tenki:[today|tomorrow|dayaftertomorrow]> [CITY]
 
   [CITY] should be city name in Kanji listed on following table.
-  http://weather.livedoor.com/forecast/rss/forecastmap.xml
-
-  If timing is not specified, show today's information.
+  http://weather.livedoor.com/forecast/rss/primary_area.xml
 
 
 == Configuration
@@ -32,7 +29,7 @@ LWWS: http://weather.livedoor.com/weather_hacks/webservice.html
 BotConfig = [
 {
   :name => :TenkiBot,
-  :ch   => /nadoka/,  # default: /.*/
+  :ch   => /nadoka/,  # default: //
 }
 ]
 
@@ -42,62 +39,65 @@ BotConfig = [
 require 'open-uri'
 require 'pp'
 require 'kconv'
-require 'rexml/document'
 require 'date'
+begin
+  require 'json'
+rescue LoadError
+  require 'rubygems'
+  require 'json'
+end
 
 module Tenki
   CityIDs = {}
 
   def init_tenki
-    open('http://weather.livedoor.com/forecast/rss/forecastmap.xml'){|f|
-      f.each{|line|
+    open('http://weather.livedoor.com/forecast/rss/primary_area.xml') do |f|
+      f.each_line do |line|
         if /city title="(.+?)" id="(\d+)"/ =~ line
-          CityIDs[$1.toutf8] = $2.to_i
+          CityIDs[$1.toutf8] = $2
         end
-      }
-    }
+      end
+    end
   end
 
-  def tenki city, timing
-    doc = open(
-      "http://weather.livedoor.com/forecast/webservice/rest/v1?" \
-      "city=#{CityIDs.fetch(city)}&day=#{timing}"){|f|
-      REXML::Document.new f.read
-    }
-
-    title = doc.elements['/lwws/title/'].text.toutf8
-    telop = doc.elements['/lwws/telop/'].text.toutf8
-    link = doc.elements['/lwws/link/'].text.toutf8
-    desc = doc.elements['/lwws/description/'].text.toutf8
-    max = doc.elements['/lwws/temperature/max/celsius/'].text
-    min = doc.elements['/lwws/temperature/min/celsius/'].text
-    date = Date.parse(doc.elements['/lwws/forecastdate/'].text)
-    datestr = date.strftime('%m/%d')
-
-    desc.sub!(/\.\.\..*/m, '...')
-
-    celsius = []
-    celsius << "max: #{max}" if max
-    celsius << "min: #{min}" if min
-    unless celsius.empty?
-      celsius = "(#{celsius.join(', ')}) "
+  def tenki(city)
+    unless city_id = CityIDs[city]
+      return "Unknown city.  Check city title on http://weather.livedoor.com/forecast/rss/primary_area.xml"
     end
-    "#{title} (#{datestr}): #{telop} - #{celsius}#{desc} - #{link}"
+    json = open("http://weather.livedoor.com/forecast/webservice/json/v1?city=#{city_id}") do |f|
+      JSON.parse f.read
+    end
+
+    tenki = "#{json['title']}: "
+    tenki << json['forecasts'].map do |forecast|
+      max = forecast['temperature']['max']
+      min = forecast['temperature']['min']
+      celsius = []
+      celsius << "min:#{min['celsius']}" if min
+      celsius << "max:#{max['celsius']}" if max
+      unless celsius.empty?
+        temperature = "(#{celsius.join(',')})"
+      end
+      "#{forecast['dateLabel']}:#{forecast['telop']}#{temperature}"
+    end.join(', ')
+    desc = json['description']
+    text, = desc['text'].split(/\n\n/, 2)
+    text.gsub!(/\n/, '')
+    tenki << " - #{text}(#{desc['publicTime']})"
+    tenki << " - #{json['link']}"
+
+    tenki
   end
 end
 
 if __FILE__ == $0
   include Tenki
-  city = ARGV.shift
-  timing = ARGV.shift || 'today'
-  if city.nil?
-    puts "#$0 city [today|tomorrow|dayaftertomorrow]"
+  if ARGV.empty?
+    puts "#$0 city"
   else
     init_tenki
-    begin
-      puts tenki(city, timing)
-    rescue IndexError
-      puts "Unknown city.  Check city title on http://weather.livedoor.com/forecast/rss/forecastmap.xml"
+    ARGV.each do |city|
+      puts tenki(city)
     end
   end
   exit
@@ -116,17 +116,14 @@ class TenkiBot < Nadoka::NDK_Bot
     return unless @available_channel === ch
     return if same_bot?(ch)
     msg = NKF.nkf('-w', msg)
-    if /\Atenki(|:(today|tomorrow|dayaftertomorrow))>(.+)/ =~ msg
-      city = $3.strip.toutf8
-      timing = ($2 || 'today').strip
+    if /\Atenki>/ =~ msg
+      city = $'.strip.toutf8
       begin
-        result = tenki(city, timing).gsub(/\n/, ' ')
-      rescue IndexError
-        result = "Unknown city.  Check city title on http://weather.livedoor.com/forecast/rss/forecastmap.xml"
+        result = tenki(city)
       rescue => e
         result = "#{e}"
       end
-      send_notice ch, NKF.nkf(@nkf, "tenki bot: #{result}")
+      send_notice ch, NKF.nkf(@nkf, "tenki bot: #{result}".gsub(/\s+/, ' '))
     end
   end
 end

data/plugins/titlebot.nb

@@ -1,4 +1,4 @@
-# -*-ruby-*-
+# -*-ruby; coding: utf-8 -*-
 # vim:set ft=ruby:
 #
 # Copyright (c) 2009, 2011, 2012 Kazuhiro NISHIYAMA
@@ -33,6 +33,12 @@ require 'open-uri'
 require 'timeout'
 require 'tmpdir'
 
+begin
+  require 'cgi/util'
+rescue LoadError
+  require 'cgi'
+end
+
 begin
   require 'rubygems'
   require 'nokogiri'
@@ -92,10 +98,10 @@ module URL2Title
         when /euc-jp/i # euc-jp, x-euc-jp
           charset = "eucjp-ms"
         end
-        if /\Autf-8\z/i =~ charset
+        if /\A(?:utf-8|eucjp-ms)\z/i =~ charset
           # avoid #<ArgumentError: invalid byte sequence in UTF-8>
           # or Iconv::IllegalSequence
-          body = NKF.nkf("-Wwm0x", body)
+          body = NKF.nkf("-wm0x --ic=#{charset}", body)
         elsif charset
           charset.sub!(/\Ax-?/i, '')
           begin
@@ -127,20 +133,33 @@ module URL2Title
               title = tweet unless tweet.empty?
             end
           end
-        when /\A(?:www\.so-net\.ne\.jp)\z/
+        else
           if %r"<title\b(?>[^<>]*)>(.*?)</title(?>[^<>]*)>"miu =~ body
             title = $1
           end
-          if %r!<dt id="ttl">(.*?)</dt>!miu =~ body
+          if defined?(::Nokogiri)
+            doc ||= Nokogiri::HTML(body, uri.to_s, 'utf-8')
+            og_title = doc.xpath("//meta[@property='og:title'][1]/@content")
+            unless og_title.empty?
+              # title is escaped string when get by regexp
+              title = CGI.escapeHTML(og_title.text)
+            end
+          elsif /<meta property="og:title" content="(.+?)">/ =~ body
             title = $1
           end
-        else
-          if %r"<title\b(?>[^<>]*)>(.*?)</title(?>[^<>]*)>"miu =~ body
+          if defined?(::Nokogiri)
+            doc ||= Nokogiri::HTML(body, uri.to_s, 'utf-8')
+            og_title = doc.xpath("//meta[@property='og:title']/@content")
+            unless og_title.empty?
+              # title is escaped string when get by regexp
+              title = CGI.escapeHTML(og_title.text)
+            end
+          elsif /<meta property="og:title" content="(.+?)">/ =~ body
             title = $1
           end
           if uri.fragment && defined?(::Nokogiri)
             begin
-              doc = Nokogiri::HTML(body, uri.to_s, 'utf-8')
+              doc ||= Nokogiri::HTML(body, uri.to_s, 'utf-8')
               xpath = "//*[@id='#{uri.fragment}' or @name='#{uri.fragment}']"
               fragment_element = doc.xpath(xpath)
               # tDiary style
@@ -153,6 +172,19 @@ module URL2Title
             end
           end
         end
+        if defined?(::Nokogiri)
+          doc ||= Nokogiri::HTML(body, uri.to_s, 'utf-8')
+          canonical_uri = doc.xpath("//link[@rel='canonical'][1]/@href")
+          unless canonical_uri.empty?
+            info[:uri] = URI(canonical_uri.text)
+          end
+        elsif /<link rel="canonical" href="(.+?)"/i =~ body
+          info[:uri] = URI(CGI.unescapeHTML($1))
+        end
+        if title
+          title = CGI.unescapeHTML(title)
+          title.gsub!(/\xE3\x80\x9C/u, "\xEF\xBD\x9E") # WAVE DASH -> FULLWIDTH TILDE
+        end
         info[:title] = title || body
         return info
       when /\Aimage\//
@@ -211,7 +243,7 @@ if __FILE__ == $0
     ARGV.each do |url|
       info = u2t(url)
       p info
-      puts url
+      puts info[:uri]
       puts info[:title]
     end
   end
@@ -232,7 +264,7 @@ class TitleBot < Nadoka::NDK_Bot
     end
 
     @same_bot = @bot_config.fetch(:same_bot, /(?!)/)
-    @nkf_options = @bot_config.fetch(:nkf, "--oc=CP50221 --ic=UTF-8 --numchar-input --fb-xml")
+    @nkf_options = @bot_config.fetch(:nkf, "--oc=CP50221 --ic=UTF-8 --fb-xml")
     @timeout = @bot_config.fetch(:timeout, 10)
     @fragment_size_range = @bot_config.fetch(:fragment_size_range, 5..100)
     @headers = @bot_config.fetch(:headers, {})

data/plugins/twitterbot.nb

@@ -95,39 +95,50 @@ class TwitterBot < Nadoka::NDK_Bot
     end
 
     @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
+      loop do
+        UserStream.client.user do |status|
           begin
-            screen_name = status[:user][:screen_name]
-            if status[:retweeted_status]
-              status = status[:retweeted_status]
-              screen_name << ":"
-              screen_name << status[:user][:screen_name]
+            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}"
+            when status[:user]
+              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
+              text.tr!("\r\n", ' ')
+              text.gsub!(/&lt;/, '<')
+              text.gsub!(/&gt;/, '>')
+              text.gsub!(/&quot;/, '"')
+              text = NKF.nkf('--numchar-input --ic=UTF-8 --oc=' + @nkf_encoding, text) if @nkf_encoding
+              text.gsub!(/&amp;/, '&')
+              send_notice @ch, "#{time.strftime('%H:%M')} #{screen_name}: #{text}"
+            else
+              send_notice @ch, status.inspect
             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
+            @logger.slog e.inspect
             slog e.backtrace
             slog e.inspect
             slog status.inspect
           end
         end
+        @logger.slog "user stream finished...and restart"
       end
     end
   end

data/rice/irc.rb

@@ -300,7 +300,7 @@ module RICE
         
       rescue Closed
         begin
-          @main_th.run if @main_th.alive?
+          @main_th.run if alive?
         rescue Closed
         end
         retry
@@ -317,7 +317,7 @@ module RICE
     def close(restart = false)
       begin
         unless restart
-          @main_th.exit if @main_th.alive?
+          @main_th.exit if alive?
           @read_th.exit if @read_th.alive?
         end
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nadoka
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-04-29 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.
@@ -52,6 +52,7 @@ files:
 - plugins/drbcl.rb
 - plugins/drbot.nb
 - plugins/evalbot.nb
+- plugins/githubissuesbot.nb
 - plugins/gonzuibot.nb
 - plugins/googlebot.nb
 - plugins/identifynickserv.nb