pushmi_pullyu 2.0.1 → 2.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/dependabot.yml +12 -0
- data/.rubocop.yml +7 -6
- data/CHANGELOG.md +7 -0
- data/lib/pushmi_pullyu/aip/downloader.rb +2 -1
- data/lib/pushmi_pullyu/cli.rb +4 -4
- data/lib/pushmi_pullyu/logging.rb +6 -6
- data/lib/pushmi_pullyu/version.rb +1 -1
- data/pushmi_pullyu.gemspec +5 -2
- metadata +10 -9
- data/.travis.yml +0 -16
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e0e6a8b121842bd88b72a166f8ff85b9b7d78e8dd294c248c573af3981582a81
|
4
|
+
data.tar.gz: 29e1631a92cd88dcb827769d6d6ef1e89172cc099fa88eaa1193406f4df604ba
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4daaab3f235775f372c1141f1eabc0f8f122272115105d07f08797d492d2475c003e7145ae9aa39df7ce7a0592da6f0eb3ff3bc2bd65e71758299dbaaf6ba535
|
7
|
+
data.tar.gz: f96752a30fc91992224d2a76c39106a1992aa4eb2a2eec4b9f09b30b503a403b74353b6b0e6eecec0e85911760c02797f3fc9a1bb51dc35e32fc6dc299925450
|
data/.rubocop.yml
CHANGED
@@ -13,6 +13,7 @@ AllCops:
|
|
13
13
|
- 'Dangerfile'
|
14
14
|
ExtraDetails: true
|
15
15
|
TargetRubyVersion: 2.5
|
16
|
+
NewCops: enable
|
16
17
|
|
17
18
|
# readability is Actually Good
|
18
19
|
Layout/EmptyLinesAroundClassBody:
|
@@ -96,14 +97,14 @@ RSpec/ExampleLength:
|
|
96
97
|
RSpec/MultipleExpectations:
|
97
98
|
Enabled: false
|
98
99
|
|
100
|
+
RSpec/MultipleMemoizedHelpers:
|
101
|
+
Enabled: false
|
102
|
+
|
99
103
|
RSpec/DescribedClass:
|
100
104
|
EnforcedStyle: explicit
|
101
105
|
|
102
|
-
|
103
|
-
Enabled:
|
104
|
-
|
105
|
-
Lint/StructNewOverride:
|
106
|
-
Enabled: true
|
106
|
+
Naming/VariableNumber:
|
107
|
+
Enabled: false
|
107
108
|
|
108
|
-
|
109
|
+
Style/OpenStructUse:
|
109
110
|
Enabled: false
|
data/CHANGELOG.md
CHANGED
@@ -8,6 +8,13 @@ and releases in PushmiPullyu adheres to [Semantic Versioning](https://semver.org
|
|
8
8
|
|
9
9
|
## [Unreleased]
|
10
10
|
|
11
|
+
## [2.0.2] - 2021-11-22
|
12
|
+
|
13
|
+
- Fix authentication bug when using ssl
|
14
|
+
- bump rubocop and rubocop-rspec
|
15
|
+
|
16
|
+
## [2.0.1] - 2021-02-02
|
17
|
+
|
11
18
|
- Fix dependency declaration for UUID gem
|
12
19
|
|
13
20
|
## [2.0.0] - 2020-12-14
|
@@ -80,7 +80,8 @@ class PushmiPullyu::AIP::Downloader
|
|
80
80
|
def authenticate_http_calls
|
81
81
|
@uri = URI.parse(PushmiPullyu.options[:jupiter][:jupiter_url])
|
82
82
|
@http = Net::HTTP.new(@uri.host, @uri.port)
|
83
|
-
|
83
|
+
@http.use_ssl = true if @uri.instance_of? URI::HTTPS
|
84
|
+
request = Net::HTTP::Post.new("#{@uri.request_uri}auth/system")
|
84
85
|
request.set_form_data(
|
85
86
|
email: PushmiPullyu.options[:jupiter][:user],
|
86
87
|
api_key: PushmiPullyu.options[:jupiter][:api_key]
|
data/lib/pushmi_pullyu/cli.rb
CHANGED
@@ -89,7 +89,7 @@ class PushmiPullyu::CLI
|
|
89
89
|
|
90
90
|
def parse_config(config_file)
|
91
91
|
if File.exist?(config_file)
|
92
|
-
YAML.safe_load(ERB.new(
|
92
|
+
YAML.safe_load(ERB.new(File.read(config_file)).result).deep_symbolize_keys || {}
|
93
93
|
else
|
94
94
|
{}
|
95
95
|
end
|
@@ -249,12 +249,12 @@ class PushmiPullyu::CLI
|
|
249
249
|
# On first call of shutdown, this will gracefully close the main run loop
|
250
250
|
# which let's the program exit itself. Calling shutdown again will force shutdown the program
|
251
251
|
def shutdown
|
252
|
-
if
|
253
|
-
exit!(1)
|
254
|
-
else
|
252
|
+
if PushmiPullyu.server_running?
|
255
253
|
# using stderr instead of logger as it uses an underlying mutex which is not allowed inside trap contexts.
|
256
254
|
warn 'Exiting... Interrupt again to force quit.'
|
257
255
|
PushmiPullyu.server_running = false
|
256
|
+
else
|
257
|
+
exit!(1)
|
258
258
|
end
|
259
259
|
end
|
260
260
|
|
@@ -21,7 +21,7 @@ module PushmiPullyu::Logging
|
|
21
21
|
|
22
22
|
attr_writer :logger
|
23
23
|
|
24
|
-
def initialize_logger(log_target =
|
24
|
+
def initialize_logger(log_target = $stdout)
|
25
25
|
@logger = Logger.new(log_target)
|
26
26
|
@logger.level = Logger::INFO
|
27
27
|
@logger
|
@@ -47,11 +47,11 @@ module PushmiPullyu::Logging
|
|
47
47
|
preservation_logger = Logger.new("#{PushmiPullyu.options[:logdir]}/preservation_events.log")
|
48
48
|
|
49
49
|
message = "#{deposited_file.name} was successfully deposited into Swift Storage!\n"\
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
50
|
+
"Here are the details of this preservation event:\n"\
|
51
|
+
"\tUUID: '#{deposited_file.name}'\n"\
|
52
|
+
"\tTimestamp of Completion: '#{deposited_file.last_modified}'\n"\
|
53
|
+
"\tAIP Checksum: '#{deposited_file.etag}'\n"\
|
54
|
+
"\tMetadata: #{deposited_file.metadata}\n"\
|
55
55
|
|
56
56
|
file_details = file_log_details(aip_directory)
|
57
57
|
|
data/pushmi_pullyu.gemspec
CHANGED
@@ -42,9 +42,12 @@ Gem::Specification.new do |spec|
|
|
42
42
|
spec.add_development_dependency 'pry-byebug', '~> 3.6'
|
43
43
|
spec.add_development_dependency 'rake', '~> 13.0'
|
44
44
|
spec.add_development_dependency 'rspec', '~> 3.0'
|
45
|
-
spec.add_development_dependency 'rubocop', '~>
|
46
|
-
spec.add_development_dependency 'rubocop-rspec', '~>
|
45
|
+
spec.add_development_dependency 'rubocop', '~> 1.23'
|
46
|
+
spec.add_development_dependency 'rubocop-rspec', '~> 2.6'
|
47
47
|
spec.add_development_dependency 'timecop', '~> 0.8'
|
48
48
|
spec.add_development_dependency 'vcr', '~> 5.0'
|
49
49
|
spec.add_development_dependency 'webmock', '~> 3.3'
|
50
|
+
spec.metadata = {
|
51
|
+
'rubygems_mfa_required' => 'true'
|
52
|
+
}
|
50
53
|
end
|
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.2
|
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: 2021-
|
12
|
+
date: 2021-11-23 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: activesupport
|
@@ -357,28 +357,28 @@ dependencies:
|
|
357
357
|
requirements:
|
358
358
|
- - "~>"
|
359
359
|
- !ruby/object:Gem::Version
|
360
|
-
version: '
|
360
|
+
version: '1.23'
|
361
361
|
type: :development
|
362
362
|
prerelease: false
|
363
363
|
version_requirements: !ruby/object:Gem::Requirement
|
364
364
|
requirements:
|
365
365
|
- - "~>"
|
366
366
|
- !ruby/object:Gem::Version
|
367
|
-
version: '
|
367
|
+
version: '1.23'
|
368
368
|
- !ruby/object:Gem::Dependency
|
369
369
|
name: rubocop-rspec
|
370
370
|
requirement: !ruby/object:Gem::Requirement
|
371
371
|
requirements:
|
372
372
|
- - "~>"
|
373
373
|
- !ruby/object:Gem::Version
|
374
|
-
version: '
|
374
|
+
version: '2.6'
|
375
375
|
type: :development
|
376
376
|
prerelease: false
|
377
377
|
version_requirements: !ruby/object:Gem::Requirement
|
378
378
|
requirements:
|
379
379
|
- - "~>"
|
380
380
|
- !ruby/object:Gem::Version
|
381
|
-
version: '
|
381
|
+
version: '2.6'
|
382
382
|
- !ruby/object:Gem::Dependency
|
383
383
|
name: timecop
|
384
384
|
requirement: !ruby/object:Gem::Requirement
|
@@ -434,12 +434,12 @@ files:
|
|
434
434
|
- ".editorconfig"
|
435
435
|
- ".github/CODEOWNERS"
|
436
436
|
- ".github/PULL_REQUEST_TEMPLATE"
|
437
|
+
- ".github/dependabot.yml"
|
437
438
|
- ".github/workflows/ruby.yml"
|
438
439
|
- ".gitignore"
|
439
440
|
- ".hound.yml"
|
440
441
|
- ".rspec"
|
441
442
|
- ".rubocop.yml"
|
442
|
-
- ".travis.yml"
|
443
443
|
- CHANGELOG.md
|
444
444
|
- Dangerfile
|
445
445
|
- Gemfile
|
@@ -469,7 +469,8 @@ files:
|
|
469
469
|
homepage: https://github.com/ualbertalib/pushmi_pullyu
|
470
470
|
licenses:
|
471
471
|
- MIT
|
472
|
-
metadata:
|
472
|
+
metadata:
|
473
|
+
rubygems_mfa_required: 'true'
|
473
474
|
post_install_message:
|
474
475
|
rdoc_options: []
|
475
476
|
require_paths:
|
@@ -485,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
485
486
|
- !ruby/object:Gem::Version
|
486
487
|
version: '0'
|
487
488
|
requirements: []
|
488
|
-
rubygems_version: 3.
|
489
|
+
rubygems_version: 3.1.6
|
489
490
|
signing_key:
|
490
491
|
specification_version: 4
|
491
492
|
summary: Ruby application to manage flow of content from Jupiter into Swift for preservation
|