get fixes from adventist

.github/workflows/build-test-lint.yaml

@@ -31,10 +31,12 @@ jobs:
       confdir: '/app/samvera/hyrax-webapp/solr/conf'
       webTarget: hyku-web
       workerTarget: hyku-worker
+      rspec_cmd: "cd .. && gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"
 
   lint:
     needs: build
     uses: scientist-softserv/actions/.github/workflows/[email protected]
     with:
       webTarget: hyku-web
       workerTarget: hyku-worker
+      rubocop_cmd: "cd .. && bundle && bundle exec rubocop --parallel --format progress"

.gitignore

@@ -7,4 +7,5 @@ scratch.md
 *~undo-tree~
 .env.*
 .DS_Store
-/file_cache/
+
+/coverage

Dockerfile

@@ -1,7 +1,23 @@
-FROM ghcr.io/samvera/hyku/base:latest as hyku-web
+FROM ghcr.io/samvera/hyku/base:latest as hyku-knap-base
 
 # This is specifically NOT $APP_PATH but the parent directory
 COPY --chown=1001:101 . /app/samvera
+ENV BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
+ENV BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true
+
+# Ensure root permissions for installing Tesseract data
+USER root
+
+# Install "best" training data for Tesseract
+RUN echo "📚 Installing Tesseract Best (training data)!" && \
+    wget https://github.com/tesseract-ocr/tessdata_best/raw/main/eng.traineddata -O /usr/share/tessdata/eng_best.traineddata
+
+# Switch back to the non-root user for running the application
+USER app
+
+FROM hyku-knap-base as hyku-web
+RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DB_URL='postgresql://fake' bundle exec rake assets:precompile && yarn install
+
 CMD ./bin/web
 
 FROM hyku-web as hyku-worker

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
@@ -6,3 +8,11 @@ gemspec
 
 # Start debugger with binding.b [https://github.com/ruby/debug]
 # gem "debug", ">= 1.0.0"
+
+gemfile_path = File.expand_path("hyrax-webapp/Gemfile", __dir__)
+if File.exist?(gemfile_path)
+  gemfile = File.read(gemfile_path).split("\n").reject { |l| l.match('knapsack') }
+  # rubocop:disable Security/Eval
+  eval(gemfile.join("\n"), binding)
+  # rubocop:enable Security/Eval
+end

LICENSE

@@ -1,15 +1,205 @@
-Copyright 2023 The Assay Depot Inc.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-Additional copyright may be held by others, as reflected in the commit history.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   1. Definitions.
 
-   http://www.apache.org/licenses/LICENSE-2.0
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2012 Penn State University
+   Copyright 2013 University of Notre Dame, Northwestern University, and Data Curation Experts
+   Copyright 2014 Data Curation Experts
+   Additional copyright may be held by others, as reflected in the commit log
+
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

app/controllers/hyku_knapsack/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HykuKnapsack
   class ApplicationController < ActionController::Base
   end

app/helpers/hyku_knapsack/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HykuKnapsack
   module ApplicationHelper
   end

app/jobs/hyku_knapsack/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HykuKnapsack
   class ApplicationJob < ActiveJob::Base
   end

app/mailers/hyku_knapsack/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HykuKnapsack
   class ApplicationMailer < ActionMailer::Base
     default from: "[email protected]"

app/models/hyku_knapsack/application_record.rb

@@ -1,4 +1,6 @@
-module HykuKnapsac
+# frozen_string_literal: true
+
+module HykuKnapsack
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
   end

bin/knapsacker

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby -wU
 
-# The purpose of this script is to quickly assess which files should:
+# The purpose of this script is to quickly assess which specs should:
 #
 # - be removed (e.g. duplicate in Knapsack and Hyku)
 # - be reviewed (e.g. differences between Knapsack and Hyku)
@@ -65,11 +65,10 @@ end
 
 # TODO: This is not generally working.
 dir_glob_patterns_to_check.each do |pattern|
-  Dir.glob(File.join(yours, pattern)).each do |your_path|
-    path = your_path.sub(File.join(yours, '/'), '')
-    upstream_path = File.join(upstream, path)
-    if File.exist?(upstream_path)
-      results = `diff #{your_path} #{upstream_path}`.strip
+  Dir.glob(pattern).each do |path|
+    hyku_path = File.join(upstream, path)
+    if File.exist?(hyku_path)
+      results = `diff #{path} #{hyku_path}`.strip
       if results.empty?
         duplicates << path
       else
@@ -95,7 +94,7 @@ end
 puts ""
 
 puts "------------------------------------------------------------------"
-puts "Files in \"yours\" that are exact duplicates of \"upstream\" files"
+puts "Files in your Hyku that are exact duplicates of upstream Hyku file"
 puts "They are prefixed with a `='"
 puts "------------------------------------------------------------------"
 duplicates.each do |path|
@@ -108,7 +107,7 @@ end
 puts ""
 
 puts "----------------------------------------------------"
-puts "Files that are in \"yours\" but not in \"upstream\" "
+puts "Files that are in your Hyku but not in upstream Hyku"
 puts "They are prefixed with a `+'"
 puts "----------------------------------------------------"
 in_yours_but_not_in_upstream.each do |path|
@@ -118,7 +117,7 @@ end
 puts ""
 
 puts "-------------------------------------------------------------"
-puts "Files that are changed in \"yours\" relative to \"upstream\""
+puts "Files that are changed in your Hyku relative to upstream Hyku"
 puts "They are prefixed with a `Δ'"
 puts "-------------------------------------------------------------"
 changed_in_yours.each do |path|

bin/rails

@@ -1,24 +1,4 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails gems
-# installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path("..", __dir__)
-ENGINE_PATH = File.expand_path("../lib/hyku_knapsack/engine", __dir__)
-APP_PATH = File.expand_path("../hyrax-webapp/config/application", __dir__)
-
-# Set up gems listed in the Gemfile.
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
-require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
-
-require "rails"
-# Pick the frameworks you want:
-require "active_model/railtie"
-require "active_job/railtie"
-require "active_record/railtie"
-require "active_storage/engine"
-require "action_controller/railtie"
-require "action_mailer/railtie"
-require "action_view/railtie"
-require "action_cable/engine"
-# require "rails/test_unit/railtie"
-require "rails/engine/commands"
+APP_PATH = File.expand_path('../config/application', __dir__)
+require_relative '../config/boot'
+require 'rails/commands'

db-migrate-seed.sh

@@ -10,7 +10,6 @@ db-wait.sh "$SOLR_HOST:$SOLR_PORT"
 migrations_run=`PGPASSWORD=$DB_PASSWORD psql -h $DB_HOST -U $DB_USER $DB_NAME -t -c "SELECT version FROM schema_migrations ORDER BY schema_migrations" | wc -c`
 migrations_fs=`ls -l db/migrate/ | awk '{print $9}' | grep -o '[0-9]\+' | wc -c`
 if [[ "$migrations_run" -lt "$migrations_fs" ]]; then
-    bundle
     bundle exec rails db:create
     bundle exec rails db:migrate
     bundle exec rails db:seed