From 176360b2228b9cfb6e707726ec8b8aa958d902c6 Mon Sep 17 00:00:00 2001
From: koi-chan <koi-chan@mail.kazagakure.net>
Date: Sat, 27 Jul 2019 09:45:31 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Bcdice:=20=E3=83=86=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=81=AB=E5=A4=B1=E6=95=97=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: #154
---
 lib/rgrb/plugin/bcdice/generator.rb       |  6 +++---
 lib/rgrb/plugin/bcdice/irc_adapter.rb     |  2 +-
 spec/rgrb/plugin/bcdice/generator_spec.rb | 18 ++++++++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/lib/rgrb/plugin/bcdice/generator.rb b/lib/rgrb/plugin/bcdice/generator.rb
index 7c62b142..a12b258f 100644
--- a/lib/rgrb/plugin/bcdice/generator.rb
+++ b/lib/rgrb/plugin/bcdice/generator.rb
@@ -19,14 +19,14 @@ module Bcdice
       class Generator
         include PluginBase::Generator
 
-        # 生成器を初期化する
-        def initialize
+        def configure(*)
           super
 
+          @bcdice = CgiDiceBot.new
           @version_and_commit_id = get_version_and_commit_id
           logger.warn("BCDice を読み込みました: #{bcdice_version}")
 
-          @bcdice = CgiDiceBot.new
+          self
         end
 
         # BCDice でダイスを振った結果を返す
diff --git a/lib/rgrb/plugin/bcdice/irc_adapter.rb b/lib/rgrb/plugin/bcdice/irc_adapter.rb
index ccee267c..5421cf1e 100644
--- a/lib/rgrb/plugin/bcdice/irc_adapter.rb
+++ b/lib/rgrb/plugin/bcdice/irc_adapter.rb
@@ -24,7 +24,7 @@ class IrcAdapter
         def initialize(*args)
           super
 
-          @generator = Generator.new
+          prepare_generator
           @header = 'BCDice'
         end
 
diff --git a/spec/rgrb/plugin/bcdice/generator_spec.rb b/spec/rgrb/plugin/bcdice/generator_spec.rb
index 39d05e01..dc437cc8 100644
--- a/spec/rgrb/plugin/bcdice/generator_spec.rb
+++ b/spec/rgrb/plugin/bcdice/generator_spec.rb
@@ -1,12 +1,26 @@
 # vim: fileencoding=utf-8
 
+require 'lumberjack'
 require_relative '../../../spec_helper'
-
 require 'rgrb/plugin/bcdice/generator'
 require 'rgrb/plugin/bcdice/errors'
 
 describe RGRB::Plugin::Bcdice::Generator do
-  let(:generator) { described_class.new }
+  let(:generator) do
+    g = described_class.new
+    g.instance_variable_set(
+      :@bcdice,
+      CgiDiceBot.new
+    )
+    g.instance_variable_set(
+      :@version_and_commit_id,
+      g.send(:get_version_and_commit_id)
+    )
+
+    g.logger = Lumberjack::Logger.new($stdout, progname: self.class.to_s)
+
+    g
+  end
 
   describe '#bcdice_version' do
     it 'BCDice のバージョンを出力する' do

From 73201da78c787681e74e77aaa0dba05d0c8bbf29 Mon Sep 17 00:00:00 2001
From: koi-chan <koi-chan@mail.kazagakure.net>
Date: Sat, 27 Jul 2019 09:49:28 +0900
Subject: [PATCH 2/2] =?UTF-8?q?Discord=20=E3=82=A2=E3=83=80=E3=83=97?=
 =?UTF-8?q?=E3=82=BF=E3=81=AE=E4=BF=AE=E6=AD=A3=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/rgrb/plugin/bcdice/discord_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rgrb/plugin/bcdice/discord_adapter.rb b/lib/rgrb/plugin/bcdice/discord_adapter.rb
index 01916f29..afbde349 100644
--- a/lib/rgrb/plugin/bcdice/discord_adapter.rb
+++ b/lib/rgrb/plugin/bcdice/discord_adapter.rb
@@ -24,7 +24,7 @@ class DiscordAdapter
         def initialize(*args)
           super
 
-          @generator = Generator.new
+          prepare_generator
           @header = 'BCDice'
         end