pushmi_pullyu 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 178780e39d4759d4510533ec9e8d73d48f1caafb2903e8b76059d1f63d831418
-  data.tar.gz: 31d7cef11a46cfbee7167f6492f09f721a8f9586624f6793da5b294faab0ae9d
+  metadata.gz: b1c8f5c84c24f23977c7f8ff928e8439e45e2b099b63e3ff8972a772266e987c
+  data.tar.gz: a064f9b40b1cfb10e2cf3788954e95533f00a1729703811345d323f015576eb4
 SHA512:
-  metadata.gz: 924be7d5609673e1d8ca83f3c320a5d6866e12b6baa04795bfd7b4906e25ee57a7180c9c473c404a55f0ba20aa17da213e81fc4ed401d1a76d256e0775efb3e6
-  data.tar.gz: 2e9978ce931d0b07e7c5efe51f656e49749765691a56285fa2c223292715a6224197fafd08477f02515c04462d9c23cee61a84dfb70327b5ddb010d4bdf5519d
+  metadata.gz: 5fb80ac9494f4ad90043f780ac88c79476bd7f07888c20d8466c3633234630ac77dd24ce0afa323cc3276aed2facdef530d8923affd82ee23064e0c71cff0cfc
+  data.tar.gz: 326793c9c9d7db37cd65b3990dbc2e62b1639ef23405a2ab0d46a1be3519b5ac215e5defc0d17376e670956def228dd45ec30aafa8b79dda7e90e5dca0eee940

data/.github/workflows/ruby.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:

data/.rubocop.yml

@@ -4,6 +4,9 @@
 # https://github.com/bbatsov/rubocop/blob/master/config/enabled.yml
 require: rubocop-rspec
 
+inherit_from:
+  - https://raw.githubusercontent.com/ualbertalib/library_applications_development_inclusive_language/main/inclusive_language_rubocop.yml
+
 AllCops:
   DisplayCopNames: true
   DisplayStyleGuide: true

data/CHANGELOG.md

@@ -6,6 +6,37 @@ PushmiPullyu is a Ruby application, whose primary job is to manage the flow of c
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and releases in PushmiPullyu adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+## [2.1.4]
+
+### Added
+ - Bring in and enforce inclusive language cops [PR#469](https://github.com/ualbertalib/pushmi_pullyu/pull/469)
+
+### Fixed
+ - Use `File.open` with a block for simple exception handling and ensuring files are closed [#475](https://github.com/ualbertalib/pushmi_pullyu/issues/475)
+ - Fix problem with authentication token expiration by @lagoan in https://github.com/ualbertalib/pushmi_pullyu/pull/457
+ 
+### Changed 
+ - Bump bundler from 2.3.12 to 2.4.9 [PR#483](https://github.com/ualbertalib/pushmi_pullyu/pull/483)
+
+### Chores
+ - Use add_dependency instead of add_runtime_dependency. [PR#473](https://github.com/ualbertalib/pushmi_pullyu/pull/473)
+ - Bump rexml from 3.2.8 to 3.3.2 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/462
+ - Bump timecop from 0.9.8 to 0.9.10 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/450
+ - Bump redis from 5.0.8 to 5.3.0 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/468
+ - Update CI for branch name changes by @pgwillia in https://github.com/ualbertalib/pushmi_pullyu/pull/480
+ - Bump danger from 9.3.2 to 9.5.0 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/466
+ - Bump bagit from 0.4.6 to 0.6.0 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/482
+ - Update minitar requirement from ~> 0.7 to >= 0.7, < 2.0 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/481
+ - Bump rubocop-rspec from 2.24.1 to 3.1.0 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/478
+ - Bump rdf from 3.2.11 to 3.2.12 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/479
+ - Bump webmock from 3.19.1 to 3.24.0 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/477
+ - Bump rubocop from 1.64.0 to 1.66.1 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/473
+ - Bump rollbar from 3.4.1 to 3.6.0 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/472
+ - Bump activesupport from 7.1.1 to 7.1.4 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/470
+ - Bump rake from 13.0.6 to 13.2.1 by @dependabot in https://github.com/ualbertalib/pushmi_pullyu/pull/426
+
 ## [2.1.3]
  - Refresh authentication token after it expires [#311](https://github.com/ualbertalib/pushmi_pullyu/issues/311)
 

data/Dangerfile

@@ -18,7 +18,7 @@ declared_trivial = (github.pr_title + github.pr_body).include?('#trivial') || !h
 
 if !git.modified_files.include?('CHANGELOG.md') && !declared_trivial
   error_message = "Please include a CHANGELOG entry. \nYou can find it at " \
-                  '[CHANGELOG.md](https://github.com/ualbertalib/pushmi_pullyu/blob/master/CHANGELOG.md).'
+                  '[CHANGELOG.md](https://github.com/ualbertalib/pushmi_pullyu/blob/main/CHANGELOG.md).'
   fail(error_message, sticky: false)
 end
 

data/Gemfile

@@ -5,14 +5,14 @@ gemspec
 
 group :development, :test do
   gem 'bundler', '~> 2.0'
-  gem 'danger', '~> 9.3'
+  gem 'danger', '~> 9.5'
   gem 'pry', '~> 0.10', '>= 0.10.4'
   gem 'pry-byebug', '~> 3.6'
-  gem 'rake', '~> 13.0'
+  gem 'rake', '~> 13.2'
   gem 'rspec', '~> 3.13'
-  gem 'rubocop', '~> 1.64'
-  gem 'rubocop-rspec', '~> 2.24'
+  gem 'rubocop', '~> 1.66'
+  gem 'rubocop-rspec', '~> 3.1'
   gem 'timecop', '~> 0.9'
   gem 'vcr', '~> 5.0'
-  gem 'webmock', '~> 3.19'
+  gem 'webmock', '~> 3.24'
 end

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    pushmi_pullyu (2.1.3)
+    pushmi_pullyu (2.1.4)
       activesupport (>= 5, < 8)
       bagit (~> 0.4)
       connection_pool (~> 2.2)
       daemons (~> 1.2, >= 1.2.4)
-      minitar (~> 0.7)
+      minitar (>= 0.7, < 2.0)
       openstack (~> 3.3, >= 3.3.10)
       rdf (>= 1.99, < 4.0)
       rdf-n3 (>= 1.99, < 4.0)
@@ -18,7 +18,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.1)
+    activesupport (7.1.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -28,14 +28,14 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    addressable (2.8.5)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    bagit (0.4.6)
+    bagit (0.6.0)
       docopt (~> 0.5.0)
       validatable (~> 1.6)
     base64 (0.2.0)
-    bigdecimal (3.1.4)
+    bigdecimal (3.1.8)
     builder (3.2.4)
     byebug (11.1.3)
     claide (1.1.0)
@@ -45,14 +45,15 @@ GEM
       open4 (~> 1.3)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
-    crack (0.4.5)
+    crack (1.0.0)
+      bigdecimal
       rexml
     daemons (1.4.1)
-    danger (9.3.2)
+    danger (9.5.0)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
@@ -62,37 +63,35 @@ GEM
       git (~> 1.13)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
-      no_proxy_fix
-      octokit (~> 6.0)
+      octokit (>= 4.0)
       terminal-table (>= 1, < 4)
     diff-lcs (1.5.1)
     docopt (0.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    drb (2.1.1)
-      ruby2_keywords
+    drb (2.2.1)
     ebnf (2.3.5)
       htmlentities (~> 4.3)
       rdf (~> 3.2)
       scanf (~> 1.0)
       sxp (~> 1.2)
       unicode-types (~> 1.8)
-    faraday (2.7.11)
+    faraday (2.8.1)
       base64
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-http-cache (2.5.0)
+    faraday-http-cache (2.5.1)
       faraday (>= 0.8)
     faraday-net_http (3.0.2)
-    git (1.18.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    hashdiff (1.0.1)
+    hashdiff (1.1.1)
     htmlentities (4.3.4)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     json (2.7.2)
     kramdown (2.4.0)
@@ -109,22 +108,21 @@ GEM
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1003)
-    minitar (0.9)
-    minitest (5.20.0)
-    mutex_m (0.1.2)
+    minitar (0.12.1)
+    minitest (5.25.1)
+    mutex_m (0.2.0)
     nap (1.1.0)
     net-http-persistent (4.0.2)
       connection_pool (~> 2.2)
     netrc (0.11.0)
-    no_proxy_fix (0.1.2)
-    octokit (6.1.1)
+    octokit (9.1.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     open4 (1.3.4)
     openstack (3.3.21)
       json
-    parallel (1.24.0)
-    parser (3.3.1.0)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -133,12 +131,12 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.3)
-    racc (1.8.0)
+    public_suffix (5.1.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
+    rake (13.2.1)
     rchardet (1.8.0)
-    rdf (3.2.11)
+    rdf (3.2.12)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (3.2.1)
       rdf (~> 3.2)
@@ -150,9 +148,9 @@ GEM
     rdf-xsd (3.2.1)
       rdf (~> 3.2)
       rexml (~> 3.2)
-    redis (5.0.8)
-      redis-client (>= 0.17.0)
-    redis-client (0.17.1)
+    redis (5.3.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.2)
       connection_pool
     regexp_parser (2.9.2)
     rest-client (2.1.0)
@@ -160,9 +158,8 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
-    rollbar (3.4.1)
+    rexml (3.3.8)
+    rollbar (3.6.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -176,27 +173,20 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.0)
-    rubocop (1.64.0)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.3)
+    rubocop-ast (1.32.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
-    rubocop-rspec (2.24.1)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.1.0)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sawyer (0.9.2)
@@ -215,26 +205,25 @@ GEM
     sparql-client (3.2.2)
       net-http-persistent (~> 4.0, >= 4.0.2)
       rdf (~> 3.2, >= 3.2.11)
-    strscan (3.1.0)
     sxp (1.2.4)
       matrix (~> 0.4)
       rdf (~> 3.2)
     systemu (2.6.5)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    timecop (0.9.8)
+    timecop (0.9.10)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     unicode-types (1.9.0)
     uuid (2.3.9)
       macaddr (~> 1.0)
     validatable (1.6.7)
     vcr (5.1.0)
-    webmock (3.19.1)
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -244,17 +233,17 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  danger (~> 9.3)
+  danger (~> 9.5)
   pry (~> 0.10, >= 0.10.4)
   pry-byebug (~> 3.6)
   pushmi_pullyu!
-  rake (~> 13.0)
+  rake (~> 13.2)
   rspec (~> 3.13)
-  rubocop (~> 1.64)
-  rubocop-rspec (~> 2.24)
+  rubocop (~> 1.66)
+  rubocop-rspec (~> 3.1)
   timecop (~> 0.9)
   vcr (~> 5.0)
-  webmock (~> 3.19)
+  webmock (~> 3.24)
 
 BUNDLED WITH
-   2.3.12
+   2.4.9

data/README.md

@@ -86,7 +86,7 @@ You can also provide a configuration file which PushmiPullyu will use with the -
 
 By default, if no configuration file is specified, PushmiPullyu will look for a configuration file at config/pushmi_pullyu.yml.
 
-Take the following [sample configuration](https://github.com/ualbertalib/pushmi_pullyu/blob/master/examples/pushmi_pullyu.yml) as inspiration or check out the [DEFAULTS hash](https://github.com/ualbertalib/pushmi_pullyu/blob/master/lib/pushmi_pullyu.rb) in the main module to see all available options.
+Take the following [sample configuration](https://github.com/ualbertalib/pushmi_pullyu/blob/main/examples/pushmi_pullyu.yml) as inspiration or check out the [DEFAULTS hash](https://github.com/ualbertalib/pushmi_pullyu/blob/main/lib/pushmi_pullyu.rb) in the main module to see all available options.
 
 Options passed on the command line will also override options specified in the config file.
 
@@ -144,7 +144,7 @@ To release a new version, bump the version file found here: `lib/pushmi_pullyu/v
 
 Try to bump versions using [semantic versioning](http://semver.org/).
 
-Commit this change into master branch via a PR.
+Commit this change into main branch via a PR.
 
 Once committed, you can do a release by running the following rake command:
 

data/lib/pushmi_pullyu/aip/creator.rb

@@ -41,7 +41,9 @@ class PushmiPullyu::AIP::Creator
     tar_aip_filename = File.expand_path(@aip_filename)
 
     Dir.chdir(PushmiPullyu.options[:workdir]) do
-      Minitar.pack(@noid, File.open(tar_aip_filename, 'wb'))
+      File.open(tar_aip_filename, 'wb') do |tar|
+        Minitar.pack(@noid, tar)
+      end
     end
   end
 

data/lib/pushmi_pullyu/swift_depositer.rb

@@ -53,13 +53,17 @@ class PushmiPullyu::SwiftDepositer
       headers = { 'etag' => checksum,
                   'content-type' => 'application/x-tar' }.merge(metadata)
       deposited_file = era_container.object(file_base_name)
-      deposited_file.write(File.open(file_name), headers)
+      File.open(file_name) do |file|
+        deposited_file.write(file, headers)
+      end
     else
       # for creating new: construct hash with symbols as keys, add metadata as a hash within the header hash
       headers = { etag: checksum,
                   content_type: 'application/x-tar',
                   metadata: metadata }
-      deposited_file = era_container.create_object(file_base_name, headers, File.open(file_name))
+      File.open(file_name) do |file|
+        deposited_file = era_container.create_object(file_base_name, headers, file)
+      end
     end
 
     deposited_file

data/lib/pushmi_pullyu/version.rb

@@ -1,3 +1,3 @@
 module PushmiPullyu
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.4'.freeze
 end

data/pushmi_pullyu.gemspec

@@ -21,18 +21,18 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'activesupport', '>= 5', '< 8'
-  spec.add_runtime_dependency 'bagit', '~> 0.4'
-  spec.add_runtime_dependency 'connection_pool', '~> 2.2'
-  spec.add_runtime_dependency 'daemons', '~> 1.2', '>= 1.2.4'
-  spec.add_runtime_dependency 'minitar', '~> 0.7'
-  spec.add_runtime_dependency 'openstack', '~> 3.3', '>= 3.3.10'
-  spec.add_runtime_dependency 'rdf', '>= 1.99', '< 4.0'
-  spec.add_runtime_dependency 'rdf-n3', '>= 1.99', '< 4.0'
-  spec.add_runtime_dependency 'redis', '>= 3.3', '< 6.0'
-  spec.add_runtime_dependency 'rest-client', '>= 1.8', '< 3.0'
-  spec.add_runtime_dependency 'rollbar', '>= 2.18', '< 4.0'
-  spec.add_runtime_dependency 'uuid', '~> 2.3.9'
+  spec.add_dependency 'activesupport', '>= 5', '< 8'
+  spec.add_dependency 'bagit', '~> 0.4'
+  spec.add_dependency 'connection_pool', '~> 2.2'
+  spec.add_dependency 'daemons', '~> 1.2', '>= 1.2.4'
+  spec.add_dependency 'minitar', '>= 0.7', '< 2.0'
+  spec.add_dependency 'openstack', '~> 3.3', '>= 3.3.10'
+  spec.add_dependency 'rdf', '>= 1.99', '< 4.0'
+  spec.add_dependency 'rdf-n3', '>= 1.99', '< 4.0'
+  spec.add_dependency 'redis', '>= 3.3', '< 6.0'
+  spec.add_dependency 'rest-client', '>= 1.8', '< 3.0'
+  spec.add_dependency 'rollbar', '>= 2.18', '< 4.0'
+  spec.add_dependency 'uuid', '~> 2.3.9'
 
   spec.metadata = {
     'rubygems_mfa_required' => 'true'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushmi_pullyu
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Shane Murnaghan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -83,16 +83,22 @@ dependencies:
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: openstack
   requirement: !ruby/object:Gem::Requirement
@@ -294,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.5
 signing_key: 
 specification_version: 4
 summary: Ruby application to manage flow of content from Jupiter into Swift for preservation