pushmi_pullyu 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25051393a56976db185a30c9cd498afd7997854d2a6931f3b6190132cec76a97
-  data.tar.gz: 731b8dbcf8a3d9124f44d57001bda6952bb2da07df874a1f97f52d7e7176c065
+  metadata.gz: 128bfb644445954d7b9c5eb3700dd1f3e4d3c92ea1e8448ab98054d750b2d53d
+  data.tar.gz: 2fc44c64692367c9c4b254ec32b8241c7ecdc8fb1a33384561cbfcd34096a085
 SHA512:
-  metadata.gz: 82b083e9b991fbc0b7c95507415d312bc29b29a4f16fdcfe8689efc2dc4c69542a4c15010ce9b5841cebebe73920de7499512bf1eaab57bb379816bd1dba75ae
-  data.tar.gz: 2439db5f7058ddc7b042894538a592d076c467b34c7211c262d15e3a2d6d436f8a3d785f6b53c3bd68e93566832fed18bbde6b32efa4f0f4e8e08eceacd3ed57
+  metadata.gz: daaaf67bda17bdea14310b41a87a1c51190f41337d8f0d467887dea5ed9cc700b2b05822bddd6038a4c7746927439d2576fd8a7c3fb2a878d7f59a8ac84e45be
+  data.tar.gz: 33197ef8eb83869cea35ea5af258d83c16c56e77cbb0716fc61a6fa344b3d5cdf75e25a0fd72d6e2ab71148ddae9648351d29c5f2b53c9569af9f04869538ba0

data/CHANGELOG.md

@@ -8,6 +8,10 @@ and releases in PushmiPullyu adheres to [Semantic Versioning](https://semver.org
 
 ## [Unreleased]
 
+## [2.0.6] - 2023-03-17
+
+- Fix URI concatenation for jupiter's base url. [#309](https://github.com/ualbertalib/pushmi_pullyu/issues/309)
+
 ## [2.0.5] - 2023-02-17
 
 - Add rescue block to catch exceptions while waiting for next item [#280](https://github.com/ualbertalib/pushmi_pullyu/issues/280)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pushmi_pullyu (2.0.5)
+    pushmi_pullyu (2.0.6)
       activesupport (>= 5, < 8)
       bagit (~> 0.4)
       connection_pool (~> 2.2)
@@ -248,4 +248,4 @@ DEPENDENCIES
   webmock (~> 3.3)
 
 BUNDLED WITH
-   2.3.19
+   2.3.12

data/README.md

@@ -104,6 +104,13 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 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).
 
+You'll need to set these two env vars otherwise you'll likely run into an error (Errno::ECONNRESET: Connection reset by peer):
+
+```bash
+export JUPITER_API_KEY=3eeb395e-63b7-11ea-bc55-0242ac130003
+export JUPITER_USER=ditech@ualberta.ca
+```
+
 ## Testing
 
 Pre-requisites:

data/lib/pushmi_pullyu/aip/downloader.rb

@@ -86,7 +86,7 @@ class PushmiPullyu::AIP::Downloader
     @uri = URI.parse(PushmiPullyu.options[:jupiter][:jupiter_url])
     @http = Net::HTTP.new(@uri.host, @uri.port)
     @http.use_ssl = true if @uri.instance_of? URI::HTTPS
-    request = Net::HTTP::Post.new("#{@uri.request_uri}auth/system")
+    request = Net::HTTP::Post.new(URI.join(@uri, '/auth/system'))
     request.set_form_data(
       email: PushmiPullyu.options[:jupiter][:user],
       api_key: PushmiPullyu.options[:jupiter][:api_key]
@@ -102,7 +102,7 @@ class PushmiPullyu::AIP::Downloader
     log_downloading(remote, local)
 
     @uri = URI.parse(PushmiPullyu.options[:jupiter][:jupiter_url])
-    request = Net::HTTP::Get.new(@uri.request_uri + remote)
+    request = Net::HTTP::Get.new(URI.join(@uri, remote))
     # add previously stored cookies
     request['Cookie'] = @cookies
 
@@ -118,7 +118,7 @@ class PushmiPullyu::AIP::Downloader
   end
 
   def get_file_paths(url)
-    request = Net::HTTP::Get.new(@uri.request_uri + url)
+    request = Net::HTTP::Get.new(URI.join(@uri, url))
     # add previously stored cookies
     request['Cookie'] = @cookies
 

data/lib/pushmi_pullyu/cli.rb

@@ -220,7 +220,7 @@ class PushmiPullyu::CLI
     rescue StandardError => e
       begin
         queue.add_entity_in_timeframe(entity)
-      rescue MaxDepositAttemptsReached => e
+      rescue PushmiPullyu::PreservationQueue::MaxDepositAttemptsReached => e
         log_exception(e)
       end
 

data/lib/pushmi_pullyu/version.rb

@@ -1,3 +1,3 @@
 module PushmiPullyu
-  VERSION = '2.0.5'.freeze
+  VERSION = '2.0.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pushmi_pullyu
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Shane Murnaghan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport