rsf_services 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37725d7fecfdd23abdad0c81c3df11c959654741
-  data.tar.gz: 168e66251e517809b4ada09878f6e9076b9fa550
+  metadata.gz: 89364c396c53b0bebc2fe5b82a277c3b640c3426
+  data.tar.gz: 95a9e35ca7d7e37b7db5d34ab006670c5a311085
 SHA512:
-  metadata.gz: b10e3b94c43fc9397762654c35ace5a96160aefffa44ac77f201dd3b637955766ce2dd5469c8a480080b1c7c01272ea729c1b2b6a3a077ba848a90fe39fc1b61
-  data.tar.gz: 7f75fc98208547df81f7dac614f141350e049e1e519ed9aa8b7c61f9d9aa492c0f2f00bbae921cfa9881851bddf8361b3be467eb2bfa15597cae5daae79e6d5f
+  metadata.gz: b5220a8ec855e06e50ef2bd10b6544d5a64cc722bb804b872dcd245aaca2a0e37a72ee5edd604067cf666fe0df6225a9979867acb7e992f07c6cbdad95dc5089
+  data.tar.gz: 24acda345fe63cba07b5f4635f6614df36894362803ab11e61f959b29226f9005847882467390a475e187e55745f5e0bebdd0924827c6feb7bd463868df12218

data/lib/rsf_services.rb

@@ -83,9 +83,9 @@ class RSFServices < RScriptRW
   
   class Package
     
-    def initialize(obj, package)
+    def initialize(obj, package, debug: debug)
 
-      @obj, @package = obj, package
+      @obj, @package, @debug = obj, package, debug
 
       @url = File.join(@obj.package_basepath, package + '.rsf')
       doc = Rexle.new open(@url, 
@@ -93,10 +93,13 @@ class RSFServices < RScriptRW
       a = doc.root.xpath 'job/attribute::id'
       
       a.each do |attr|
+        
         method_name = attr.value.gsub('-','_') 
-        method = "def %s(*args); run_job('%s', args) ; end" % \
-                                                            ([method_name] * 2)
-        self.instance_eval(method)
+
+        define_singleton_method method_name.to_sym do |*args|
+          run_job method_name, args
+        end
+
       end
 
     end
@@ -105,21 +108,28 @@ class RSFServices < RScriptRW
     
     def run_job(method_name, *args)
       
+      puts 'inside Package::run_job: args: ' + args.inspect if @debug
+      
       args.flatten!(1)
-      params = args.pop if args.find {|x| x.is_a? Hash}
+      params = args.find {|x| x.is_a? Hash} ? args.pop : {}
       a = ['//job:' + method_name, @url, args].flatten(1)
-  
+      
+      if @debug then
+        puts 'a: ' + a.inspect
+        puts 'params: ' + params.inspect
+      end
+      
       @obj.run a, params
     end
     
 
   end  
 
-  attr_reader :services, :package_basepath
+  attr_reader :services, :package_basepath, :registry
 
-  def initialize(reg=nil, package_basepath: '', log: nil)
+  def initialize(reg=nil, package_basepath: '', log: nil, debug: true)
     
-    @log = log
+    @log, @debug = log, debug
 
     super(log: log)
 
@@ -127,11 +137,7 @@ class RSFServices < RScriptRW
 
     if reg then
 
-      @services['registry'] = if reg.is_a? String then
-        reg = DWSRegistry.new reg_path
-      else
-        reg
-      end
+      @registry = @services['registry'] = reg
       
       # load the system/startup RSF jobs
 
@@ -151,6 +157,7 @@ class RSFServices < RScriptRW
 
   end
   
+  
   def delete()
     PackageMethod.new self, type: :delete
   end    
@@ -208,7 +215,7 @@ class RSFServices < RScriptRW
   
   def method_missing(method_name, *args)
     self.type = :get
-    Package.new self, method_name.to_s
+    Package.new self, method_name.to_s, debug: @debug
   end    
   
 end

data.tar.gz.sig

@@ -1,2 +1,2 @@
-M�_֮��
-`�`���g¹@I1�&��>���XT��;I��^�e��`�/�-J����Ե�l��L|X'���&ߊ<u���;J��z�=r,N���};G4�2�"�����ҷ�#������ΟH�v��&�l�Z�l�Y��[�#	;�Q����G���k嚦 Dfe�*�ӓ������c��dZ�p�ͦ������KqjYc����;���.
��7�QZf}�'�v�F�ٓ��"}�`%�*v�,=�����&
+_+�X�0�{s��ҟ�wf��!�{YL���]���-�08��+$�`�>���^��MW����l�7C޹Y�i�*�eź��� ����3:p
+�M:H�+rC�\���(�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsf_services
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   fMXSqexhUAZIyk80TuvEsqUgRCN81F92e6Yq47RQ0oKhCG9Xor/NhJodXh91NhRW
   zAgihHevT4OTsg==
   -----END CERTIFICATE-----
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rscript
@@ -42,7 +42,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: dws-registry
   requirement: !ruby/object:Gem::Requirement