rsf_services 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45319136967bdd9209ce4d585cb679d4cbc76867
-  data.tar.gz: 00e42b3c0598e7e7b4c75125dd7bfdcd2d22f7d6
+  metadata.gz: 07e5fdedd9dcd97e02f7bee7f675790b86312b5e
+  data.tar.gz: fb3181ff3a09922f78dce94bf22b0d5433dbdb4e
 SHA512:
-  metadata.gz: f500b4e4d3dbba7b4eae6f7ff45ea17eea8e16fe5275f4206ef359c28a113490a3c002ef81e9d56f5017dd84349661080342c3a7cf1d917b7ada73e0e8cd85df
-  data.tar.gz: 4267e56843a25f8cb8bdae73d7bd56717075e2fe1b08e607e76c2bece744a09e51059907e5a4cecae18619fef3aeb2349a42d0489b5731ba88860693242d64fc
+  metadata.gz: 2e48364256e4188604f35491a776ed07d0547594657a2134e24d6f94a10301ef64790795262bfed615bd8bc637f74dd1b1d5a6e4352c77a2a68f5b9a11e03832
+  data.tar.gz: a98e8cd341b43cfa5906b7c1c2cf0ce999abeb24d43a7d08a575983a586647fb621f31e720ff115d84e64f6d6cda0126075e82515e007b626106baa7acfab3dc

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-[Ȗp�W핰X�R�iz۔j�ڥ��c5�:�8�����)Y�~:��y<.F�C�B���/�(0yrS�a�rTe�����a�}�$�p)���w�K���L����u j��/��p��Uy�P{�$)5�X��D��8�2(��`4>@��.F�3�\�
-X�t�>���?֝J�A���/�!�>���Ch����	�xw9�	�2������|ˈ�Ҽ���(|���Y~�w؃X4��~ü���J�(�Vr��8���&�
-^k
+V�!-��1|�M���=7�Wv�QH�n�FBQ�g�J眞���.����^��"kN���r���9�0��\0.xX=���#7�cXh�k��"Ty)21��{���bX$��m���_?�h����p]mmb��,��

data/lib/rsf_services.rb

@@ -11,7 +11,7 @@ class RSFServices < RScript
 
   attr_reader :services
 
-  def initialize(reg_path='', package_basepath: '', logfile: nil)
+  def initialize(reg=nil, package_basepath: '', logfile: nil)
     
     @log = Logger.new logfile, 'daily' if logfile
 
@@ -19,13 +19,19 @@ class RSFServices < RScript
 
     @package_basepath, @services = package_basepath, {}
 
-    if reg_path.length > 0 then
-
-      @services['registry'] = reg = DWSRegistry.new reg_path
+    if reg then
 
+      @services['registry'] = if reg.is_a? String then
+        #reg = DWSRegistry.new reg_path
+      else
+        reg
+      end
+      
       # load the system/startup RSF jobs
 
-      jobs = reg.get_keys('system/startup/*[load="1"]').inject({}) do |r, job|
+      startup = reg.get_key('system/startup')
+      
+      jobs =  startup.xpath('*[load="1"]').inject({}) do |r, job|
         settings = reg.get_keys("system/packages/#{job.name}/*")\
                           .inject({}){|r,x| r.merge(x.name.to_sym => x.text) }
         r.merge(job.name => settings)
@@ -42,10 +48,12 @@ class RSFServices < RScript
   def run_job(package, jobs, params={}, *qargs, 
                   package_path: ("%s/%s.rsf" % [@package_basepath, package]))
 
-    log 'inside run job' + ("package: %s jobs: %s params: %s qargs: %s package_path: %s" % [package, jobs, params, qargs, package_path])
+    log 'run job' + ("package: %s jobs: %s params: %s qargs: %s " + \
+            " package_path: %s" % [package, jobs, params, qargs, package_path])
     yield(params) if block_given?    
     
     a = [package_path, jobs.split(/\s/).map{|x| "//job:%s" % x} ,qargs].flatten
+
     result, args = read(a)
 
     rws = self
@@ -72,7 +80,7 @@ class RSFServices < RScript
 
   def log(msg)
 
-    @log.debug msg if @log
+    @log.debug ':::'  + msg[0..250] if @log
 
   end
     

data.tar.gz.sig

@@ -1,4 +1,3 @@
-3!R_L._{��U�f�1�60�R������dG�K������=�va��ɚP����1H`PЍ ��'��M6�~��L��)�ص|IΕ4���t h�;.%Ś���4,�WE��$������m�FG��$f%��N�E7�ϵO�N�����g!nO��
?�$Q���噑�
nmܗ��
-H_.n�qq�E
-��F�Nl��F�D
-�]�2��xL8�b�ok�+_�ޠ���A%j��X$y�M����U
-��sF��
+��L
+�˜m5�~��<�v&q`p�����7Q�v���ݟ��Aȇ/5h;�Cpm���tBӐZS�Q%t��
+x���A�18�xn���oV����c_�Dz������4��0e���r]PI�.5���0���R���}Q+��l�Ȑ r�/5���~�M[�MZ����j�\��Ũ.���Vdf(Sџ���'��i�S�|=M�
��MM����8���?H$o�'x��1bW�7��ǹJ���n

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsf_services
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   lQHqISZBVVMIgZGbxYKri7Y0ehSCRPSH0P3Vt0q4Wg4692YXgZvZ8B5V4SyjCdY4
   Ir306rK/DllbZA==
   -----END CERTIFICATE-----
-date: 2016-03-13 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rscript