butler 1.8.1 → 1.8.2

data/lib/butler/plugin/onhandlers.rb

@@ -20,11 +20,11 @@ class Butler
 					when :on_notice:  subscribe(:NOTICE,  priority) { |listener, message| new(message).on_notice(listener, message.from, message.text) }
 					when :on_nick:    subscribe(:NICK,    priority) { |listener, message| new(message).on_nick(listener, message.from, message.old_nick) }
 					when :on_topic:   subscribe(:TOPIC,   priority) { |listener, message| new(message).on_topic(listener, message.from, message.channel, message.text) }
-					when :on_part:    subscribe(:PART,    priority) { |listener, message| new(message).on_part(listener, message.from, message.channel) }
+					when :on_part:    subscribe(:PART,    priority) { |listener, message| new(message).on_part(listener, message.from, message.channel, message.text) }
 					when :on_quit:    subscribe(:QUIT,    priority) { |listener, message| new(message).on_quit(listener, message.from, message.text) }
-					when :on_kick:    subscribe(:KICK,    priority) { |listener, message| new(message).on_kick(listener) }
-					when :on_kill:    subscribe(:KILL,    priority) { |listener, message| new(message).on_kill(listener) }
-					when :on_kline:   subscribe(:KLINE,   priority) { |listener, message| new(message).on_kline(listener) }
+					when :on_kick:    subscribe(:KICK,    priority) { |listener, message| new(message).on_kick(listener, message.from, message.for, message.channel, message.text) }
+					when :on_kill:    subscribe(:KILL,    priority) { |listener, message| new(message).on_kill(listener, message.from, message.for, message.text) }
+					when :on_kline:   subscribe(:KLINE,   priority) { |listener, message| new(message).on_kline(listener, message.from, message.for, message.text) }
 					when :on_invocation
 						subscribe(:PRIVMSG, priority) { |listener, message|
 							new(message).on_invocation(listener) if message.invocation

data/lib/butler/plugin/trigger.rb

@@ -13,6 +13,8 @@ require 'butler/plugin'
 class Butler
 	class Plugin
 		class Trigger
+			Priority = 0
+
 			attr_reader :authorization
 			attr_reader :hash
 			attr_reader :language
@@ -39,11 +41,11 @@ class Butler
 			end
 
 			def priority
-				0
+				Priority
 			end
 			
 			def <=>(other)
-				0 <=> other.priority
+				other.priority <=> Priority
 			end
 			
 			def abort_invocations?

data/lib/butler/plugins.rb

@@ -80,7 +80,7 @@ class Butler
 		end
 		
 		def identify(name)
-			plugin = Dir["#{@dir}/**/*#{name}#{Suffix}"].first
+			plugin = Dir["#{@dir}/**/#{name}#{Suffix}"].first
 			plugin && plugin[@dir.length+1..-(Suffix.length+1)]
 		end
 		

data/lib/butler/session.rb

@@ -0,0 +1,11 @@
+class Butler
+	class Session < Hash
+		def []=(key, value)
+			if value.nil? then
+				delete(key)
+			else
+				super
+			end
+		end
+	end
+end

data/lib/butler/version.rb

@@ -10,7 +10,7 @@ class Butler #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 8
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/cloptions.rb

@@ -70,7 +70,7 @@ class CLOptions
 		private
 		def add_flag(match, from)
 			name, data = match.captures
-			raise "Unknown switch -#{name}" unless switch = from[name]
+			raise "Unknown switch #{name}" unless switch = from[name]
 			flag       = switch.process(data, @argv_processing)
 			switch.mappings.each { |mapping|
 				@flags[mapping] = flag

data/lib/diagnostics.rb

@@ -0,0 +1,20 @@
+#--
+# Copyright 2007 by Stefan Rusterholz.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+
+
+# Used to provide better diagnostics
+class Diagnostics
+	def initialize(owner, exceptions={})
+		@owner      = owner
+		@exceptions = Hash.new { |h,k| [NoMethodError, "undefined method `#{k}' for #{@owner.inspect}"] }.merge(exceptions)
+	end
+
+	def method_missing(m, *args, &block)
+		ex, msg = *@exceptions[m]
+		raise ex, msg
+	end
+end

data/lib/dialogline.rb

@@ -244,7 +244,7 @@ class DialogLine
 			Context.run(@dialog, file, @use_ostruct, variables)
 		end
 
-		def validate(response, default, klass, *args) # FIXME, use Validator class here
+		def validate(response, default, klass, *args)
 			return [default, true] if !default.nil? and response.empty?
 	
 			case [klass]

data/lib/durations.rb

@@ -6,6 +6,25 @@
 
 
 
+module Kernel
+	private
+
+	# return 1 second
+	def second; 1.seconds; end
+
+	# return 1 minute
+	def minute; 1.minutes; end
+
+	# return 1 hour
+	def hour;   1.hours;   end
+
+	# return 1 day
+	def day;    1.days;    end
+
+	# return 1 week
+	def week;   1.weeks;   end
+end
+
 class Numeric
 	# == Synopsis
 	#   45.seconds # => 45
@@ -40,12 +59,6 @@ class Numeric
 	def weeks(*args)
 		args.inject(self*604800) { |s,a| s+a }
 	end
-	
-	alias second seconds
-	alias minute minutes
-	alias hour   hours
-	alias day    days
-	alias week   weeks
 
 	def ago
 		Time.now-self

data/lib/event.rb

@@ -7,10 +7,7 @@
 
 
 require 'ruby/range/stepped'
-require 'event/at'
-require 'event/every'
-require 'event/timed'
-
+# more requires at bottom - privatizing Event.new makes that necessary
 
 
 #	== Description
@@ -85,7 +82,7 @@ class Event
 	attr_accessor :scheduler
 
 	class <<self
-		#private :new # FIXME I don't know what the fu* is going on but setting it public in descendants doesn't work here and I don't see why... :-S
+		private :new
 
 		# Creates a Schedule which is invoked in an interval, every <seconds> seconds.
 		# Postponing an every Schedule will set Schedule#next to Time.now+<seconds>.
@@ -296,3 +293,9 @@ class Event
 		@scheduler.reschedule(self) if @scheduler
 	end
 end
+
+
+
+require 'event/at'
+require 'event/every'
+require 'event/timed'

data/lib/installer.rb

@@ -7,6 +7,13 @@
 
 
 require 'rbconfig'
+require 'etc'
+begin
+	require 'win32/etc'
+	class Etc::Passwd
+		alias dir home_dir
+	end
+rescue LoadError; end
 
 
 
@@ -21,8 +28,8 @@ require 'rbconfig'
 # where stuff might go.
 # 
 # == Synopsis
-#   x = Iterator.new { |iter| [1,2,3].each { |e| iter.yield(e) } }
-#   p x.map { |e| e*2 }
+#   installer = Installer.new("appname")
+#   install_binary_in(installer.cli_binary_suggestions.first)
 # 
 class Installer
 	def initialize(app_name)
@@ -38,7 +45,7 @@ class Installer
 	end
 	
 	def home(user=nil)
-		File.expand_path("~#{user}")
+		Etc.getpwnam(user || Etc.getlogin).dir
 	end
 	
 	def user_data_suggestions(user=nil)

data/lib/ostructfixed.rb

@@ -11,6 +11,12 @@ require 'ostruct'
 
 
 class OpenStruct
+	def self.with(&block)
+		struct = new
+		struct.instance_eval(&block)
+		struct
+	end
+
 	# Get the field by its name, faster than #send and with
 	# dynamic field names more convenient.
 	def [](field)
@@ -28,4 +34,9 @@ class OpenStruct
 	def to_hash
 		@table.dup
 	end
+
+	# Get the internal hash-table.
+	def __hash__
+		@table
+	end
 end

data/lib/ruby/kernel/daemonize.rb

@@ -14,7 +14,6 @@ require 'ruby/kernel/safe_fork'
 module Kernel
 	# This method causes the current running process to become a daemon
 	# All further printing is relied to the error.log
-	# FIXME doesn't belong into Butler::Bot, rather into botcontrol
 	def daemonize(chdir=nil, &on_sighup)
 		srand # Split rand streams between spawning and daemonized process
 		safe_fork and exit # Fork and exit from the parent
@@ -35,7 +34,7 @@ module Kernel
 		STDERR.reopen(STDOUT)
 		
 		Dir.chdir(chdir) if chdir
-		File.umask 0033 # FIXME ask somebody knowledgable about a sensible value
+		File.umask 0066
 
 		sess_id
 	end

data/test/butler/plugin/mapper.rb

@@ -0,0 +1,46 @@
+require 'pp'
+require 'test/unit'
+require 'butler/plugin/mapper'
+
+class TestMapper < Test::Unit::TestCase
+	class MockMessage < OpenStruct; def to_s; text; end; end
+	class MockPlugin < OpenStruct; end
+	class MockButler < OpenStruct; end
+
+	def setup
+		plugin = MockPlugin.new
+		butler = MockButler.new(
+			:users    => { "apeiros" => "user:apeiros" },
+			:channels => { "#butler" => "channel:#butler" }
+		)
+		plugin.butler = butler
+		def plugin.typemap(name); Butler::Plugin::MappingTypes[name]; end
+		@messages_match = [
+			{:text => "op", :user => nil, :channel => nil},
+			{:text => "op apeiros", :user => nil, :channel => nil},
+			{:text => "op in #butler", :user => nil, :channel => nil},
+			{:text => "op apeiros in #butler", :user => nil, :channel => nil},
+			{:text => "op apeiros butler", :user => nil, :channel => nil},
+			{:text => "op apeiros,butler", :user => nil, :channel => nil},
+			{:text => "op apeiros, butler", :user => nil, :channel => nil},
+			{:text => "op apeiros butler in #butler", :user => nil, :channel => nil},
+			{:text => "op apeiros,butler in #butler", :user => nil, :channel => nil},
+			{:text => "op apeiros, butler in #butler", :user => nil, :channel => nil},
+			{:text => "op \"in\""},
+			{:text => "op \"in\" in #butler"},
+		].map { |data| MockMessage.new(data) }
+		@mappings = [
+			Butler::Plugin::Mapper.new(plugin, nil, nil, "op [*user@Nick] [in :channel@Channel]")
+		]
+	end
+
+	def test_match
+		mapper = @mappings.first
+		@messages_match.each { |m|
+			assert(mapper.invoked_by?(m), "failed mapping '#{m}' against #{mapper}")
+		}
+	end
+	
+	def test_priority
+	end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: butler
 version: !ruby/object:Gem::Version 
-  version: 1.8.1
-date: 2007-10-27 00:00:00 +02:00
+  version: 1.8.2
+date: 2007-11-28 00:00:00 +01:00
 summary: Butler - the IRC bot with class
 require_paths: 
 - lib
@@ -29,10 +29,10 @@ post_install_message:
 authors: 
 - Stefan Rusterholz
 files: 
-- CHANGELOG
+- CHANGELOG.txt
 - LICENSE.txt
 - GPL.txt
-- README
+- README.txt
 - Rakefile
 - bin/botcontrol
 - data/butler
@@ -44,16 +44,19 @@ files:
 - data/butler/dialogs/create.rb
 - data/butler/dialogs/create_config.rb
 - data/butler/dialogs/delete.rb
+- data/butler/dialogs/dir.rb
 - data/butler/dialogs/en
 - data/butler/dialogs/en/backup.yaml
 - data/butler/dialogs/en/botcontrol.yaml
 - data/butler/dialogs/en/create.yaml
 - data/butler/dialogs/en/create_config.yaml
 - data/butler/dialogs/en/delete.yaml
+- data/butler/dialogs/en/dir.yaml
 - data/butler/dialogs/en/help.yaml
 - data/butler/dialogs/en/info.yaml
 - data/butler/dialogs/en/list.yaml
 - data/butler/dialogs/en/notyetimplemented.yaml
+- data/butler/dialogs/en/quickcreate.yaml
 - data/butler/dialogs/en/rename.yaml
 - data/butler/dialogs/en/start.yaml
 - data/butler/dialogs/en/sync_plugins.yaml
@@ -64,20 +67,21 @@ files:
 - data/butler/dialogs/interactive.rb
 - data/butler/dialogs/list.rb
 - data/butler/dialogs/notyetimplemented.rb
+- data/butler/dialogs/quickcreate.rb
 - data/butler/dialogs/rename.rb
 - data/butler/dialogs/selectbot.rb
 - data/butler/dialogs/start.rb
 - data/butler/dialogs/sync_plugins.rb
 - data/butler/dialogs/uninstall.rb
 - data/butler/dialogs/unknown_command.rb
-- data/butler/ircd_scripts
 - data/butler/plugins
 - data/butler/plugins/core
+- data/butler/plugins/core/access.rb
 - data/butler/plugins/core/logout.rb
 - data/butler/plugins/core/plugins.rb
-- data/butler/plugins/core/privilege.rb
 - data/butler/plugins/core/user.rb
 - data/butler/plugins/dev
+- data/butler/plugins/dev/bleakhouse.rb
 - data/butler/plugins/dev/eval.rb
 - data/butler/plugins/dev/nometa.rb
 - data/butler/plugins/dev/onhandlers.rb
@@ -109,6 +113,7 @@ files:
 - data/butler/plugins/service/clones.rb
 - data/butler/plugins/service/define.rb
 - data/butler/plugins/service/log.rb
+- data/butler/plugins/service/more.rb
 - data/butler/plugins/service/svn.rb
 - data/butler/plugins/util
 - data/butler/plugins/util/cycle.rb
@@ -136,11 +141,16 @@ files:
 - lib/butler
 - lib/butler/bot.rb
 - lib/butler/control.rb
+- lib/butler/debuglog.rb
 - lib/butler/dialog.rb
 - lib/butler/initialvalues.rb
 - lib/butler/irc
 - lib/butler/irc/channel.rb
-- lib/butler/irc/channels.rb
+- lib/butler/irc/channellist.rb
+- lib/butler/irc/client
+- lib/butler/irc/client/filter.rb
+- lib/butler/irc/client/listener.rb
+- lib/butler/irc/client/listenerlist.rb
 - lib/butler/irc/client.rb
 - lib/butler/irc/hostmask.rb
 - lib/butler/irc/message.rb
@@ -153,15 +163,18 @@ files:
 - lib/butler/irc/string.rb
 - lib/butler/irc/topic.rb
 - lib/butler/irc/user.rb
-- lib/butler/irc/users.rb
+- lib/butler/irc/userlist.rb
+- lib/butler/irc/whois.rb
 - lib/butler/plugin
 - lib/butler/plugin/configproxy.rb
 - lib/butler/plugin/mapper.rb
 - lib/butler/plugin/matcher.rb
+- lib/butler/plugin/more.rb
 - lib/butler/plugin/onhandlers.rb
 - lib/butler/plugin/trigger.rb
 - lib/butler/plugin.rb
 - lib/butler/plugins.rb
+- lib/butler/session.rb
 - lib/butler/version.rb
 - lib/butler.rb
 - lib/cloptions
@@ -169,6 +182,7 @@ files:
 - lib/cloptions/switch.rb
 - lib/cloptions.rb
 - lib/configuration.rb
+- lib/diagnostics.rb
 - lib/dialogline
 - lib/dialogline/localizations.rb
 - lib/dialogline.rb
@@ -229,6 +243,9 @@ files:
 - lib/string.rb
 - lib/templater.rb
 - lib/w3validator.rb
+- test/butler
+- test/butler/plugin
+- test/butler/plugin/mapper.rb
 - test/cloptions.rb
 - test/cv.rb
 - test/irc
@@ -251,7 +268,7 @@ rdoc_options:
 - --title
 - Butler library API
 - --main
-- README
+- README.txt
 - --charset
 - utf-8
 - --inline-source
@@ -259,8 +276,8 @@ rdoc_options:
 - "2"
 - --line-numbers
 extra_rdoc_files: 
-- README
-- CHANGELOG
+- README.txt
+- CHANGELOG.txt
 - GPL.txt
 - LICENSE.txt
 executables: