YUKI Hiroshi
yuki****@clear*****
Thu Jan 16 16:35:59 JST 2014
これは将来的にDrntest::EngineをDrntestから切り離すことを想定して敢えて config_dirのみを渡すようにしていたのでした。 （base_dirはEngine内では使われませんし） Kouhei Sutou wrote: > Author > Kouhei Sutou <kou �� clear-code.com> > Date > 2014-01-16 15:57:33 +0900 (Thu, 16 Jan 2014) > New Revision > b50e31ee19bc42a8ef06681eca373898536d2049 > <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049> > Message > > Move config_dir to Engine > > Modified files > > * lib/drntest/engine.rb > <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#diff-0> > * lib/drntest/test-runner.rb > <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#diff-1> > > Modified: lib/drntest/engine.rb (+5 -4) > =================================================================== > > ... <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L19> > 20 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L20> > 21 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L21> > 22 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L22> > 23 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L23> > > 24 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L24> > 25 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L25> > 26 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L26> > > > 27 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L27> > 28 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L28> > 29 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L29> > ... <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L40> > 41 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L41> > 42 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L42> > 43 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L43> > 44 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L44> > > 45 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L45> > 46 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L46> > 47 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L47> > 48 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L48> > > 49 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L49> > 50 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L50> > 51 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0L51> > > > > ... <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R19> > 20 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R20> > 21 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R21> > 22 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R22> > > 23 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R23> > 24 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R24> > 25 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R25> > > 26 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R26> > 27 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R27> > 28 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R28> > 29 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R29> > 30 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R30> > ... <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R41> > 42 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R42> > 43 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R43> > 44 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R44> > > 45 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R45> > 46 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R46> > 47 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R47> > 48 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R48> > > 49 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R49> > 50 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R50> > 51 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R51> > 52 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L0R52> > > > > @@ -20,10 +20,11 @@require "fileutils" > > module Drntest > class Engine > - attr_reader :config_dir, :fluentd, :fluentd_options > + attr_reader :fluentd, :fluentd_options > > def initialize(params) > - @config_dir = Pathname(params[:config_dir]) > + @base_path = params[:base_path] > + @config_dir = params[:config_dir] > @default_port = params[:default_port] > @default_host = params[:default_host] > @default_tag = params[:default_tag] > @@ -41,11 +42,11 @@module Drntest > end > > def config_file > - config_dir + "fluentd.conf" > + @config_dir + "fluentd.conf" > end > > def catalog_file > - config_dir + "catalog.json" > + @config_dir + "catalog.json" > end > > def port > > Modified: lib/drntest/test-runner.rb (+2 -1) > =================================================================== > > ... <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1L32> > 33 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1L33> > 34 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1L34> > 35 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1L35> > 36 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1L36> > > > 37 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1L37> > 38 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1L38> > 39 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1L39> > > > > ... <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R32> > 33 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R33> > 34 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R34> > 35 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R35> > > 36 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R36> > 37 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R37> > 38 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R38> > 39 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R39> > 40 <https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049#L1R40> > > > > @@ -33,7 +33,8 @@module Drntest > @owner = owner > @base_path = Pathname(owner.base_path) > @target_path = Pathname(target) > - @engine = Engine.new(:config_dir => config_dir, > + @engine = Engine.new(:base_path => @base_path, > + :config_dir => config_dir, > :default_port => @owner.port, > :default_host => @owner.host, > :default_tag => @owner.tag, > > > > _______________________________________________ > Groonga-commit mailing list > Groonga-commit �� lists.sourceforge.jp > http://lists.sourceforge.jp/mailman/listinfo/groonga-commit > -- 結城 洋志 <YUKI Hiroshi> E-mail: yuki �� clear-code.com 株式会社クリアコード 〒113-0033 東京都文京区本郷3-27-12 本郷デントビル2階 TEL : 03-6231-7270 FAX : 03-6231-7271 WWW : http://www.clear-code.com/
