tengine_support 0.3.9 → 0.3.10

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

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

@@ -15,7 +15,6 @@ module Tengine::Support::Config::Definition
       klass.class_eval do
         self.class_attribute :children, :instance_writer => false, :instance_reader => false
         self.children = []
-
         self.class_attribute :definition_reference_names, :instance_writer => false
         self.definition_reference_names = []
       end
@@ -98,6 +97,7 @@ module Tengine::Support::Config::Definition
       child.__parent__ = self
       child
     end
+    self
   end
 
   def child_by_name(__name__)

data/lib/tengine/support/config/logger.rb

@@ -1,12 +1,23 @@
+# -*- coding: utf-8 -*-
 require 'tengine/support/config'
 
 class Tengine::Support::Config::Logger
   include Tengine::Support::Config::Definition
 
-  field :output, 'file path or "STDOUT" / "STDERR" / "NULL".', :type => :string
+  field :output, 'file path or "STDOUT" / "STDERR" / "NULL".', :type => :string, :default => "STDOUT"
   field :rotation, 'rotation file count or daily,weekly,monthly.', :type => :string
   field :rotation_size, 'number of max log file size.', :type => :integer
-  field :level, 'debug/info/warn/error/fatal.', :type => :string
+  field :level, 'Logging severity threshold. debug/info/warn/error/fatal.', :type => :string, :default => "info"
+
+  field :progname, 'program name to include in log messages.', :type => :string
+  field :datetime_format, 'A string suitable for passing to strftime.', :type => :string
+
+  # formatterにはprocしか設定できないので特別設定ファイルやコマンドラインオプションで指定することはできません。
+  # もしformatteを指す名前を指定したい場合は、別途定義したfieldをから求めたformatterの値を、
+  # オーバーライドしたnew_loggerで設定するようにしてください。
+  attr_accessor :formatter
+  # field :formatter, 'Logging formatter, as a Proc that will take four arguments and return the formatted message.',
+  #   :type => :proc, :hidden => true
 
   def new_logger
     case output
@@ -16,8 +27,10 @@ class Tengine::Support::Config::Logger
     else dev = output
     end
     shift_age = (rotation =~ /\A\d+\Z/) ? rotation.to_i : rotation
-    result = Logger.new(dev, shift_age, rotation_size)
-    result.level = Logger.const_get(level.upcase)
+    result = ::Logger.new(dev, shift_age, rotation_size)
+    result.level = ::Logger.const_get(level.to_s.upcase)
+    result.datetime_format = self.datetime_format if self.datetime_format
+    result.progname = self.progname if self.progname
     result
   end
 

data/spec/tengine_support/config/logger_spec.rb

@@ -7,17 +7,141 @@ require 'tempfile'
 describe 'Tengine::Support::Config::Logger' do
 
   context "static" do
-
     describe Tengine::Support::Config::Logger.output do
       it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
       its(:type){ should == :string }
       its(:__name__){ should == :output }
       its(:description){ should == 'file path or "STDOUT" / "STDERR" / "NULL".'}
+      its(:default){ should == "STDOUT"}
+    end
+
+    describe Tengine::Support::Config::Logger.rotation do
+      it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
+      its(:type){ should == :string }
+      its(:__name__){ should == :rotation }
+      its(:description){ should == 'rotation file count or daily,weekly,monthly.'}
+      its(:default){ should == nil}
+    end
+
+    describe Tengine::Support::Config::Logger.rotation_size do
+      it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
+      its(:type){ should == :integer }
+      its(:__name__){ should == :rotation_size }
+      its(:description){ should == 'number of max log file size.'}
+      its(:default){ should == nil}
+    end
+
+    describe Tengine::Support::Config::Logger.level do
+      it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
+      its(:type){ should == :string }
+      its(:__name__){ should == :level }
+      its(:description){ should == 'Logging severity threshold. debug/info/warn/error/fatal.'}
+      its(:default){ should == "info"}
+    end
+
+    describe Tengine::Support::Config::Logger.progname do
+      it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
+      its(:type){ should == :string }
+      its(:__name__){ should == :progname }
+      its(:description){ should == 'program name to include in log messages.'}
+      its(:default){ should == nil}
+    end
+
+    describe Tengine::Support::Config::Logger.datetime_format do
+      it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
+      its(:type){ should == :string }
+      its(:__name__){ should == :datetime_format }
+      its(:description){ should == 'A string suitable for passing to strftime.'}
       its(:default){ should == nil}
     end
+
+    # describe Tengine::Support::Config::Logger.formatter do
+    #   it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
+    #   its(:type){ should == :proc }
+    #   its(:__name__){ should == :formatter }
+    #   its(:description){ should == 'Logging formatter, as a Proc that will take four arguments and return the formatted message.'}
+    #   its(:default){ should == nil}
+    # end
+  end
+
+  context "デフォルト値" do
+    context "instantiate_childrenなし" do
+      subject{ Tengine::Support::Config::Logger.new }
+      its(:output){ should == nil }
+      its(:rotation){ should == nil}
+      its(:rotation_size){ should == nil}
+      its(:level){ should == nil}
+      its(:datetime_format){ should == nil}
+      its(:formatter){ should == nil}
+      its(:progname){ should == nil}
+    end
+
+    context "instantiate_childrenあり" do
+      subject{ Tengine::Support::Config::Logger.new.instantiate_children }
+      its(:output){ should == "STDOUT" }
+      its(:rotation){ should == nil}
+      its(:rotation_size){ should == nil}
+      its(:level){ should == "info"}
+      its(:datetime_format){ should == nil}
+      its(:formatter){ should == nil}
+      its(:progname){ should == nil}
+    end
   end
 
   describe :new_logger do
+    context "デフォルトの場合" do
+      subject{ Tengine::Support::Config::Logger.new.instantiate_children.new_logger }
+      its(:datetime_format){ should == nil}
+      its(:formatter){ should == nil}
+      its(:level){ should == 1}
+      its(:progname){ should == nil}
+    end
+
+    context "各属性を設定を指定する場合" do
+      before{ @tempfile = Tempfile.new("test.log") }
+      after { @tempfile.close }
+      subject do
+        Tengine::Support::Config::Logger.new.tap{|c|
+          c.output = @tempfile.path
+          c.rotation = "3"
+          c.rotation_size = 1000000
+          c.level = "info"
+          c.datetime_format = "%Y/%m/%d %H:%M:%S"
+          c.progname = "foobar"
+        }.instantiate_children.new_logger
+      end
+      its(:datetime_format){ should == "%Y/%m/%d %H:%M:%S"}
+      its(:formatter){ should == nil}
+      its(:level){ should == 1}
+      its(:progname){ should == "foobar"}
+      it "実際に出力してみる" do
+        t = Time.local(2011, 12, 31, 23, 59, 59)
+        Time.stub!(:now).and_return(t)
+        subject.info("something started.")
+        subject.error("something happened.")
+        File.read(@tempfile.path).should == [
+          "I, [2011/12/31 23:59:59##{Process.pid}]  INFO -- foobar: something started.\n",
+          "E, [2011/12/31 23:59:59##{Process.pid}] ERROR -- foobar: something happened.\n"
+        ].join
+      end
+
+      context "更にformatterも指定してみる" do
+        before do
+          subject.formatter = lambda{|level, t, prog, msg| "#{t.iso8601} #{level} #{prog} #{msg}\n"}
+        end
+        it "実際に出力してみる" do
+          t = Time.local(2011, 12, 31, 23, 59, 59)
+          Time.stub!(:now).and_return(t)
+          subject.info("something started.")
+          subject.error("something happened.")
+          File.read(@tempfile.path).should == [
+            "2011-12-31T23:59:59+09:00 INFO foobar something started.\n",
+            "2011-12-31T23:59:59+09:00 ERROR foobar something happened.\n",
+          ].join
+        end
+      end
+    end
+
     it "STDOUTの場合" do
       config = Tengine::Support::Config::Logger.new
       config.output = "STDOUT"
@@ -28,7 +152,6 @@ describe 'Tengine::Support::Config::Logger' do
       config.level.should == "warn"
       config.rotation.should == nil
       config.rotation_size.should == nil
-
       logger = Logger.new(STDOUT, nil, nil)
       Logger.should_receive(:new).with(STDOUT, nil, nil).and_return(logger)
       logger.should_receive(:level=).with(Logger::WARN)

data/spec/tengine_support/config_spec/dump_skelton_spec.rb

@@ -39,25 +39,29 @@ describe "dump_skelton" do
       },
 
       :log_common => {
-        :output        => nil        ,
+        :output        => "STDOUT"   ,
         :rotation      => 3          ,
         :rotation_size => 1024 * 1024,
         :level         => 'info'     ,
+        :progname => nil, :datetime_format => nil,
       }.freeze,
 
       :application_log => {
         :output        => "STDOUT",
-        :rotation=>3, :rotation_size=>1048576, :level=>"info"
+        :rotation=>3, :rotation_size=>1048576, :level=>"info",
+        :progname => nil, :datetime_format => nil,
       }.freeze,
 
       :process_stdout_log => {
         :output        => "STDOUT",
-        :rotation=>3, :rotation_size=>1048576, :level=>"info"
+        :rotation=>3, :rotation_size=>1048576, :level=>"info",
+        :progname => nil, :datetime_format => nil,
       }.freeze,
 
       :process_stderr_log => {
         :output        => "STDOUT",
-        :rotation=>3, :rotation_size=>1048576, :level=>"info"
+        :rotation=>3, :rotation_size=>1048576, :level=>"info",
+        :progname => nil, :datetime_format => nil,
       }.freeze,
     }
 
@@ -105,25 +109,29 @@ describe "dump_skelton" do
       },
 
       :log_common => {
-        :output        => nil        ,
+        :output        => "STDOUT"   ,
         :rotation      => 3          ,
         :rotation_size => 1024 * 1024,
         :level         => 'info'     ,
+        :progname => nil, :datetime_format => nil,
       }.freeze,
 
       :application_log => {
         :output        => "STDOUT",
-        :rotation=>3, :rotation_size=>1048576, :level=>"info"
+        :rotation=>3, :rotation_size=>1048576, :level=>"info",
+        :progname => nil, :datetime_format => nil,
       }.freeze,
 
       :process_stdout_log => {
         :output        => "STDOUT",
-        :rotation=>3, :rotation_size=>1048576, :level=>"info"
+        :rotation=>3, :rotation_size=>1048576, :level=>"info",
+        :progname => nil, :datetime_format => nil,
       }.freeze,
 
       :process_stderr_log => {
         :output        => "STDOUT",
-        :rotation=>3, :rotation_size=>1048576, :level=>"info"
+        :rotation=>3, :rotation_size=>1048576, :level=>"info",
+        :progname => nil, :datetime_format => nil,
       }.freeze,
     }
 

data/spec/tengine_support/config_spec/load_config_file_by_config_option_spec.rb

@@ -25,7 +25,7 @@ describe "config" do
         it { subject.event_queue.exchange.durable.should == true}
         it { subject.event_queue.queue.name.should == "tengine_event_queue"}
         it { subject.event_queue.queue.durable.should == true}
-        it { subject.log_common.output.should == nil}
+        it { subject.log_common.output.should == "STDOUT"}
         it { subject.log_common.rotation.should == 5}
         it { subject.log_common.rotation_size.should == 1024 * 1024 * 1024}
         it { subject.application_log.output.should == "log/application.log"}

data/spec/tengine_support/config_spec/load_spec.rb

@@ -18,7 +18,7 @@ describe "config" do
       it { subject.event_queue.exchange.durable.should == true}
       it { subject.event_queue.queue.name.should == "tengine_event_queue"}
       it { subject.event_queue.queue.durable.should == true}
-      it { subject.log_common.output.should == nil}
+      it { subject.log_common.output.should == "STDOUT"}
       it { subject.log_common.rotation.should == 5}
       it { subject.log_common.rotation_size.should == 1024 * 1024 * 1024}
       it { subject.log_common.level.should == "info"}
@@ -49,7 +49,7 @@ describe "config" do
       it { subject[:event_queue][:exchange][:durable].should == true}
       it { subject[:event_queue][:queue][:name].should == "tengine_event_queue"}
       it { subject[:event_queue][:queue][:durable].should == true}
-      it { subject[:log_common][:output].should == nil}
+      it { subject[:log_common][:output].should == "STDOUT"}
       it { subject[:log_common][:rotation].should == 5}
       it { subject[:log_common][:rotation_size].should == 1024 * 1024 * 1024}
       it { subject[:log_common][:level].should == "info"}

data/spec/tengine_support/config_spec/parse_spec.rb

@@ -23,7 +23,7 @@ describe "config" do
         it { subject.event_queue.exchange.durable.should == true}
         it { subject.event_queue.queue.name.should == "tengine_event_queue"}
         it { subject.event_queue.queue.durable.should == true}
-        it { subject.log_common.output.should == nil}
+        it { subject.log_common.output.should == "STDOUT"}
         it { subject.log_common.rotation.should == 3}
         it { subject.log_common.rotation_size.should == 1024 * 1024}
         it { subject.log_common.level.should == "debug"}
@@ -91,24 +91,39 @@ db:
         --db-database=VAL            database name to connect db.  default: "tengine_production"
 
 log_common:
-        --log-common-output=VAL      file path or "STDOUT" / "STDERR" / "NULL". 
-        --log-common-level=VAL       debug/info/warn/error/fatal.  default: "info"
+        --log-common-output=VAL      file path or "STDOUT" / "STDERR" / "NULL".  default: "STDOUT"
+        --log-common-level=VAL       Logging severity threshold. debug/info/warn/error/fatal.  default: "info"
+        --log-common-progname=VAL    program name to include in log messages. 
+        --log-common-datetime-format=VAL
+                                     A string suitable for passing to strftime. 
 
 application_log:
         --application-log-output=VAL file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/application.log" else "STDOUT" default: "STDOUT"
-        --application-log-level=VAL  debug/info/warn/error/fatal. value of --log-common-level default: "info"
+        --application-log-level=VAL  Logging severity threshold. debug/info/warn/error/fatal. value of --log-common-level default: "info"
+        --application-log-progname=VAL
+                                     program name to include in log messages. 
+        --application-log-datetime-format=VAL
+                                     A string suitable for passing to strftime. 
 
 process_stdout_log:
         --process-stdout-log-output=VAL
                                      file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/suite_stdout.log" else "STDOUT" default: "STDOUT"
         --process-stdout-log-level=VAL
-                                     debug/info/warn/error/fatal. value of --log-common-level default: "info"
+                                     Logging severity threshold. debug/info/warn/error/fatal. value of --log-common-level default: "info"
+        --process-stdout-log-progname=VAL
+                                     program name to include in log messages. 
+        --process-stdout-log-datetime-format=VAL
+                                     A string suitable for passing to strftime. 
 
 process_stderr_log:
         --process-stderr-log-output=VAL
                                      file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/suite_stderr.log" else "STDOUT" default: "STDOUT"
         --process-stderr-log-level=VAL
-                                     debug/info/warn/error/fatal. value of --log-common-level default: "info"
+                                     Logging severity threshold. debug/info/warn/error/fatal. value of --log-common-level default: "info"
+        --process-stderr-log-progname=VAL
+                                     program name to include in log messages. 
+        --process-stderr-log-datetime-format=VAL
+                                     A string suitable for passing to strftime. 
 
 General:
         --version                    show version 

data/spec/tengine_support/config_spec.rb

@@ -51,7 +51,7 @@ describe "config" do
         it { subject.event_queue.exchange.durable.should == true}
         it { subject.event_queue.queue.name.should == "tengine_event_queue"}
         it { subject.event_queue.queue.durable.should == true}
-        it { subject.log_common.output.should == nil}
+        it { subject.log_common.output.should == "STDOUT"}
         it { subject.log_common.rotation.should == 3}
         it { subject.log_common.rotation_size.should == 1024 * 1024}
         it { subject.log_common.level.should == "info"}
@@ -96,25 +96,29 @@ describe "config" do
           },
 
           :log_common => {
-            :output        => nil        ,
+            :output        => "STDOUT"   ,
             :rotation      => 3          ,
             :rotation_size => 1024 * 1024,
             :level         => 'info'     ,
+            :progname => nil, :datetime_format => nil,
           }.freeze,
 
           :application_log => {
             :output        => "STDOUT",
-            :rotation=>3, :rotation_size=>1048576, :level=>"info"
+            :rotation=>3, :rotation_size=>1048576, :level=>"info",
+            :progname => nil, :datetime_format => nil,
           }.freeze,
 
           :process_stdout_log => {
             :output        => "STDOUT",
-            :rotation=>3, :rotation_size=>1048576, :level=>"info"
+            :rotation=>3, :rotation_size=>1048576, :level=>"info",
+            :progname => nil, :datetime_format => nil,
           }.freeze,
 
           :process_stderr_log => {
             :output        => "STDOUT",
-            :rotation=>3, :rotation_size=>1048576, :level=>"info"
+            :rotation=>3, :rotation_size=>1048576, :level=>"info",
+            :progname => nil, :datetime_format => nil,
           }.freeze,
         }
       end

data/tengine_support.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tengine_support"
-  s.version = "0.3.9"
+  s.version = "0.3.10"
 
   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"]
-  s.date = "2011-11-18"
+  s.date = "2011-11-19"
   s.description = "tengine_support provides utility classes/modules which is not included in active_support. It doesn't depend on other tengine gems."
   s.email = "tengine@nautilus-technologies.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tengine_support
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -20,11 +20,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000Z
+date: 2011-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70223758524920 !ruby/object:Gem::Requirement
+  requirement: &70122766440900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70223758524920
+  version_requirements: *70122766440900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70223758524320 !ruby/object:Gem::Requirement
+  requirement: &70122766440340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70223758524320
+  version_requirements: *70122766440340
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70223758523720 !ruby/object:Gem::Requirement
+  requirement: &70122766439840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *70223758523720
+  version_requirements: *70122766439840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70223758523180 !ruby/object:Gem::Requirement
+  requirement: &70122766439300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.18
   type: :development
   prerelease: false
-  version_requirements: *70223758523180
+  version_requirements: *70122766439300
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70223758522660 !ruby/object:Gem::Requirement
+  requirement: &70122766438780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70223758522660
+  version_requirements: *70122766438780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70223758522060 !ruby/object:Gem::Requirement
+  requirement: &70122766438300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70223758522060
+  version_requirements: *70122766438300
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70223758521460 !ruby/object:Gem::Requirement
+  requirement: &70122766437760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223758521460
+  version_requirements: *70122766437760
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70223758520860 !ruby/object:Gem::Requirement
+  requirement: &70122766437240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70223758520860
+  version_requirements: *70122766437240
 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: 952268646322731472
+      hash: -4354806175457109230
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: