PerfectlyNormal-Flexo 0.4.2 → 0.4.4

data/bin/mkflexorc

@@ -93,7 +93,5 @@ module Flexo
   end
 end
 
-if __FILE__ == $0
-  c = Flexo::ConfigGenerator.new
-  c.generate_interactive
-end
+c = Flexo::ConfigGenerator.new
+c.generate_interactive

data/flexo.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name         = "Flexo"
-  s.version      = "0.4.2"
-	s.date         = "2008-10-19"
+  s.version      = "0.4.4"
+	s.date         = "2008-12-25"
   s.author       = "Per Christian B. Viken"
   s.email        = "perchr@northblue.org"
-  s.homepage     = "http://eastblue.org/dev/flexo/"
+  s.homepage     = "http://eastblue.org/projects/flexo/"
   s.platform     = Gem::Platform::RUBY
   s.summary      = "A simple, extensible IRC bot based on Flux"
   s.files        = ["README",

data/lib/flexo/data.rb

@@ -56,11 +56,7 @@ module Flexo
     def parse_hostmask(mask)
       m = mask.match(/^([^!\s]+)(?:(?:!([^@\s]+))?@(\S+))?$/)
       
-      if m
-        host = Hostmask.new(m[1], m[2], m[3])
-        return host
-      end
-      
+      return Hostmask.new(m[1], m[2], m[3]) if m      
       return nil
     end
   end

data/lib/flexo/dispatcher.rb

@@ -72,10 +72,12 @@ module Flexo
     def subscribe(event, &block)
       if event.is_a?(Symbol) || event.kind_of?(String)
         if (e = event.to_s) =~ /^(?:RPL|ERR)_/i
+          @manager.logger.debug "Subscribing to a ReplyEvent (#{e})"
           event = Flexo::Events::ReplyEvent[e.upcase]
         else
           match = e.match(/^(.+?)(?:_?event)?$/i)
           event = Flexo::Events.const_get("#{match[1].capitalize}Event")
+          @manager.logger.debug "Subscribing to a #{match[1].capitalize}Event (else)"
         end
       end
 
@@ -86,6 +88,7 @@ module Flexo
         numeric = false
       end
 
+      @manager.logger.debug "Creating a handler against #{numeric.to_s}"
       handler = Handler.new(numeric, &block)
       @manager.mutex do
         @handlers[event] ||= []
@@ -105,6 +108,24 @@ module Flexo
       
       @manager.logger.debug("Handler #{handler} removed")
     end
+    
+    # Waits for a specified amount of time, which defaults to 60.
+    # If the chosen event isn't receieved within that time, a TimeoutError
+    # is raised.
+    def await(event, opts = {}, &block)
+      opts    = {:timeout => 60}.merge(opts)
+      queue   = Queue.new
+      handler = subscribe(event) do |e|
+        queue << e
+        block.call(e) if block_given?
+      end
+
+      begin
+        Timeout.timeout(opts[:timeout], Flexo::TimeoutError) { queue.shift }
+      ensure
+        unsubscribe(handler)
+      end
+    end
 
     # Easy way to add a trigger.
     # See Flexo::Trigger for documentation

data/lib/flexo/errors.rb

@@ -6,6 +6,10 @@ module Flexo
   # Raised when the configuration is invalid, and there's no way to recover
   class InvalidConfigurationException < Error
   end
+  
+  # Error raised when calls to Dispatcher.await times out
+  class TimeoutError < Error
+  end
 
   # Raised when a plugin is missing a required dependency
   class PluginDependencyError < Error

data/lib/flexo/events/reply.rb

@@ -22,8 +22,8 @@ module Flexo
       end
 
       def self.[](reply)
-        n = (reply =~ /^\d+$/ || reply.kind_of?(Integer)) ? reply.to_i : Numerics.const_get(reply)
-        Numeric.new(n)
+        n = (reply =~ /^\d+$/ || reply.kind_of?(Integer)) ? reply.to_i : Flexo::Numerics.const_get(reply)
+        Flexo::Events::ReplyEvent::Numeric.new(n)
       end
     end
 

data/lib/flexo/handler.rb

@@ -22,7 +22,7 @@ module Flexo
     # aptly named 'call', is called, the block passed
     # as block when creating this instance, is executed.
     def call(event)
-      if !@numeric || event.class == ReplyEvent && @numeric == event.numeric
+      if !@numeric || event.class == Flexo::Events::ReplyEvent && @numeric == event.numeric
         @manager.thread { @block.call(event) }
       end
     end

data/lib/flexo/manager.rb

@@ -33,9 +33,6 @@ module Flexo
 
     # Create everything
     def setup
-      return if @setup == true
-      @setup         = true
-      
       @config        = Flexo::Config.new
       raise InvalidConfigurationException unless @config.valid?
 
@@ -96,9 +93,11 @@ module Flexo
           end
         end
       }
-
-      @logger.debug "Sleeping a while to allow logging into the server"
-      sleep 15
+      
+      while(!@server.welcomed) do
+        @logger.debug "Not welcomed, sleeping"
+        sleep 0.5
+      end
 
       @logger.info "Joining channels"
       @config['core.channels'].each do |channel|

data/lib/flexo/plugin.rb

@@ -62,6 +62,17 @@ module Flexo
       super
     end
 
+		# Searches loaded plugins for a method. Used by plugins to see if
+		# certain optional functionality is available, instead of adding
+		# the plugin providing the function as a requirement.
+		def has_method?(method)
+			@plugins.each do |name, plugin|
+				return true if plugin.respond_to?(method)
+			end
+
+			return false
+		end
+
     # Synchronize mutex
     def mutex
       @manager.pluginmutex { yield }

data/lib/flexo/pluginmanager.rb

@@ -113,6 +113,16 @@ module Flexo
       klass = @plugins_loaded[plugin]
       @manager.mutex { @plugins_loaded.delete(plugin) }
       klass.unload
+
+			# Every file we load ends up in $". Require checks there, and if it's there,
+			# it doesn't reload the file. So to force tthe removal of the plugin,
+			# we remove the class from the object space, and from the array
+			@plugins_path.each do |p|
+				file = File.expand_path(File.join(p, "#{plugin.downcase}.rb"))
+				$".delete file
+			end
+
+			Object.send :remove_const, klass.name if klass
     end
   end
 end

data/lib/flexo/server.rb

@@ -10,11 +10,13 @@ module Flexo
     attr_reader :thread
     attr_reader :server
     attr_reader :nickname
+    attr_reader :welcomed
 
     def initialize
       @manager  = Flexo::Manager.instance
       @socket   = nil
       @server   = nil
+      @welcomed = false
     end
 
     def setup
@@ -126,19 +128,27 @@ module Flexo
 
       # First, we add a handler to fix things
       # if our nickname is taken
-      nicktaken = @manager.dispatcher.subscribe(Flexo::Events::ReplyEvent) do |event|
-        if event.numeric == 433
-          nick = config['core.nick'].shift
-          quote "NICK #{nick}"
-          @manager.logger.info("Nickname taken, trying #{nick}")
-          @manager.nickname = nick
-        end
+      nicktaken = @manager.dispatcher.subscribe(:ERR_NICKNAMEINUSE) do
+        nick = config['core.nick'].shift
+        quote "NICK #{nick}"
+        @manager.logger.info("Nickname taken, trying #{nick}")
+        @manager.nickname = nick
       end
 
       nick = config['core.nick'].shift
       @manager.sender.nick nick
       @manager.sender.user config['core.username'], 0, config['core.realname']
-      @manager.nickname = nick
+
+      @manager.thread do
+        @manager.dispatcher.await(:RPL_WELCOME, :timeout => 30) do |reply|
+          @manager.mutex do
+            @manager.nickname = nick
+            @manager.logger.debug "Welcomed!"
+            @welcomed = true
+          end
+          @manager.dispatcher.unsubscribe(nicktaken)
+        end
+      end
     end
 
     # Disconnects from the server

data/plugins/auth.rb

@@ -22,10 +22,12 @@ module Flexo
         @default_level = 0
 
         add_trigger(/^user register ([a-zA-Z][a-zA-Z0-9_-]*) (\S+)$/, &method(:cmd_register))
-        add_trigger(/^user addmask ([a-zA-Z][a-zA-Z0-9_-]*) (\S+)$/,  &method(:cmd_addmask))
+        add_trigger(/^user mask add ([a-zA-Z][a-zA-Z0-9_-]*) (\S+)$/,  &method(:cmd_addmask))
 
         add_restricted_trigger(/^user change ([a-zA-Z][a-zA-Z0-9_-]*) (\d{1,3})$/, :level => 256, &method(:cmd_changelevel))
         add_restricted_trigger(/^user remove ([a-zA-Z][a-zA-Z0-9_-]*)$/, :level => 256, &method(:cmd_remove))
+        add_restricted_trigger(/^user forceregister ([a-zA-Z][a-zA-Z0-9_-]*) (\S+)$/, :level => 256, &method(:cmd_admin_register))
+        add_restricted_trigger(/^user mask forceadd ([a-zA-Z][a-zA-Z0-9_-]*) ([a-zA-Z][a-zA-Z0-9_-]*) (\S+)$/, :level => 256, &method(:cmd_admin_addmask))
         add_trigger(/^user lookup ([a-zA-Z][a-zA-Z0-9_-]*)$/, &method(:cmd_lookup))
 
         @db = pstore_open("#{@manager.config.path}/user.db")
@@ -148,7 +150,7 @@ module Flexo
         tmpuser = {
           :username  => user,
           :password  => Digest::MD5.hexdigest(pass).to_s,
-          :hostmasks => [[nick, host]],
+          :hostmasks => nick != nil ? [[nick, host]] : [],
           :level     => level.to_i
         }
 
@@ -164,6 +166,19 @@ module Flexo
         end
       end
 
+      # Triggered when a superuser registers another user
+      def cmd_admin_register(privmsg, username, password)
+        @manager.logger.debug "AuthPlugin: Going to register #{username} (admin)"
+        p = privmsg
+        return notify_cannot_register_in_public(p) if privmsg.to_channel?
+        return notify_username_taken(p) if username_exists?(username)
+        
+        register(username, password, nil, nil, @default_level.to_i)
+        
+        privmsg.reply("Successfully registered #{username}", false)
+        privmsg.reply("No hostmask has been added for that user", false)
+      end
+      
       # Triggered when a user tries to register via a privmsg
       def cmd_register(privmsg, username, password)
         @manager.logger.debug "AuthPlugin: Going to register #{username}"
@@ -180,6 +195,17 @@ module Flexo
         privmsg.reply("You have been added as a master!", false) if master
       end
 
+      # Triggered when a superuser adds a hostmask to a user
+      def cmd_admin_addmask(privmsg, username, nick, mask)
+        @manager.logger.debug "AuthPlugin: Adding a mask to #{username} (admin)"
+        p = privmsg
+        return notify_incorrect_information(p) if (!username_exists?(username))
+        return notify_hostmask_taken(p) if hostmask_exists?(nick, mask)
+        
+        addmask(username, nick, mask)
+        privmsg.reply "Successfully added the new mask to #{username}"
+      end
+      
       # Triggered when a user wants to add a new hostmask to themselves
       def cmd_addmask(privmsg, username, password)
         @manager.logger.debug "AuthPlugin: Adding a mask to #{username}"
@@ -224,13 +250,21 @@ module Flexo
           return notify_user_not_found(privmsg)
         end
 
-        level = 0
+        user = nil
         
         @db.transaction do |pstore|
-          level = pstore[:users][username.downcase][:level]
+          user = pstore[:users][username.downcase]
         end
 
-        msg(privmsg, "#{username} has a level of #{level.to_s}")
+        privmsg.reply "#{username} has a level of #{user[:level].to_s}"
+        
+        srcuser = get_user_from_hostmask(privmsg.sender, privmsg.data.hostmask.hostname)
+        if(srcuser && srcuser[:level] > 1)
+          privmsg.reply "Registered nick/hostmask-combinations:"
+          user[:hostmasks].each do |nick,host|
+            privmsg.reply "  #{nick}@#{host}"
+          end
+        end
       end
 
       # Convenience function for errors

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: PerfectlyNormal-Flexo
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors: 
 - Per Christian B. Viken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-19 00:00:00 -07:00
+date: 2008-12-25 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -64,7 +64,7 @@ files:
 - plugins/dbus.rb
 - plugins/svnlookup.rb
 has_rdoc: true
-homepage: http://eastblue.org/dev/flexo/
+homepage: http://eastblue.org/projects/flexo/
 post_install_message: 
 rdoc_options: []