Merge pull request ahoward#3 from ubermajestix/master

Reload.
brettgoulder · Oct 13, 2011 · 57bb9ea · 57bb9ea
2 parents 8e3965c + 11df08c
commit 57bb9ea
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/bin/fbomb b/bin/fbomb
@@ -23,7 +23,7 @@ Main {
   end
 
   def load_commands!
-    @commands = FBomb::Command.load(config[:commands])
+    FBomb::Command.load(config[:commands])
   end
 
   def load_room!
@@ -72,7 +72,7 @@ Main {
 
                 if arg =~ %r|^\s*/|
                   path = arg.strip
-                  command = @commands[path]
+                  command = FBomb::Command.table[path]
                   if command
                     logging_errors do
                       logger.info("#{ path } #{ args.join(' ') }")

diff --git a/lib/fbomb/command.rb b/lib/fbomb/command.rb
@@ -16,9 +16,11 @@ class << Command
       fattr(:table){ Table.new }
       fattr(:dir){ File.join(File.expand_path(File.dirname(__FILE__)), 'commands') }
       fattr(:room)
+      fattr(:command_paths){ [] }
 
       def load(*args)
         args.flatten.uniq.each do |arg|
+          Command.command_paths << arg
           case arg.to_s
             when %r|^/|
               load_absolute_path(arg)

diff --git a/lib/fbomb/commands/builtin.rb b/lib/fbomb/commands/builtin.rb
@@ -2,6 +2,16 @@
 
 ##
 #
+  command(:reload){
+    help 'reload fbomb commands'
+
+    call do |*args|
+      FBomb::Command.table = FBomb::Command::Table.new
+      FBomb::Command.load(Command.command_paths)
+      speak('locked and loaded.')
+    end
+  }
+
   command(:rhymeswith) {
     help 'show ryhming words'