omf_common 6.1.1 → 6.1.2.pre

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.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NGUxNTcyOGZiMDI5Mjg0Zjg5ZDQxZjQ2OTg4OWYwNmVkMTcyZDczYw==
5
- data.tar.gz: !binary |-
6
- ZmQ3NzU1ZjdlOWU4ZDBmZjcxYjdmMDM0ZjQ1YTg3MDI5MmI2NmQ5Mg==
2
+ SHA1:
3
+ metadata.gz: 32cc6e36f7af96f717e901385b4b5c66eda3a4e2
4
+ data.tar.gz: 8efbf765fb444c3f8d13b0524aa06cb431af7c64
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- YTY0MDgwNzMzNDY3YjFlNWZkOWE3NWFkZjljYWVmNWU0NGFmZGY4NGYzZWZj
10
- MGUxYzlhNzZkNDk3YmFjMmQ3MGNhYmQ5MGM4ZGU2ZDU4OTk2ZDhlY2EwOWMw
11
- MmU5MjUwODQ3MjU4ODg4YzVhYWM2OTc5MzMwZTU4ZDJkMmJkZGE=
12
- data.tar.gz: !binary |-
13
- ZmMyNjEzOWU1ZGEyZDI4MmRlNjYxMGRhMzE4NzkyNjk5YTA3YTJlNDk4YmM3
14
- NTcwNTM2OWI2OTg3ODAwOWI3YmI5NDRlYWQ5ODg2OTg2ZTRkZjE2NGM1MTQz
15
- NDAyMjBjNmUxNTE1ZTA0ZTY0NmZiMmExM2UyMzBmZjI5M2UyNGI=
6
+ metadata.gz: cd984b628ce48ff2bc45cc2eb5eb4b12a7d75843cede3fa4d458b7704e33d839104edb6f4ba314966ea3d2feac4db72ecb0b7fab9bf6333a1a6f16023dfd329e
7
+ data.tar.gz: 69fb47b89efd50ed244cc8ac7513fe107ad05f1795b6ac57ea3daf4bffea33cf389cf241e24a16e1e233467a89a0302c002f0d2ef611a268e9048d381f3edffc
data/lib/omf_common.rb CHANGED
@@ -3,6 +3,8 @@
3
3
  # You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
4
4
  # By downloading or using this software you accept the terms and the liability disclaimer in the License.
5
5
 
6
+ require 'active_support'
7
+ require 'active_support/deprecation'
6
8
  require 'active_support/core_ext'
7
9
 
8
10
  require 'omf_common/default_logging'
@@ -68,14 +68,15 @@ module OmfCommon
68
68
  # EM.add_periodic_timer(interval_sec, &block)
69
69
  # end
70
70
  # end
71
- EM.add_periodic_timer(interval_sec) do
71
+ t = EM.add_periodic_timer(interval_sec) do
72
72
  begin
73
- block.call()
73
+ block.call(t)
74
74
  rescue => ex
75
75
  error "Exception '#{ex}'"
76
76
  debug "#{ex}\n\t#{ex.backtrace.join("\n\t")}"
77
77
  end
78
78
  end
79
+ t
79
80
  end
80
81
 
81
82
  def run(&block)
@@ -36,6 +36,7 @@ module OmfCommon
36
36
  content = body.merge({
37
37
  op: type,
38
38
  mid: SecureRandom.uuid,
39
+ ts: Time.now.to_i,
39
40
  props: properties
40
41
  })
41
42
  issuer = self.authenticate? ? (body[:issuer] || body[:src]) : nil
@@ -8,7 +8,7 @@ module OmfCommon
8
8
 
9
9
  def self.version_of(name)
10
10
  git_tag = `git describe --tags 2> /dev/null`.chomp
11
- git_root = `git root 2> /dev/null`.chomp
11
+ git_root = `git rev-parse --show-toplevel 2> /dev/null`.chomp
12
12
  gem_v = Gem.loaded_specs[name].version.to_s rescue '0.0.0'
13
13
 
14
14
  # Not in a development environment or git not present
data/omf_common.gemspec CHANGED
@@ -17,19 +17,19 @@ Gem::Specification.new do |s|
17
17
 
18
18
  s.files = `git ls-files`.split("\n")
19
19
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
20
- s.executables = ["omf_monitor_topic","omf_send_request", "omf_send_create"]
20
+ s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
21
21
  s.require_paths = ["lib"]
22
22
 
23
23
  # specify any dependencies here; for example:
24
24
  s.add_development_dependency "minitest"
25
- s.add_development_dependency "em-minitest-spec", "~> 1.1.1"
25
+ s.add_development_dependency "em-minitest-spec"
26
26
  s.add_development_dependency "simplecov"
27
27
  s.add_development_dependency "pry"
28
28
  s.add_development_dependency "mocha"
29
29
 
30
- s.add_runtime_dependency "eventmachine", "= 1.0.3"
31
- s.add_runtime_dependency "blather", "= 0.8.8"
32
- s.add_runtime_dependency "logging", "~> 1.7.1"
30
+ s.add_runtime_dependency "eventmachine"
31
+ s.add_runtime_dependency "blather"
32
+ s.add_runtime_dependency "logging"
33
33
  s.add_runtime_dependency "hashie"
34
34
  s.add_runtime_dependency "oml4r", "~> 2.10.1"
35
35
  s.add_runtime_dependency "json"
metadata CHANGED
@@ -1,139 +1,139 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: omf_common
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.1.1
4
+ version: 6.1.2.pre
5
5
  platform: ruby
6
6
  authors:
7
7
  - NICTA
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-31 00:00:00.000000000 Z
11
+ date: 2014-04-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: minitest
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ! '>='
17
+ - - '>='
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ! '>='
24
+ - - '>='
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: em-minitest-spec
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - '>='
32
32
  - !ruby/object:Gem::Version
33
- version: 1.1.1
33
+ version: '0'
34
34
  type: :development
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: 1.1.1
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: simplecov
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ! '>='
45
+ - - '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ! '>='
52
+ - - '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: pry
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ! '>='
59
+ - - '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ! '>='
66
+ - - '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: mocha
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ! '>='
73
+ - - '>='
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ! '>='
80
+ - - '>='
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: eventmachine
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '='
87
+ - - '>='
88
88
  - !ruby/object:Gem::Version
89
- version: 1.0.3
89
+ version: '0'
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: 1.0.3
96
+ version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: blather
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '='
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
- version: 0.8.8
103
+ version: '0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '='
108
+ - - '>='
109
109
  - !ruby/object:Gem::Version
110
- version: 0.8.8
110
+ version: '0'
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: logging
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - '>='
116
116
  - !ruby/object:Gem::Version
117
- version: 1.7.1
117
+ version: '0'
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - '>='
123
123
  - !ruby/object:Gem::Version
124
- version: 1.7.1
124
+ version: '0'
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: hashie
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ! '>='
129
+ - - '>='
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ! '>='
136
+ - - '>='
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
@@ -154,56 +154,56 @@ dependencies:
154
154
  name: json
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ! '>='
157
+ - - '>='
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ! '>='
164
+ - - '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: json-jwt
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ! '>='
171
+ - - '>='
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ! '>='
178
+ - - '>='
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: amqp
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ! '>='
185
+ - - '>='
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :runtime
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ! '>='
192
+ - - '>='
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  - !ruby/object:Gem::Dependency
196
196
  name: uuidtools
197
197
  requirement: !ruby/object:Gem::Requirement
198
198
  requirements:
199
- - - ! '>='
199
+ - - '>='
200
200
  - !ruby/object:Gem::Version
201
201
  version: '0'
202
202
  type: :runtime
203
203
  prerelease: false
204
204
  version_requirements: !ruby/object:Gem::Requirement
205
205
  requirements:
206
- - - ! '>='
206
+ - - '>='
207
207
  - !ruby/object:Gem::Version
208
208
  version: '0'
209
209
  description: Common library of OMF, a generic framework for controlling and managing
@@ -211,9 +211,14 @@ description: Common library of OMF, a generic framework for controlling and mana
211
211
  email:
212
212
  - omf-user@lists.nicta.com.au
213
213
  executables:
214
+ - file_broadcaster.rb
215
+ - file_receiver.rb
216
+ - omf_cert.rb
217
+ - omf_keygen
214
218
  - omf_monitor_topic
215
- - omf_send_request
219
+ - omf_send_configure
216
220
  - omf_send_create
221
+ - omf_send_request
217
222
  extensions: []
218
223
  extra_rdoc_files: []
219
224
  files:
@@ -307,18 +312,42 @@ require_paths:
307
312
  - lib
308
313
  required_ruby_version: !ruby/object:Gem::Requirement
309
314
  requirements:
310
- - - ! '>='
315
+ - - '>='
311
316
  - !ruby/object:Gem::Version
312
317
  version: 1.9.3
313
318
  required_rubygems_version: !ruby/object:Gem::Requirement
314
319
  requirements:
315
- - - ! '>='
320
+ - - '>'
316
321
  - !ruby/object:Gem::Version
317
- version: '0'
322
+ version: 1.3.1
318
323
  requirements: []
319
324
  rubyforge_project: omf_common
320
- rubygems_version: 2.2.2
325
+ rubygems_version: 2.1.11
321
326
  signing_key:
322
327
  specification_version: 4
323
328
  summary: Common library of OMF
324
- test_files: []
329
+ test_files:
330
+ - test/fixture/1st_level.pem
331
+ - test/fixture/2nd_level.pem
332
+ - test/fixture/3rd_level.pem
333
+ - test/fixture/alice-cert.pem
334
+ - test/fixture/alice-key.pem
335
+ - test/fixture/omf_test.cert.pem
336
+ - test/fixture/omf_test.pem
337
+ - test/fixture/omf_test.pub
338
+ - test/fixture/omf_test.pub.pem
339
+ - test/fixture/pubsub.rb
340
+ - test/fixture/rc.pem
341
+ - test/fixture/root.pem
342
+ - test/omf_common/auth/certificate_spec.rb
343
+ - test/omf_common/auth/certificate_store_spec.rb
344
+ - test/omf_common/auth/ssh_pub_key_convert_spec.rb
345
+ - test/omf_common/comm/topic_spec.rb
346
+ - test/omf_common/comm/xmpp/communicator_spec.rb
347
+ - test/omf_common/comm/xmpp/topic_spec.rb
348
+ - test/omf_common/comm_spec.rb
349
+ - test/omf_common/command_spec.rb
350
+ - test/omf_common/core_ext/string_spec.rb
351
+ - test/omf_common/message/xml/message_spec.rb
352
+ - test/omf_common/message_spec.rb
353
+ - test/test_helper.rb