etda_utilities 0.17.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e32d2539c0a8c63a5919e46b43d95e259495eaaae56c1979e28f8b423f325bd4
-  data.tar.gz: 1040a84a4dcf29f4df15fae7c2b364bb186405673709e468b0ba8e60b36604a4
+  metadata.gz: 112648ea28d76db4b2a2fae233aa429351da5d6ef818f00a47e1475e6902a958
+  data.tar.gz: 88ace546f783b11104c28c00a6caf93cc5b07b25f88cb651fc0917703a4679fc
 SHA512:
-  metadata.gz: 7add9928c36e4845f85c9ed15d329d93dc0ab40d3a53068be3af012f1642172741e4bac96e2fe26bad00e3d3309ba231ea4ea79159d8882910aca5fe24c1f839
-  data.tar.gz: 0eb9aef4bbf29a1463c1e4bc70c447664775867945b42ed7fea43b3c13ae54a5ed1b92f316d32f48cea1e28ddad4537e08168382bd1a002fcf93b49d464362fa
+  metadata.gz: 59d9d7bcd9a7b2d0ef734ba937f56045f5290430dd15d65ee2d433212798e2e96a5c43e86920384e38ebfef07c30c86a7a3da26f1eb1a645beff16feff392c1f
+  data.tar.gz: dc1c37aef7c8de64aa46107f3a88a943fe1f7429d5107d8f633e2ffe1efedd692644472bd99a62870e1c575a25afae9633072cf832e1fff893d1b163a9c47367

data/.github/workflows/ruby-ci.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v2
       # Add or replace dependency steps here
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@8f312efe1262fb463d906e9bf040319394c18d3e # v1.92
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       # Add or replace test runners here
@@ -33,11 +33,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@8f312efe1262fb463d906e9bf040319394c18d3e # v1.92
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       # Add or replace any other lints here
-      - name: Security audit dependencies
-        run: bundle exec bundle-audit
       - name: Lint Ruby files
         run: bundle exec rubocop

data/.rubocop.yml

@@ -12,6 +12,7 @@ Metrics/BlockLength:
   Exclude:
    - spec/lib/etda_utilities_etda_file_paths_spec.rb
    - spec/lib/etda_utilities_partner_spec.rb
+   - spec/lib/etda_utilities_hosts_spec.rb
 
 Metrics/MethodLength:
   Enabled: false
@@ -159,3 +160,7 @@ Style/BlockDelimiters:
 
 Naming/FileName:
   Exclude:
+
+Style/OptionalBooleanParameter:
+  Exclude:
+  - 'lib/etda_utilities/hosts.rb'

data/.ruby-version

@@ -1 +1 @@
-2.7.4
+3.1.3

data/Gemfile

@@ -11,5 +11,3 @@ gem 'rubocop', require: false
 gem 'rubocop-rspec', require: false
 
 gem 'byebug', require: false
-
-gem 'bundle-audit', require: false

data/Gemfile.lock

@@ -1,25 +1,21 @@
 PATH
   remote: .
   specs:
-    etda_utilities (0.17.0)
+    etda_utilities (0.19.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    bundle-audit (0.1.0)
-      bundler-audit
-    bundler-audit (0.6.1)
-      bundler (>= 1.2.0, < 3)
-      thor (~> 0.18)
+    ast (2.4.2)
     byebug (11.1.1)
     diff-lcs (1.3)
-    jaro_winkler (1.5.4)
-    parallel (1.19.1)
-    parser (2.7.0.5)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
+    json (2.6.3)
+    parallel (1.22.1)
+    parser (3.2.1.1)
+      ast (~> 2.4.1)
+    rainbow (3.1.1)
     rake (13.0.1)
+    regexp_parser (2.7.0)
     rexml (3.2.5)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -34,25 +30,30 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.80.1)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.48.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.30.1)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.1)
-    thor (0.20.3)
-    unicode-display_width (1.6.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.27.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.17.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.19.0)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
+    ruby-progressbar (1.13.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundle-audit
   bundler (~> 2.3.a)
   byebug
   etda_utilities!

data/README.md

@@ -1,6 +1,6 @@
 # EtdaUtilities
 
-[![Build Status](https://travis-ci.com/psu-stewardship/etda_utilities.svg?token=aQpbqAxsm8KshbvyB24o&branch=master)](https://travis-ci.com/psu-stewardship/etda_utilities)
+![CI](https://github.com/psu-libraries/etda_utilities/actions/workflows/ruby-ci.yml/badge.svg)
 
 Common methods used by etda_workflow and etda_explore
 

data/etda_utilities.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib", "lib/etda_utilities"]
 
+  spec.required_ruby_version = '~> 3.1'
+
   spec.add_development_dependency "bundler", "~> 2.3.a"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/etda_utilities/access_level.rb

@@ -6,6 +6,7 @@ module EtdaUtilities
 
   class AccessLevel
     attr_accessor :attributes
+
     # attr_accessor :current_access_level
     # *** IMPORTANT NOTE ***
     # The order of the keys in this array matter and they should go from least restrictive to most restrictive

data/lib/etda_utilities/etda_file_paths.rb

@@ -15,29 +15,29 @@ module EtdaUtilities
     end
 
     def workflow_upload_final_files_path
-      workflow_base_path + 'final_submission_files/'
+      "#{workflow_base_path}final_submission_files/"
     end
 
     def workflow_upload_format_review_path
-      workflow_base_path + 'format_review_files/'
+      "#{workflow_base_path}format_review_files/"
     end
 
     def workflow_restricted
-      workflow_base_path + RESTRICTED_DIR + '/'
+      "#{workflow_base_path}#{RESTRICTED_DIR}/"
     end
 
     def explore_open
-      explore_base_path + OPEN_DIR + '/'
+      "#{explore_base_path}#{OPEN_DIR}/"
     end
 
     def explore_psu_only
-      explore_base_path + RESTRICTED_INSTITUTION_DIR + '/'
+      "#{explore_base_path}#{RESTRICTED_INSTITUTION_DIR}/"
     end
 
     def detailed_file_path(file_id)
       str1 = format("%02d", ((file_id.to_i || 0) % 100))
       str2 = file_id.to_s
-      str1 + '/' + str2 + '/'
+      "#{str1}/#{str2}/"
     end
 
     def explore_download_file_path(file_id, access_level, filename)

data/lib/etda_utilities/hosts.rb

@@ -2,6 +2,28 @@
 
 module EtdaUtilities
   class Hosts
+    class << self
+      def workflow_url(partner = nil, host = nil)
+        if ENV['WORKFLOW_HOST']
+          "https://#{ENV['WORKFLOW_HOST']}"
+        else
+          raise ArgumentError, "_partner and _host are required arguments" if partner.nil? || host.nil?
+
+          "https://#{new.workflow_submit_host(partner, host)}"
+        end
+      end
+
+      def explore_url(partner = nil, host = nil)
+        if ENV['EXPLORE_HOST']
+          "https://#{ENV['EXPLORE_HOST']}"
+        else
+          raise ArgumentError, "_partner and _host are required arguments" if partner.nil? || host.nil?
+
+          "https://#{new.explore_host(partner, host)}"
+        end
+      end
+    end
+
     def workflow_submit_host(partner, environment = 'prod')
       host_builder(partner, environment, true)
     end
@@ -34,16 +56,8 @@ module EtdaUtilities
       end
 
       def partner_host(partner)
-        case partner
-        when 'graduate'
-          "etda"
-        when 'honors'
-          "honors"
-        when 'milsch'
-          "millennium-scholars"
-        when 'sset'
-          "sset"
-        end
+        host_hash = { 'graduate' => "etda", 'honors' => "honors", 'milsch' => "millennium-scholars", 'sset' => "sset" }
+        host_hash[partner]
       end
   end
 end

data/lib/etda_utilities/partner.rb

@@ -46,6 +46,10 @@ module EtdaUtilities
       attributes['committee']['list']['label']
     end
 
+    def header_title
+      attributes['header_title']
+    end
+
     def graduate?
       id == 'graduate'
     end

data/lib/etda_utilities/partner.yml

@@ -1,6 +1,7 @@
 graduate:
   slug: eTD
   name: Graduate School
+  header_title: Electronic Theses and Dissertations for Graduate School
   email:
     address: gradthesis@psu.edu
     list: 'ul-etda-graduate-admin@pennstateoffice365.onmicrosoft.com'
@@ -14,6 +15,7 @@ graduate:
 honors:
   slug: eHT
   name: Schreyer Honors College
+  header_title: Electronic Theses for Schreyer Honors College
   email:
     address: SHCAcademics@psu.edu
     list: 'ul-etda-honors-admin@pennstateoffice365.onmicrosoft.com'
@@ -27,11 +29,12 @@ honors:
 milsch:
   slug: MSPT
   name: Millennium Scholars Program
+  header_title: Electronic Theses for Millennium Scholars Program
   email:
     address: millennium@psu.edu
     list: 'ul-etda-milsch-admin@pennstateoffice365.onmicrosoft.com'
   program:
-    label: Millennium Scholars Program Name
+    label: Millennium Scholars Program
   committee:
     label: Thesis Supervisor
     list:
@@ -40,6 +43,13 @@ milsch:
 sset:
   slug: SSETT
   name: School of Science, Engineering, and Technology
+  header_title: Final Papers for the School of Science, Engineering, and Technology
   email:
     address: sset@psu.edu
-    list: 'ul-etda-sset-admin@pennstateoffice365.onmicrosoft.com'
+    list: 'ul-etda-sset-admin@pennstateoffice365.onmicrosoft.com'
+  program:
+    label: Program
+  committee:
+    label: Committee Member
+    list:
+      label: Committee Members

data/lib/etda_utilities/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EtdaUtilities
-  VERSION = "0.17.0"
+  VERSION = "0.19.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etda_utilities
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.0
 platform: ruby
 authors:
 - ajk5603@psu.edu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
-- ".travis.yml"
 - CODEOWNERS
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -88,24 +87,24 @@ homepage: https://github.com/psu-stewardship/etda_utilities
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - lib/etda_utilities
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: A gem containing common fuctions for the ETDA applications.
 test_files: []

data/.travis.yml

@@ -1,33 +0,0 @@
-language: ruby
-cache: bundler
-sudo: required
-#rvm:
-#- 2.6.0
-jdk:
-- oraclejdk12
-env:
-  global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - JS=true
-before_install:
-  - "gem --version"
-  - "gem update --system"
-  - "gem --version"
-  - 'gem install bundler -v "$(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)"'
-script:
-- gem install bundler
-- gem install rspec
-- bundle exec rubocop
-- bundle exec rspec 
-notifications:
-  email:
-    recipients:
-      secure: "l84DQVl48Z4/O/H/zAHFL6GmnBe5BHGQZj2rBv2/X7j1QfOOQEb3h0ZVk5+RdlGLvNjgc8va0sI6JJWa8QuQa68/T6RfcBoZHb90pKOIRoZOVjiwwUYC+mdRMv5s0vemJ2VxreAoJl5JmJ6TLvy5w52G7mmMOm+1VuYPv3MuvZ3nbFwm15qz6LxiRhyUJhaXcZhi1emZYsRd+qazQ9HlkKWMoCz68gi8zWVULnRbZSIHIEj4GV5bn9L67u+699LgIjKrT1Xeh0wnb/wtPIrgwheSksgqYcaRRkBmkaajjss2Zeg5m5hUteTTsx6mSAk3QSTjqVQ0t/Kh5En68W4B/VnA8qiuLolzHqaTqid8sa4rvh/JVAU3zsOvMun5f3OZzdgf7VTXM/E3A+L25KrVTk9UcQnPHcvJvdAIlr0ZZTX2G+3Vs/XSEPQk4KRfLFSqLUm4uYvh9INki7SlB7lllYudSMQzV/5Ghg2K6UaxP9PDRRxOCVPWeYuR3H3tesdBciv+6+d3LxDdAWVbxZwphlGtS5N7NlIl2du888wQ5COaOwSAlXIQWdRvvVfvvQaTTY245jdsiToNX+KSf27bT+szpHyzOaIsT1kO4DAIdSlSxdSK600GsM5RY80iIF92mFc9EjK24WqFZ0PpaSRZ3L4aUvl+HbdS/K4+q1uTCTM="
-    on_success: change
-    on_failure: always
-  irc:
-    channels: 
-    template: 
-
-
-