rsf_services 0.3.0 → 0.4.0

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/lib/rsf_services.rb +20 -25
  4. data.tar.gz.sig +0 -0
  5. metadata +27 -27
  6. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 3256c3e81c36efdb57e7fe5010eeef1a9d10a75c
4
- data.tar.gz: 8d599650a9c593c2a0bef2dcc3bfe928550e2c4d
3
+ metadata.gz: 86c7559b8e69b8266787d83bd0378ab7e198c1e0
4
+ data.tar.gz: 22c70de4cbd32a0278bb3bfda4208a56ae8e6d1c
5
5
  SHA512:
6
- metadata.gz: 9cecc11da748a09c53996e6f290c845eef0cfe70cd4c570083b10caa8815874bb6078c829aa27a9c6ddd7c434d6eb7eab34e2bfb748711ff6494c559ee5f6ce6
7
- data.tar.gz: 4a13cb77a12257c260c9ad9084dff09ceb82a9c1b5eeaa8b7d861dc9bb2d9c9592c60dd4da3fd058fd37afb1be40618b8f079ba34865d33708217d82fb81348c
6
+ metadata.gz: 9654023482d63cb27d8e97c2ee6059a84b80dcec523da5ebadf5223df696ef90355e8798cd7e88a7e4c575cbfffa48439f060f179672377b854e7c20383a8201
7
+ data.tar.gz: 5fc026b0d893139ca3b36e57f0f35fe1a0ac03681cf290cd3f706526bbe9d52ed54c49ebc33246ca5e8459cf748d06f51bf905173ced3332ddb03a4211edfadf
checksums.yaml.gz.sig CHANGED
Binary file
data/lib/rsf_services.rb CHANGED
@@ -4,13 +4,9 @@
4
4
 
5
5
  require 'rscript'
6
6
  require 'dws-registry'
7
- require 'logger'
8
7
 
9
8
 
10
- class RSFServices < RScript
11
-
12
- # this class (Package) is a modified copy of the code from
13
- # the rsf_services gem on 28-Jul 2016
9
+ class RSFServices < RScript
14
10
 
15
11
  class Package
16
12
 
@@ -48,11 +44,11 @@ class RSFServices < RScript
48
44
 
49
45
  attr_reader :services
50
46
 
51
- def initialize(reg=nil, package_basepath: '', logfile: nil)
47
+ def initialize(reg=nil, package_basepath: '', log: nil)
52
48
 
53
- @log = Logger.new logfile, 'daily' if logfile
49
+ @log = log
54
50
 
55
- super(logfile: logfile)
51
+ super(log: log)
56
52
 
57
53
  @package_basepath, @services = package_basepath, {}
58
54
 
@@ -85,45 +81,44 @@ class RSFServices < RScript
85
81
  def run_job(package, jobs, params={}, *qargs,
86
82
  package_path: ("%s/%s.rsf" % [@package_basepath, package]))
87
83
 
88
- log 'run job' + ("package: %s jobs: %s params: %s qargs: %s " + \
84
+ if @log then
85
+ @log.info 'RSFServices/run job: ' +
86
+ ("package: %s jobs: %s params: %s qargs: %s " + \
89
87
  " package_path: %s" % [package, jobs, params, qargs, package_path])
88
+ end
89
+
90
90
  yield(params) if block_given?
91
91
 
92
92
  a = [package_path, jobs.split(/\s/).map{|x| "//job:%s" % x} ,qargs].flatten
93
93
 
94
- result, args = read(a)
94
+ c, args = read(a)
95
95
 
96
96
  rws = self
97
97
 
98
98
  begin
99
99
 
100
- log 'result : ' + result
100
+ @log.info 'RSFServices/run job: code: ' + c if @log
101
101
 
102
- r = eval result
102
+ r = eval c
103
+
104
+ @log.info 'RSFServices/run job: result: ' + r if @log
103
105
 
104
- log 'r : ' + r.inspect
105
106
  return r
106
107
 
107
108
  rescue Exception => e
109
+
108
110
  params = {}
109
- err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")
110
- log 'err_label : ' + err_label.inspect
111
- log(err_label)
111
+ err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")
112
+ @log.debug 'RSFServices/run_job/error: ' + err_label if @log
113
+
112
114
  end
113
115
 
114
- end
115
-
116
+ end
116
117
 
117
118
  private
118
119
 
119
- def log(msg)
120
-
121
- @log.debug ':::' + msg[0..250] if @log
122
-
123
- end
124
-
125
120
  def method_missing(method_name, *args)
126
121
  Package.new self, @package_basepath, method_name.to_s
127
122
  end
128
-
123
+
129
124
  end
data.tar.gz.sig CHANGED
Binary file
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rsf_services
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.0
4
+ version: 0.4.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
12
12
  -----BEGIN CERTIFICATE-----
13
13
  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
14
14
  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
15
- 8ixkARkWAmV1MB4XDTE2MDExNDIxNDM0NFoXDTE3MDExMzIxNDM0NFowSDESMBAG
15
+ 8ixkARkWAmV1MB4XDTE3MTEwNzEyMjIyMloXDTE4MTEwNzEyMjIyMlowSDESMBAG
16
16
  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
17
17
  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
18
- ggEBAMFISA5WF7jU3Qnw5RoDh+utpZB5mvdVW+Eai5elTFLc33S3qOWmeOp8Mi7H
19
- HqMBz9LAyM53Aktb1+Q3NO8fBNT2yujrGDHHIzR0/ODQJKUyNe1eqMF9soqjqG3C
20
- sxiHTDCCwUPVBknvO2Ur+/ERwezfi2AhzbkxBeflaT/qTDOzGNtcPYZkKVdGAyim
21
- CTxUUXN53WHG1Slv17p/5cWjibCkAlAG3RlwNTGbd6Cm9iQOORBExQ9GcmMLuiHR
22
- gq+iRjXwGOwRGaAB6I6dhSxBGCza3LOyPhaZInXbxIYwgt9hbs0AyqE1pAgzIPFT
23
- VSF6d2tu352oF58iWVWVMppBpk8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
24
- DwQEAwIEsDAdBgNVHQ4EFgQU6GvDokLCZIh3E0XlEDPKxk5cwAowJgYDVR0RBB8w
18
+ ggEBAM6ArbaoZfrtyDLlCKcgJYGnh+R/iCmqECp5xB4Wi37MPmM7WKDmNKG74I4p
19
+ /4xb0J8u+1UcBC7NPhPqassXG9wB7lzd0r+QsX4r6Lxs780HAL/aIof2LeUs/SOd
20
+ i/iPKvHtlcla1/PNW2FQ8cyNvlIBZP5L3eoCvsTf2vQ2IYOhu6GzM/w/asFj2Jau
21
+ 0THxjxBqEcwe2oEAuNPYdMau1Cr7nZklqhklZ0xw3XbYYsf8WSuzNhSY76VYu5gK
22
+ Yu5HXTxEnUdbSJCPrI2hiamNT7+4TNidMo5X/mLefBNLfxSuBOHWZYB3JP7OdLal
23
+ 85sTVH2wxI2FTrrmCMEb0vzfjOMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
24
+ DwQEAwIEsDAdBgNVHQ4EFgQU/tx07QXFeH8Atsi4MTBVxMrwFRQwJgYDVR0RBB8w
25
25
  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
26
- c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAgVLlYRqE
27
- fL2eKi1yG10hNLcIrkentQPrLMJG8cc3on+wfmpLgYVPtWtzbG2PBnZzVTFfsosQ
28
- Jm8qXydOVyRWH6k8KlmUpYe0+iEgyRMyzwErTPSU+is3QTjwVHW1BtOQDeK11Ugy
29
- BkfRnPz1igkRWgPk/muH+SV+0vnwybSUt5Ak7IsZOPKzffvF8w6nGs2X04bLB/yd
30
- 74swnDmf9L3xLIl9eenmd+r/IcxaftBMQTmb0K2kb8+b2tTAojTKSgTpBPCTLKXm
31
- lQHqISZBVVMIgZGbxYKri7Y0ehSCRPSH0P3Vt0q4Wg4692YXgZvZ8B5V4SyjCdY4
32
- Ir306rK/DllbZA==
26
+ c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAmdtHrVBx
27
+ 2/6PkEgwZ9+p3WOrMaigpMUZ/m61grJYwJYCSO6LaheYAuaxaWZ7r9yEYxAENnIL
28
+ AKCRm2Ku2kWJrNo/ICVheOqWxBUiYNGiHufCzHJ5v6v0kSFqE5i76+XcqWwxA+Qw
29
+ WUatu6CVsiQ41DJ/8PvhHQx/V1LJC4l/n1b8564nuS4H9eQf2wDPdsrNZVFbaozs
30
+ C5fxR7YEvpsn65ARgRxJr3kHMnnAh0oB723bHcDRUcfEV31eGCOvbJQtUfz1X7kr
31
+ fMXSqexhUAZIyk80TuvEsqUgRCN81F92e6Yq47RQ0oKhCG9Xor/NhJodXh91NhRW
32
+ zAgihHevT4OTsg==
33
33
  -----END CERTIFICATE-----
34
- date: 2016-07-28 00:00:00.000000000 Z
34
+ date: 2017-11-07 00:00:00.000000000 Z
35
35
  dependencies:
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rscript
@@ -39,42 +39,42 @@ dependencies:
39
39
  requirements:
40
40
  - - "~>"
41
41
  - !ruby/object:Gem::Version
42
- version: '0.3'
42
+ version: '0.4'
43
43
  - - ">="
44
44
  - !ruby/object:Gem::Version
45
- version: 0.3.2
45
+ version: 0.4.0
46
46
  type: :runtime
47
47
  prerelease: false
48
48
  version_requirements: !ruby/object:Gem::Requirement
49
49
  requirements:
50
50
  - - "~>"
51
51
  - !ruby/object:Gem::Version
52
- version: '0.3'
52
+ version: '0.4'
53
53
  - - ">="
54
54
  - !ruby/object:Gem::Version
55
- version: 0.3.2
55
+ version: 0.4.0
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: dws-registry
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
60
  - - "~>"
61
61
  - !ruby/object:Gem::Version
62
- version: '0.3'
62
+ version: '0.4'
63
63
  - - ">="
64
64
  - !ruby/object:Gem::Version
65
- version: 0.3.6
65
+ version: 0.4.0
66
66
  type: :runtime
67
67
  prerelease: false
68
68
  version_requirements: !ruby/object:Gem::Requirement
69
69
  requirements:
70
70
  - - "~>"
71
71
  - !ruby/object:Gem::Version
72
- version: '0.3'
72
+ version: '0.4'
73
73
  - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: 0.3.6
75
+ version: 0.4.0
76
76
  description:
77
- email: james@r0bertson.co.uk
77
+ email: james@jamesrobertson.eu
78
78
  executables: []
79
79
  extensions: []
80
80
  extra_rdoc_files: []
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
100
100
  version: '0'
101
101
  requirements: []
102
102
  rubyforge_project:
103
- rubygems_version: 2.5.1
103
+ rubygems_version: 2.6.13
104
104
  signing_key:
105
105
  specification_version: 4
106
106
  summary: Runs within a DRb server to run RSF jobs, as well as other services.
metadata.gz.sig CHANGED
Binary file