tengine_support 0.3.19 → 0.3.20
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/lib/tengine/support/config/definition.rb +3 -9
- data/lib/tengine/support/config/definition/field.rb +20 -2
- data/lib/tengine/support/config/definition/has_many_children.rb +2 -9
- data/lib/tengine/support/config/definition/optparse_visitor.rb +3 -0
- data/lib/tengine/support/config/logger.rb +29 -3
- data/spec/tengine/support/config/logger_spec.rb +72 -1
- data/spec/tengine/support/config_spec/parse_spec.rb +4 -4
- data/tengine_support.gemspec +2 -2
- metadata +19 -19
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.3.
|
1
|
+
0.3.20
|
@@ -22,11 +22,12 @@ module Tengine::Support::Config::Definition
|
|
22
22
|
end
|
23
23
|
|
24
24
|
module ClassMethods
|
25
|
-
def field(__name__, *args)
|
25
|
+
def field(__name__, *args, &block)
|
26
26
|
attrs = args.last.is_a?(Hash) ? args.pop : {}
|
27
27
|
attrs[:description] = args.first unless args.empty?
|
28
28
|
attrs[:__name__] = __name__
|
29
29
|
attrs[:__parent__] = self
|
30
|
+
attrs[:convertor] = block
|
30
31
|
|
31
32
|
if (superclass < Tengine::Support::Config::Definition) &&
|
32
33
|
(self.children == self.superclass.children)
|
@@ -61,14 +62,7 @@ module Tengine::Support::Config::Definition
|
|
61
62
|
end
|
62
63
|
|
63
64
|
define_method("#{field.__name__}=") do |value|
|
64
|
-
|
65
|
-
case field.type
|
66
|
-
when :boolean then !!value
|
67
|
-
when :integer then value.nil? ? nil : value.to_i
|
68
|
-
when :string then value.nil? ? nil : value.to_s
|
69
|
-
else value
|
70
|
-
end
|
71
|
-
instance_variable_set("@#{field.__name__}", val)
|
65
|
+
instance_variable_set("@#{field.__name__}", field.convert(value))
|
72
66
|
end
|
73
67
|
end
|
74
68
|
end
|
@@ -1,8 +1,12 @@
|
|
1
|
+
# -*- coding: utf-8 -*-
|
1
2
|
require 'tengine/support/config/definition'
|
2
3
|
|
3
4
|
class Tengine::Support::Config::Definition::Field
|
4
|
-
attr_accessor :__name__, :__parent__, :
|
5
|
-
attr_accessor :
|
5
|
+
attr_accessor :__name__, :__parent__, :__type__
|
6
|
+
attr_accessor :__block__ # __block__ はactionの具体的な動作を保持します
|
7
|
+
attr_accessor :convertor # convertor はfieldの変換ロジックを保持します
|
8
|
+
attr_accessor :type, :default_description, :default, :description, :hidden, :enum
|
9
|
+
|
6
10
|
def initialize(attrs = {})
|
7
11
|
attrs.each{|k, v| send("#{k}=", v)}
|
8
12
|
end
|
@@ -53,4 +57,18 @@ class Tengine::Support::Config::Definition::Field
|
|
53
57
|
'--' << name_array.join('-').gsub(%r{_}, '-')
|
54
58
|
end
|
55
59
|
|
60
|
+
def convert(value)
|
61
|
+
return convertor.call(value) if convertor
|
62
|
+
result = case self.type
|
63
|
+
when :boolean then !!value
|
64
|
+
when :integer then value.nil? ? nil : value.to_i
|
65
|
+
when :string then value.nil? ? nil : value.to_s
|
66
|
+
else value
|
67
|
+
end
|
68
|
+
if self.enum && !self.enum.include?(result)
|
69
|
+
raise ArgumentError, "must be one of #{self.enum.inspect} but was #{result.inspect}"
|
70
|
+
end
|
71
|
+
result
|
72
|
+
end
|
73
|
+
|
56
74
|
end
|
@@ -69,8 +69,8 @@ module Tengine::Support::Config::Definition::HasManyChildren
|
|
69
69
|
attrs.update({
|
70
70
|
:__name__ => name,
|
71
71
|
:__parent__ => self,
|
72
|
-
:__block__ => block,
|
73
72
|
:__type__ => attrs[:__type__] || :field,
|
73
|
+
:convertor => block,
|
74
74
|
})
|
75
75
|
if field = children.detect{|child| child.__name__ == name}
|
76
76
|
new_field = field.dup
|
@@ -88,14 +88,7 @@ module Tengine::Support::Config::Definition::HasManyChildren
|
|
88
88
|
(field.default.respond_to?(:to_proc) ? self.instance_eval(&field.deault) : field.default)
|
89
89
|
end
|
90
90
|
define_method("#{field.__name__}=") do |value|
|
91
|
-
|
92
|
-
case field.type
|
93
|
-
when :boolean then !!value
|
94
|
-
when :integer then value.nil? ? nil : value.to_i
|
95
|
-
when :string then value.nil? ? nil : value.to_s
|
96
|
-
else value
|
97
|
-
end
|
98
|
-
instance_variable_set("@#{field.__name__}", val)
|
91
|
+
instance_variable_set("@#{field.__name__}", field.convert(value))
|
99
92
|
end
|
100
93
|
end
|
101
94
|
end
|
@@ -53,6 +53,9 @@ class Tengine::Support::Config::Definition::OptparseVisitor
|
|
53
53
|
o.on(*args){|f| d.__parent__.send("#{d.__name__}=", f) }
|
54
54
|
else
|
55
55
|
long_opt << "=VAL"
|
56
|
+
if d.enum
|
57
|
+
desc_str << " must be one of " << (d.enum.join(',').gsub(/\A\[|\]\Z/, ''))
|
58
|
+
end
|
56
59
|
if default_value = d.default_value
|
57
60
|
desc_str << " default: #{default_value.inspect}"
|
58
61
|
end
|
@@ -5,12 +5,38 @@ require 'active_support/hash_with_indifferent_access'
|
|
5
5
|
class Tengine::Support::Config::Logger
|
6
6
|
include Tengine::Support::Config::Definition
|
7
7
|
|
8
|
-
field :output, 'file path or "STDOUT" / "STDERR" / "NULL".', :type => :string, :default => "STDOUT"
|
9
|
-
|
8
|
+
field :output, 'file path or "STDOUT" / "STDERR" / "NULL".', :type => :string, :default => "STDOUT" do |value|
|
9
|
+
value = value.to_s
|
10
|
+
case value
|
11
|
+
when *%w[STDOUT STDERR NULL] then value
|
12
|
+
else
|
13
|
+
dirname = File.dirname(File.expand_path(value))
|
14
|
+
raise ArgumentError, "directory not found #{dirname} for value" unless File.directory?(dirname)
|
15
|
+
value
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
field :rotation, 'rotation file count or daily,weekly,monthly.' do |value|
|
20
|
+
if value.nil?
|
21
|
+
nil
|
22
|
+
elsif value.is_a?(Integer)
|
23
|
+
value
|
24
|
+
else
|
25
|
+
case value.to_s
|
26
|
+
when *%w[daily weekly monthly] then value
|
27
|
+
when /\A\d+\Z/ then value.to_i
|
28
|
+
else raise ArgumentError, "must be nil or an Integer or one of daily,weekly,monthly"
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
32
|
+
|
10
33
|
field :rotation_size, 'number of max log file size.', :type => :integer
|
11
|
-
|
34
|
+
|
35
|
+
field :level, 'Logging severity threshold.', :type => :string,
|
36
|
+
:enum => %w[debug info warn error fatal], :default => "info"
|
12
37
|
|
13
38
|
field :progname, 'program name to include in log messages.', :type => :string
|
39
|
+
|
14
40
|
field :datetime_format, 'A string suitable for passing to strftime.', :type => :string
|
15
41
|
|
16
42
|
# formatterにはprocしか設定できないので特別設定ファイルやコマンドラインオプションで指定することはできません。
|
@@ -35,7 +35,8 @@ describe 'Tengine::Support::Config::Logger' do
|
|
35
35
|
it { subject.should be_a(Tengine::Support::Config::Definition::Field)}
|
36
36
|
its(:type){ should == :string }
|
37
37
|
its(:__name__){ should == :level }
|
38
|
-
its(:description){ should == 'Logging severity threshold.
|
38
|
+
its(:description){ should == 'Logging severity threshold.'}
|
39
|
+
its(:enum){ should == %w[debug info warn error fatal]}
|
39
40
|
its(:default){ should == "info"}
|
40
41
|
end
|
41
42
|
|
@@ -86,6 +87,76 @@ describe 'Tengine::Support::Config::Logger' do
|
|
86
87
|
its(:formatter){ should == nil}
|
87
88
|
its(:progname){ should == nil}
|
88
89
|
end
|
90
|
+
|
91
|
+
describe :level do
|
92
|
+
subject{ Tengine::Support::Config::Logger.new.instantiate_children }
|
93
|
+
|
94
|
+
%w[debug info warn error fatal].each do |name|
|
95
|
+
it "#{name}を設定することができる" do
|
96
|
+
subject.level = name
|
97
|
+
subject.level.should == name
|
98
|
+
end
|
99
|
+
end
|
100
|
+
|
101
|
+
%w[invalid_name DEBUG inf err].each do |name|
|
102
|
+
it "#{name}は設定することができない" do
|
103
|
+
expect{
|
104
|
+
subject.level = name
|
105
|
+
}.to raise_error(ArgumentError)
|
106
|
+
end
|
107
|
+
end
|
108
|
+
end
|
109
|
+
|
110
|
+
describe :rotation do
|
111
|
+
subject{ Tengine::Support::Config::Logger.new.instantiate_children }
|
112
|
+
|
113
|
+
["daily", "weekly", "monthly", :daily, 2, 8].each do |value|
|
114
|
+
it "#{value}を設定することができる(変換なし)" do
|
115
|
+
subject.rotation = value
|
116
|
+
subject.rotation.should == value
|
117
|
+
end
|
118
|
+
end
|
119
|
+
|
120
|
+
["1", "100"].each do |value|
|
121
|
+
it "#{value}を設定することができる(変換あり)" do
|
122
|
+
subject.rotation = value
|
123
|
+
subject.rotation.should == value.to_i
|
124
|
+
end
|
125
|
+
end
|
126
|
+
|
127
|
+
['invalid_rotation', true, false].each do |value|
|
128
|
+
it "#{value}は設定することができない" do
|
129
|
+
expect{
|
130
|
+
subject.rotation = value
|
131
|
+
}.to raise_error(ArgumentError)
|
132
|
+
end
|
133
|
+
end
|
134
|
+
end
|
135
|
+
|
136
|
+
|
137
|
+
describe :output do
|
138
|
+
subject{ Tengine::Support::Config::Logger.new.instantiate_children }
|
139
|
+
|
140
|
+
%w[STDOUT STDERR NULL].each do |value|
|
141
|
+
it "#{value}を設定することができる" do
|
142
|
+
subject.output = value
|
143
|
+
subject.output.should == value
|
144
|
+
end
|
145
|
+
end
|
146
|
+
|
147
|
+
it "存在するディレクトリのファイル" do
|
148
|
+
path = File.expand_path("unexist.log", File.dirname(__FILE__))
|
149
|
+
subject.output = path
|
150
|
+
subject.output.should == path
|
151
|
+
end
|
152
|
+
|
153
|
+
it "存在しないディレクトリのファイル" do
|
154
|
+
expect{
|
155
|
+
subject.output = "/unexist/dir/foo.log"
|
156
|
+
}.to raise_error(ArgumentError)
|
157
|
+
end
|
158
|
+
end
|
159
|
+
|
89
160
|
end
|
90
161
|
|
91
162
|
describe :new_logger do
|
@@ -138,14 +138,14 @@ db:
|
|
138
138
|
|
139
139
|
log_common:
|
140
140
|
--log-common-output=VAL file path or "STDOUT" / "STDERR" / "NULL". default: "STDOUT"
|
141
|
-
--log-common-level=VAL Logging severity threshold. debug
|
141
|
+
--log-common-level=VAL Logging severity threshold. must be one of debug,info,warn,error,fatal default: "info"
|
142
142
|
--log-common-progname=VAL program name to include in log messages.
|
143
143
|
--log-common-datetime-format=VAL
|
144
144
|
A string suitable for passing to strftime.
|
145
145
|
|
146
146
|
application_log:
|
147
147
|
--application-log-output=VAL file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/application.log" else "STDOUT" default: "STDOUT"
|
148
|
-
--application-log-level=VAL Logging severity threshold.
|
148
|
+
--application-log-level=VAL Logging severity threshold. value of --log-common-level must be one of debug,info,warn,error,fatal default: "info"
|
149
149
|
--application-log-progname=VAL
|
150
150
|
program name to include in log messages.
|
151
151
|
--application-log-datetime-format=VAL
|
@@ -155,7 +155,7 @@ process_stdout_log:
|
|
155
155
|
--process-stdout-log-output=VAL
|
156
156
|
file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/suite_stdout.log" else "STDOUT" default: "STDOUT"
|
157
157
|
--process-stdout-log-level=VAL
|
158
|
-
Logging severity threshold.
|
158
|
+
Logging severity threshold. value of --log-common-level must be one of debug,info,warn,error,fatal default: "info"
|
159
159
|
--process-stdout-log-progname=VAL
|
160
160
|
program name to include in log messages.
|
161
161
|
--process-stdout-log-datetime-format=VAL
|
@@ -165,7 +165,7 @@ process_stderr_log:
|
|
165
165
|
--process-stderr-log-output=VAL
|
166
166
|
file path or "STDOUT" / "STDERR" / "NULL". if daemon process then "./log/suite_stderr.log" else "STDOUT" default: "STDOUT"
|
167
167
|
--process-stderr-log-level=VAL
|
168
|
-
Logging severity threshold.
|
168
|
+
Logging severity threshold. value of --log-common-level must be one of debug,info,warn,error,fatal default: "info"
|
169
169
|
--process-stderr-log-progname=VAL
|
170
170
|
program name to include in log messages.
|
171
171
|
--process-stderr-log-datetime-format=VAL
|
data/tengine_support.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "tengine_support"
|
8
|
-
s.version = "0.3.
|
8
|
+
s.version = "0.3.20"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["saishu", "w-irie", "taigou", "totty", "hiroshinakao", "g-morita", "guemon", "aoetk", "hattori-at-nt", "t-yamada", "y-karashima", "akm"]
|
12
|
-
s.date = "2011-11-
|
12
|
+
s.date = "2011-11-25"
|
13
13
|
s.description = "tengine_support provides utility classes/modules which is not included in active_support. It doesn't depend on other tengine gems."
|
14
14
|
s.email = "tengine@nautilus-technologies.com"
|
15
15
|
s.extra_rdoc_files = [
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tengine_support
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.20
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -20,11 +20,11 @@ authors:
|
|
20
20
|
autorequire:
|
21
21
|
bindir: bin
|
22
22
|
cert_chain: []
|
23
|
-
date: 2011-11-
|
23
|
+
date: 2011-11-25 00:00:00.000000000Z
|
24
24
|
dependencies:
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: activesupport
|
27
|
-
requirement: &
|
27
|
+
requirement: &2155483560 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 3.0.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *2155483560
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: rspec
|
38
|
-
requirement: &
|
38
|
+
requirement: &2155483060 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 2.6.0
|
44
44
|
type: :development
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *2155483060
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: yard
|
49
|
-
requirement: &
|
49
|
+
requirement: &2155482540 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ~>
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 0.7.2
|
55
55
|
type: :development
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *2155482540
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: bundler
|
60
|
-
requirement: &
|
60
|
+
requirement: &2155482020 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ~>
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: 1.0.18
|
66
66
|
type: :development
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *2155482020
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: jeweler
|
71
|
-
requirement: &
|
71
|
+
requirement: &2155481420 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ~>
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: 1.6.4
|
77
77
|
type: :development
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *2155481420
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: simplecov
|
82
|
-
requirement: &
|
82
|
+
requirement: &2155480880 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ~>
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: 0.5.3
|
88
88
|
type: :development
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *2155480880
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: autotest
|
93
|
-
requirement: &
|
93
|
+
requirement: &2155480360 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: '0'
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *2155480360
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: rdiscount
|
104
|
-
requirement: &
|
104
|
+
requirement: &2155479800 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,7 +109,7 @@ dependencies:
|
|
109
109
|
version: '0'
|
110
110
|
type: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *2155479800
|
113
113
|
description: tengine_support provides utility classes/modules which is not included
|
114
114
|
in active_support. It doesn't depend on other tengine gems.
|
115
115
|
email: tengine@nautilus-technologies.com
|
@@ -187,7 +187,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
187
187
|
version: '0'
|
188
188
|
segments:
|
189
189
|
- 0
|
190
|
-
hash:
|
190
|
+
hash: -1551665832818632818
|
191
191
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
192
192
|
none: false
|
193
193
|
requirements:
|