butler 1.8.3 → 1.9.0

data/lib/butler/remote/server.rb

@@ -0,0 +1,85 @@
+class Butler
+	module Remote
+		class Server
+			include Log::Comfort
+			
+			attr_reader :host
+			attr_reader :port
+
+			def initialize(bot)
+				@bot      = bot
+				@host     = nil
+				@port     = nil
+				@clients  = []
+				@server   = nil
+				@logger   = nil
+				@accepter = nil
+				@lock     = Mutex.new
+			end
+			
+			def host=(value)
+				stop
+				@host   = value.freeze
+				@server = TCPServer.new(@host, @port)
+				start
+			end
+			
+			def port=(value)
+				stop
+				@port   = value.freeze
+				start
+			end
+			
+			def start(host=@host, port=@port)
+				if @host != host || @port != port then
+					@host   = host.freeze
+					@port   = port
+					@server = TCPServer.new(@host, @port)
+					stop
+				end
+				@accepter ||= Thread.new(&method(:accepter))
+			end
+			
+			def stop
+				@lock.synchronize {
+					@accepter.kill if @accepter
+					@accepter = nil
+					@clients.each { |client| client.quit("Server terminated") }
+					@clients  = []
+				}
+			end
+			
+			def login(*args)
+				@bot.access.login(*args)
+			end
+			
+			def dispatch(*args)
+				@bot.dispatch(*args)
+			end
+			
+			def myself
+				@bot.myself
+			end
+			
+			def disconnected(connection)
+				@lock.synchronize {
+					@clients.delete(connection)
+				}
+			end
+			
+			def running?
+				@accepter ? true : false
+			end
+
+			def accepter
+				while socket = @server.accept
+					@lock.synchronize {
+						@clients << Connection.open_thread(self, socket)
+					}
+				end
+			rescue => e
+				exception(e)
+			end
+		end
+	end
+end

data/lib/butler/remote/user.rb

@@ -0,0 +1,46 @@
+#--
+# Copyright 2007 by Stefan Rusterholz.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+
+
+class Butler
+	module Remote
+		class User
+			attr_reader :access
+			attr_reader   :session
+
+			def authorized?(*args)
+				@access.authorized?(*args)
+			end
+
+			def initialize(name, access)
+				@access	= access
+				@session = Session.new
+				@name 	= name.dup.freeze
+			end
+			
+			def nick
+				@name
+			end
+			
+			def status
+				:online
+			end
+			
+			def channels
+				[]
+			end
+			
+			def history
+				[]
+			end
+	
+			def method_missing(*args, &block)
+				return nil
+			end
+		end
+	end
+end

data/lib/butler/service.rb

@@ -16,7 +16,7 @@ class Butler
 		include Log::Comfort
 
 		attr_reader :butler
-		attr_reader :message
+		attr_reader :path
 		attr_reader :name
 		attr_reader :rdn
 		attr_reader :version
@@ -34,6 +34,7 @@ class Butler
 			@version  = version
 			@listener = []
 			load(@path.fixtures) if File.exist?(@path.fixtures)
+			info("Loaded service #{@rdn} '#{@name}':#{@version} (#{self})")
 		end
 		
 		def register(object)

data/lib/butler/services.rb

@@ -39,7 +39,7 @@ class Butler
 
 			begin
 				constant = "%s_%08X" %  [name.camelcase, rand(0xffffffff)]
-			end while Butler::Plugins.const_defined?(constant)
+			end while Butler::Services.const_defined?(constant)
 			service = Butler::Services.const_set(constant, Module.new)
 			service.extend(Butler::Service)
 			service.logger = @butler.logger
@@ -62,4 +62,4 @@ class Butler
 			@services[name]
 		end
 	end
-end
+end

data/lib/butler/version.rb

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

data/lib/configuration.rb

@@ -11,12 +11,6 @@ require 'yaml'
 
 
 
-class String
-	def config_key # FIXME %2e instead of . is just ugly...
-		gsub(/\//, '%2f')
-	end
-end
-
 # == Indexing
 # Author:  Stefan Rusterholz
 # Contact: apeiros@gmx.net>
@@ -47,6 +41,17 @@ class Configuration
 	end	
 
 	ConfFile = Struct.new(:data, :path, :mtime)
+
+	class <<self
+		def escape(name)
+			# encode control characters, potentially dangerous characters and leading /'s
+			name.gsub(/[\x00-\x1f%\x2f\x7f{}()\[\]~*+-]/) { |m| "%%%02x"%m[0] }.sub(/^\x2e/, '%2e')
+		end
+
+		def unescape(name)
+			name.gsub(/%[a-f\d]{2}/) { |m| m[1,2].to_i(16).chr }
+		end
+	end
 	
 	attr_reader :base
 
@@ -79,6 +84,7 @@ class Configuration
 	def [](key)
 		file, key = split(key)
 		return nil unless key_exist?(file, key)
+		load(file) unless key
 		key ? @files[file][key] : @files[file]
 	end
 	
@@ -129,20 +135,11 @@ class Configuration
 		keys      = Array === key ? key.map { |k| String(k) } : key.split(/\//)
 		file      = @base.dup
 		raise InvalidKey.new(key) if keys.empty?
-		file << "/#{encode_filename(keys.shift)}" while (File.directory?(file) && keys.first)
+		file << "/#{Configuration.escape(keys.shift)}" while (File.directory?(file) && keys.first)
 		file << ".yaml"
 		return [file, keys.empty? ? nil : keys.join(".")]
 	end
 	
-	def encode_filename(name)
-		# FIXME: {}()\[\]~ what about those?
-		name.gsub(/[\x00-\x1f%\x2f\x7f]/) { |m| "%%%02x"%m[0] }.sub(/^\x2e/, '%2e')
-	end
-
-	def decode_filename(name)
-		name.gsub(/%[a-f\d]{2}/) { |m| m[1,2].to_i(16).chr }
-	end
-	
 	def load(file, force=false)
 		if force || !@files.has_key?(file) then
 			@files[file] = nil

data/lib/ostructfixed.rb

@@ -11,12 +11,6 @@ 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)

data/lib/ruby/array/random.rb

@@ -7,8 +7,9 @@ class Array
 		else
 			raise ArgumentError unless Integer === n and n.between?(0,length)
 			ary = dup
+			l   = length
 			n.times { |i|
-				r = rand(n-i)+i
+				r = rand(l-i)+i
 				ary[r], ary[i] = ary[i], ary[r]
 			}
 			ary.first(n)

data/lib/scriptfile.rb

@@ -7,13 +7,12 @@
 
 
 require 'ruby/kernel/non_verbose'
+require 'thread'
 
 # use data after __END__ in .rb files like normal files
 # WARNING:
 # - if you have an __END__ alone in a multiline comment or string
 #   your .rb file will be damaged.
-# - Current implementation *will* append an __END__ to the file, regardeless
-#   of what you do (that will change)
 # 
 # Example:
 # 	require 'scriptfile'
@@ -35,6 +34,16 @@ class ScriptFile < File
 	(IO.instance_methods(false)+File.instance_methods(false) - %w[see tell pos truncate]).each { |m| private m }
 
 	class <<self
+		# Append data to the file. Immediatly closes it after writing
+		def write(file, text)
+			open(file, "a") { |fh| fh.write(text) }
+		end
+
+		# Write data to the file. Immediatly closes it after writing
+		def write(file, text)
+			open(file, "w") { |fh| fh.write(text) }
+		end
+
 		# Like File::read, slurp the whole files DATA at once.
 		def read(file)
 			open(file) { |fh| fh.read }
@@ -51,31 +60,71 @@ class ScriptFile < File
 
 	# Same as File::new
 	def initialize(file, mode="r")
-		super(file, "r+") # "r#{'+' unless mode=='r'}"
-		@offset = 0
+		super(file, "r#{'+' unless mode=='r'}") # "r#{'+' unless mode=='r'}"
+		@offset      = 0
+		@end_present = false
+		@lock        = Mutex.new
+
+		# find the __END__
 		while line = gets
 			@offset += line.size
-			break if line =~ /^__END__$/
-		end
-		unless line then
-			file_seek(-1, IO::SEEK_CUR)
-			unless read(1) == "\n" then
-				puts
-				@offset += 1
+			if line =~ /^__END__$/
+				@end_present = true
+				break
 			end
-			print "__END__\n"
-			@offset += 8
 		end
+
 		case mode
 			when /^w/: truncate
 			when /^a/: read
 		end
 	end
+	
+	# append the end-line before writing
+	def write_end
+		return if @end_present
+		@lock.synchronize {
+			@end_present = true
+			file_seek(-1, IO::SEEK_END)
+			unless read(1) == "\n" then
+				puts
+				@offset += 1
+			end
+			puts "__END__"
+			@offset += 8
+		}
+	end
+	private :write_end
 
 	public :each, :each_byte, :each_line
 	public :gets, :getc, :read, :readchar, :readline, :readlines
-	public :puts, :putc, :print, :printf, :write
 	public :ctime, :atime, :mtime
+	public :puts, :putc, :print, :printf, :write
+	
+	def puts(*a)
+		write_end
+		super
+	end
+	
+	def putc(*a)
+		write_end
+		super
+	end
+	
+	def print(*a)
+		write_end
+		super
+	end
+
+	def write(*a)
+		write_end
+		super
+	end
+	
+	def printf(*a)
+		write_end
+		super
+	end	
 	
 	alias file_seek seek unless method_defined?(:file_seek)
 	private :file_seek

data/lib/timingoutresource.rb

@@ -0,0 +1,54 @@
+require 'blank'
+
+# in case timeout was not required
+module Timeout; class Error < Interrupt; end; end
+
+class TimingOutResource < Blank
+	@get = Object.instance_method(:instance_variable_get)
+	@set = Object.instance_method(:instance_variable_set)
+
+	# Timeout a resource immediatly
+	def self.timeout(resource)
+		@set.bind(resource).call(:@due, Time.now-1)
+		@get.bind(resource).call(:@sleeper).wakeup
+	end
+	
+	# Postpone the timeout of a resource
+	def self.postpone(resource, by=nil)
+		by ||= @get.bind(resource).call(:@timeout)
+		@set.bind(resource).call(:@due, Time.now+by)
+	end
+
+	# Create a proxy object to a resource with a timeout so that
+	# the object can be freed/garbage collected after a specific
+	# time. After the timeout, all calls will raise a Timeout::Error
+	# (or the error you specified). Any method call before the timeout
+	# will reset the timer.
+	def initialize(resource, timeout, error=nil, &on_timeout)
+		@resource   = resource
+		@timeout    = timeout
+		@on_timeout = on_timeout
+		@due        = Time.now+timeout
+		@error      = error
+
+		@sleeper    = Thread.new {
+			until (now=Time.now) >= @due
+				sleep(@due-now)
+			end
+			@on_timeout.call(@resource)
+			@resource   = nil # enable garbage collection
+			@on_timeout = nil # enable garbage collection
+		}
+	end
+	
+	def method_missing(*args, &block)
+		if @resource then
+			@due = Time.now+@timeout
+			@resource.__send__(*args, &block)
+		elsif @error then
+			Kernel.raise(@error)
+		else
+			Kernel.raise(Timeout::Error, "Resource no longer available")
+		end
+	end
+end

data/test/test_scriptfile.rb

@@ -0,0 +1,51 @@
+require 'fileutils'
+require 'ruby/file/write'
+require 'scriptfile'
+require 'test/unit'
+
+class TestScriptFile < Test::Unit::TestCase
+	Base = File.expand_path(File.dirname(__FILE__)+'/test_scriptfile')
+	NoData     = <<EOT
+class ExampleScript
+	def which_has
+	end
+	
+	def no_end
+	end
+end
+EOT
+	NoDataNoNL = <<EOT.chomp
+class ExampleScript
+	def which_has
+	end
+	
+	def no_end
+	end
+end
+EOT
+	WithData   = <<EOT
+class ExampleScript
+	def which_has
+	end
+	
+	def no_end
+	end
+end
+__END__
+Here we have some data
+EOT
+
+	def setup
+		FileUtils.mkdir(Base)
+		File.write(Base+'/no_end.rb', NoData)
+		File.write(Base+'/no_end_no_nl.rb', NoDataNoNL)
+		File.write(Base+'/withdata.rb', WithData)
+	end
+
+	def teardown
+		FileUtils.rm_r(Base)
+	end
+	
+	def test_all
+	end
+end