bixby-common 0.4.12 → 0.4.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/Gemfile +13 -13
  4. data/Gemfile.lock +108 -107
  5. data/VERSION +1 -1
  6. data/bixby-common.gemspec +39 -39
  7. data/lib/bixby-common/command_spec.rb +1 -1
  8. data/lib/bixby-common/util/jsonify.rb +1 -1
  9. data/lib/bixby-common/util/log.rb +19 -1
  10. data/lib/bixby-common/websocket/api_channel.rb +3 -6
  11. data/test/util/log_test.rb +3 -3
  12. metadata +50 -50
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c42be708d73846920649d7e5d751739ec25457a5
4
- data.tar.gz: 75b57b797385e2e5f9f5ecb00d3a95c0340f4286
3
+ metadata.gz: f8808556abdc0a3c28e1132294798952ad051b89
4
+ data.tar.gz: fcefa34df5481021e4f69193d386c307fabde18d
5
5
  SHA512:
6
- metadata.gz: f994c619270d896ccb1a26084d4bda47755bdb1bf77453006137503873e68f9aeda766481f4241412855ac8411673e0605bf0b222ad2131f9e487f8923b24ccf
7
- data.tar.gz: 74c12adcccc39bb244d26bd3fa41437e159df8c7a81810835f9cf6c56a22baa312c97161f642ab9a99d44b234e8b5be0f232d7a950535eb1d827db55a37a5504
6
+ metadata.gz: 1c27983ba7757eb78d3d1eb87966fc9a9266a1f83ff6845296bb5755d2317702f0ceeef3aa183e8b688bde15af35ac03020d75899b22afbe629ece1c4c5b030a
7
+ data.tar.gz: 18ab406540294582f7c030faba441b7613799e032863f1345d61a0591e93305d56da4c03df47969f667d3285ed91866cf6934688422bb776a9b3672741a4170a
data/.travis.yml CHANGED
@@ -8,7 +8,7 @@ after_script: "rake coveralls"
8
8
 
9
9
  language: ruby
10
10
  rvm:
11
- - 2.0.0
11
+ - 2.1.1
12
12
  - 1.9.3
13
13
 
14
14
  branches:
data/Gemfile CHANGED
@@ -1,31 +1,31 @@
1
1
  source "https://rubygems.org"
2
2
 
3
- gem "faye-websocket"
4
- gem "multi_json"
5
- gem "httpi"
6
- gem "logging"
3
+ gem "faye-websocket", "~> 0.7"
4
+ gem "multi_json", "~> 1.8"
5
+ gem "httpi", "~> 2.1"
6
+ gem "logging", "~> 1.8"
7
7
 
8
- gem "api-auth", :git => "https://github.com/chetan/api_auth.git", :branch => "bixby"
8
+ gem "api-auth", "~> 1.0", :git => "https://github.com/chetan/api_auth.git", :branch => "bixby"
9
9
 
10
- gem "semver2"
10
+ gem "semver2", "~> 3.3"
11
11
 
12
12
  group :development do
13
13
  gem "yard", "~> 0.8"
14
14
  gem "bundler", "~> 1.1"
15
- gem "jeweler", :git => "https://github.com/chetan/jeweler.git", :branch => "bixby"
16
- gem "pry"
15
+ gem "jeweler", "~> 2.0", :git => "https://github.com/chetan/jeweler.git", :branch => "bixby"
16
+ gem "pry", "~> 0.9"
17
17
 
18
- gem "test_guard", :git => "https://github.com/chetan/test_guard.git"
19
- gem 'rb-inotify', :require => false
20
- gem 'rb-fsevent', :require => false
21
- gem 'rb-fchange', :require => false
18
+ gem "test_guard", "~> 0.2", :git => "https://github.com/chetan/test_guard.git"
19
+ gem 'rb-inotify', "~> 0.9", :require => false
20
+ gem 'rb-fsevent', "~> 0.9", :require => false
21
+ gem 'rb-fchange', "~> 0.0", :require => false
22
22
  end
23
23
 
24
24
  group :test do
25
25
  gem "simplecov", :platforms => [:mri_19, :mri_20, :rbx], :git => "https://github.com/chetan/simplecov.git", :branch => "inline_nocov"
26
26
  gem "easycov", :github => "chetan/easycov"
27
27
  gem "micron", :github => "chetan/micron"
28
- gem "coveralls", :require => false
28
+ gem "coveralls", :require => false
29
29
 
30
30
  gem "webmock", :require => false
31
31
  gem "mocha", :require => false
data/Gemfile.lock CHANGED
@@ -1,6 +1,6 @@
1
1
  GIT
2
2
  remote: git://github.com/chetan/easycov.git
3
- revision: 0fd0c852ae174c8de7c4d5c904c59b6cd1869d66
3
+ revision: 6e89ff38c36a605c4de8a34893726c73bd93f3b4
4
4
  specs:
5
5
  easycov (0.4.0)
6
6
  multi_json
@@ -10,34 +10,33 @@ GIT
10
10
 
11
11
  GIT
12
12
  remote: git://github.com/chetan/micron.git
13
- revision: 93984e01daf0820b2f7781aeacaee52b5934592c
13
+ revision: 0c1e9c0b9d9e052805f43485fe3454cbd25913c5
14
14
  specs:
15
- micron (0.5.0)
16
- colorize
15
+ micron (0.5.1)
16
+ ansi
17
17
  easycov
18
18
  hitimes
19
19
 
20
20
  GIT
21
21
  remote: https://github.com/chetan/api_auth.git
22
- revision: 2440c3a1d23b95977185ce25210c86cbeded7cee
22
+ revision: ddb73695efba631fdebe310f6710c0badc2b7be9
23
23
  branch: bixby
24
24
  specs:
25
25
  api-auth (1.0.3)
26
26
 
27
27
  GIT
28
28
  remote: https://github.com/chetan/jeweler.git
29
- revision: c83ba18b074e82415052e80499a770bff87bf944
29
+ revision: b90381a3958daae7f3ce3d8c4d710fe39e72443b
30
30
  branch: bixby
31
31
  specs:
32
- jeweler (1.8.7)
32
+ jeweler (2.0.1)
33
33
  builder
34
- bundler (~> 1.0)
34
+ bundler (>= 1.0)
35
35
  git (>= 1.2.5)
36
- github_api (= 0.10.1)
36
+ github_api
37
37
  highline (>= 1.6.15)
38
- nokogiri (= 1.5.10)
38
+ nokogiri (>= 1.5.10)
39
39
  rake
40
- rdoc
41
40
 
42
41
  GIT
43
42
  remote: https://github.com/chetan/simplecov.git
@@ -50,7 +49,7 @@ GIT
50
49
 
51
50
  GIT
52
51
  remote: https://github.com/chetan/test_guard.git
53
- revision: 0c21a29cc9aaabbeb9224da50a8cfcfb50665bf3
52
+ revision: 178e47e2e57dc83060d6cabc18f206916b9d02f2
54
53
  specs:
55
54
  test_guard (0.2.1)
56
55
  awesome_print
@@ -63,155 +62,157 @@ GIT
63
62
  GEM
64
63
  remote: https://rubygems.org/
65
64
  specs:
66
- addressable (2.3.5)
65
+ addressable (2.3.6)
66
+ ansi (1.4.3)
67
67
  awesome_print (1.2.0)
68
- bouncy-castle-java (1.5.0147)
69
68
  builder (3.2.2)
70
- celluloid (0.15.2)
71
- timers (~> 1.1.0)
72
- coderay (1.0.9)
73
- colorize (0.6.0)
74
- coveralls (0.7.0)
69
+ celluloid (0.16.0)
70
+ timers (~> 4.0.0)
71
+ coderay (1.1.0)
72
+ colorize (0.7.3)
73
+ coveralls (0.7.1)
75
74
  multi_json (~> 1.3)
76
75
  rest-client
77
76
  simplecov (>= 0.7)
78
77
  term-ansicolor
79
78
  thor
80
- crack (0.4.1)
81
- safe_yaml (~> 0.9.0)
82
- curb (0.8.5)
79
+ crack (0.4.2)
80
+ safe_yaml (~> 1.0.0)
81
+ curb (0.8.6)
82
+ descendants_tracker (0.0.4)
83
+ thread_safe (~> 0.3, >= 0.3.1)
83
84
  eventmachine (1.0.3)
84
85
  eventmachine (1.0.3-java)
85
- faraday (0.8.8)
86
- multipart-post (~> 1.2.0)
87
- faye-websocket (0.7.0)
86
+ faraday (0.9.0)
87
+ multipart-post (>= 1.2, < 3)
88
+ faye-websocket (0.7.4)
88
89
  eventmachine (>= 0.12.0)
89
- websocket-driver (>= 0.3.0)
90
- ffi (1.9.0)
91
- ffi (1.9.0-java)
92
- git (1.2.6)
93
- github_api (0.10.1)
94
- addressable
95
- faraday (~> 0.8.1)
96
- hashie (>= 1.2)
97
- multi_json (~> 1.4)
98
- nokogiri (~> 1.5.2)
90
+ websocket-driver (>= 0.3.1)
91
+ ffi (1.9.5)
92
+ ffi (1.9.5-java)
93
+ git (1.2.8)
94
+ github_api (0.12.1)
95
+ addressable (~> 2.3)
96
+ descendants_tracker (~> 0.0.4)
97
+ faraday (~> 0.8, < 0.10)
98
+ hashie (>= 3.2)
99
+ multi_json (>= 1.7.5, < 2.0)
100
+ nokogiri (~> 1.6.3)
99
101
  oauth2
100
102
  growl (1.0.3)
101
- hashie (2.0.5)
102
- highline (1.6.19)
103
- hirb (0.7.1)
104
- hitimes (1.2.1)
105
- hitimes (1.2.1-java)
106
- httpauth (0.2.0)
107
- httpclient (2.3.4.1)
108
- httpi (2.1.0)
103
+ hashie (3.3.1)
104
+ highline (1.6.21)
105
+ hirb (0.7.2)
106
+ hitimes (1.2.2)
107
+ hitimes (1.2.2-java)
108
+ httpclient (2.4.0)
109
+ httpi (2.2.7)
109
110
  rack
110
- rubyntlm (~> 0.3.2)
111
- jruby-openssl (0.9.2)
112
- bouncy-castle-java (>= 1.5.0147)
113
- json (1.8.0)
114
- json (1.8.0-java)
115
- jwt (0.1.8)
116
- multi_json (>= 1.5)
117
- listen (2.1.0)
111
+ jruby-openssl (0.9.5-java)
112
+ json (1.8.1)
113
+ json (1.8.1-java)
114
+ jwt (1.0.0)
115
+ listen (2.7.11)
118
116
  celluloid (>= 0.15.2)
119
117
  rb-fsevent (>= 0.9.3)
120
118
  rb-inotify (>= 0.9)
121
119
  little-plugger (1.1.3)
122
- logging (1.8.1)
120
+ logging (1.8.2)
123
121
  little-plugger (>= 1.1.3)
124
- multi_json (>= 1.3.6)
125
- metaclass (0.0.1)
122
+ multi_json (>= 1.8.4)
123
+ metaclass (0.0.4)
126
124
  method_source (0.8.2)
127
- mime-types (1.25)
128
- mixlib-shellout (1.2.0)
129
- mocha (0.14.0)
125
+ mime-types (2.3)
126
+ mini_portile (0.6.0)
127
+ mixlib-shellout (1.4.0)
128
+ mocha (1.1.0)
130
129
  metaclass (~> 0.0.1)
131
- multi_json (1.8.2)
130
+ multi_json (1.10.1)
132
131
  multi_xml (0.5.5)
133
- multipart-post (1.2.0)
134
- nokogiri (1.5.10)
135
- nokogiri (1.5.10-java)
136
- oauth2 (0.9.2)
137
- faraday (~> 0.8)
138
- httpauth (~> 0.2)
139
- jwt (~> 0.1.4)
140
- multi_json (~> 1.0)
132
+ multipart-post (2.0.0)
133
+ netrc (0.7.7)
134
+ nokogiri (1.6.3.1)
135
+ mini_portile (= 0.6.0)
136
+ nokogiri (1.6.3.1-java)
137
+ oauth2 (1.0.0)
138
+ faraday (>= 0.8, < 0.10)
139
+ jwt (~> 1.0)
140
+ multi_json (~> 1.3)
141
141
  multi_xml (~> 0.5)
142
142
  rack (~> 1.2)
143
- oj (2.1.6)
144
- pry (0.9.12.2)
145
- coderay (~> 1.0.5)
146
- method_source (~> 0.8)
143
+ oj (2.10.2)
144
+ pry (0.10.1)
145
+ coderay (~> 1.1.0)
146
+ method_source (~> 0.8.1)
147
147
  slop (~> 3.4)
148
- pry (0.9.12.2-java)
149
- coderay (~> 1.0.5)
150
- method_source (~> 0.8)
148
+ pry (0.10.1-java)
149
+ coderay (~> 1.1.0)
150
+ method_source (~> 0.8.1)
151
151
  slop (~> 3.4)
152
152
  spoon (~> 0.0)
153
153
  rack (1.5.2)
154
- rake (10.1.0)
154
+ rake (10.3.2)
155
155
  rb-fchange (0.0.6)
156
156
  ffi
157
- rb-fsevent (0.9.3)
158
- rb-inotify (0.9.2)
157
+ rb-fsevent (0.9.4)
158
+ rb-inotify (0.9.5)
159
159
  ffi (>= 0.5.0)
160
- rdoc (4.0.1)
161
- json (~> 1.4)
162
- rest-client (1.6.7)
163
- mime-types (>= 1.16)
164
- rubyntlm (0.3.4)
165
- safe_yaml (0.9.7)
166
- semver2 (3.3.2)
167
- simplecov-console (0.1.3)
160
+ rest-client (1.7.2)
161
+ mime-types (>= 1.16, < 3.0)
162
+ netrc (~> 0.7)
163
+ safe_yaml (1.0.4)
164
+ semver2 (3.4.0)
165
+ simplecov-console (0.2.0)
168
166
  colorize
169
167
  hirb
170
168
  simplecov
171
169
  simplecov-html (0.7.1)
172
- slop (3.4.6)
170
+ slop (3.6.0)
173
171
  spoon (0.0.4)
174
172
  ffi
175
- term-ansicolor (1.2.2)
176
- tins (~> 0.8)
177
- thor (0.18.1)
178
- timers (1.1.0)
179
- tins (0.12.0)
180
- webmock (1.14.0)
181
- addressable (>= 2.2.7)
173
+ term-ansicolor (1.3.0)
174
+ tins (~> 1.0)
175
+ thor (0.19.1)
176
+ thread_safe (0.3.4)
177
+ thread_safe (0.3.4-java)
178
+ timers (4.0.1)
179
+ hitimes
180
+ tins (1.3.3)
181
+ webmock (1.19.0)
182
+ addressable (>= 2.3.6)
182
183
  crack (>= 0.3.2)
183
- websocket-driver (0.3.0)
184
- websocket-driver (0.3.0-java)
185
- yard (0.8.7.2)
184
+ websocket-driver (0.3.4)
185
+ websocket-driver (0.3.4-java)
186
+ yard (0.8.7.4)
186
187
 
187
188
  PLATFORMS
188
189
  java
189
190
  ruby
190
191
 
191
192
  DEPENDENCIES
192
- api-auth!
193
+ api-auth (~> 1.0)!
193
194
  bundler (~> 1.1)
194
195
  coveralls
195
196
  curb
196
197
  easycov!
197
- faye-websocket
198
+ faye-websocket (~> 0.7)
198
199
  httpclient
199
- httpi
200
- jeweler!
200
+ httpi (~> 2.1)
201
+ jeweler (~> 2.0)!
201
202
  jruby-openssl
202
203
  json
203
- logging
204
+ logging (~> 1.8)
204
205
  micron!
205
206
  mixlib-shellout
206
207
  mocha
207
- multi_json
208
+ multi_json (~> 1.8)
208
209
  oj
209
- pry
210
- rb-fchange
211
- rb-fsevent
212
- rb-inotify
213
- semver2
210
+ pry (~> 0.9)
211
+ rb-fchange (~> 0.0)
212
+ rb-fsevent (~> 0.9)
213
+ rb-inotify (~> 0.9)
214
+ semver2 (~> 3.3)
214
215
  simplecov!
215
- test_guard!
216
+ test_guard (~> 0.2)!
216
217
  webmock
217
218
  yard (~> 0.8)
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.12
1
+ 0.4.13
data/bixby-common.gemspec CHANGED
@@ -2,16 +2,16 @@
2
2
  # DO NOT EDIT THIS FILE DIRECTLY
3
3
  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
4
4
  # -*- encoding: utf-8 -*-
5
- # stub: bixby-common 0.4.12 ruby lib
5
+ # stub: bixby-common 0.4.13 ruby lib
6
6
 
7
7
  Gem::Specification.new do |s|
8
8
  s.name = "bixby-common"
9
- s.version = "0.4.12"
9
+ s.version = "0.4.13"
10
10
 
11
11
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
12
12
  s.require_paths = ["lib"]
13
13
  s.authors = ["Chetan Sarva"]
14
- s.date = "2014-03-25"
14
+ s.date = "2014-10-03"
15
15
  s.description = "Bixby Common files/libs"
16
16
  s.email = "chetan@pixelcop.net"
17
17
  s.extra_rdoc_files = [
@@ -86,51 +86,51 @@ Gem::Specification.new do |s|
86
86
  s.specification_version = 4
87
87
 
88
88
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
89
- s.add_runtime_dependency(%q<faye-websocket>, [">= 0"])
90
- s.add_runtime_dependency(%q<multi_json>, [">= 0"])
91
- s.add_runtime_dependency(%q<httpi>, [">= 0"])
92
- s.add_runtime_dependency(%q<logging>, [">= 0"])
93
- s.add_runtime_dependency(%q<api-auth>, [">= 0"])
94
- s.add_runtime_dependency(%q<semver2>, [">= 0"])
89
+ s.add_runtime_dependency(%q<faye-websocket>, ["~> 0.7"])
90
+ s.add_runtime_dependency(%q<multi_json>, ["~> 1.8"])
91
+ s.add_runtime_dependency(%q<httpi>, ["~> 2.1"])
92
+ s.add_runtime_dependency(%q<logging>, ["~> 1.8"])
93
+ s.add_runtime_dependency(%q<api-auth>, ["~> 1.0"])
94
+ s.add_runtime_dependency(%q<semver2>, ["~> 3.3"])
95
95
  s.add_development_dependency(%q<yard>, ["~> 0.8"])
96
96
  s.add_development_dependency(%q<bundler>, ["~> 1.1"])
97
- s.add_development_dependency(%q<jeweler>, [">= 0"])
98
- s.add_development_dependency(%q<pry>, [">= 0"])
99
- s.add_development_dependency(%q<test_guard>, [">= 0"])
100
- s.add_development_dependency(%q<rb-inotify>, [">= 0"])
101
- s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
102
- s.add_development_dependency(%q<rb-fchange>, [">= 0"])
97
+ s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
98
+ s.add_development_dependency(%q<pry>, ["~> 0.9"])
99
+ s.add_development_dependency(%q<test_guard>, ["~> 0.2"])
100
+ s.add_development_dependency(%q<rb-inotify>, ["~> 0.9"])
101
+ s.add_development_dependency(%q<rb-fsevent>, ["~> 0.9"])
102
+ s.add_development_dependency(%q<rb-fchange>, ["~> 0.0"])
103
103
  else
104
- s.add_dependency(%q<faye-websocket>, [">= 0"])
105
- s.add_dependency(%q<multi_json>, [">= 0"])
106
- s.add_dependency(%q<httpi>, [">= 0"])
107
- s.add_dependency(%q<logging>, [">= 0"])
108
- s.add_dependency(%q<api-auth>, [">= 0"])
109
- s.add_dependency(%q<semver2>, [">= 0"])
104
+ s.add_dependency(%q<faye-websocket>, ["~> 0.7"])
105
+ s.add_dependency(%q<multi_json>, ["~> 1.8"])
106
+ s.add_dependency(%q<httpi>, ["~> 2.1"])
107
+ s.add_dependency(%q<logging>, ["~> 1.8"])
108
+ s.add_dependency(%q<api-auth>, ["~> 1.0"])
109
+ s.add_dependency(%q<semver2>, ["~> 3.3"])
110
110
  s.add_dependency(%q<yard>, ["~> 0.8"])
111
111
  s.add_dependency(%q<bundler>, ["~> 1.1"])
112
- s.add_dependency(%q<jeweler>, [">= 0"])
113
- s.add_dependency(%q<pry>, [">= 0"])
114
- s.add_dependency(%q<test_guard>, [">= 0"])
115
- s.add_dependency(%q<rb-inotify>, [">= 0"])
116
- s.add_dependency(%q<rb-fsevent>, [">= 0"])
117
- s.add_dependency(%q<rb-fchange>, [">= 0"])
112
+ s.add_dependency(%q<jeweler>, ["~> 2.0"])
113
+ s.add_dependency(%q<pry>, ["~> 0.9"])
114
+ s.add_dependency(%q<test_guard>, ["~> 0.2"])
115
+ s.add_dependency(%q<rb-inotify>, ["~> 0.9"])
116
+ s.add_dependency(%q<rb-fsevent>, ["~> 0.9"])
117
+ s.add_dependency(%q<rb-fchange>, ["~> 0.0"])
118
118
  end
119
119
  else
120
- s.add_dependency(%q<faye-websocket>, [">= 0"])
121
- s.add_dependency(%q<multi_json>, [">= 0"])
122
- s.add_dependency(%q<httpi>, [">= 0"])
123
- s.add_dependency(%q<logging>, [">= 0"])
124
- s.add_dependency(%q<api-auth>, [">= 0"])
125
- s.add_dependency(%q<semver2>, [">= 0"])
120
+ s.add_dependency(%q<faye-websocket>, ["~> 0.7"])
121
+ s.add_dependency(%q<multi_json>, ["~> 1.8"])
122
+ s.add_dependency(%q<httpi>, ["~> 2.1"])
123
+ s.add_dependency(%q<logging>, ["~> 1.8"])
124
+ s.add_dependency(%q<api-auth>, ["~> 1.0"])
125
+ s.add_dependency(%q<semver2>, ["~> 3.3"])
126
126
  s.add_dependency(%q<yard>, ["~> 0.8"])
127
127
  s.add_dependency(%q<bundler>, ["~> 1.1"])
128
- s.add_dependency(%q<jeweler>, [">= 0"])
129
- s.add_dependency(%q<pry>, [">= 0"])
130
- s.add_dependency(%q<test_guard>, [">= 0"])
131
- s.add_dependency(%q<rb-inotify>, [">= 0"])
132
- s.add_dependency(%q<rb-fsevent>, [">= 0"])
133
- s.add_dependency(%q<rb-fchange>, [">= 0"])
128
+ s.add_dependency(%q<jeweler>, ["~> 2.0"])
129
+ s.add_dependency(%q<pry>, ["~> 0.9"])
130
+ s.add_dependency(%q<test_guard>, ["~> 0.2"])
131
+ s.add_dependency(%q<rb-inotify>, ["~> 0.9"])
132
+ s.add_dependency(%q<rb-fsevent>, ["~> 0.9"])
133
+ s.add_dependency(%q<rb-fchange>, ["~> 0.0"])
134
134
  end
135
135
  end
136
136
 
data/lib/bixby-common/command_spec.rb CHANGED
@@ -180,7 +180,7 @@ class CommandSpec
180
180
  s << " args: #{self.args}"
181
181
  s << " user: #{self.user}"
182
182
  s << " group: #{self.group}"
183
- s << " env: " + MultiJson.dump(self.env)
183
+ s << " env: " + (self.env.nil?() ? "" : MultiJson.dump(self.env))
184
184
  s << " stdin: " + Debug.pretty_str(stdin)
185
185
  s.join("\n")
186
186
  end # :nocov:
data/lib/bixby-common/util/jsonify.rb CHANGED
@@ -6,7 +6,7 @@ module Jsonify
6
6
 
7
7
  include Hashify
8
8
 
9
- def to_json
9
+ def to_json(*opts)
10
10
  MultiJson.dump(self.to_hash)
11
11
  end
12
12
 
data/lib/bixby-common/util/log.rb CHANGED
@@ -1,4 +1,5 @@
1
1
 
2
+ require "httpi"
2
3
  require "logging"
3
4
 
4
5
  require "bixby-common/util/log/filtering_layout"
@@ -39,7 +40,20 @@ module Bixby
39
40
 
40
41
  # set level: ENV flag overrides; default to warn
41
42
  opts[:level] = ENV["BIXBY_LOG"] if ENV["BIXBY_LOG"]
42
- opts[:level] ||= :warn
43
+
44
+ if opts[:level].nil? then
45
+ # try to read from config file
46
+ c = Bixby.path("etc", "bixby.yml")
47
+ if File.exists? c then
48
+ if config = YAML.load_file(c) then
49
+ log_level = config["log_level"]
50
+ log_level = log_level.strip.downcase if log_level.kind_of? String
51
+ opts[:level] = log_level
52
+ end
53
+ end
54
+ end
55
+
56
+ opts[:level] ||= :info
43
57
 
44
58
  pattern = opts.delete(:pattern) || '%.1l, [%d] %5l -- %c:%L: %m\n'
45
59
  layout = Logging.layouts.pattern(:pattern => pattern)
@@ -93,6 +107,10 @@ module Bixby
93
107
  root.add_appenders("file") if !root.appenders.find{ |a| a.name == "file" }
94
108
  root.level = opts[:level]
95
109
  root.trace = true
110
+
111
+ # setup HTTPI logger
112
+ HTTPI.log = true
113
+ HTTPI.logger = Logging.logger[HTTPI]
96
114
  end
97
115
 
98
116
  end # Log
data/lib/bixby-common/websocket/api_channel.rb CHANGED
@@ -93,25 +93,22 @@ module Bixby
93
93
  # Fired whenever a message is received on the channel
94
94
  def message(event)
95
95
  req = Message.from_wire(event.data)
96
- logger.debug { "new '#{req.type}' message" }
97
96
 
98
97
  if req.type == "rpc" then
99
98
  # Execute the requested method and return the result
100
99
  json_req = req.json_request
101
- logger.debug { json_req.to_s }
100
+ logger.debug { "RPC request\n#{json_req}" }
102
101
  json_response = @handler.new(req).handle(json_req)
103
-
104
- # result = { :type => "rpc_result", :id => req.id, :data => json_response }
105
- # ws.send(MultiJson.dump(result))
106
102
  ws.send(Response.new(json_response, req.id).to_wire)
107
103
 
108
104
  elsif req.type == "rpc_result" then
109
105
  # Pass the result back to the caller
110
106
  res = req.json_response
111
- logger.debug { res.to_s }
107
+ logger.debug { "RPC_RESULT for request id #{req.id}\n#{res}" }
112
108
  @responses[req.id].response = res
113
109
 
114
110
  elsif req.type == "connect" then
111
+ logger.debug { "CONNECT request #{req.id}"}
115
112
  ret = @handler.new(req).connect(req.json_request, self)
116
113
  if ret.kind_of? JsonResponse then
117
114
  ws.send(Response.new(ret, req.id).to_wire)
data/test/util/log_test.rb CHANGED
@@ -17,10 +17,10 @@ class TestLog < TestCase
17
17
 
18
18
  ENV.delete("BIXBY_LOG")
19
19
  Bixby::Log.setup_logger
20
- assert_equal 2, Logging::Logger.root.level # warn
21
-
22
- Bixby::Log.setup_logger(:level => :info)
23
20
  assert_equal 1, Logging::Logger.root.level # info
21
+
22
+ Bixby::Log.setup_logger(:level => :error)
23
+ assert_equal 3, Logging::Logger.root.level # error
24
24
  end
25
25
 
26
26
  def test_filtering_layout
metadata CHANGED
@@ -1,99 +1,99 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bixby-common
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.12
4
+ version: 0.4.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chetan Sarva
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-25 00:00:00.000000000 Z
11
+ date: 2014-10-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faye-websocket
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ">="
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '0'
19
+ version: '0.7'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ">="
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '0'
26
+ version: '0.7'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: multi_json
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ">="
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: '0'
33
+ version: '1.8'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ">="
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: '0'
40
+ version: '1.8'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: httpi
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
47
+ version: '2.1'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: '0'
54
+ version: '2.1'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: logging
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: '0'
61
+ version: '1.8'
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: '0'
68
+ version: '1.8'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: api-auth
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ">="
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: '0'
75
+ version: '1.0'
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ">="
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: '0'
82
+ version: '1.0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: semver2
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '0'
89
+ version: '3.3'
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: '0'
96
+ version: '3.3'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: yard
99
99
  requirement: !ruby/object:Gem::Requirement
@@ -126,86 +126,86 @@ dependencies:
126
126
  name: jeweler
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ">="
129
+ - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: '0'
131
+ version: '2.0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ">="
136
+ - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: '0'
138
+ version: '2.0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: pry
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ">="
143
+ - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: '0'
145
+ version: '0.9'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ">="
150
+ - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: '0'
152
+ version: '0.9'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: test_guard
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ">="
157
+ - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: '0'
159
+ version: '0.2'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: '0'
166
+ version: '0.2'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: rb-inotify
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ">="
171
+ - - "~>"
172
172
  - !ruby/object:Gem::Version
173
- version: '0'
173
+ version: '0.9'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ">="
178
+ - - "~>"
179
179
  - !ruby/object:Gem::Version
180
- version: '0'
180
+ version: '0.9'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: rb-fsevent
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ">="
185
+ - - "~>"
186
186
  - !ruby/object:Gem::Version
187
- version: '0'
187
+ version: '0.9'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ">="
192
+ - - "~>"
193
193
  - !ruby/object:Gem::Version
194
- version: '0'
194
+ version: '0.9'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: rb-fchange
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ">="
199
+ - - "~>"
200
200
  - !ruby/object:Gem::Version
201
- version: '0'
201
+ version: '0.0'
202
202
  type: :development
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ">="
206
+ - - "~>"
207
207
  - !ruby/object:Gem::Version
208
- version: '0'
208
+ version: '0.0'
209
209
  description: Bixby Common files/libs
210
210
  email: chetan@pixelcop.net
211
211
  executables: []