rse 0.1.2 → 0.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/lib/rse.rb +30 -26
  5. metadata +47 -42
  6. metadata.gz.sig +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 36a05c67f09a77d1bdcb8afcf542ff78b0b19948651a27de39f9d572e68f0e3f
4
- data.tar.gz: 717d9df27c6c4c6dcc3e3c81feb6f00786d463e473834e81b516da562cd64984
3
+ metadata.gz: 37030503f31b2375b3c839fa1a8badf4dfdfa084f4b590ca75709132971a4730
4
+ data.tar.gz: 9de364427b5014027fcf2c93c7bc930b2e94db3c877c7a0a541943f6214f7e29
5
5
  SHA512:
6
- metadata.gz: ca8db30032ab3aaa604993761d13e7743df9f160a6a47a190d5d3bf3456223557e900e9b3fc34e15465d30e76c3f4238026482bc3a1bfc9084d8803a8dd2499f
7
- data.tar.gz: 72a133e9035d09d96fc11d66e73a879fb480dc0f4012c89df4d9c6199f8a3958ebc7a2bee644d7db928f9eaed86899b28384a2ae0a21a3d2b6cb8fc6a1e6b1a8
6
+ metadata.gz: 4cfdaa962a33cd09113d867dc528e46c682a8b3c588fc688a71958fb6f9b1a375360bc81a95ca4827fcca652b84528bf3f375592b7f654428c16d2a5fa4f43a4
7
+ data.tar.gz: 9e77f798d315d8b836fff1a9a06133920d2d88769b3d4bea3b032cbb2c5d2792ab9f75fc3edf05e4ae96b3ccbde9dd9a54090394f6edb7e9ca59f881173ceb1b
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/lib/rse.rb CHANGED
@@ -13,46 +13,50 @@ require 'spspublog_drb_client'
13
13
  class Rse
14
14
  using ColouredText
15
15
 
16
- def initialize(package_basepath=nil, host: '', port: '61000',
17
- debug: false, loghost: 'localhost', logport: '9090',
18
- reghost: 'localhost', spshost: 'localhost', app_rsf: nil)
16
+ def initialize(package_basepath=nil, host: '0.0.0.0', port: '61000',
17
+ debug: false, loghost: nil, logport: '9090',
18
+ reghost: nil, spshost: nil, app_rsf: nil)
19
19
 
20
20
  @host, @port, @debug = host, port, debug
21
21
 
22
22
  puts 'before spspublog'.info if @debug
23
- log = SPSPubLogDRbClient.new host: loghost, port: logport
23
+ log = loghost ? SPSPubLogDRbClient.new(host: loghost, port: logport) : nil
24
24
 
25
25
  puts 'before reg'.info if @debug
26
- reg = RemoteDwsRegistry.new domain: reghost
26
+ reg = reghost ? RemoteDwsRegistry.new(domain: reghost) : nil
27
27
 
28
28
  @rs = rs = RSFServices.new reg, package_basepath: package_basepath,
29
29
  log: log, app_rsf: app_rsf, debug: debug
30
30
 
31
- sps = SPSSub.new host: spshost
32
-
33
- Thread.new do
34
- sps.subscribe(topic: 'rse/#') do |msg,topic|
35
- a = topic.split('/')[1..-1]
36
- if a.length < 2 then
37
- begin
38
- r = rs.run_job(a.first, msg)
39
- rescue
40
- sps.notice 'rse_result: no job ' + a.first
31
+ sps = spshost ? SPSSub.new(host: spshost) : nil
32
+
33
+ if sps then
34
+
35
+ Thread.new do
36
+ sps.subscribe(topic: 'rse/#') do |msg,topic|
37
+ a = topic.split('/')[1..-1]
38
+ if a.length < 2 then
39
+ begin
40
+ r = rs.run_job(a.first, msg)
41
+ rescue
42
+ sps.notice 'rse_result: no job ' + a.first
43
+ end
44
+ sps.notice 'rse_result: ' + r.inspect
45
+ else
46
+ package, job = a
47
+ begin
48
+ r = rs.run_job(package, job, {}, msg)
49
+ rescue
50
+ sps.notice 'rse_result: no job ' + a.first
51
+ end
52
+ sps.notice "rse_result/%s/%s: %s" % [package, job, r.inspect ]
41
53
  end
42
- sps.notice 'rse_result: ' + r.inspect
43
- else
44
- package, job = a
45
- begin
46
- r = rs.run_job(package, job, {}, msg)
47
- rescue
48
- sps.notice 'rse_result: no job ' + a.first
49
- end
50
- sps.notice "rse_result/%s/%s: %s" % [package, job, r.inspect ]
51
54
  end
52
55
  end
53
- end
54
56
 
55
- @rs.services['sps'] = sps
57
+ @rs.services['sps'] = sps
58
+
59
+ end
56
60
 
57
61
  puts 'ready'
58
62
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rse
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.2
4
+ version: 0.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
10
10
  cert_chain:
11
11
  - |
12
12
  -----BEGIN CERTIFICATE-----
13
- MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
14
- YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzIyMTIyNjIzWhcN
15
- MTkwMzIyMTIyNjIzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
16
- cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKgZh3
17
- L6Dw+LGmfDESYKAzFPLp7/DBCngXOpF9Xs67N9oWW6VvXuI4QfYP3TMWgML63LZW
18
- fPbMIiIV77DgNzKEFIdkuVw4hBdS3rOBU8CM1rsCuzTNEz5dIk3j4X8f2u1MXj+R
19
- xj8Kobrsf4T4j+GCnWmF8vs6A8mZ61ErqJZuAo/3DJk00e/feRpJMLDDauZ9jN1s
20
- q/oLq0qGjgUEMfXzBpzc6ZH4ThQ/K18gVDs/5lVok+p2PnT6eBHll8KGQHrBLJ12
21
- hOaPn2CfXXc1QIEhlFes5CuTga8UPslZKDsB0GUyP5i2UDCWtbLx3/lohits6ahB
22
- Cq9TE50l+qgNussvAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
23
- HQYDVR0OBBYEFO4iKKVwKQysm3lDMP3B7tVBNZ0mMCYGA1UdEQQfMB2BG2dlbW1h
24
- c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
25
- ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBABG0GDpCcLRqUaSpe01+
26
- P7faKJpVfFpGTeBOeFMhXcIfXBts6XDkt0BV5WVs8hELMOuygayayVXegSkFRPCr
27
- /f6GsmIVVUffLVoKhh8sbC9WH6ZE3hddzGZ4ak98DkYE+6a9V/07qjjjQIwYJBQ7
28
- FKi+vwEKeiIniq3jsTvxUnZBLx+FaO+vVWgbqi2LI5FjXWEU1+Pv0sF1dHXUKOiR
29
- 6VLVRd61U5PLkXgiFDUQTMQxbROuNge8Tn1sTxSPIK1FbNsKnx+1+5sonMBgu4zn
30
- gou7xRtdjGdiyT3PyvX0OQ+99BHHx73PhDP1g8iDZJM0XfIVmfFIYOOCSNgKEgUM
31
- V1M=
13
+ MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
14
+ YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMzI1MjIwNjI1WhcN
15
+ MjAwMzI0MjIwNjI1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
16
+ cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDSmdqb
17
+ vlxlGfBzluHMGj/iMbNgP1RHxRerWYNFm4RULDYmEgzziyDvmSdiIJhrmUTQ9kAu
18
+ 5/1dG5Qv/DexeUIAGeDcNQer+1WqY5szZwXlg+dmmqRNjZTvtiCt+Nv8srSdY2+V
19
+ Ba36+CuyuZNTJIlQUlG5+byT3+R29ZNqP5fGfBIrpnK70HDqcpn9+63HwbVnUXeV
20
+ aOqh+6FSU1eoR+GyLeG4kOVndEZlTUrn9FXOeTU81dVSkXbWat8UfJXb7ldIb4Ot
21
+ LkLbcnQJLVco3zwp2kus3y6lYBFdFC/xgV3jq7RtrPbgZFbG/uMQcGIZ96++Zmrg
22
+ ZSc4/fD4ptFtdrVvVHL+I6JEpru6kJ35OPXa1x+LC4taIf9rNZ+t21Kq6Tb6+UVy
23
+ tRvvfrhZJtbXyjOjHBZEszk2D6unRIFbnzIb/fh0PKdsrz4JVkHZ8d2kGWnmtaFU
24
+ 3wTGzz6QSAQHtsOLPGAbUmn6HHYzTBrOVXxQ44kvK51B/jdtwxojJGydbX0CAwEA
25
+ AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUq4MAVfVC
26
+ BWX1ArO4wymRRhR+ySYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
27
+ c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
28
+ BgkqhkiG9w0BAQsFAAOCAYEAphtm0kF4w34GsaclAwrWBqA01scjJhWenRadT6+5
29
+ 3nJZc7284zWwd11H0rEf64CEbgxdUhqVg2+tcKaBdvCrPw7+I+gMEr4B0MD1r2dq
30
+ nJct4Q/2TD1AGPFKa+GYWGpXH2yKJiHhIHs+2m4Iugb4mAukhwuXaKeZCiENMp/p
31
+ i31FVPkmCk26KSIfwZoNldBjlpfmEwMyBNlNgv7zYZuMf+Qchqvt2J+TgWQ5rOSY
32
+ RoLsFrst2KMslz3sxRLmwu8BJk6OMPgclk5B4cR+2lRhev2RUXUI72dsAHtOe5Fx
33
+ ovNEkn9DLhVi3Onf1trHGYeW5GyB5q9XuOnCVhCyARmOkcS07TCu1MuUIypVnUOl
34
+ m1/DlryaUR8I8InR60+GgcH5B8Rg9B1nO91wh1wYEy6psDkAzYllLXT53hu2gDjX
35
+ gLIcOm5figGx9YoCYFixR00ARSKpMaCDMCJwL3iA1m4pL04Smvm0XogHNs49NRTP
36
+ odE6WphoqAaREBcw0TYGZZLM
32
37
  -----END CERTIFICATE-----
33
- date: 2019-01-21 00:00:00.000000000 Z
38
+ date: 2019-03-25 00:00:00.000000000 Z
34
39
  dependencies:
35
40
  - !ruby/object:Gem::Dependency
36
41
  name: sps-sub
@@ -41,7 +46,7 @@ dependencies:
41
46
  version: '0.3'
42
47
  - - ">="
43
48
  - !ruby/object:Gem::Version
44
- version: 0.3.6
49
+ version: 0.3.7
45
50
  type: :runtime
46
51
  prerelease: false
47
52
  version_requirements: !ruby/object:Gem::Requirement
@@ -51,67 +56,67 @@ dependencies:
51
56
  version: '0.3'
52
57
  - - ">="
53
58
  - !ruby/object:Gem::Version
54
- version: 0.3.6
59
+ version: 0.3.7
55
60
  - !ruby/object:Gem::Dependency
56
61
  name: rsf_services
57
62
  requirement: !ruby/object:Gem::Requirement
58
63
  requirements:
59
- - - "~>"
60
- - !ruby/object:Gem::Version
61
- version: '0.7'
62
64
  - - ">="
63
65
  - !ruby/object:Gem::Version
64
- version: 0.7.1
66
+ version: 0.8.0
67
+ - - "~>"
68
+ - !ruby/object:Gem::Version
69
+ version: '0.8'
65
70
  type: :runtime
66
71
  prerelease: false
67
72
  version_requirements: !ruby/object:Gem::Requirement
68
73
  requirements:
69
- - - "~>"
70
- - !ruby/object:Gem::Version
71
- version: '0.7'
72
74
  - - ">="
73
75
  - !ruby/object:Gem::Version
74
- version: 0.7.1
76
+ version: 0.8.0
77
+ - - "~>"
78
+ - !ruby/object:Gem::Version
79
+ version: '0.8'
75
80
  - !ruby/object:Gem::Dependency
76
81
  name: remote_dwsregistry
77
82
  requirement: !ruby/object:Gem::Requirement
78
83
  requirements:
79
84
  - - "~>"
80
85
  - !ruby/object:Gem::Version
81
- version: '0.2'
86
+ version: '0.4'
82
87
  - - ">="
83
88
  - !ruby/object:Gem::Version
84
- version: 0.2.7
89
+ version: 0.4.1
85
90
  type: :runtime
86
91
  prerelease: false
87
92
  version_requirements: !ruby/object:Gem::Requirement
88
93
  requirements:
89
94
  - - "~>"
90
95
  - !ruby/object:Gem::Version
91
- version: '0.2'
96
+ version: '0.4'
92
97
  - - ">="
93
98
  - !ruby/object:Gem::Version
94
- version: 0.2.7
99
+ version: 0.4.1
95
100
  - !ruby/object:Gem::Dependency
96
101
  name: spspublog_drb_client
97
102
  requirement: !ruby/object:Gem::Requirement
98
103
  requirements:
99
- - - ">="
100
- - !ruby/object:Gem::Version
101
- version: 0.1.0
102
104
  - - "~>"
103
105
  - !ruby/object:Gem::Version
104
106
  version: '0.1'
107
+ - - ">="
108
+ - !ruby/object:Gem::Version
109
+ version: 0.1.1
105
110
  type: :runtime
106
111
  prerelease: false
107
112
  version_requirements: !ruby/object:Gem::Requirement
108
113
  requirements:
109
- - - ">="
110
- - !ruby/object:Gem::Version
111
- version: 0.1.0
112
114
  - - "~>"
113
115
  - !ruby/object:Gem::Version
114
116
  version: '0.1'
117
+ - - ">="
118
+ - !ruby/object:Gem::Version
119
+ version: 0.1.1
115
120
  description:
116
121
  email: james@jamesrobertson.eu
117
122
  executables: []
@@ -138,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
138
143
  - !ruby/object:Gem::Version
139
144
  version: '0'
140
145
  requirements: []
141
- rubygems_version: 3.0.2
146
+ rubygems_version: 3.0.1
142
147
  signing_key:
143
148
  specification_version: 4
144
149
  summary: Executes Ruby jobs (using the rsf_services gem) from a DRb server.
metadata.gz.sig CHANGED
Binary file