tengine_support 0.3.5 → 0.3.6

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/lib/tengine/support/config/definition/suite.rb

@@ -6,6 +6,15 @@ require 'tengine/support/yaml_with_erb'
 class Tengine::Support::Config::Definition::Suite
   include Tengine::Support::Config::Definition::HasManyChildren
 
+  def initialize(hash_or_filepath = nil)
+    build if respond_to?(:build)
+    case hash_or_filepath
+    when Hash then load(hash_or_filepath)
+    when String then load_file(hash_or_filepath)
+    end
+  end
+
+
   def mapping(mapping = nil)
     @mapping = mapping if mapping
     @mapping

data/spec/support/suite.rb

@@ -103,3 +103,65 @@ EOS
   end
 
 end
+
+
+
+
+# build_suite1 との違いは、Tengine::Support::Config::Definition::Suiteを直接newするのではなく
+# 継承したものをnewしている点です。それ以外は変わりません
+def build_suite3(*args)
+  ConfigSuite3.new(*args)
+end
+
+class ConfigSuite3 < Tengine::Support::Config::Definition::Suite
+  def build
+    banner <<EOS
+Usage: config_test [-k action] [-f path_to_config]
+         [-H db_host] [-P db_port] [-U db_user] [-S db_pass] [-B db_database]
+
+EOS
+
+    field(:action, "test|load|start|enable|stop|force-stop|status|activate", :type => :string, :default => "start")
+    load_config(:config, "path/to/config_file", :type => :string)
+    add(:process, App1::ProcessConfig)
+    add(:db, Tengine::Support::Config::Mongoid::Connection, :defaults => {:database => "tengine_production"})
+    group(:event_queue, :hidden => true) do
+      add(:connection, Tengine::Support::Config::Amqp::Connection)
+      add(:exchange  , Tengine::Support::Config::Amqp::Exchange, :defaults => {:name => 'tengine_event_exchange'})
+      add(:queue     , Tengine::Support::Config::Amqp::Queue   , :defaults => {:name => 'tengine_event_queue'})
+    end
+    hide_about_rotation = proc do
+      find(:rotation).hidden = true; find(:rotation_size).hidden = true
+    end
+    add(:log_common, Tengine::Support::Config::Logger,
+      :defaults => {
+        :rotation      => 3          ,
+        :rotation_size => 1024 * 1024,
+        :level         => 'info'     ,
+      }, &hide_about_rotation)
+    add(:application_log, App1::LoggerConfig,
+      :logger_name => "application",
+      :dependencies => { :process_config => :process, :log_common => :log_common,}, &hide_about_rotation)
+    add(:process_stdout_log, App1::LoggerConfig,
+      :logger_name => "#{File.basename($PROGRAM_NAME)}_stdout",
+      :dependencies => { :process_config => :process, :log_common => :log_common,}, &hide_about_rotation)
+    add(:process_stderr_log, App1::LoggerConfig,
+      :logger_name => "#{File.basename($PROGRAM_NAME)}_stderr",
+      :dependencies => { :process_config => :process, :log_common => :log_common,}, &hide_about_rotation)
+    separator("\nGeneral:")
+    __action__(:version, "show version"){ STDOUT.puts "1.1.1"; exit }
+    __action__(:dump_skelton, "dump skelton of config"){ STDOUT.puts YAML.dump(root.to_hash); exit }
+    __action__(:help   , "show this help message"){ STDOUT.puts option_parser.help; exit }
+
+    mapping({
+        [:action] => :k,
+        [:config] => :f,
+        [:process, :daemon] => :D,
+        [:db, :host] => :O,
+        [:db, :port] => :P,
+        [:db, :username] => :U,
+        [:db, :password] => :S,
+      })
+
+  end
+end

data/spec/tengine_support/config_spec/load_spec.rb

@@ -101,6 +101,34 @@ describe "config" do
       it_should_behave_like "load_spec_01.yml's data with db config"
     end
 
+    describe :load_file_by_suite3 do
+      before(:all) do
+        @suite = build_suite3
+        @suite.load_file(File.expand_path('load_spec_01.yml.erb', File.dirname(__FILE__)))
+      end
+      subject{ @suite }
+      it_should_behave_like "load_spec_01.yml's data common"
+      it_should_behave_like "load_spec_01.yml's data with db config"
+    end
+
+    describe :load_file_by_suite3_with_filepath do
+      before(:all) do
+        @suite = build_suite3(File.expand_path('load_spec_01.yml.erb', File.dirname(__FILE__)))
+      end
+      subject{ @suite }
+      it_should_behave_like "load_spec_01.yml's data common"
+      it_should_behave_like "load_spec_01.yml's data with db config"
+    end
+
+    describe :load_file_by_suite3_with_hash do
+      before(:all) do
+        @suite = build_suite3(YAML.load_file(File.expand_path('load_spec_01.yml.erb', File.dirname(__FILE__))))
+      end
+      subject{ @suite }
+      it_should_behave_like "load_spec_01.yml's data common"
+      it_should_behave_like "load_spec_01.yml's data with db config"
+    end
+
 
     context "set like a Hash" do
       before do

data/tengine_support.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_support"
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["saishu", "w-irie", "taigou", "totty", "hiroshinakao", "g-morita", "guemon", "aoetk", "hattori-at-nt", "t-yamada", "y-karashima", "akm"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_support
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -24,7 +24,7 @@ date: 2011-11-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2155333380 !ruby/object:Gem::Requirement
+  requirement: &2167510600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2155333380
+  version_requirements: *2167510600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155332900 !ruby/object:Gem::Requirement
+  requirement: &2167510120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2155332900
+  version_requirements: *2167510120
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2155332400 !ruby/object:Gem::Requirement
+  requirement: &2167509620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2155332400
+  version_requirements: *2167509620
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2155331920 !ruby/object:Gem::Requirement
+  requirement: &2167509100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *2155331920
+  version_requirements: *2167509100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2155331440 !ruby/object:Gem::Requirement
+  requirement: &2167508580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2155331440
+  version_requirements: *2167508580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2155258140 !ruby/object:Gem::Requirement
+  requirement: &2167507980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *2155258140
+  version_requirements: *2167507980
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2155257520 !ruby/object:Gem::Requirement
+  requirement: &2167507380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155257520
+  version_requirements: *2167507380
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2155257040 !ruby/object:Gem::Requirement
+  requirement: &2167506800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155257040
+  version_requirements: *2167506800
 description: tengine_support provides utility classes/modules which is not included
   in active_support. It doesn't depend on other tengine gems.
 email: tengine@nautilus-technologies.com
@@ -177,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3661991772208996840
+      hash: 2179763552862649060
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: