omf_rc 6.0.6 → 6.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGVkMGMxZDRjNTQ0YzdmOWJiYzBjODNlYWZkYTlmNDgyODk3ZjY1Mw==
+    MDRlZmViZGMwYjE0Y2ZhY2U2NWMzNzQ1NWI5Nzg5OTg3ZTYwZGE4NA==
   data.tar.gz: !binary |-
-    YmIzMWEyOWZlODM2OWQ4ZjdmZTQ4ZjZiNjc4ZTQ0YWMxNDg2NDZjMA==
+    YjA5Yjk3MmQzN2VhOTkyNGUzNzJmOWJjNzNmODlmNzM4ZDM3NTQyZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDE1NWE2NjIxOGQ0NTkxZTA1NzlhNTMyMTc1N2I1NTc2MTNlN2YwYTY4MTBk
-    OTQ1OWE3NmRlOTZhMTBiODk3MTZkOTllYmYzNTg0NjkxZTBkYjMzMDA2NDMx
-    MDY3OWNkY2ZlNzE0MDJjMDkxYzIzMTYwODQ1Y2NmN2JlNGI4YjI=
+    ZmZiMDQ3NWFkNjdkMDliY2U0OGUzZThiZDBiOTI5YTg2MWY0NmM3Mzk1OTU5
+    ZDhkMGQ5MzU1NmRiZTA0YjcwNDE2OWMzNjMzOGI4NWIzMmViOTkzNGVmNzJm
+    MmU3NDExZjg1MWJlZTI1YzQwMWE1MjUwZjU3M2ViMmM3MDc3ZjA=
   data.tar.gz: !binary |-
-    MDc2NWVlYzVlMTg4NDNiYTIwZGZjNjQ0N2M0ZThmMmIxM2NhNDgzMTViNDNh
-    MTljNmU5MTA5YTcwZTQ5NWVmY2Y4MGY1Mzc3OGFmZjAzMzBhZWUwY2Y4YWFk
-    MDU1YjEzOWNmNDU1N2FlNWE4ZGY2Mzk0ZTMzNzdkNzdhMjBjODQ=
+    ZGU1NGNlMDc0OTAzODRjODM1NzEzYzY1ZjFkYTQwM2ViNGIxNTJlNzc3Y2Nk
+    M2Q1NDdmNWJiOWEyNDJiODE0NmJkZGNhNjRmMTM2OTkyY2Y0MmExNzQ5MTJm
+    NTU3ZjNlYWY1ZGIzYTFlMzQxZjEwYTI3YjY1YTBjYTZiNDk4ZWU=

data/bin/omf_rc

@@ -72,7 +72,7 @@ class OmfRcRunner
       Signal.trap("SIGINT") do
         # TODO: Should release resources first
         info "Stopping ..."
-        el.stop
+        OmfCommon.comm.disconnect
       end
 
       # Load extensions
@@ -144,6 +144,11 @@ class OmfRcRunner
       exit(1)
     end
 
+    if !config_file && !adv_config_file
+      puts "You must specify a config file"
+      exit(1)
+    end
+
     if config_file
       cfg_opts =  OmfCommon.load_yaml(config_file, symbolize_keys: true, erb_process: true)
       copts = @def_opts.merge(cfg_opts.merge(@copts))
@@ -186,17 +191,17 @@ class OmfRcRunner
           @gopts[:logging_configfile] = file
         end
 
-        op.on("-u URI", "Communication URI [#{@def_opts[:uri]}") do |uri|
-          @copts[:uri] = uri
-        end
+        # op.on("-u URI", "Communication URI [#{@def_opts[:uri]}") do |uri|
+        #   @copts[:uri] = uri
+        # end
 
         op.on("-e ENVIRONMENT", "Environment (development, production ...) [#{@def_opts[:environment]}]") do |e|
           @gopts[:environment] = e
         end
 
-        op.on("-i UID", "UID (and pubsub topic) of the resource, [#{@def_opts[:uid]}]") do |uid|
-          @copts[:uid] = uid
-        end
+        # op.on("-i UID", "UID (and pubsub topic) of the resource, [#{@def_opts[:uid]}]") do |uid|
+        #   @copts[:uid] = uid
+        # end
 
         op.on("-v", "--version", "Show version") do
           puts "OMF Resource Controller version '#{@gem_version}'"

data/config/config.yml

@@ -3,6 +3,8 @@
 # default xmpp user name/password is "hostname-pid"
 # this is to ensure that every RC has its own topic and XMPP account
 :uid: <%= Socket.gethostname %>
+#:uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@srv.mytestbed.net
+#:uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@norbit.npc.nicta.com.au
 :uri: xmpp://<%= "#{Socket.gethostname}-#{Process.pid}" %>:<%= "#{Socket.gethostname}-#{Process.pid}" %>@localhost
 :environment: production
 :debug: false

data/lib/omf_rc/version.rb

@@ -4,5 +4,5 @@
 # By downloading or using this software you accept the terms and the liability disclaimer in the License.
 
 module OmfRc
-  VERSION = "6.0.6"
+  VERSION = "6.0.7"
 end

data/omf_rc.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "em-minitest-spec", "~> 1.1.1"
   s.add_development_dependency "pry"
   s.add_development_dependency "simplecov"
-  s.add_runtime_dependency "omf_common", "~> 6.0.6"
+  s.add_runtime_dependency "omf_common", "~> 6.0.7"
   s.add_runtime_dependency "cocaine", "~> 0.3.0"
   s.add_runtime_dependency "mocha"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.0.7
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-16 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.6
+        version: 6.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.6
+        version: 6.0.7
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement