nadoka 0.8.4 → 0.8.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a0027c38e7562857343bf5e48f87e1916ec53cde
+  data.tar.gz: 86d15edf115119b3f5bcd9f54804195684c3bfa9
+SHA512:
+  metadata.gz: 9a5a016d5cf5855d582ff360ab65022d4c53e2edab751d8349154b379dd1913091b6522b4b5ae56567433723d3801e9d3836edc3fd9df5f2918c15511004d5ea
+  data.tar.gz: 1548049a15809f1f5a54bf9521d14d426bd0ad0bb0182114b7ea79c7aa36f94ef117ff26fc83073c70e8981a221f715d0d1e0fc81edef91b729a679aa1450698

data/.travis.yml

@@ -0,0 +1,24 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+  - ruby-head
+  - jruby-head
+  - 1.8.7
+  - ree
+matrix:
+  allow_failures:
+    - rvm: jruby-18mode
+    - rvm: jruby-19mode
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: ree
+script: ruby check-syntax.rb
+notifications:
+  irc: "irc.freenode.org#nadoka_jp"

data/README.md

@@ -2,6 +2,9 @@
 
 Written by SASADA Koichi <ko1 at atdot.net>
 
+[![Build Status](https://travis-ci.org/nadoka/nadoka.png?branch=master)](https://travis-ci.org/nadoka/nadoka)
+[![Code Climate](https://codeclimate.com/github/nadoka/nadoka.png)](https://codeclimate.com/github/nadoka/nadoka)
+
 ## What's this?
 
 Nadoka is IRC Client Server program.

data/check-syntax.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+STDERR.puts RUBY_DESCRIPTION
+result = true
+Dir.glob("{bin/nadoka,nadokarc,**/*.[nr]b}") do |filename|
+  STDERR.print "#{filename}: "
+  result &&= system("ruby", "-cw", filename)
+end
+exit(result)

data/ndk/version.rb

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

data/plugins/githubissuesbot.nb

@@ -33,13 +33,34 @@ end
 module GithubIssues
   module_function
 
-  def issues(owner, repo, since=nil, state='open')
+  DEFAULT_HEADER = {
+    'User-Agent' => "Nadoka-GithubIssuesBot/0.1",
+  }
+
+  def uri_read(uri, header)
+    debug = $GITHUB_ISSUES_DEBUG
+    p uri if debug
+    uri.open("r", header) do |f|
+      p f.meta if debug
+      return f.read
+    end
+  rescue OpenURI::HTTPError => e
+    p e.io.meta if debug
+    if e.io.meta["x-ratelimit-remaining"] == "0"
+      raise "#{e}: because x-ratelimit-remaining=0"
+    end
+    raise "#{e}: #{uri}"
+  end
+
+  def issues(owner, repo, since, state='open', header=DEFAULT_HEADER)
     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)
+    json = uri_read(uri, header)
+    issues = JSON.parse(json)
     issues.each do |issue|
       comments_uri = URI("#{issue['comments_url']}?since=#{since}")
-      comments = JSON.parse(comments_uri.read)
+      json = uri_read(comments_uri, header)
+      comments = JSON.parse(json)
       if comments.empty?
         yield [:issue, issue, issue_to_s(issue)]
       else
@@ -77,9 +98,10 @@ module GithubIssues
 end
 
 if __FILE__ == $0
+  $GITHUB_ISSUES_DEBUG = $DEBUG
   owner = "rubima"
   repo = "rubima"
-  since = Time.now - 60*60*3
+  since = Time.now - 60*60*3*7
   GithubIssues.issues(owner, repo, since) do |_, _, s|
     puts s.gsub(/\s+/, ' ')
   end
@@ -135,7 +157,7 @@ class GithubIssuesBot < Nadoka::NDK_Bot
       send_notice @ch, s
     end
   rescue Exception => e
-    send_notice(@ch, "rss bot error: #{e}")
+    send_notice(@ch, "github issues bot error for #{@owner}/#{@repo}: #{e}")
     @manager.ndk_error e
   end
 end

data/plugins/googlebot.nb

@@ -54,7 +54,9 @@ BotConfig = [
 =end
 
 
-require 'iconv'
+unless "".respond_to?(:encode)
+  require 'iconv'
+end
 require 'kconv'
 require 'shellwords'
 require 'cgi'
@@ -192,6 +194,10 @@ class GoogleBot < Nadoka::NDK_Bot
       result.gsub!(/&nbsp;/u, " ")
       result.gsub!(/\s+/, " ")
       return result
+    elsif /<div class="leg_calc [^<>]*><div[^<>]*>([^<>]*)<\/div><div[^<>]*>([^<>]*)</u =~ html
+      result = "#{$1} #{$2}"
+      #@logger.slog("google_calc>#{result.dump}")
+      return result
     else
       "response error"
     end

data/plugins/sixamobot.nb

@@ -1,4 +1,4 @@
-#-*-ruby-*-
+#-*-ruby; coding: euc-jp -*-
 #
 # Copyright (c) 2004-2005 SASADA Koichi <ko1 at atdot.net>
 #

data/plugins/titlebot.nb

@@ -27,7 +27,10 @@ Reply title of URL.
 
 =end
 
-require 'iconv'
+begin
+  require 'iconv'
+rescue LoadError
+end
 require 'nkf'
 require 'open-uri'
 require 'timeout'
@@ -45,6 +48,13 @@ begin
 rescue LoadError
 end
 
+unless OpenURI.redirectable?(URI("http://example.com"), URI("https://example.com"))
+  def OpenURI.redirectable?(uri1, uri2) # :nodoc:
+    uri1.scheme.downcase == uri2.scheme.downcase ||
+    (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme)
+  end
+end
+
 module URL2Title
   module_function
 
@@ -104,39 +114,46 @@ module URL2Title
           body = NKF.nkf("-wm0x --ic=#{charset}", body)
         elsif charset
           charset.sub!(/\Ax-?/i, '')
-          begin
-            body = Iconv.conv("utf-8", charset, body)
-          rescue Iconv::IllegalSequence => e
-            info[:errors] << e
-            body = NKF.nkf("-wm0x", body)
-          rescue Iconv::InvalidEncoding => e
-            info[:errors] << e
-            body = NKF.nkf("-wm0x", body)
+          if defined?(Iconv)
+            begin
+              body = Iconv.conv("utf-8", charset, body)
+            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
+          else
+            body = body.encode("utf-8", charset, :invalid => :replace, :undef => :replace)
           end
         else
           body = NKF.nkf("-wm0x", body)
         end
 
         title = nil
-        case uri.host
+        if %r"<title\b(?>[^<>]*)>(.*?)</title(?>[^<>]*)>"miu =~ body
+          title = $1
+        end
+
+        case f.base_uri.host
         when /\A(?:twitter\.com)\z/
-          if %r"<title\b(?>[^<>]*)>(.*?)</title(?>[^<>]*)>"miu =~ body
-            title = $1
-          end
           if defined?(::Nokogiri)
             doc = Nokogiri::HTML(body, uri.to_s, 'utf-8')
-            tweet = doc.css('.tweet-text')
-            unless tweet.empty?
+            tweet, = doc.css('.tweet-text')
+            if tweet
               tweet = tweet.inner_html
               tweet.gsub!(/<.*?>/, '')
               tweet.strip!
               title = tweet unless tweet.empty?
             end
           end
-        else
-          if %r"<title\b(?>[^<>]*)>(.*?)</title(?>[^<>]*)>"miu =~ body
-            title = $1
+        when /\A(?:github\.com)\z/
+          # ignore og:title
+          if title
+            title = title.gsub(/\xC2\xB8/u, "-")
           end
+        else
           if defined?(::Nokogiri)
             doc ||= Nokogiri::HTML(body, uri.to_s, 'utf-8')
             og_title = doc.xpath("//meta[@property='og:title'][1]/@content")
@@ -176,10 +193,10 @@ module URL2Title
           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)
+            info[:uri] = URI(shorten_url(canonical_uri.text))
           end
         elsif /<link rel="canonical" href="(.+?)"/i =~ body
-          info[:uri] = URI(CGI.unescapeHTML($1))
+          info[:uri] = URI(shorten_url(CGI.unescapeHTML($1)))
         end
         if title
           title = CGI.unescapeHTML(title)
@@ -217,6 +234,18 @@ module URL2Title
     url.sub(/\/\#!\//, '/')
   end
 
+  def shorten_url(url)
+    case url
+    when %r!\Ahttp://www\.amazon\.co\.jp/.*(/dp/.+)\z!
+      "http://amazon.jp#{$1}"
+    when %r!\A(http://(?:[a-z]+\.)?slashdot\.jp/story/\d+/\d+/\d+/\d+)(?:/.*)?\z!
+      $1
+    else
+      # default: do nothing
+      url
+    end
+  end
+
   def url2title(url, headers)
     url = prepare_url(url)
     info = get_title(url, headers)

data/plugins/xibot.nb

@@ -1,3 +1,4 @@
+# coding: UTF-8
 #
 # Xi Bot
 #

data/rice/irc.rb

@@ -717,7 +717,8 @@ E
        369,RPL_ENDOFWHOWAS 321,RPL_LISTSTART
        322,RPL_LIST 323,RPL_LISTEND 325,RPL_UNIQOPIS
        324,RPL_CHANNELMODEIS 331,RPL_NOTOPIC
-       332,RPL_TOPIC 341,RPL_INVITING 342,RPL_SUMMONING
+       332,RPL_TOPIC 333,RPL_TOPICWHOTIME
+       341,RPL_INVITING 342,RPL_SUMMONING
        344,RPL_REOPLIST 345,RPL_ENDOFREOPLIST
        346,RPL_INVITELIST 347,RPL_ENDOFINVITELIST
        348,RPL_EXCEPTLIST 349,RPL_ENDOFEXCEPTLIST

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nadoka
 version: !ruby/object:Gem::Version
-  version: 0.8.4
-  prerelease: 
+  version: 0.8.5
 platform: ruby
 authors:
 - Kazuhiro NISHIYAMA
@@ -10,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-07-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.
@@ -23,10 +22,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - bin/nadoka
+- check-syntax.rb
 - doc/ChangeLog.old
 - lib/rss_check.rb
 - lib/tagparts.rb
@@ -79,26 +80,25 @@ files:
 - rice/irc.rb
 homepage: https://github.com/nadoka/nadoka
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: nadoka
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: IRC logger, monitor and proxy program ("bot")
 test_files: []