maltese 0.8.15 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47f0ba0813eeed3c56a5636d34acbb9bc3349cef65513b3a834c05dcda19bc08
-  data.tar.gz: 6ecb5ff42d4759e07c7632420aa78a81284a57ebba7aeca9d2747218e0d78297
+  metadata.gz: c055f201fbb1897c52f01b81a3a2ba65702266a331ca3b4484ac757499ae267c
+  data.tar.gz: aa1443e00f56188003e1194340d92192e10d6e996fd0424920db7768d079ea4c
 SHA512:
-  metadata.gz: 05aedc2d77881876ac08bf9f11a2796220619e06e128209f83600758d5c5c5448a47db3b7a25f67870b1ceaba63ea5c840958c2f5fa1ad85666280b285362306
-  data.tar.gz: c15bcefd230f7839556345f455879c702ed25a06368410d9e6e1bc72a86885b4cb06fdb8ddb03f5c3a21be605339834da56c21ef2c91fc39f8588fa45e84e483
+  metadata.gz: 20cff31e196123eb7b4c8b66a22dd39865c335919fea0c73bdfb832e00fde48bcd10ea38ba8091d66a6a0d504819946f03067a0d9a44d1da2306b9b256e3e8d3
+  data.tar.gz: 1b1deb4d8ad8218992a3b85dadfea96c97cbc7fda4ebcb65d165fd5d5afd8873d7e218ac9f08190dc13ca2583fdbaa0241959c408698f6c17e095a95e5b0028a

data/Dockerfile

@@ -11,6 +11,6 @@ RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" &&
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install maltese gem
-RUN /sbin/setuser app gem install maltese -v 0.8.15
+RUN /sbin/setuser app gem install maltese -v 0.9.0
 
 CMD maltese sitemap --sitemap_bucket $SITEMAP_BUCKET --rack_env $RACK_ENV --access_key $AWS_ACCESS_KEY_ID --secret_key $AWS_SECRET_ACCESS_KEY --region $AWS_REGION

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    maltese (0.8.15)
+    maltese (0.9.0)
       activesupport (>= 4.2.5, < 6)
       aws-sdk-s3 (~> 1.19)
       dotenv (~> 2.1, >= 2.1.1)
       faraday (= 0.17.0)
+      logger (~> 1.4.2)
       maremma (~> 4.1)
       mime-types (~> 3.1)
       sitemap_generator (~> 6.0)
@@ -58,6 +59,7 @@ GEM
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.2.0)
+    logger (1.4.2)
     maremma (4.4)
       activesupport (>= 4.2.5, < 6)
       addressable (>= 2.3.6)

data/README.md

@@ -8,7 +8,7 @@ Ruby gem and command-line tool for generating sitemap files from the DataCite RE
 
 Run as a command-line tool:
 
-```
+```ruby
 maltese sitemap
 ```
 
@@ -33,7 +33,7 @@ gem install maltese
 
 We use rspec for unit testing:
 
-```
+```ruby
 bundle exec rspec
 ```
 
@@ -48,4 +48,5 @@ Follow along via [Github Issues](https://github.com/datacite/toccatore/issues).
 * Commit, push and make a pull request. Bonus points for topical branches.
 
 ## License
+
 **maltese** is released under the [MIT License](https://github.com/datacite/maltese/blob/master/LICENSE.md).

data/lib/maltese/sitemap.rb

@@ -1,6 +1,8 @@
+require "logger"
+
 module Maltese
   class Sitemap
-    attr_reader :sitemap_bucket, :rack_env, :access_key, :secret_key, :region
+    attr_reader :sitemap_bucket, :rack_env, :access_key, :secret_key, :region, :logger
 
     # load ENV variables from .env file if it exists
     env_file = File.expand_path("../../../.env", __FILE__)
@@ -23,6 +25,8 @@ module Maltese
       @access_key = attributes[:access_key].presence || ENV['AWS_ACCESS_KEY_ID']
       @secret_key = attributes[:secret_key].presence || ENV['AWS_SECRET_ACCESS_KEY']
       @region = attributes[:region].presence || ENV['AWS_REGION']
+
+      @logger = Logger.new(STDOUT)
     end
 
     def sitemap_url
@@ -65,11 +69,11 @@ module Maltese
       total = get_total(options)
 
       if total.nil?
-        puts "An error occured."
+        logger.error "An error occured."
       elsif total > 0
         process_data(options.merge(total: total, url: get_query_url))
       else
-        puts "No works found."
+        logger.info "No works found."
       end
 
       # return number of works queued
@@ -105,11 +109,11 @@ module Maltese
 
         if response.status == 200
           link_count += parse_data(response)
-          puts "#{link_count} DOIs parsed."
+          logger.info "#{link_count} DOIs parsed."
           options[:url] = response.body.dig("links", "next")
         else
-          puts "An error occured for URL #{options[:url]}."
-          puts "Error message: #{response.body.fetch("errors").inspect}" if response.body.fetch("errors", nil).present?
+          logger.error "An error occured for URL #{options[:url]}."
+          logger.error "Error message: #{response.body.fetch("errors").inspect}" if response.body.fetch("errors", nil).present?
           error_count += 1
           options[:url] = nil
         end 

data/lib/maltese/version.rb

@@ -1,3 +1,3 @@
 module Maltese
-  VERSION = "0.8.15"
+  VERSION = "0.9.0"
 end

data/maltese.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   # Declary dependencies here, rather than in the Gemfile
   s.add_dependency 'maremma', '~> 4.1'
   s.add_dependency 'faraday', '0.17.0'
+  s.add_dependency 'logger', '~> 1.4.2'
   s.add_dependency 'activesupport', '>= 4.2.5', '< 6'
   s.add_dependency 'dotenv', '~> 2.1', '>= 2.1.1'
   s.add_dependency 'thor', '~> 0.19'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maltese
 version: !ruby/object:Gem::Version
-  version: 0.8.15
+  version: 0.9.0
 platform: ruby
 authors:
 - Martin Fenner
@@ -38,6 +38,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.17.0
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement