mixlib-log-json 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/.rbenv-gemset +1 -0
  3. data/.ruby-version +1 -0
  4. data/Gemfile +9 -9
  5. data/Rakefile +1 -1
  6. data/lib/mixlib/log/jsonformatter.rb +3 -3
  7. data/spec/formatter/json_formatter_spec.rb +1 -2
  8. data/spec/spec_helper.rb +1 -1
  9. metadata +87 -37
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 816558bd9d113ffd665805a3254929df62122f54
4
- data.tar.gz: 6d68b892779704a46bf7226c18b6b4591be8548c
3
+ metadata.gz: 2eac474da48be00622c3814667bb303edf4e2b45
4
+ data.tar.gz: 5296610846c06c91c0f8c50c23a1a9832e62ce76
5
5
  SHA512:
6
- metadata.gz: d4f91231543c19647026f6861bb86b170f3028744d9926b8b0c69ecb477a546ea20d656fe2b22351bb4d4c6eed216b7201d20189a91572982779b3cb7e3b0eea
7
- data.tar.gz: 03dc257a6510956f68f68af58ab1510ebac2fe378debebcc2a98fa73ab82d81ed330c0c9c7766efc994e7ffa878931bbc62b9527b7720125c6d0ed780c70b76f
6
+ metadata.gz: 2033b0cd6282f1e642ba73c6937287e052fbf1f751af3df49a6cef996f45072623c2f49ab7f45d55c3c2775992fc033e03b54f60077073d0a3ab6e65ca009b86
7
+ data.tar.gz: ea393b4200392c6102675857d56c04f7a7245b4ef38976ed17acd69026d03c9b47fbb83c46d9951c12a399ed5d81ab9fb446034e7332e71830901b4aa9c6d988
data/.rbenv-gemset ADDED
@@ -0,0 +1 @@
1
+ .gems
data/.ruby-version ADDED
@@ -0,0 +1 @@
1
+ 2.1.0
data/Gemfile CHANGED
@@ -1,13 +1,13 @@
1
- source "http://rubygems.org"
1
+ source "https://rubygems.org"
2
2
 
3
- gem "mixlib-log"
4
- gem "yajl-ruby"
3
+ gem "mixlib-log", "~> 1.6.0", ">= 1.6.0"
4
+ gem "multi_json", "~> 1.7", ">= 1.7.9"
5
5
 
6
6
  group :development do
7
- gem "rspec", ">= 2.13.0"
8
- gem "yard", ">= 0.8"
9
- gem "cucumber", ">= 0"
10
- gem "bundler", "~> 1.3.5"
11
- gem "jeweler", "~> 1.8.4"
12
- gem "simplecov", "~> 0.7.1"
7
+ gem 'rspec', "~> 2.13", ">= 2.13"
8
+ gem "yard", "~> 0.8", ">= 0.8.7"
9
+ gem "cucumber", "~> 1.3", ">= 1.3"
10
+ gem "bundler", "~> 1.6", ">= 1.6.1"
11
+ gem "jeweler", "~> 2.0", ">= 2.0"
12
+ gem "simplecov", "~> 0.8", ">= 0.8.2"
13
13
  end
data/Rakefile CHANGED
@@ -21,7 +21,7 @@ Jeweler::Tasks.new do |gem|
21
21
  gem.description = %Q{A general JSON logger for mixlib}
22
22
  gem.email = "joshtoft@gmail.com"
23
23
  gem.authors = ["Josh Toft"]
24
- gem.version = '0.0.2'
24
+ gem.version = '0.0.3'
25
25
  # dependencies defined in Gemfile
26
26
  end
27
27
  Jeweler::RubygemsDotOrgTasks.new
data/lib/mixlib/log/jsonformatter.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  require 'mixlib/log/formatter'
2
2
  require 'time'
3
- require 'yajl'
3
+ require 'multi_json'
4
4
 
5
5
  module Mixlib
6
6
  module Log
@@ -9,10 +9,10 @@ module Mixlib
9
9
  def call(severity, time, progname, msg)
10
10
  jsonmsg = { s: severity.downcase }
11
11
  if @@show_time
12
- jsonmsg[:time] = time.iso8601()
12
+ jsonmsg[:t] = time.iso8601()
13
13
  end
14
14
 
15
- sprintf("%s\n", ::Yajl::Encoder.encode(jsonmsg.merge(msg2hash(msg))))
15
+ sprintf("%s\n", MultiJson.dump(jsonmsg.merge(msg2hash(msg))))
16
16
  end
17
17
 
18
18
  def msg2hash(msg)
data/spec/formatter/json_formatter_spec.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  $:.unshift File.dirname(__FILE__)
2
2
  require "spec_helper"
3
3
  require 'time'
4
- require 'yajl'
5
4
 
6
5
  describe Mixlib::Log::JSONFormatter do
7
6
  before(:each) do
@@ -19,7 +18,7 @@ describe Mixlib::Log::JSONFormatter do
19
18
  Mixlib::Log::JSONFormatter.show_time = true
20
19
  time = Time.new
21
20
  iso8601 = time.iso8601()
22
- teststr = "{\"s\":\"monkey\",\"time\":\"#{iso8601}\",\"m\":\"mos def\"}\n"
21
+ teststr = "{\"s\":\"monkey\",\"t\":\"#{iso8601}\",\"m\":\"mos def\"}\n"
23
22
  @formatter.call("monkey", time, "test", "mos def").should == teststr
24
23
  end
25
24
 
data/spec/spec_helper.rb CHANGED
@@ -12,7 +12,7 @@ if RUBY_VERSION.gsub('.', '').to_i >= 190
12
12
 
13
13
  SimpleCov.configure do
14
14
  clean_filters
15
- load_adapter 'test_frameworks'
15
+ load_profile 'test_frameworks'
16
16
  end
17
17
 
18
18
  ENV["COVERAGE"] && SimpleCov.start do
metadata CHANGED
@@ -1,127 +1,175 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mixlib-log-json
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josh Toft
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-08-16 00:00:00.000000000 Z
11
+ date: 2014-04-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-log
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: 1.6.0
20
+ - - "~>"
21
+ - !ruby/object:Gem::Version
22
+ version: 1.6.0
20
23
  type: :runtime
21
24
  prerelease: false
22
25
  version_requirements: !ruby/object:Gem::Requirement
23
26
  requirements:
24
- - - '>='
27
+ - - ">="
28
+ - !ruby/object:Gem::Version
29
+ version: 1.6.0
30
+ - - "~>"
25
31
  - !ruby/object:Gem::Version
26
- version: '0'
32
+ version: 1.6.0
27
33
  - !ruby/object:Gem::Dependency
28
- name: yajl-ruby
34
+ name: multi_json
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
- - - '>='
37
+ - - ">="
38
+ - !ruby/object:Gem::Version
39
+ version: 1.7.9
40
+ - - "~>"
32
41
  - !ruby/object:Gem::Version
33
- version: '0'
42
+ version: '1.7'
34
43
  type: :runtime
35
44
  prerelease: false
36
45
  version_requirements: !ruby/object:Gem::Requirement
37
46
  requirements:
38
- - - '>='
47
+ - - ">="
39
48
  - !ruby/object:Gem::Version
40
- version: '0'
49
+ version: 1.7.9
50
+ - - "~>"
51
+ - !ruby/object:Gem::Version
52
+ version: '1.7'
41
53
  - !ruby/object:Gem::Dependency
42
54
  name: rspec
43
55
  requirement: !ruby/object:Gem::Requirement
44
56
  requirements:
45
- - - '>='
57
+ - - ">="
58
+ - !ruby/object:Gem::Version
59
+ version: '2.13'
60
+ - - "~>"
46
61
  - !ruby/object:Gem::Version
47
- version: 2.13.0
62
+ version: '2.13'
48
63
  type: :development
49
64
  prerelease: false
50
65
  version_requirements: !ruby/object:Gem::Requirement
51
66
  requirements:
52
- - - '>='
67
+ - - ">="
53
68
  - !ruby/object:Gem::Version
54
- version: 2.13.0
69
+ version: '2.13'
70
+ - - "~>"
71
+ - !ruby/object:Gem::Version
72
+ version: '2.13'
55
73
  - !ruby/object:Gem::Dependency
56
74
  name: yard
57
75
  requirement: !ruby/object:Gem::Requirement
58
76
  requirements:
59
- - - '>='
77
+ - - ">="
78
+ - !ruby/object:Gem::Version
79
+ version: 0.8.7
80
+ - - "~>"
60
81
  - !ruby/object:Gem::Version
61
82
  version: '0.8'
62
83
  type: :development
63
84
  prerelease: false
64
85
  version_requirements: !ruby/object:Gem::Requirement
65
86
  requirements:
66
- - - '>='
87
+ - - ">="
88
+ - !ruby/object:Gem::Version
89
+ version: 0.8.7
90
+ - - "~>"
67
91
  - !ruby/object:Gem::Version
68
92
  version: '0.8'
69
93
  - !ruby/object:Gem::Dependency
70
94
  name: cucumber
71
95
  requirement: !ruby/object:Gem::Requirement
72
96
  requirements:
73
- - - '>='
97
+ - - ">="
98
+ - !ruby/object:Gem::Version
99
+ version: '1.3'
100
+ - - "~>"
74
101
  - !ruby/object:Gem::Version
75
- version: '0'
102
+ version: '1.3'
76
103
  type: :development
77
104
  prerelease: false
78
105
  version_requirements: !ruby/object:Gem::Requirement
79
106
  requirements:
80
- - - '>='
107
+ - - ">="
81
108
  - !ruby/object:Gem::Version
82
- version: '0'
109
+ version: '1.3'
110
+ - - "~>"
111
+ - !ruby/object:Gem::Version
112
+ version: '1.3'
83
113
  - !ruby/object:Gem::Dependency
84
114
  name: bundler
85
115
  requirement: !ruby/object:Gem::Requirement
86
116
  requirements:
87
- - - ~>
117
+ - - ">="
118
+ - !ruby/object:Gem::Version
119
+ version: 1.6.1
120
+ - - "~>"
88
121
  - !ruby/object:Gem::Version
89
- version: 1.3.5
122
+ version: '1.6'
90
123
  type: :development
91
124
  prerelease: false
92
125
  version_requirements: !ruby/object:Gem::Requirement
93
126
  requirements:
94
- - - ~>
127
+ - - ">="
128
+ - !ruby/object:Gem::Version
129
+ version: 1.6.1
130
+ - - "~>"
95
131
  - !ruby/object:Gem::Version
96
- version: 1.3.5
132
+ version: '1.6'
97
133
  - !ruby/object:Gem::Dependency
98
134
  name: jeweler
99
135
  requirement: !ruby/object:Gem::Requirement
100
136
  requirements:
101
- - - ~>
137
+ - - ">="
102
138
  - !ruby/object:Gem::Version
103
- version: 1.8.4
139
+ version: '2.0'
140
+ - - "~>"
141
+ - !ruby/object:Gem::Version
142
+ version: '2.0'
104
143
  type: :development
105
144
  prerelease: false
106
145
  version_requirements: !ruby/object:Gem::Requirement
107
146
  requirements:
108
- - - ~>
147
+ - - ">="
148
+ - !ruby/object:Gem::Version
149
+ version: '2.0'
150
+ - - "~>"
109
151
  - !ruby/object:Gem::Version
110
- version: 1.8.4
152
+ version: '2.0'
111
153
  - !ruby/object:Gem::Dependency
112
154
  name: simplecov
113
155
  requirement: !ruby/object:Gem::Requirement
114
156
  requirements:
115
- - - ~>
157
+ - - ">="
116
158
  - !ruby/object:Gem::Version
117
- version: 0.7.1
159
+ version: 0.8.2
160
+ - - "~>"
161
+ - !ruby/object:Gem::Version
162
+ version: '0.8'
118
163
  type: :development
119
164
  prerelease: false
120
165
  version_requirements: !ruby/object:Gem::Requirement
121
166
  requirements:
122
- - - ~>
167
+ - - ">="
123
168
  - !ruby/object:Gem::Version
124
- version: 0.7.1
169
+ version: 0.8.2
170
+ - - "~>"
171
+ - !ruby/object:Gem::Version
172
+ version: '0.8'
125
173
  description: A general JSON logger for mixlib
126
174
  email: joshtoft@gmail.com
127
175
  executables: []
@@ -129,7 +177,9 @@ extensions: []
129
177
  extra_rdoc_files:
130
178
  - README.md
131
179
  files:
132
- - .rspec
180
+ - ".rbenv-gemset"
181
+ - ".rspec"
182
+ - ".ruby-version"
133
183
  - Gemfile
134
184
  - README.md
135
185
  - Rakefile
@@ -146,17 +196,17 @@ require_paths:
146
196
  - lib
147
197
  required_ruby_version: !ruby/object:Gem::Requirement
148
198
  requirements:
149
- - - '>='
199
+ - - ">="
150
200
  - !ruby/object:Gem::Version
151
201
  version: '0'
152
202
  required_rubygems_version: !ruby/object:Gem::Requirement
153
203
  requirements:
154
- - - '>='
204
+ - - ">="
155
205
  - !ruby/object:Gem::Version
156
206
  version: '0'
157
207
  requirements: []
158
208
  rubyforge_project:
159
- rubygems_version: 2.0.5
209
+ rubygems_version: 2.2.0
160
210
  signing_key:
161
211
  specification_version: 4
162
212
  summary: A general JSON logger for mixlib