nadoka 0.8.5 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0027c38e7562857343bf5e48f87e1916ec53cde
-  data.tar.gz: 86d15edf115119b3f5bcd9f54804195684c3bfa9
+SHA256:
+  metadata.gz: 8794eb0d0b61ad6529c1f96b4b55fadd8eec443f0a36e8b284e6eaf21b9ad3c8
+  data.tar.gz: 43242ba299e9acc927cdce8a1049d8ca5160cb1b8ff4d7ddc478e8cdc0c3152a
 SHA512:
-  metadata.gz: 9a5a016d5cf5855d582ff360ab65022d4c53e2edab751d8349154b379dd1913091b6522b4b5ae56567433723d3801e9d3836edc3fd9df5f2918c15511004d5ea
-  data.tar.gz: 1548049a15809f1f5a54bf9521d14d426bd0ad0bb0182114b7ea79c7aa36f94ef117ff26fc83073c70e8981a221f715d0d1e0fc81edef91b729a679aa1450698
+  metadata.gz: 643b75b33ebb71275c0c1c71a437c3dee2f2b1a313bdc0c7164f6db66371197206cb3f12cef9a2d034fa0a86d7c48158ee53e7c268994bbb3aa2b29d3bd010c8
+  data.tar.gz: 9ea081ef58fdfdc708d0cf92d37db5fc725a0d95028fa391339dc9408648489b8dbcbd2a693c6acc06b09d39978d55428e479805f4122353c56aa4492a8f5cd9

data/.travis.yml

@@ -1,24 +1,20 @@
 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
+  - 2.7
+  - 2.6
+  - 2.5
+  - 2.4
+  - 2.3
   - 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
+before_install:
+  - gem update bundler
 script: ruby check-syntax.rb
 notifications:
   irc: "irc.freenode.org#nadoka_jp"

data/README.md

@@ -2,8 +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)
+[![Gem Version](https://badge.fury.io/rb/nadoka.svg)](http://badge.fury.io/rb/nadoka)
+[![Build Status](https://img.shields.io/travis/nadoka/nadoka.svg)](https://travis-ci.org/nadoka/nadoka)
+[![Code Climate](https://img.shields.io/codeclimate/github/nadoka/nadoka.svg)](https://codeclimate.com/github/nadoka/nadoka)
 
 ## What's this?
 
@@ -21,5 +22,4 @@ You can do with this software:
 See Web pages:
 
 - https://github.com/nadoka/nadoka
-- http://rubyforge.org/projects/nadoka/
 - http://www.atdot.net/nadoka/

data/lib/notify_socket.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2019 Kazuhiro NISHIYAMA
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+# see https://www.freedesktop.org/software/systemd/man/sd_notify.html
+class NotifySocket
+  def initialize(path=ENV['NOTIFY_SOCKET'])
+    @notify_socket = nil
+    return unless path
+    @notify_socket = Addrinfo.unix(path, :DGRAM).connect
+  end
+
+  def []=(key, value)
+    return unless @notify_socket
+    @notify_socket.puts "#{key}=#{value}"
+  end
+
+  def ready!
+    self['READY'] = 1
+  end
+
+  def reloading!
+    self['RELOADING'] = 1
+  end
+
+  def stopping!
+    self['STOPPING'] = 1
+  end
+
+  # notify_socket.status = 'Completed 66% of file system check…'
+  def status=(state)
+    self['STATUS'] = state
+  end
+
+  # notify_socket.errno = 2
+  def errno=(error_code)
+    self['ERRNO'] = error_code
+  end
+
+  # notify_socket.buserror = 'org.freedesktop.DBus.Error.TimedOut'
+  def buserror=(error_code)
+    self['BUSERROR'] = error_code
+  end
+
+  # notify_socket.mainpid = 4711
+  def mainpid=(pid)
+    self['MAINPID'] = pid
+  end
+
+  def watchdog!
+    self['WATCHDOG'] = 1
+  end
+
+  # notify_socket.watchdog_usec = 20_000_000
+  def watchdog_usec=(usec)
+    self['WATCHDOG_USEC'] = usec
+  end
+
+  def extend_timeout_usec=(usec)
+    self['EXTEND_TIMEOUT_USEC'] = usec
+  end
+end

data/lib/rss_check.rb

@@ -79,7 +79,7 @@ class RSS_Check
 
     def read_content
       case @uri.scheme
-      when 'http'
+      when 'http', 'https'
         open(@uri){|f|
           if f.content_encoding.any?{|e| /gzip/ =~ e}
             Zlib::GzipReader.new(StringIO.new(f.read)).read || ''
@@ -96,7 +96,7 @@ class RSS_Check
 
     def mtime
       case @uri.scheme
-      when 'http'
+      when 'http', 'https'
         open(@uri){|f|
           f.last_modified || Time.now
         }
@@ -204,13 +204,11 @@ if $0 == __FILE__
     ARGV.shift || './rss_cache',
     false # false
   )
-  require 'iconv'
   require 'kconv'
-  ic = Iconv.open("EUC-JP", "UTF-8")
   
   rssc.check.each{|e|
     puts e[:about]
-    title = (e[:ccode] == 'UTF-8') ? ic.iconv(e[:title]) : e[:title]
+    title = (e[:ccode] == 'UTF-8') ? e[:title].toeuc : e[:title]
     puts title
   }
   rssc.dump

data/nadoka.gemspec

@@ -16,8 +16,6 @@ Gem::Specification.new do |s|
  older proxy written in Perl.
 }.tr_s(" \n", " ").strip
 
-  s.rubyforge_project = "nadoka"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/nadoka.rb

@@ -29,6 +29,16 @@ require 'ndk/bot'
 $stdout.sync=true
 $NDK_Debug  = false
 
+if ENV.key?('NOTIFY_SOCKET')
+  require 'lib/notify_socket'
+  $NDK_NOTIFY_SOCKET = NotifySocket.new
+else
+  $NDK_NOTIFY_SOCKET = Object.new
+  def $NDK_NOTIFY_SOCKET.method_missing(*)
+    # ignore
+  end
+end
+
 unless defined? Process.daemon
   def Process.daemon(nochdir = nil, noclose = nil)
     exit!(0) if fork
@@ -45,6 +55,7 @@ unless defined? Process.daemon
 end
 
 rcfile = nil
+pidfile = nil
 daemon = false
 optparse = OptionParser.new{|opts|
   opts.banner = "Usage: ruby #{$0} [options]"
@@ -70,6 +81,9 @@ optparse = OptionParser.new{|opts|
   opts.on("--daemon", "run as daemon"){
     daemon = true
   }
+  opts.on("--pid [PIDFILE]", "Put process pid into PIDFILE"){|f|
+    pidfile = f
+  }
 
   opts.separator ""
   opts.separator "Common options:"
@@ -95,21 +109,31 @@ if daemon
   Process.daemon
 end
 
+if pidfile
+  open(pidfile, "w") {|f| f.puts Process.pid }
+end
+
 begin
   GC.start
   Nadoka::NDK_Server.new(rcfile).start
 rescue Nadoka::NDK_QuitProgram
-  #
+  $NDK_NOTIFY_SOCKET.stopping!
 rescue Nadoka::NDK_RestartProgram
+  $NDK_NOTIFY_SOCKET.reloading!
   GC.start
   ObjectSpace.each_object(Socket) {|sock| sock.close}
   retry
 rescue Exception => e
+  $NDK_NOTIFY_SOCKET.stopping!
   open('nadoka_fatal_error', 'w'){|f|
     f.puts e
     f.puts e.backtrace.join("\n")
   } 
 end
 
+if pidfile
+  File.unlink(pidfile)
+end
+
 end
 

data/nadokarc

@@ -7,7 +7,7 @@
 #
 # 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 lisence.
+# the same terms of the Ruby's license.
 #
 #
 
@@ -68,19 +68,19 @@ class NADOKA_Config < Nadoka::NDK_ConfigBase
       :port => 6667,                       # default: 6667
       :pass => nil,                        # default: nil
     },
-    { :host => 'irc.media.kyoto-u.ac.jp',
-      :port => (6660 .. 6669),
-    },
-    { :host => 'irc.huie.hokudai.ac.jp',
+    # { :host => 'irc.media.kyoto-u.ac.jp',
+    #   :port => (6660 .. 6669),
+    # },
+    # { :host => 'irc.huie.hokudai.ac.jp',
       # without :port, use 6667 as default port
-    },
+    # },
     # IPv6 Sample
     # {
     #   :host => 'irc6.ircnet.ne.jp',
     #   :port => 6667,
     # },
     # {
-    #   :host => 'irc6.livedoor.ne.jp',
+    #   :host => 'dh6.ircnet.ne.jp',
     #   :port => (6660 .. 6669),
     # },
   ]

data/ndk/config.rb

@@ -387,7 +387,7 @@ module Nadoka
       @config = {}
       klass = ConfigClass.last
 
-      klass.ancestors[0..-3].reverse_each{|kl|
+      klass.ancestors[0..klass.ancestors.index(NDK_ConfigBase)].reverse_each{|kl|
         kl.constants.each{|e|
           @config[e.downcase.intern] = klass.const_get(e)
         }
@@ -506,9 +506,10 @@ module Nadoka
           else
             if m = msgobj[$1.intern]
               if m.respond_to?(:force_encoding)
-                m.force_encoding(Encoding::ASCII_8BIT)
+                m.dup.force_encoding(Encoding::ASCII_8BIT)
+              else
+                m
               end
-              m
             else
               "!!unknown attribute: #{$1}!!"
             end

data/ndk/logger.rb

@@ -214,7 +214,7 @@ module Nadoka
         :nostamp => nostamp,
         :ch      => ch,
       }
-
+      $NDK_NOTIFY_SOCKET.status = msgobj.inspect.tr("\n", ' ')
       msgobj
     end
 

data/ndk/server.rb

@@ -180,6 +180,10 @@ module Nadoka
           @server_thread.raise NDK_ReconnectToServer
         when '020'
           # ignore
+        when 'PRIVMSG'
+          # ignore
+        when '004'
+          # ignore
         else
           msg = "Server login fail!(#{q})"
           @logger.slog msg
@@ -215,6 +219,7 @@ module Nadoka
       end
 
       invoke_event :invoke_bot, :server_connected
+      $NDK_NOTIFY_SOCKET.ready!
 
       # loop
       while q = recv_from_server
@@ -409,6 +414,7 @@ module Nadoka
             if @connected
               if @pong_recieved
                 @pong_fail_count = 0
+                $NDK_NOTIFY_SOCKET.watchdog!
               else
                 # fail
                 @pong_fail_count += 1

data/ndk/version.rb

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

data/plugins/autoop.nb

@@ -29,7 +29,7 @@ BotConfig = [
 
 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 lisence.
+the same terms of the Ruby's license.
 
 == Author
 

data/plugins/crubybot.nb

@@ -0,0 +1,93 @@
+# -*-ruby-*-
+require 'ffi/clang'
+require 'tempfile'
+
+# dependency:
+#   * ffi-clang.gem
+#   * libclang
+#     * lang/clang34 in FreeBSD ports
+#     * llvm of homebrew
+#
+# example setting:
+#   {
+#     :name => :CRubyBot,
+#     :channels => [ "#ruby-ja" ],
+#     :ruby_srcdir => '/path/of/ruby/src',
+#   }
+#
+class CRubyBot < Nadoka::NDK_Bot
+  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.fetch(:ch, //)
+    end
+    unless @ruby_srcdir = @bot_config[:ruby_srcdir]
+      raise "ruby_srcdir is not specified"
+    end
+    unless Dir.exist?(@ruby_srcdir)
+      raise "ruby_srcdir(#{@ruby_srcdir}) does not exist"
+    end
+    @ruby_srcdir << '/' if @ruby_srcdir[-1] != '/'
+    @translation_unit = nil
+    @translation_unit_rev = nil
+  end
+
+  def bot_state
+    "<#{self.class.to_s}>"
+  end
+
+  def translation_unit
+    rev = IO.read("#@ruby_srcdir/revision.h").to_s[/\d+/].to_i
+    return @translation_unit if @translation_unit_rev == rev
+    ary = Dir[File.join @ruby_srcdir, "*.c"]
+    f = Tempfile.open(["crubybot-ruby", ".c"])
+    ary = Dir[File.join @ruby_srcdir, "*.c"]
+    ary << File.join(@ruby_srcdir, "win32/win32.c")
+    ary.each do |fn|
+      f.puts %[#include "#{fn}"]
+    end
+    f.flush
+    index = FFI::Clang::Index.new
+    @translation_unit = index.parse_translation_unit(f.path, "-I#{@ruby_srcdir}/include")
+    @translation_unit_rev = rev
+    f.close(true)
+    @translation_unit
+  end
+
+  def find_def(name, kind)
+    translation_unit.cursor.visit_children do |cursor, parent|
+      if cursor.kind == kind && cursor.definition? && cursor.spelling == name
+        loc = cursor.location
+        path = loc.file
+        if path.start_with?(@ruby_srcdir)
+          return [path[@ruby_srcdir.size..-1], loc.line]
+        end
+      end
+      next :recurse
+    end
+    return nil
+  end
+
+  def on_privmsg(client, ch, message)
+    return unless @available_channel === ch
+    case message
+    when /\A\S*(struct|fun\w*)\s+(\w+)/
+      kind1 = $1
+      name = $2
+      kind = case kind1
+             when "struct"
+               :cursor_struct
+             when /\Afun/
+               :cursor_function
+             end
+      path, line = find_def(name, kind)
+      return unless path
+      send_notice(ch, "crubybot: #{kind1} #{name} at " \
+                  "https://github.com/ruby/ruby/blob/trunk/#{path}#L#{line}")
+    end
+  end
+end