omf_rc 6.0.6 → 6.0.7

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,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MGVkMGMxZDRjNTQ0YzdmOWJiYzBjODNlYWZkYTlmNDgyODk3ZjY1Mw==
4
+ MDRlZmViZGMwYjE0Y2ZhY2U2NWMzNzQ1NWI5Nzg5OTg3ZTYwZGE4NA==
5
5
  data.tar.gz: !binary |-
6
- YmIzMWEyOWZlODM2OWQ4ZjdmZTQ4ZjZiNjc4ZTQ0YWMxNDg2NDZjMA==
6
+ YjA5Yjk3MmQzN2VhOTkyNGUzNzJmOWJjNzNmODlmNzM4ZDM3NTQyZA==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- MDE1NWE2NjIxOGQ0NTkxZTA1NzlhNTMyMTc1N2I1NTc2MTNlN2YwYTY4MTBk
10
- OTQ1OWE3NmRlOTZhMTBiODk3MTZkOTllYmYzNTg0NjkxZTBkYjMzMDA2NDMx
11
- MDY3OWNkY2ZlNzE0MDJjMDkxYzIzMTYwODQ1Y2NmN2JlNGI4YjI=
9
+ ZmZiMDQ3NWFkNjdkMDliY2U0OGUzZThiZDBiOTI5YTg2MWY0NmM3Mzk1OTU5
10
+ ZDhkMGQ5MzU1NmRiZTA0YjcwNDE2OWMzNjMzOGI4NWIzMmViOTkzNGVmNzJm
11
+ MmU3NDExZjg1MWJlZTI1YzQwMWE1MjUwZjU3M2ViMmM3MDc3ZjA=
12
12
  data.tar.gz: !binary |-
13
- MDc2NWVlYzVlMTg4NDNiYTIwZGZjNjQ0N2M0ZThmMmIxM2NhNDgzMTViNDNh
14
- MTljNmU5MTA5YTcwZTQ5NWVmY2Y4MGY1Mzc3OGFmZjAzMzBhZWUwY2Y4YWFk
15
- MDU1YjEzOWNmNDU1N2FlNWE4ZGY2Mzk0ZTMzNzdkNzdhMjBjODQ=
13
+ ZGU1NGNlMDc0OTAzODRjODM1NzEzYzY1ZjFkYTQwM2ViNGIxNTJlNzc3Y2Nk
14
+ M2Q1NDdmNWJiOWEyNDJiODE0NmJkZGNhNjRmMTM2OTkyY2Y0MmExNzQ5MTJm
15
+ NTU3ZjNlYWY1ZGIzYTFlMzQxZjEwYTI3YjY1YTBjYTZiNDk4ZWU=
data/bin/omf_rc CHANGED
@@ -72,7 +72,7 @@ class OmfRcRunner
72
72
  Signal.trap("SIGINT") do
73
73
  # TODO: Should release resources first
74
74
  info "Stopping ..."
75
- el.stop
75
+ OmfCommon.comm.disconnect
76
76
  end
77
77
 
78
78
  # Load extensions
@@ -144,6 +144,11 @@ class OmfRcRunner
144
144
  exit(1)
145
145
  end
146
146
 
147
+ if !config_file && !adv_config_file
148
+ puts "You must specify a config file"
149
+ exit(1)
150
+ end
151
+
147
152
  if config_file
148
153
  cfg_opts = OmfCommon.load_yaml(config_file, symbolize_keys: true, erb_process: true)
149
154
  copts = @def_opts.merge(cfg_opts.merge(@copts))
@@ -186,17 +191,17 @@ class OmfRcRunner
186
191
  @gopts[:logging_configfile] = file
187
192
  end
188
193
 
189
- op.on("-u URI", "Communication URI [#{@def_opts[:uri]}") do |uri|
190
- @copts[:uri] = uri
191
- end
194
+ # op.on("-u URI", "Communication URI [#{@def_opts[:uri]}") do |uri|
195
+ # @copts[:uri] = uri
196
+ # end
192
197
 
193
198
  op.on("-e ENVIRONMENT", "Environment (development, production ...) [#{@def_opts[:environment]}]") do |e|
194
199
  @gopts[:environment] = e
195
200
  end
196
201
 
197
- op.on("-i UID", "UID (and pubsub topic) of the resource, [#{@def_opts[:uid]}]") do |uid|
198
- @copts[:uid] = uid
199
- end
202
+ # op.on("-i UID", "UID (and pubsub topic) of the resource, [#{@def_opts[:uid]}]") do |uid|
203
+ # @copts[:uid] = uid
204
+ # end
200
205
 
201
206
  op.on("-v", "--version", "Show version") do
202
207
  puts "OMF Resource Controller version '#{@gem_version}'"
data/config/config.yml CHANGED
@@ -3,6 +3,8 @@
3
3
  # default xmpp user name/password is "hostname-pid"
4
4
  # this is to ensure that every RC has its own topic and XMPP account
5
5
  :uid: <%= Socket.gethostname %>
6
+ #:uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@srv.mytestbed.net
7
+ #:uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@norbit.npc.nicta.com.au
6
8
  :uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@localhost
7
9
  :environment: production
8
10
  :debug: false
@@ -4,5 +4,5 @@
4
4
  # By downloading or using this software you accept the terms and the liability disclaimer in the License.
5
5
 
6
6
  module OmfRc
7
- VERSION = "6.0.6"
7
+ VERSION = "6.0.7"
8
8
  end
data/omf_rc.gemspec CHANGED
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
25
25
  s.add_development_dependency "em-minitest-spec", "~> 1.1.1"
26
26
  s.add_development_dependency "pry"
27
27
  s.add_development_dependency "simplecov"
28
- s.add_runtime_dependency "omf_common", "~> 6.0.6"
28
+ s.add_runtime_dependency "omf_common", "~> 6.0.7"
29
29
  s.add_runtime_dependency "cocaine", "~> 0.3.0"
30
30
  s.add_runtime_dependency "mocha"
31
31
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: omf_rc
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.6
4
+ version: 6.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - NICTA
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-09-16 00:00:00.000000000 Z
11
+ date: 2013-09-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: minitest
@@ -72,14 +72,14 @@ dependencies:
72
72
  requirements:
73
73
  - - ~>
74
74
  - !ruby/object:Gem::Version
75
- version: 6.0.6
75
+ version: 6.0.7
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: 6.0.6
82
+ version: 6.0.7
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: cocaine
85
85
  requirement: !ruby/object:Gem::Requirement