Merge d900dc6 into 6ad3916

cre-ne-jp · Jul 23, 2019 · 2da923e · 2da923e
2 parents 6ad3916 + d900dc6
commit 2da923e
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 20 deletions.
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,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/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,12 +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,
-            logger: logger
-          }
+          plugin_options[adapter] = PluginBase::AdapterOptions.new(
+            config.id,
+            root_path,
+            plugin_config,
+            logger
+          )
 
           logger.warn(
             "プラグイン #{plugin_name} の設定を読み込みました"

diff --git a/lib/rgrb/plugin_base/adapter.rb b/lib/rgrb/plugin_base/adapter.rb
@@ -12,12 +12,12 @@ def prepare_generator
         generator_class = Object.const_get(class_name_tree.join('::'))
         @generator = generator_class.new
 
-        @generator.config_id = config[:config_id]
-        @generator.root_path = config[:root_path]
-        @generator.logger = config[:logger]
+        @generator.config_id = config.id
+        @generator.root_path = config.root_path
+        @generator.logger = config.logger
 
         # プラグインをロガーとして使えるよう、設定に含める
-        config_data = config[:plugin].merge({ logger: self })
+        config_data = config.plugin.merge({ logger: self })
         @generator.configure(config_data)
 
         true

diff --git a/lib/rgrb/plugin_base/adapter_options.rb b/lib/rgrb/plugin_base/adapter_options.rb
@@ -0,0 +1,12 @@
+# vim: fileencoding=utf-8
+
+module RGRB
+  module PluginBase
+    AdapterOptions = Struct.new(
+      :id,
+      :root_path,
+      :plugin,
+      :logger,
+    )
+  end
+end
diff --git a/spec/rgrb/plugin/configurable_spec.rb b/spec/rgrb/plugin/configurable_spec.rb
@@ -4,6 +4,7 @@
 
 require 'rgrb/plugin_base/generator'
 require 'rgrb/plugin_base/adapter'
+require 'rgrb/plugin_base/adapter_options'
 
 module RGRB
   module Plugin
@@ -28,12 +29,14 @@ class IrcAdapter
         attr_reader :generator
 
         def config
-          {
-            root_path: '/home/rgrb',
-            plugin: {
+          PluginBase::AdapterOptions.new(
+            'test',
+            '/home/rgrb',
+            {
               'name' => 'RGRB'
-            }
-          }
+            },
+            Lumberjack::Logger.new($stdout, progname: self.class.to_s)
+          )
         end
       end
     end