Merge 7c4e22b into 69c79df

cre-ne-jp · Jul 30, 2019 · 402fb81 · 402fb81
2 parents 69c79df + 7c4e22b
commit 402fb81
Show file tree

Hide file tree

Showing 50 changed files with 834 additions and 910 deletions.
diff --git a/lib/rgrb/discord_plugin.rb b/lib/rgrb/discord_plugin.rb
diff --git a/lib/rgrb/exec/discord_bot.rb b/lib/rgrb/exec/discord_bot.rb
@@ -8,6 +8,7 @@
 require 'rgrb/version'
 require 'rgrb/config'
 require 'rgrb/plugins_loader'
+require 'rgrb/plugin_base/adapter_options'
 
 module RGRB
   module Exec
@@ -98,10 +99,12 @@ def extract_plugin_options(
           plugin_name = adapter.plugin_name
           plugin_config = config.plugin_config[plugin_name] || {}
 
-          plugin_options[adapter] = {
-            root_path: root_path,
-            plugin: plugin_config
-          }
+          plugin_options[adapter] = PluginBase::AdapterOptions.new(
+            config.id,
+            root_path,
+            plugin_config,
+            logger
+          )
 
           logger.warn(
             "プラグイン #{plugin_name} の設定を読み込みました"

diff --git a/lib/rgrb/exec/irc_bot.rb b/lib/rgrb/exec/irc_bot.rb
@@ -8,6 +8,7 @@
 require 'rgrb/version'
 require 'rgrb/config'
 require 'rgrb/plugins_loader'
+require 'rgrb/plugin_base/adapter_options'
 
 module RGRB
   module Exec
@@ -98,11 +99,12 @@ def extract_plugin_options(
           plugin_name = adapter.plugin_name
           plugin_config = config.plugin_config[plugin_name] || {}
 
-          plugin_options[adapter] = {
-            root_path: root_path,
-            plugin: plugin_config,
-            config_id: config.id
-          }
+          plugin_options[adapter] = PluginBase::AdapterOptions.new(
+            config.id,
+            root_path,
+            plugin_config,
+            logger
+          )
 
           logger.warn(
             "プラグイン #{plugin_name} の設定を読み込みました"

diff --git a/lib/rgrb/plugin/bcdice/discord_adapter.rb b/lib/rgrb/plugin/bcdice/discord_adapter.rb
@@ -1,6 +1,6 @@
 # vim: fileencoding=utf-8
 
-require 'rgrb/discord_plugin'
+require 'rgrb/plugin_base/discord_adapter'
 require 'rgrb/plugin/bcdice/constants'
 require 'rgrb/plugin/bcdice/errors'
 require 'rgrb/plugin/bcdice/generator'
@@ -14,7 +14,7 @@ module Plugin
     module Bcdice
       # Bcdice の Discord アダプター
       class DiscordAdapter
-        include RGRB::DiscordPlugin
+        include PluginBase::DiscordAdapter
 
         set(plugin_name: 'Bcdice')
         self.prefix = '.bcdice'
@@ -24,7 +24,7 @@ class DiscordAdapter
         def initialize(*args)
           super
 
-          @generator = Generator.new
+          prepare_generator
           @header = 'BCDice'
         end