Streamlining plugin load.

AresMUSH · Jan 26, 2018 · 32e7c2f · 32e7c2f
1 parent a610654
commit 32e7c2f
Show file tree

Hide file tree

Showing 48 changed files with 31 additions and 340 deletions.
diff --git a/copy_help.rb b/copy_help.rb
@@ -8,25 +8,23 @@
 filename_friendly_help_version = help_version.gsub(".", "-")
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[engine]))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
 
 require 'fileutils'
 require 'ansi'
 require 'aresmush'
-require 'engine'
 require 'erubis'
 require 'rspec'
 require 'rspec/core/rake_task'
 require 'tempfile'
 #require 'mongoid'
 require_relative 'install/init_db.rb'
 require_relative 'install/configure_game.rb'
-require_relative 'plugins/help/lib/helpers.rb'
+require_relative 'plugins/help/helpers.rb'
 
 def minimal_boot
   bootstrapper = AresMUSH::Bootstrapper.new
-  AresMUSH::Global.plugin_manager.load_all
   bootstrapper.config_reader.load_game_config
+  AresMUSH::Global.plugin_manager.load_all
   bootstrapper.help_reader.load_game_help
   bootstrapper.db.load_config
 end

diff --git a/engine/aresmush/commands/dispatcher.rb b/engine/aresmush/commands/dispatcher.rb
@@ -73,6 +73,7 @@ def on_command(client, cmd)
 
         CommandAliasParser.substitute_aliases(enactor, cmd, Global.plugin_manager.shortcuts)
         Global.plugin_manager.plugins.each do |p|
+          next if !p.respond_to?(:get_cmd_handler)
           AresMUSH.with_error_handling(client, cmd) do
             handler_class = p.get_cmd_handler(client, cmd, enactor)
             if (handler_class)
@@ -95,6 +96,7 @@ def on_event(event)
       begin
         event_name = event.class.to_s.gsub("AresMUSH::", "")
         Global.plugin_manager.plugins.each do |p|
+          next if !p.respond_to?(:get_event_handler)
           AresMUSH.with_error_handling(nil, "Handling #{event_name}.") do            
             handler_class = p.get_event_handler(event_name)
             if (handler_class)

diff --git a/engine/aresmush/config/help_reader.rb b/engine/aresmush/config/help_reader.rb
@@ -22,9 +22,7 @@ def load_game_help
       end
     end
 
-    def load_help_file(file, plugin)
-      Global.logger.debug "Loading help from #{file}."
-
+    def load_help_file(file, plugin)      
       plugin_title = plugin ? plugin.downcase : ""
 
       md = MarkdownFile.new(file)

diff --git a/engine/aresmush/plugin/plugin_manager.rb b/engine/aresmush/plugin/plugin_manager.rb
@@ -59,7 +59,10 @@ def load_plugin(name)
       load_plugin_locale plugin_module
       load_plugin_help plugin_module
 
-      @plugins << plugin_module.send(:load_plugin)
+      if (plugin_module.respond_to?(:init_plugin))
+        plugin_module.send(:init_plugin)
+      end
+      @plugins << plugin_module
     end
 
     def load_plugin_locale(plugin_module)

diff --git a/engine/aresmush/web/engine_api_server.rb b/engine/aresmush/web/engine_api_server.rb
@@ -74,10 +74,6 @@ class EngineApiServer < Sinatra::Base
        end
        return { error: "Sorry, something went wrong with the web request." }.to_json
      end
-
-     post '/upload/?' do 
-       puts params.inspect
-     end
 
   end
 end
diff --git a/plugins/arescentral/arescentral.rb b/plugins/arescentral/arescentral.rb
@@ -12,13 +12,6 @@ def self.shortcuts
       Global.read_config("arescentral", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)      
       case cmd.root
       when "handle"

diff --git a/plugins/bbs/bbs.rb b/plugins/bbs/bbs.rb
@@ -11,13 +11,6 @@ def self.shortcuts
       Global.read_config("bbs", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       return nil if !cmd.root_is?("bbs")
 

diff --git a/plugins/channels/channels.rb b/plugins/channels/channels.rb
@@ -11,13 +11,6 @@ def self.shortcuts
       Global.read_config("channels", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)      
       case cmd.root
       when "channel"

diff --git a/plugins/chargen/chargen.rb b/plugins/chargen/chargen.rb
@@ -11,13 +11,6 @@ def self.shortcuts
       Global.read_config("chargen", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       case cmd.root
       when "app"
@@ -64,10 +57,6 @@ def self.get_cmd_handler(client, cmd, enactor)
 
       return nil    
     end
-
-    def self.get_event_handler(event_name) 
-      nil
-    end
 
     def self.get_web_request_handler(request)
       case request.cmd

diff --git a/plugins/chargen/helpers.rb b/plugins/chargen/helpers.rb
@@ -44,8 +44,7 @@ def self.unsubmit_app(char)
     end
 
     def self.read_tutorial(name)
-      dir = File.dirname(__FILE__) + "/../engine/templates/"
-      filename = File.join(dir, name)
+      filename = File.join(File.dirname(__FILE__), 'templates', name)
       File.read(filename, :encoding => "UTF-8")
     end
 

diff --git a/plugins/cookies/cookies.rb b/plugins/cookies/cookies.rb
@@ -10,13 +10,6 @@ def self.shortcuts
       Global.read_config("cookies", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       return nil if !cmd.root_is?("cookie")
 

diff --git a/plugins/custom/custom.rb b/plugins/custom/custom.rb
@@ -10,19 +10,8 @@ def self.shortcuts
       Global.read_config("custom", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       nil     
     end
-
-    def self.get_event_handler(event_name) 
-      nil
-    end
   end
 end
diff --git a/plugins/demographics/demographics.rb b/plugins/demographics/demographics.rb
@@ -10,13 +10,6 @@ def self.shortcuts
       Global.read_config("demographics", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
 
       case cmd.root
@@ -61,10 +54,6 @@ def self.get_cmd_handler(client, cmd, enactor)
 
       nil     
     end
-
-    def self.get_event_handler(event_name) 
-      nil
-    end
 
     def self.get_web_request_handler(request)
       case request.cmd

diff --git a/plugins/describe/describe.rb b/plugins/describe/describe.rb
@@ -10,13 +10,6 @@ def self.shortcuts
       Global.read_config("describe", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       case cmd.root
       when "describe", "shortdesc"
@@ -64,9 +57,5 @@ def self.get_cmd_handler(client, cmd, enactor)
 
       nil
     end
-
-    def self.get_event_handler(event_name) 
-      nil
-    end
   end
 end
diff --git a/plugins/events/events.rb b/plugins/events/events.rb
@@ -10,13 +10,6 @@ def self.shortcuts
       Global.read_config("events", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       case cmd.root
       when "event"

diff --git a/plugins/friends/friends.rb b/plugins/friends/friends.rb
@@ -10,13 +10,6 @@ def self.shortcuts
       Global.read_config("friends", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       return nil if !cmd.root_is?("friend")
 
@@ -33,9 +26,5 @@ def self.get_cmd_handler(client, cmd, enactor)
 
       nil
     end
-
-    def self.get_event_handler(event_name) 
-      nil
-    end
   end
 end
diff --git a/plugins/fs3combat/fs3combat.rb b/plugins/fs3combat/fs3combat.rb
@@ -10,13 +10,6 @@ def self.shortcuts
       Global.read_config("fs3combat", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       case cmd.root
       when"damage"

diff --git a/plugins/fs3combat/helpers/general_helper.rb b/plugins/fs3combat/helpers/general_helper.rb
@@ -47,15 +47,9 @@ def self.emit_to_combat(combat, message, npcmaster = nil, add_to_scene = false)
     def self.emit_to_organizer(combat, message, npcmaster = nil)
       message = message + " (#{npcmaster})" if npcmaster
 
-      if (defined? Engine)
-        client = Login.find_client(combat.organizer)
-        if (client)
-          client.emit t('fs3combat.organizer_emit', :message => message)
-        end
-      else
-        Global.notifier.notify(:combat, t('fs3combat.organizer_emit', :message => message)) do |char|
-          char == combat.organizer
-        end
+      client = Login.find_client(combat.organizer)
+      if (client)
+        client.emit t('fs3combat.organizer_emit', :message => message)
       end
     end
 
@@ -64,15 +58,9 @@ def self.emit_to_combatant(combatant, message)
       return if !char
 
       client_message = message.gsub(/#{combatant.name}/, "%xh%xc#{combatant.name}%xn")  
-      if (defined? Engine)
-        client = Login.find_client(char)
-        if (client)
-          client.emit t('fs3combat.combat_emit', :message => client_message)
-        end
-      else
-        Global.notifier.notify(:combat, t('fs3combat.combat_emit', :message => client_message)) do |char|
-          char == combatant.character
-        end
+      client = Login.find_client(char)
+      if (client)
+        client.emit t('fs3combat.combat_emit', :message => client_message)
       end
     end
 

diff --git a/plugins/fs3skills/fs3skills.rb b/plugins/fs3skills/fs3skills.rb
@@ -10,13 +10,6 @@ def self.shortcuts
       Global.read_config("fs3skills", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       case cmd.root
       when "abilities"

diff --git a/plugins/help/help.rb b/plugins/help/help.rb
@@ -10,12 +10,8 @@ def self.shortcuts
       Global.read_config("help", "shortcuts")
     end
 
-    def self.load_plugin
+    def self.init_plugin
       Help.reload_help
-      self
-    end
-
-    def self.unload_plugin
     end
 
     def self.get_cmd_handler(client, cmd, enactor)
@@ -29,10 +25,6 @@ def self.get_cmd_handler(client, cmd, enactor)
 
        nil
     end
-
-    def self.get_event_handler(event_name) 
-      nil
-    end
 
     def self.get_web_request_handler(request)
       case request.cmd

diff --git a/plugins/ictime/ictime.rb b/plugins/ictime/ictime.rb
@@ -11,13 +11,6 @@ def self.shortcuts
       Global.read_config("ictime", "shortcuts")
     end
 
-    def self.load_plugin
-      self
-    end
-
-    def self.unload_plugin
-    end
-
     def self.get_cmd_handler(client, cmd, enactor)
       case cmd.root
       when "ictime"
@@ -26,9 +19,5 @@ def self.get_cmd_handler(client, cmd, enactor)
 
       nil
     end
-
-    def self.get_event_handler(event_name) 
-      nil
-    end
   end
 end