PerfectlyNormal-Flexo 0.3.9 → 0.4.0

data/flexo.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name         = "Flexo"
-  s.version      = "0.3.9"
-	s.date         = "2008-10-14"
+  s.version      = "0.4.0"
+	s.date         = "2008-10-15"
   s.author       = "Per Christian B. Viken"
   s.email        = "perchr@northblue.org"
   s.homepage     = "http://eastblue.org/dev/flexo/"

data/lib/flexo/constants.rb

@@ -9,7 +9,7 @@ module Flexo
 
     CHANPREFIX = ['#', '&', '+', '!']
 
-    FLEXO_VERSION = '0.3.9'
+    FLEXO_VERSION = '0.4.0'
     FLEXO_RELEASE = 'Bendless Love'
   end
 end

data/lib/flexo/event.rb

@@ -15,7 +15,7 @@ module Flexo
     def initialize(manager, data)
       @manager = manager
       @data    = data
-      @manager.logger.debug("Creating instance of #{self.class}")
+      @manager.logger.debug2("Creating instance of #{self.class}")
     end
 
     # Checks the nickname in the hostmask

data/lib/flexo/manager.rb

@@ -66,7 +66,7 @@ module Flexo
       @server.setup
 
       @logger.debug "Created all Flexo-classes. Going to create threads"
-      manager = Thread.new do
+      manager = Thread.new do        
         loop do
           if @threadqueue.size < @threadmax
             @threadgroup.add(@threadqueue.shift.wakeup)
@@ -145,6 +145,10 @@ module Flexo
     def server
       return @server
     end
+    
+    def load_plugin(plugin)
+      return @pluginmanager.load_plugin(plugin)
+    end
 
     def nickname; return @nickname; end
     def nickname=(nick); @nickname = nick; nick; end

data/lib/flexo/pluginmanager.rb

@@ -83,10 +83,10 @@ module Flexo
 
           plugin = klass.new(@plugins_loaded)
         rescue Flexo::PluginError => e
-          puts "Plugin encountered an error (#{e.class}): #{e.message}"
-          puts e.backtrace
+          @manager.logger.error "Plugin encountered an error (#{e.class}): #{e.message}"
+          @manager.logger.error e.backtrace
         rescue Flexo::PluginDependencyError => e
-          @manager.logger.warn e.message
+          @manager.logger.error e.message
           return nil
         rescue Flexo::PluginNotFoundError => e
           @manager.logger.warn e.message

data/plugins/auth.rb

@@ -163,7 +163,7 @@ module Flexo
         p = privmsg
         return notify_cannot_register_in_public(p) if privmsg.to_channel?
         return notify_username_taken(p) if username_exists?(username)
-        return notify_hostmask_taken(p) if hostmask_exists?(privmsg.from, privmsg.data.mask.host)
+        return notify_hostmask_taken(p) if hostmask_exists?(privmsg.from, privmsg.data.hostmask.hostname)
 
         master = (usercount == 0 ? true : false)
         register(username, password, privmsg.sender, privmsg.data.hostmask.hostname, (master ? 256 : @default_level.to_i))

data/plugins/control.rb

@@ -6,7 +6,7 @@ module Flexo
     # as well as for adding the restricted commands
     class ControlPlugin < Flexo::Plugin
       NAME    = 'Control'
-      VERSION = '0.1.0'
+      VERSION = '0.1.2'
       SUMMARY = 'Control a Flexo instance through IRC'
       DEPENDS = ['auth']
 
@@ -14,22 +14,39 @@ module Flexo
         super
 
         @manager.logger.debug("ControlPlugin started")
-        add_trigger(/^ctrl quit$/, &method(:cmd_quit))
-        add_trigger(/^ctrl realquit$/, &method(:cmd_realquit))
-        add_trigger(/^ctrl join (#\S+)$/, &method(:cmd_join))
+        add_restricted_trigger(/^ctrl quit ?(.+)*$/, :level => 256, &method(:cmd_quit))
+        add_restricted_trigger(/^ctrl join (#\S+)$/, :level => 192, &method(:cmd_join))
+        add_restricted_trigger(/^ctrl part (#\S+)$/, :level => 192, &method(:cmd_part))
+        add_restricted_trigger(/^ctrl plugin load (\S+)$/, :level => 256, &method(:cmd_loadplugin))
+        add_restricted_trigger(/^ctrl plugin unload (\S+)$/, :level => 256, &method(:cmd_unloadplugin))
       end
 
+      private
+      
       def cmd_join(privmsg, channel)
         @manager.sender.join(channel)
       end
       
-      def cmd_quit(privmsg)
-        @manager.logger.debug("Trying to quit")
-        privmsg.reply("No!")
+      def cmd_part(privmsg, channel)
+        @manager.sender.part(channel)
+      end
+      
+      def cmd_quit(privmsg, message = "Leaving!")
+        @manager.logger.info("Requested to quit...")
+        @manager.sender.quit(message)
+      end
+      
+      def cmd_loadplugin(privmsg, plugin)
+        @manager.logger.debug("ControlPlugin: Trying to load #{plugin}")
+        begin
+          plugin = @manager.load_plugin(plugin)
+          privmsg.reply "Successfully loaded #{plugin}"
+        rescue
+        end
       end
       
-      def cmd_realquit(privmsg)
-        @manager.sender.quit("Leaving!")
+      def cmd_unloadplugin(privmsg, plugin)
+        privmsg.reply "Not implemented yet"
       end
     end
   end

data/plugins/svnlookup.rb

@@ -1,9 +1,3 @@
-begin
-  require 'svn/info'
-rescue LoadError
-  raise PluginDependencyError, "Ruby-bindings for Subversion not found"
-end
-
 module Flexo
   module Plugins
     # SVN Lookup -- Registers a command to view commit
@@ -13,28 +7,27 @@ module Flexo
     # this plugin requires read-access to the filesystem.
     class SvnLookupPlugin < Flexo::Plugin
       NAME    = 'SvnLookup'
-      VERSION = '0.1.0'
+      VERSION = '0.1.5'
       SUMMARY = 'Replies to !svn <project> [<revision>] with information about the commit'
-      DEPENDS = []
+      DEPENDS = ['ruby-svn/info']
 
       def initialize(*args)
         super
         @manager.config['plugins.svn.repositories'] ||= '/var/svn/repositories'
         @path = @manager.config['plugins.svn.repositories']
 
-        add_trigger(/^svn (\S+) (\d+)?/, &method(:cmd_lookup))
+        add_trigger(/^svn (\S+) ?(\d+)?$/, &method(:cmd_lookup))
       end
 
       private
 
-      def lookup(privmsg, project, revision = 'latest')
-        @manager.logger.debug "Requested information for #{project} (#{revision})"
+      def cmd_lookup(privmsg, project, revision = nil)
         begin
-          if revision == 'latest'
+          if revision == nil
             revision = Svn::Repos.open("#{@path}/#{project}").fs.youngest_rev
           end
 
-          @info = Svn::Info.new("#{@path}/#{project}", revision)
+          @info = Svn::Info.new("#{@path}/#{project}", revision.to_i)
         rescue => e
           raise PluginError, "#{e.message}\n#{e.backtrace}"
         end
@@ -45,18 +38,21 @@ module Flexo
         files_deleted  = @info.deleted_files.length
         dirs_changed   = @info.changed_dirs.length
 
-        str_changedirs = (dirs_changed < 5 ? "in #{@info.changed_dirs.join(', ')}" : 'in the repository')
+        str_changedirs = (dirs_changed < 3 ? 
+                            "in #{@info.changed_dirs.join(', ')}" : '')
         str_changed    = []
         str_changed   << "#{files_added.to_s} added" if files_added > 0
         str_changed   << "#{files_updated.to_s} updated" if files_updated > 0
         str_changed   << "#{files_deleted.to_s} deleted" if files_deleted > 0
-        str_changed    = (str_changed.length > 0 ? changes.join(', ') : '')
+        str_changed    = (str_changed.length > 0 ? str_changed.join(', ') : '')
         str_changelog  = @info.log
+        str_date       = @info.date
 
         str_full       = "[#{project}] #{str_changed} #{str_changedirs}."
-        str_full      += " r#{revision} commited by #{author}: #{str_changelog}"
+        str_full      += " r#{revision} commited by #{author} (#{str_date})"
 
         privmsg.reply str_full
+        privmsg.reply str_changelog
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: PerfectlyNormal-Flexo
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors: 
 - Per Christian B. Viken
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-14 00:00:00 -07:00
+date: 2008-10-15 00:00:00 -07:00
 default_executable: 
 dependencies: []