ircbot 0.2.0 → 0.2.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ircbot (0.2.0)
+    ircbot (0.2.1)
       chawan
       data_objects
       dm-core
@@ -50,7 +50,7 @@ GEM
       optionize (>= 0.1.0)
     extlib (0.9.15)
     net-irc (0.0.9)
-    night-time (1.0.1)
+    night-time (1.0.2)
     optionize (0.1.1)
     pg (0.14.0)
     rspec (2.10.0)

data/config/samples/postgres.yml

@@ -13,7 +13,9 @@ plugins:
   - 
     name: reminder
     db: "postgres://localhost/ircbot"
-  - summary
+  -
+    name: summary
+    engines: http, https, ch2, twitter
 reminder
 multiline: true
 timeout: 500

data/lib/ircbot/plugin.rb

@@ -20,8 +20,11 @@ module Ircbot
     attr_accessor :plugin_name
 
     def self.command?(name)
-      @commands ||= (public_instance_methods - Plugin.public_instance_methods).inject({"setup"=>1, "help"=>1}) {|h,k| h[k.to_s] = 1; h }
-      !! @commands[name.to_s]
+      !! commands[name.to_s]
+    end
+
+    def self.commands
+      @commands ||= (public_instance_methods - Plugin.public_instance_methods + %w(help) - %w(reply)).inject({}) {|h,k| h[k.to_s] = 1; h }
     end
 
     def initialize(plugins = nil)
@@ -68,7 +71,7 @@ module Ircbot
     end
 
     def help
-      raise "no helps for #{plugin_name}"
+      self[:help] || "commands: %s" % self.class.commands.keys.sort.join(",")
     end
 
     ######################################################################

data/lib/ircbot/version.rb

@@ -1,4 +1,4 @@
 module Ircbot
-  VERSION  = '0.2.0'
+  VERSION  = '0.2.2'
   HOMEPAGE = "http://github.com/maiha/ircbot"
 end

data/plugins/plugins.rb

@@ -34,7 +34,7 @@ commands: load, start, stop, delete
 
       when "help"
         if arg.empty?
-          done [bot_help, plugins_help].join("\n")
+          done [config_help, plugins_help, bot_help].compact.join("\n")
         else
           done plugins[arg].help
         end
@@ -49,8 +49,11 @@ commands: load, start, stop, delete
     end
 
     def bot_help
-      config.help ||
-        "%s bot [%s (ver:%s)]" % [config.nick, Ircbot::HOMEPAGE, Ircbot::VERSION]
+      "%s bot [%s (ver:%s)]" % [config.nick, Ircbot::HOMEPAGE, Ircbot::VERSION]
+    end
+
+    def config_help
+      config.help
     end
 end
 

data/plugins/reminder.rb

@@ -126,11 +126,6 @@ class ReminderPlugin < Ircbot::Plugin
     end
   end
 
-  def help
-    ["list -> show future reminders",
-     "YYYY-mm-dd or YYYY-mm-dd HH:MM text -> register the text"].join("\n")
-  end
-
   def setup
     return if @watcher
     bot = self.bot

data/plugins/summary/engines.rb

@@ -2,7 +2,9 @@ require 'dsl_accessor'
 require 'extlib'
 
 module Engines
-  Mapping = []
+  Mapping  = []
+  Loaded   = {}
+  NotFound = Class.new(RuntimeError)
 
   class NotImplementedError < NotImplementedError; end
   class Nop < NotImplementedError; end
@@ -14,17 +16,48 @@ module Engines
     raise NotImplementedError, "[BUG] Not supported URL: %s" % url
   end
 
-  # load ruby library and register its url
-  def self.register(name)
-    load File.dirname(__FILE__) + "/engines/#{name}.rb"
-    klass = instance_eval(Extlib::Inflection.camelize(name))
-    Mapping.unshift [klass.url, klass] unless klass == Base
+  def self.[](name)
+    unless loaded?(name)
+      raise NotFound, name.to_s
+    end
+    instance_eval(Extlib::Inflection.camelize(name))
+  end
+
+  def self.setup(*names)
+    Mapping.clear
+    names = (%w( none ) + names).flatten.uniq
+    debug "[Summary] Engines.setup(%s)" % names.inspect
+    names.each do |name|
+      klass = self[name]
+      Mapping.unshift [klass.url, klass]
+    end
+  end
+
+  # load ruby library
+  def self.load(name)
+    name = name.to_s
+    return false if loaded?(name)
+
+    file = File.dirname(__FILE__) + "/engines/#{name}.rb"
+    Kernel.load(file)
+
+    Loaded[name] = Time.now
+  end
+  def self.loaded?(name) Loaded[name]; end
+
+  def self.load_engines
+    load :base
+    load :none
+    Dir.glob(File.dirname(__FILE__) + "/engines/*.rb").sort.each do |file|
+      name = File.basename(file, ".*")
+      load(name)
+    end
   end
 
-  register("base")
-  register("none")
-  register("https")
-  register("ch2")
-  register("twitter")
+  # logger
+  def self.debug(msg)
+    puts msg.to_s
+  end
 end
 
+Engines.load_engines

data/plugins/summary/engines/http.rb

@@ -0,0 +1,6 @@
+module Engines
+  class Http < Base
+    url %r{^http://}
+  end
+end
+

data/plugins/summary/spec/summarizers_spec.rb

@@ -1,6 +1,24 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
-describe Engines do
+describe Engines, "Engines with default settings" do
+  before { Engines.setup }
+
+  summary "http://www.asahi.com" do
+    its(:class) {should == Engines::None}
+  end
+end
+
+describe Engines, "Engines(http)" do
+  before { Engines.setup("http") }
+
+  summary "http://www.asahi.com" do
+    its(:class) {should == Engines::Http}
+  end
+end
+
+describe Engines, "Engines(https,twitter,ch2)" do
+  before { Engines.setup(["https", "twitter", "ch2"]) }
+
   summary "https://example.com" do
     its(:class) {should == Engines::Https}
   end

data/plugins/summary/summary.rb

@@ -13,14 +13,26 @@ require 'engines'
 # [TEST]
 #   cd plugins/summary
 #   rspec -c spec
+#
+# [CONFIG]
+#   engines: *NAME_OF_ENGINES
+#   (see. config/samples/postgres.yml)
 
 class SummaryPlugin < Ircbot::Plugin
   Quote = ">> "
+  DEFAULT_ENGINES = %w( http https ch2 twitter )
 
   def help
     "[Summary] summarize web page (responds to only 2ch or https)"
   end
 
+  def setup
+    engines = self[:engines]
+    engines = engines.to_s.split(/\s*[,\s]\s*/).compact unless engines.is_a?(Array)
+    engines = DEFAULT_ENGINES if engines.blank?
+    Engines.setup(engines)
+  end
+
   def reply(text)
     scan_urls(text).each do |url|
       summary = once(url) {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ircbot
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - maiha
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-03 00:00:00 Z
+date: 2012-07-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dsl_accessor
@@ -289,6 +289,7 @@ files:
 - plugins/summary/engines.rb
 - plugins/summary/engines/base.rb
 - plugins/summary/engines/ch2.rb
+- plugins/summary/engines/http.rb
 - plugins/summary/engines/https.rb
 - plugins/summary/engines/none.rb
 - plugins/summary/engines/twitter.rb