rsf_services 0.5.4 → 0.6.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 +16 -19
  4. data.tar.gz.sig +3 -2
  5. metadata +8 -8
  6. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 89364c396c53b0bebc2fe5b82a277c3b640c3426
4
- data.tar.gz: 95a9e35ca7d7e37b7db5d34ab006670c5a311085
3
+ metadata.gz: db4091a687c2651292bfb7aa4ac4a12395393893
4
+ data.tar.gz: 357f30af7cac1515c75e1185725261a6b7d77b70
5
5
  SHA512:
6
- metadata.gz: b5220a8ec855e06e50ef2bd10b6544d5a64cc722bb804b872dcd245aaca2a0e37a72ee5edd604067cf666fe0df6225a9979867acb7e992f07c6cbdad95dc5089
7
- data.tar.gz: 24acda345fe63cba07b5f4635f6614df36894362803ab11e61f959b29226f9005847882467390a475e187e55745f5e0bebdd0924827c6feb7bd463868df12218
6
+ metadata.gz: fd58370452eb13f5c6a6e405e513c71f2acc1faaa459e733528fc367a58638570368775e94cba9765bc826dbbc39af6f5ee4d82bdafe57dc1b90dd2ad6d628c6
7
+ data.tar.gz: 40edecdc8de403424957a053187d99a7b0e6f6febc9b25a7e6102c42e899bd145aaa36bb9dd02f0f5f95d42aa680186b33dc6a1b7622e8912fe57cf339d7b394
checksums.yaml.gz.sig CHANGED
Binary file
data/lib/rsf_services.rb CHANGED
@@ -22,37 +22,30 @@ class RScriptRW < RScript
22
22
 
23
23
  if args.to_s[/\/\/job:/] then
24
24
 
25
- ajob = []
25
+ ajob = ''
26
26
 
27
27
  args.each_index do |i|
28
28
  if args[i].to_s[/\/\/job:/] then
29
- ajob << "@id='#{$'}' and @type='#{self.type.to_s}'"; args[i] = nil
29
+ ajob = $'; args[i] = nil
30
30
  end
31
31
  end
32
32
 
33
33
  args.compact!
34
34
 
35
- out = read_rsf(args) do |doc|
36
-
37
- doc.root.xpath('//job').each do |x|
38
- x.attributes[:type] = type.to_s unless x.attributes[:type]
39
- end
40
-
41
- if @log then
42
- @log.info 'RScriptRW/read: code: ' + doc.xml.inspect
43
- end
44
-
45
- doc.root.xpath("//job[#{ajob.join(' or ')}]").map do |job|
46
- job.xpath('script').map {|s| read_script(s)}.join("\n")
47
- end.join("\n")
48
- end
35
+ a = read_rsfdoc(args)
36
+ job = a.find do |xy|
37
+ name, x = xy
38
+ name == ajob.to_sym and
39
+ (x[:attributes][:type] || type.to_s == self.type.to_s)
40
+ end.last
49
41
 
42
+ out, attr = job[:code], job[:attributes]
43
+
50
44
  raise "job not found" unless out.length > 0
51
45
  out
52
46
 
53
47
  else
54
- out = read_rsf(args) {|doc| doc.root.xpath('//script')\
55
- .map {|s| read_script(s)}}.join("\n")
48
+ out = read_rsfdoc(args).map {|x| x.last[:code]}.join("\n")
56
49
  end
57
50
 
58
51
  @log.info 'RScript/read: code: ' + out.inspect if @log
@@ -137,7 +130,11 @@ class RSFServices < RScriptRW
137
130
 
138
131
  if reg then
139
132
 
140
- @registry = @services['registry'] = reg
133
+ @registry = @services['registry'] = if reg.is_a? String then
134
+ reg = DWSRegistry.new reg_path
135
+ else
136
+ reg
137
+ end
141
138
 
142
139
  # load the system/startup RSF jobs
143
140
 
data.tar.gz.sig CHANGED
@@ -1,2 +1,3 @@
1
- _+�X�0�{s��ҟ�wf��!�{YL���]���-�08��+$�`�>���^��MW����l�7C޹Y�i�*�eź��� ����3:p
2
- �M:H�+rC�\���(�
1
+ G�MDjp�=�a�Ԙ
2
+ : �Jq��hAwY�5�V�[Vv��1�,�Dv1���#������dn��]��ޮL#I"���h�?���h.�]q"�������Dq3<P��/�j٢��:?��n�~
3
+ ]�x�j��
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.5.4
4
+ version: 0.6.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
31
31
  fMXSqexhUAZIyk80TuvEsqUgRCN81F92e6Yq47RQ0oKhCG9Xor/NhJodXh91NhRW
32
32
  zAgihHevT4OTsg==
33
33
  -----END CERTIFICATE-----
34
- date: 2018-03-24 00:00:00.000000000 Z
34
+ date: 2018-07-28 00:00:00.000000000 Z
35
35
  dependencies:
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rscript
@@ -39,20 +39,20 @@ dependencies:
39
39
  requirements:
40
40
  - - "~>"
41
41
  - !ruby/object:Gem::Version
42
- version: '0.4'
42
+ version: '0.5'
43
43
  - - ">="
44
44
  - !ruby/object:Gem::Version
45
- version: 0.4.1
45
+ version: 0.5.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.4'
52
+ version: '0.5'
53
53
  - - ">="
54
54
  - !ruby/object:Gem::Version
55
- version: 0.4.1
55
+ version: 0.5.0
56
56
  - !ruby/object:Gem::Dependency
57
57
  name: dws-registry
58
58
  requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
62
62
  version: '0.4'
63
63
  - - ">="
64
64
  - !ruby/object:Gem::Version
65
- version: 0.4.0
65
+ version: 0.4.1
66
66
  type: :runtime
67
67
  prerelease: false
68
68
  version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
72
72
  version: '0.4'
73
73
  - - ">="
74
74
  - !ruby/object:Gem::Version
75
- version: 0.4.0
75
+ version: 0.4.1
76
76
  description:
77
77
  email: james@jamesrobertson.eu
78
78
  executables: []
metadata.gz.sig CHANGED
Binary file