pushmi_pullyu 2.0.5 → 2.0.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.rubocop.yml +0 -10
- data/CHANGELOG.md +9 -1
- data/Gemfile +14 -0
- data/Gemfile.lock +96 -88
- data/README.md +7 -0
- data/lib/pushmi_pullyu/aip/downloader.rb +3 -3
- data/lib/pushmi_pullyu/cli.rb +5 -5
- data/lib/pushmi_pullyu/version.rb +1 -1
- data/lib/pushmi_pullyu.rb +1 -2
- data/pushmi_pullyu.gemspec +1 -12
- metadata +5 -165
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: de3e5873be562beedd8ebf27f364d50e2ac993f6331cfd27480614de061a01ab
|
4
|
+
data.tar.gz: 5e07018702ff3f8660db82ee6e2cb481c650cb10413172eb36d4791e2ec97d3a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4ac86a98c6c63c3d8fe32c7f8238d676fcfd5193b291bf115af9999351d0ac36a23e84e4d75f4443bea2b7f6c73cfcc309117a8d02aba1292d9044014229f5c2
|
7
|
+
data.tar.gz: a01c230a0ac56783ae878bdc2fd83ac351706623c612d61d270ad005b47d550d28d4fc4ef1a0c2c7f09c1caa17c837157b72e8233f4a64d7c033418546a72fbb
|
data/.rubocop.yml
CHANGED
@@ -20,7 +20,6 @@ Layout/EmptyLinesAroundClassBody:
|
|
20
20
|
EnforcedStyle: empty_lines_except_namespace
|
21
21
|
|
22
22
|
Layout/IndentationConsistency:
|
23
|
-
Enabled: true
|
24
23
|
EnforcedStyle: normal
|
25
24
|
|
26
25
|
# A calculated magnitude based on number of assignments,
|
@@ -61,15 +60,6 @@ Style/ClassAndModuleChildren:
|
|
61
60
|
Style/Documentation:
|
62
61
|
Enabled: false
|
63
62
|
|
64
|
-
Style/HashEachMethods:
|
65
|
-
Enabled: true
|
66
|
-
|
67
|
-
Style/HashTransformKeys:
|
68
|
-
Enabled: true
|
69
|
-
|
70
|
-
Style/HashTransformValues:
|
71
|
-
Enabled: true
|
72
|
-
|
73
63
|
Naming/FileName:
|
74
64
|
Exclude:
|
75
65
|
- Dangerfile
|
data/CHANGELOG.md
CHANGED
@@ -8,6 +8,15 @@ and releases in PushmiPullyu adheres to [Semantic Versioning](https://semver.org
|
|
8
8
|
|
9
9
|
## [Unreleased]
|
10
10
|
|
11
|
+
## [2.0.7] - 2023-09-13
|
12
|
+
|
13
|
+
- Fix nil exception [#314](https://github.com/ualbertalib/pushmi_pullyu/issues/314)
|
14
|
+
- Bump rubocop from 1.28.1 to 1.54.1 [PR#348](https://github.com/ualbertalib/pushmi_pullyu/pull/348)
|
15
|
+
- Add missing logging for standard exception [#314](https://github.com/ualbertalib/pushmi_pullyu/issues/314)
|
16
|
+
## [2.0.6] - 2023-03-17
|
17
|
+
|
18
|
+
- Fix URI concatenation for jupiter's base url. [#309](https://github.com/ualbertalib/pushmi_pullyu/issues/309)
|
19
|
+
|
11
20
|
## [2.0.5] - 2023-02-17
|
12
21
|
|
13
22
|
- Add rescue block to catch exceptions while waiting for next item [#280](https://github.com/ualbertalib/pushmi_pullyu/issues/280)
|
@@ -47,5 +56,4 @@ and releases in PushmiPullyu adheres to [Semantic Versioning](https://semver.org
|
|
47
56
|
### Removed
|
48
57
|
- Data output for original_file information
|
49
58
|
|
50
|
-
-
|
51
59
|
## [1.0.6] - 2018-11-29
|
data/Gemfile
CHANGED
@@ -2,3 +2,17 @@ source 'https://rubygems.org'
|
|
2
2
|
|
3
3
|
# Specify your gem's dependencies in pushmi_pullyu.gemspec
|
4
4
|
gemspec
|
5
|
+
|
6
|
+
group :development, :test do
|
7
|
+
gem 'bundler', '~> 2.0'
|
8
|
+
gem 'danger', '~> 9.3'
|
9
|
+
gem 'pry', '~> 0.10', '>= 0.10.4'
|
10
|
+
gem 'pry-byebug', '~> 3.6'
|
11
|
+
gem 'rake', '~> 13.0'
|
12
|
+
gem 'rspec', '~> 3.0'
|
13
|
+
gem 'rubocop', '~> 1.57'
|
14
|
+
gem 'rubocop-rspec', '~> 2.24'
|
15
|
+
gem 'timecop', '~> 0.9'
|
16
|
+
gem 'vcr', '~> 5.0'
|
17
|
+
gem 'webmock', '~> 3.19'
|
18
|
+
end
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
pushmi_pullyu (2.0.
|
4
|
+
pushmi_pullyu (2.0.7)
|
5
5
|
activesupport (>= 5, < 8)
|
6
6
|
bagit (~> 0.4)
|
7
7
|
connection_pool (~> 2.2)
|
@@ -10,7 +10,7 @@ PATH
|
|
10
10
|
openstack (~> 3.3, >= 3.3.10)
|
11
11
|
rdf (>= 1.99, < 4.0)
|
12
12
|
rdf-n3 (>= 1.99, < 4.0)
|
13
|
-
redis (>= 3.3, <
|
13
|
+
redis (>= 3.3, < 6.0)
|
14
14
|
rest-client (>= 1.8, < 3.0)
|
15
15
|
rollbar (>= 2.18, < 4.0)
|
16
16
|
uuid (~> 2.3.9)
|
@@ -18,80 +18,73 @@ PATH
|
|
18
18
|
GEM
|
19
19
|
remote: https://rubygems.org/
|
20
20
|
specs:
|
21
|
-
activesupport (7.
|
21
|
+
activesupport (7.1.1)
|
22
|
+
base64
|
23
|
+
bigdecimal
|
22
24
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
25
|
+
connection_pool (>= 2.2.5)
|
26
|
+
drb
|
23
27
|
i18n (>= 1.6, < 2)
|
24
28
|
minitest (>= 5.1)
|
29
|
+
mutex_m
|
25
30
|
tzinfo (~> 2.0)
|
26
|
-
addressable (2.8.
|
31
|
+
addressable (2.8.5)
|
27
32
|
public_suffix (>= 2.0.2, < 6.0)
|
28
|
-
amazing_print (1.4.0)
|
29
33
|
ast (2.4.2)
|
30
|
-
bagit (0.4.
|
34
|
+
bagit (0.4.6)
|
31
35
|
docopt (~> 0.5.0)
|
32
36
|
validatable (~> 1.6)
|
37
|
+
base64 (0.1.1)
|
38
|
+
bigdecimal (3.1.4)
|
33
39
|
builder (3.2.4)
|
34
40
|
byebug (11.1.3)
|
35
|
-
claide (1.0
|
41
|
+
claide (1.1.0)
|
36
42
|
claide-plugins (0.9.2)
|
37
43
|
cork
|
38
44
|
nap
|
39
45
|
open4 (~> 1.3)
|
40
46
|
coderay (1.1.3)
|
41
47
|
colored2 (3.1.2)
|
42
|
-
concurrent-ruby (1.2.
|
43
|
-
connection_pool (2.
|
48
|
+
concurrent-ruby (1.2.2)
|
49
|
+
connection_pool (2.4.1)
|
44
50
|
cork (0.3.0)
|
45
51
|
colored2 (~> 3.1)
|
46
52
|
crack (0.4.5)
|
47
53
|
rexml
|
48
54
|
daemons (1.4.1)
|
49
|
-
danger (
|
55
|
+
danger (9.3.2)
|
50
56
|
claide (~> 1.0)
|
51
57
|
claide-plugins (>= 0.9.2)
|
52
58
|
colored2 (~> 3.1)
|
53
59
|
cork (~> 0.1)
|
54
|
-
faraday (>= 0.9.0, <
|
60
|
+
faraday (>= 0.9.0, < 3.0)
|
55
61
|
faraday-http-cache (~> 2.0)
|
56
|
-
git (~> 1.
|
62
|
+
git (~> 1.13)
|
57
63
|
kramdown (~> 2.3)
|
58
64
|
kramdown-parser-gfm (~> 1.0)
|
59
65
|
no_proxy_fix
|
60
|
-
octokit (~>
|
66
|
+
octokit (~> 6.0)
|
61
67
|
terminal-table (>= 1, < 4)
|
62
68
|
diff-lcs (1.5.0)
|
63
69
|
docopt (0.5.0)
|
64
70
|
domain_name (0.5.20190701)
|
65
71
|
unf (>= 0.0.5, < 1.0.0)
|
66
|
-
|
67
|
-
|
72
|
+
drb (2.1.1)
|
73
|
+
ruby2_keywords
|
74
|
+
ebnf (2.3.5)
|
68
75
|
htmlentities (~> 4.3)
|
69
76
|
rdf (~> 3.2)
|
70
77
|
scanf (~> 1.0)
|
71
78
|
sxp (~> 1.2)
|
72
|
-
unicode-types (~> 1.
|
73
|
-
faraday (
|
74
|
-
|
75
|
-
faraday-
|
76
|
-
faraday-excon (~> 1.1)
|
77
|
-
faraday-httpclient (~> 1.0.1)
|
78
|
-
faraday-net_http (~> 1.0)
|
79
|
-
faraday-net_http_persistent (~> 1.1)
|
80
|
-
faraday-patron (~> 1.0)
|
81
|
-
faraday-rack (~> 1.0)
|
82
|
-
multipart-post (>= 1.2, < 3)
|
79
|
+
unicode-types (~> 1.8)
|
80
|
+
faraday (2.7.11)
|
81
|
+
base64
|
82
|
+
faraday-net_http (>= 2.0, < 3.1)
|
83
83
|
ruby2_keywords (>= 0.0.4)
|
84
|
-
faraday-
|
85
|
-
faraday-em_synchrony (1.0.0)
|
86
|
-
faraday-excon (1.1.0)
|
87
|
-
faraday-http-cache (2.2.0)
|
84
|
+
faraday-http-cache (2.5.0)
|
88
85
|
faraday (>= 0.8)
|
89
|
-
faraday-
|
90
|
-
|
91
|
-
faraday-net_http_persistent (1.2.0)
|
92
|
-
faraday-patron (1.0.0)
|
93
|
-
faraday-rack (1.0.0)
|
94
|
-
git (1.13.0)
|
86
|
+
faraday-net_http (3.0.2)
|
87
|
+
git (1.18.0)
|
95
88
|
addressable (~> 2.8)
|
96
89
|
rchardet (~> 1.8)
|
97
90
|
hashdiff (1.0.1)
|
@@ -99,50 +92,53 @@ GEM
|
|
99
92
|
http-accept (1.7.0)
|
100
93
|
http-cookie (1.0.5)
|
101
94
|
domain_name (~> 0.5)
|
102
|
-
i18n (1.
|
95
|
+
i18n (1.14.1)
|
103
96
|
concurrent-ruby (~> 1.0)
|
104
97
|
json (2.6.3)
|
105
|
-
kramdown (2.
|
98
|
+
kramdown (2.4.0)
|
106
99
|
rexml
|
107
100
|
kramdown-parser-gfm (1.1.0)
|
108
101
|
kramdown (~> 2.0)
|
102
|
+
language_server-protocol (3.17.0.3)
|
109
103
|
link_header (0.0.8)
|
110
104
|
logger (1.5.3)
|
111
105
|
macaddr (1.7.2)
|
112
106
|
systemu (~> 2.6.5)
|
113
107
|
matrix (0.4.2)
|
114
108
|
method_source (1.0.0)
|
115
|
-
mime-types (3.
|
109
|
+
mime-types (3.5.1)
|
116
110
|
mime-types-data (~> 3.2015)
|
117
|
-
mime-types-data (3.
|
111
|
+
mime-types-data (3.2023.1003)
|
118
112
|
minitar (0.9)
|
119
|
-
minitest (5.
|
120
|
-
|
113
|
+
minitest (5.20.0)
|
114
|
+
mutex_m (0.1.2)
|
121
115
|
nap (1.1.0)
|
122
|
-
net-http-persistent (4.0.
|
116
|
+
net-http-persistent (4.0.2)
|
123
117
|
connection_pool (~> 2.2)
|
124
118
|
netrc (0.11.0)
|
125
119
|
no_proxy_fix (0.1.2)
|
126
|
-
octokit (
|
127
|
-
faraday (>=
|
128
|
-
sawyer (~> 0.
|
120
|
+
octokit (6.1.1)
|
121
|
+
faraday (>= 1, < 3)
|
122
|
+
sawyer (~> 0.9)
|
129
123
|
open4 (1.3.4)
|
130
124
|
openstack (3.3.21)
|
131
125
|
json
|
132
|
-
parallel (1.
|
133
|
-
parser (3.
|
126
|
+
parallel (1.23.0)
|
127
|
+
parser (3.2.2.4)
|
134
128
|
ast (~> 2.4.1)
|
135
|
-
|
129
|
+
racc
|
130
|
+
pry (0.14.2)
|
136
131
|
coderay (~> 1.1)
|
137
132
|
method_source (~> 1.0)
|
138
133
|
pry-byebug (3.10.1)
|
139
134
|
byebug (~> 11.0)
|
140
135
|
pry (>= 0.13, < 0.15)
|
141
|
-
public_suffix (5.0.
|
136
|
+
public_suffix (5.0.3)
|
137
|
+
racc (1.7.1)
|
142
138
|
rainbow (3.1.1)
|
143
139
|
rake (13.0.6)
|
144
140
|
rchardet (1.8.0)
|
145
|
-
rdf (3.2.
|
141
|
+
rdf (3.2.11)
|
146
142
|
link_header (~> 0.0, >= 0.0.8)
|
147
143
|
rdf-aggregate-repo (3.2.1)
|
148
144
|
rdf (~> 3.2)
|
@@ -154,15 +150,18 @@ GEM
|
|
154
150
|
rdf-xsd (3.2.1)
|
155
151
|
rdf (~> 3.2)
|
156
152
|
rexml (~> 3.2)
|
157
|
-
redis (
|
158
|
-
|
153
|
+
redis (5.0.7)
|
154
|
+
redis-client (>= 0.9.0)
|
155
|
+
redis-client (0.17.0)
|
156
|
+
connection_pool
|
157
|
+
regexp_parser (2.8.2)
|
159
158
|
rest-client (2.1.0)
|
160
159
|
http-accept (>= 1.7.0, < 2.0)
|
161
160
|
http-cookie (>= 1.0.2, < 2.0)
|
162
161
|
mime-types (>= 1.16, < 4.0)
|
163
162
|
netrc (~> 0.8)
|
164
|
-
rexml (3.2.
|
165
|
-
rollbar (3.4.
|
163
|
+
rexml (3.2.6)
|
164
|
+
rollbar (3.4.1)
|
166
165
|
rspec (3.12.0)
|
167
166
|
rspec-core (~> 3.12.0)
|
168
167
|
rspec-expectations (~> 3.12.0)
|
@@ -176,56 +175,65 @@ GEM
|
|
176
175
|
diff-lcs (>= 1.2.0, < 2.0)
|
177
176
|
rspec-support (~> 3.12.0)
|
178
177
|
rspec-support (3.12.0)
|
179
|
-
rubocop (1.
|
178
|
+
rubocop (1.57.1)
|
179
|
+
base64 (~> 0.1.1)
|
180
|
+
json (~> 2.3)
|
181
|
+
language_server-protocol (>= 3.17.0)
|
180
182
|
parallel (~> 1.10)
|
181
|
-
parser (>= 3.
|
183
|
+
parser (>= 3.2.2.4)
|
182
184
|
rainbow (>= 2.2.2, < 4.0)
|
183
185
|
regexp_parser (>= 1.8, < 3.0)
|
184
|
-
rexml
|
185
|
-
rubocop-ast (>= 1.
|
186
|
+
rexml (>= 3.2.5, < 4.0)
|
187
|
+
rubocop-ast (>= 1.28.1, < 2.0)
|
186
188
|
ruby-progressbar (~> 1.7)
|
187
|
-
unicode-display_width (>=
|
188
|
-
rubocop-ast (1.
|
189
|
-
parser (>= 3.
|
190
|
-
rubocop-
|
191
|
-
rubocop (~> 1.
|
192
|
-
|
189
|
+
unicode-display_width (>= 2.4.0, < 3.0)
|
190
|
+
rubocop-ast (1.29.0)
|
191
|
+
parser (>= 3.2.1.0)
|
192
|
+
rubocop-capybara (2.19.0)
|
193
|
+
rubocop (~> 1.41)
|
194
|
+
rubocop-factory_bot (2.24.0)
|
195
|
+
rubocop (~> 1.33)
|
196
|
+
rubocop-rspec (2.24.1)
|
197
|
+
rubocop (~> 1.33)
|
198
|
+
rubocop-capybara (~> 2.17)
|
199
|
+
rubocop-factory_bot (~> 2.22)
|
200
|
+
ruby-progressbar (1.13.0)
|
193
201
|
ruby2_keywords (0.0.5)
|
194
|
-
sawyer (0.
|
202
|
+
sawyer (0.9.2)
|
195
203
|
addressable (>= 2.3.5)
|
196
|
-
faraday (
|
204
|
+
faraday (>= 0.17.3, < 3)
|
197
205
|
scanf (1.0.0)
|
198
|
-
sparql (3.2.
|
199
|
-
builder (~> 3.2)
|
200
|
-
ebnf (~> 2.
|
206
|
+
sparql (3.2.6)
|
207
|
+
builder (~> 3.2, >= 3.2.4)
|
208
|
+
ebnf (~> 2.3, >= 2.3.5)
|
201
209
|
logger (~> 1.5)
|
202
|
-
rdf (~> 3.2, >= 3.2.
|
203
|
-
rdf-aggregate-repo (~> 3.2)
|
210
|
+
rdf (~> 3.2, >= 3.2.11)
|
211
|
+
rdf-aggregate-repo (~> 3.2, >= 3.2.1)
|
204
212
|
rdf-xsd (~> 3.2)
|
205
|
-
sparql-client (~> 3.2, >= 3.2.
|
206
|
-
sxp (~> 1.2, >= 1.2.
|
207
|
-
sparql-client (3.2.
|
208
|
-
net-http-persistent (~> 4.0, >= 4.0.
|
209
|
-
rdf (~> 3.2, >= 3.2.
|
210
|
-
sxp (1.2.
|
213
|
+
sparql-client (~> 3.2, >= 3.2.2)
|
214
|
+
sxp (~> 1.2, >= 1.2.4)
|
215
|
+
sparql-client (3.2.2)
|
216
|
+
net-http-persistent (~> 4.0, >= 4.0.2)
|
217
|
+
rdf (~> 3.2, >= 3.2.11)
|
218
|
+
sxp (1.2.4)
|
211
219
|
matrix (~> 0.4)
|
212
220
|
rdf (~> 3.2)
|
213
221
|
systemu (2.6.5)
|
214
222
|
terminal-table (3.0.2)
|
215
223
|
unicode-display_width (>= 1.1.1, < 3)
|
216
|
-
timecop (0.9.
|
224
|
+
timecop (0.9.8)
|
217
225
|
tzinfo (2.0.6)
|
218
226
|
concurrent-ruby (~> 1.0)
|
219
227
|
unf (0.1.4)
|
220
228
|
unf_ext
|
221
229
|
unf_ext (0.0.8.2)
|
222
|
-
unicode-display_width (2.
|
223
|
-
unicode-types (1.
|
230
|
+
unicode-display_width (2.5.0)
|
231
|
+
unicode-types (1.9.0)
|
224
232
|
uuid (2.3.9)
|
225
233
|
macaddr (~> 1.0)
|
226
234
|
validatable (1.6.7)
|
227
235
|
vcr (5.1.0)
|
228
|
-
webmock (3.
|
236
|
+
webmock (3.19.1)
|
229
237
|
addressable (>= 2.8.0)
|
230
238
|
crack (>= 0.3.2)
|
231
239
|
hashdiff (>= 0.4.0, < 2.0.0)
|
@@ -235,17 +243,17 @@ PLATFORMS
|
|
235
243
|
|
236
244
|
DEPENDENCIES
|
237
245
|
bundler (~> 2.0)
|
238
|
-
danger (~>
|
246
|
+
danger (~> 9.3)
|
239
247
|
pry (~> 0.10, >= 0.10.4)
|
240
248
|
pry-byebug (~> 3.6)
|
241
249
|
pushmi_pullyu!
|
242
250
|
rake (~> 13.0)
|
243
251
|
rspec (~> 3.0)
|
244
|
-
rubocop (~> 1.
|
245
|
-
rubocop-rspec (~> 2.
|
246
|
-
timecop (~> 0.
|
252
|
+
rubocop (~> 1.57)
|
253
|
+
rubocop-rspec (~> 2.24)
|
254
|
+
timecop (~> 0.9)
|
247
255
|
vcr (~> 5.0)
|
248
|
-
webmock (~> 3.
|
256
|
+
webmock (~> 3.19)
|
249
257
|
|
250
258
|
BUNDLED WITH
|
251
|
-
2.3.
|
259
|
+
2.3.12
|
data/README.md
CHANGED
@@ -104,6 +104,13 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
|
|
104
104
|
|
105
105
|
To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
|
106
106
|
|
107
|
+
You'll need to set these two env vars otherwise you'll likely run into an error (Errno::ECONNRESET: Connection reset by peer):
|
108
|
+
|
109
|
+
```bash
|
110
|
+
export JUPITER_API_KEY=3eeb395e-63b7-11ea-bc55-0242ac130003
|
111
|
+
export JUPITER_USER=ditech@ualberta.ca
|
112
|
+
```
|
113
|
+
|
107
114
|
## Testing
|
108
115
|
|
109
116
|
Pre-requisites:
|
@@ -86,7 +86,7 @@ class PushmiPullyu::AIP::Downloader
|
|
86
86
|
@uri = URI.parse(PushmiPullyu.options[:jupiter][:jupiter_url])
|
87
87
|
@http = Net::HTTP.new(@uri.host, @uri.port)
|
88
88
|
@http.use_ssl = true if @uri.instance_of? URI::HTTPS
|
89
|
-
request = Net::HTTP::Post.new(
|
89
|
+
request = Net::HTTP::Post.new(URI.join(@uri, '/auth/system'))
|
90
90
|
request.set_form_data(
|
91
91
|
email: PushmiPullyu.options[:jupiter][:user],
|
92
92
|
api_key: PushmiPullyu.options[:jupiter][:api_key]
|
@@ -102,7 +102,7 @@ class PushmiPullyu::AIP::Downloader
|
|
102
102
|
log_downloading(remote, local)
|
103
103
|
|
104
104
|
@uri = URI.parse(PushmiPullyu.options[:jupiter][:jupiter_url])
|
105
|
-
request = Net::HTTP::Get.new(@uri
|
105
|
+
request = Net::HTTP::Get.new(URI.join(@uri, remote))
|
106
106
|
# add previously stored cookies
|
107
107
|
request['Cookie'] = @cookies
|
108
108
|
|
@@ -118,7 +118,7 @@ class PushmiPullyu::AIP::Downloader
|
|
118
118
|
end
|
119
119
|
|
120
120
|
def get_file_paths(url)
|
121
|
-
request = Net::HTTP::Get.new(@uri
|
121
|
+
request = Net::HTTP::Get.new(URI.join(@uri, url))
|
122
122
|
# add previously stored cookies
|
123
123
|
request['Cookie'] = @cookies
|
124
124
|
|
data/lib/pushmi_pullyu/cli.rb
CHANGED
@@ -218,21 +218,21 @@ class PushmiPullyu::CLI
|
|
218
218
|
# readding it to the queue as it will always fail
|
219
219
|
rescue PushmiPullyu::AIP::EntityInvalid => e
|
220
220
|
rescue StandardError => e
|
221
|
+
log_exception(e)
|
221
222
|
begin
|
222
223
|
queue.add_entity_in_timeframe(entity)
|
223
|
-
rescue MaxDepositAttemptsReached => e
|
224
|
+
rescue PushmiPullyu::PreservationQueue::MaxDepositAttemptsReached => e
|
224
225
|
log_exception(e)
|
225
226
|
end
|
226
227
|
|
227
|
-
# rubocop:disable Lint/RescueException
|
228
228
|
# Something other than a StandardError exception means something happened which we were not expecting!
|
229
229
|
# Make sure we log the problem
|
230
|
+
# rubocop:disable Lint/RescueException
|
230
231
|
rescue Exception => e
|
231
|
-
raise e
|
232
|
-
# rubocop:enable Lint/RescueException
|
233
|
-
ensure
|
234
232
|
log_exception(e)
|
233
|
+
raise e
|
235
234
|
end
|
235
|
+
# rubocop:enable Lint/RescueException
|
236
236
|
end
|
237
237
|
|
238
238
|
def run_tick_loop
|
data/lib/pushmi_pullyu.rb
CHANGED
data/pushmi_pullyu.gemspec
CHANGED
@@ -29,22 +29,11 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.add_runtime_dependency 'openstack', '~> 3.3', '>= 3.3.10'
|
30
30
|
spec.add_runtime_dependency 'rdf', '>= 1.99', '< 4.0'
|
31
31
|
spec.add_runtime_dependency 'rdf-n3', '>= 1.99', '< 4.0'
|
32
|
-
spec.add_runtime_dependency 'redis', '>= 3.3', '<
|
32
|
+
spec.add_runtime_dependency 'redis', '>= 3.3', '< 6.0'
|
33
33
|
spec.add_runtime_dependency 'rest-client', '>= 1.8', '< 3.0'
|
34
34
|
spec.add_runtime_dependency 'rollbar', '>= 2.18', '< 4.0'
|
35
35
|
spec.add_runtime_dependency 'uuid', '~> 2.3.9'
|
36
36
|
|
37
|
-
spec.add_development_dependency 'bundler', '~> 2.0'
|
38
|
-
spec.add_development_dependency 'danger', '~> 8.0'
|
39
|
-
spec.add_development_dependency 'pry', '~> 0.10', '>= 0.10.4'
|
40
|
-
spec.add_development_dependency 'pry-byebug', '~> 3.6'
|
41
|
-
spec.add_development_dependency 'rake', '~> 13.0'
|
42
|
-
spec.add_development_dependency 'rspec', '~> 3.0'
|
43
|
-
spec.add_development_dependency 'rubocop', '~> 1.23'
|
44
|
-
spec.add_development_dependency 'rubocop-rspec', '~> 2.6'
|
45
|
-
spec.add_development_dependency 'timecop', '~> 0.8'
|
46
|
-
spec.add_development_dependency 'vcr', '~> 5.0'
|
47
|
-
spec.add_development_dependency 'webmock', '~> 3.3'
|
48
37
|
spec.metadata = {
|
49
38
|
'rubygems_mfa_required' => 'true'
|
50
39
|
}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: pushmi_pullyu
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.0.
|
4
|
+
version: 2.0.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Shane Murnaghan
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: exe
|
11
11
|
cert_chain: []
|
12
|
-
date: 2023-
|
12
|
+
date: 2023-10-16 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activesupport
|
@@ -162,7 +162,7 @@ dependencies:
|
|
162
162
|
version: '3.3'
|
163
163
|
- - "<"
|
164
164
|
- !ruby/object:Gem::Version
|
165
|
-
version: '
|
165
|
+
version: '6.0'
|
166
166
|
type: :runtime
|
167
167
|
prerelease: false
|
168
168
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -172,7 +172,7 @@ dependencies:
|
|
172
172
|
version: '3.3'
|
173
173
|
- - "<"
|
174
174
|
- !ruby/object:Gem::Version
|
175
|
-
version: '
|
175
|
+
version: '6.0'
|
176
176
|
- !ruby/object:Gem::Dependency
|
177
177
|
name: rest-client
|
178
178
|
requirement: !ruby/object:Gem::Requirement
|
@@ -227,166 +227,6 @@ dependencies:
|
|
227
227
|
- - "~>"
|
228
228
|
- !ruby/object:Gem::Version
|
229
229
|
version: 2.3.9
|
230
|
-
- !ruby/object:Gem::Dependency
|
231
|
-
name: bundler
|
232
|
-
requirement: !ruby/object:Gem::Requirement
|
233
|
-
requirements:
|
234
|
-
- - "~>"
|
235
|
-
- !ruby/object:Gem::Version
|
236
|
-
version: '2.0'
|
237
|
-
type: :development
|
238
|
-
prerelease: false
|
239
|
-
version_requirements: !ruby/object:Gem::Requirement
|
240
|
-
requirements:
|
241
|
-
- - "~>"
|
242
|
-
- !ruby/object:Gem::Version
|
243
|
-
version: '2.0'
|
244
|
-
- !ruby/object:Gem::Dependency
|
245
|
-
name: danger
|
246
|
-
requirement: !ruby/object:Gem::Requirement
|
247
|
-
requirements:
|
248
|
-
- - "~>"
|
249
|
-
- !ruby/object:Gem::Version
|
250
|
-
version: '8.0'
|
251
|
-
type: :development
|
252
|
-
prerelease: false
|
253
|
-
version_requirements: !ruby/object:Gem::Requirement
|
254
|
-
requirements:
|
255
|
-
- - "~>"
|
256
|
-
- !ruby/object:Gem::Version
|
257
|
-
version: '8.0'
|
258
|
-
- !ruby/object:Gem::Dependency
|
259
|
-
name: pry
|
260
|
-
requirement: !ruby/object:Gem::Requirement
|
261
|
-
requirements:
|
262
|
-
- - "~>"
|
263
|
-
- !ruby/object:Gem::Version
|
264
|
-
version: '0.10'
|
265
|
-
- - ">="
|
266
|
-
- !ruby/object:Gem::Version
|
267
|
-
version: 0.10.4
|
268
|
-
type: :development
|
269
|
-
prerelease: false
|
270
|
-
version_requirements: !ruby/object:Gem::Requirement
|
271
|
-
requirements:
|
272
|
-
- - "~>"
|
273
|
-
- !ruby/object:Gem::Version
|
274
|
-
version: '0.10'
|
275
|
-
- - ">="
|
276
|
-
- !ruby/object:Gem::Version
|
277
|
-
version: 0.10.4
|
278
|
-
- !ruby/object:Gem::Dependency
|
279
|
-
name: pry-byebug
|
280
|
-
requirement: !ruby/object:Gem::Requirement
|
281
|
-
requirements:
|
282
|
-
- - "~>"
|
283
|
-
- !ruby/object:Gem::Version
|
284
|
-
version: '3.6'
|
285
|
-
type: :development
|
286
|
-
prerelease: false
|
287
|
-
version_requirements: !ruby/object:Gem::Requirement
|
288
|
-
requirements:
|
289
|
-
- - "~>"
|
290
|
-
- !ruby/object:Gem::Version
|
291
|
-
version: '3.6'
|
292
|
-
- !ruby/object:Gem::Dependency
|
293
|
-
name: rake
|
294
|
-
requirement: !ruby/object:Gem::Requirement
|
295
|
-
requirements:
|
296
|
-
- - "~>"
|
297
|
-
- !ruby/object:Gem::Version
|
298
|
-
version: '13.0'
|
299
|
-
type: :development
|
300
|
-
prerelease: false
|
301
|
-
version_requirements: !ruby/object:Gem::Requirement
|
302
|
-
requirements:
|
303
|
-
- - "~>"
|
304
|
-
- !ruby/object:Gem::Version
|
305
|
-
version: '13.0'
|
306
|
-
- !ruby/object:Gem::Dependency
|
307
|
-
name: rspec
|
308
|
-
requirement: !ruby/object:Gem::Requirement
|
309
|
-
requirements:
|
310
|
-
- - "~>"
|
311
|
-
- !ruby/object:Gem::Version
|
312
|
-
version: '3.0'
|
313
|
-
type: :development
|
314
|
-
prerelease: false
|
315
|
-
version_requirements: !ruby/object:Gem::Requirement
|
316
|
-
requirements:
|
317
|
-
- - "~>"
|
318
|
-
- !ruby/object:Gem::Version
|
319
|
-
version: '3.0'
|
320
|
-
- !ruby/object:Gem::Dependency
|
321
|
-
name: rubocop
|
322
|
-
requirement: !ruby/object:Gem::Requirement
|
323
|
-
requirements:
|
324
|
-
- - "~>"
|
325
|
-
- !ruby/object:Gem::Version
|
326
|
-
version: '1.23'
|
327
|
-
type: :development
|
328
|
-
prerelease: false
|
329
|
-
version_requirements: !ruby/object:Gem::Requirement
|
330
|
-
requirements:
|
331
|
-
- - "~>"
|
332
|
-
- !ruby/object:Gem::Version
|
333
|
-
version: '1.23'
|
334
|
-
- !ruby/object:Gem::Dependency
|
335
|
-
name: rubocop-rspec
|
336
|
-
requirement: !ruby/object:Gem::Requirement
|
337
|
-
requirements:
|
338
|
-
- - "~>"
|
339
|
-
- !ruby/object:Gem::Version
|
340
|
-
version: '2.6'
|
341
|
-
type: :development
|
342
|
-
prerelease: false
|
343
|
-
version_requirements: !ruby/object:Gem::Requirement
|
344
|
-
requirements:
|
345
|
-
- - "~>"
|
346
|
-
- !ruby/object:Gem::Version
|
347
|
-
version: '2.6'
|
348
|
-
- !ruby/object:Gem::Dependency
|
349
|
-
name: timecop
|
350
|
-
requirement: !ruby/object:Gem::Requirement
|
351
|
-
requirements:
|
352
|
-
- - "~>"
|
353
|
-
- !ruby/object:Gem::Version
|
354
|
-
version: '0.8'
|
355
|
-
type: :development
|
356
|
-
prerelease: false
|
357
|
-
version_requirements: !ruby/object:Gem::Requirement
|
358
|
-
requirements:
|
359
|
-
- - "~>"
|
360
|
-
- !ruby/object:Gem::Version
|
361
|
-
version: '0.8'
|
362
|
-
- !ruby/object:Gem::Dependency
|
363
|
-
name: vcr
|
364
|
-
requirement: !ruby/object:Gem::Requirement
|
365
|
-
requirements:
|
366
|
-
- - "~>"
|
367
|
-
- !ruby/object:Gem::Version
|
368
|
-
version: '5.0'
|
369
|
-
type: :development
|
370
|
-
prerelease: false
|
371
|
-
version_requirements: !ruby/object:Gem::Requirement
|
372
|
-
requirements:
|
373
|
-
- - "~>"
|
374
|
-
- !ruby/object:Gem::Version
|
375
|
-
version: '5.0'
|
376
|
-
- !ruby/object:Gem::Dependency
|
377
|
-
name: webmock
|
378
|
-
requirement: !ruby/object:Gem::Requirement
|
379
|
-
requirements:
|
380
|
-
- - "~>"
|
381
|
-
- !ruby/object:Gem::Version
|
382
|
-
version: '3.3'
|
383
|
-
type: :development
|
384
|
-
prerelease: false
|
385
|
-
version_requirements: !ruby/object:Gem::Requirement
|
386
|
-
requirements:
|
387
|
-
- - "~>"
|
388
|
-
- !ruby/object:Gem::Version
|
389
|
-
version: '3.3'
|
390
230
|
description:
|
391
231
|
email:
|
392
232
|
- murnagha@ualberta.ca
|
@@ -454,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
454
294
|
- !ruby/object:Gem::Version
|
455
295
|
version: '0'
|
456
296
|
requirements: []
|
457
|
-
rubygems_version: 3.
|
297
|
+
rubygems_version: 3.3.26
|
458
298
|
signing_key:
|
459
299
|
specification_version: 4
|
460
300
|
summary: Ruby application to manage flow of content from Jupiter into Swift for preservation
|