Skip to content

Commit

Permalink
🧹 renames scientst-softserv => notch8 (#2405)
Browse files Browse the repository at this point in the history
* 🧹 renames scientst-softserve => notch8

renames all instances of scientist-softserv to notch8 due to company transition changes

* Update Gemfile.lock
  • Loading branch information
ShanaLMoore authored Jan 10, 2025
1 parent 1efcc99 commit 45ea8dc
Show file tree
Hide file tree
Showing 14 changed files with 63 additions and 63 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ on:
inputs:
debug_enabled:
type: boolean
description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
description: "Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)"
required: false
default: false

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
secrets: inherit
with:
platforms: "linux/amd64,linux/arm64"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-test-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
secrets: inherit
with:
platforms: "linux/amd64" # "linux/amd64,linux/arm64"
Expand All @@ -37,20 +37,20 @@ jobs:

lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
webTarget: hyku-web
workerTarget: hyku-worker
rubocop_cmd: "bundle exec rubocop --parallel --format progress"

test:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
confdir: "/app/samvera/hyrax-webapp/solr/conf"
rspec_cmd: "gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"

reports:
if: always()
needs: [test, lint]
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
steps:
- id: setup
name: Setup
uses: scientist-softserv/actions/[email protected]
uses: notch8/actions/[email protected]
with:
tag: ${{ inputs.tag }}
image_name: ${{ inputs.image_name }}
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ gem 'active-fedora', '~> 14.0'
gem 'activerecord-nulldb-adapter'
gem 'activesupport', '>= 4.2.0', group: %i[development test]
gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postrank-uri/issues/49 is fixed
gem 'apartment', github: 'scientist-softserv/apartment', branch: 'development'
gem 'apartment', github: 'notch8/apartment', branch: 'development'
gem 'aws-sdk-sqs', group: %i[aws]
gem 'bixby', group: %i[development test]
gem 'blacklight', '~> 7.29'
Expand Down Expand Up @@ -58,7 +58,7 @@ gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade'
gem 'i18n-debug', require: false, group: %i[development test]
gem 'i18n-tasks', group: %i[development test]
gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'main'
gem 'iiif_print', github: 'notch8/iiif_print', branch: 'main'
gem 'jbuilder', '~> 2.5'
gem 'jquery-rails' # Use jquery as the JavaScript library
gem 'openssl', '>= 3.2.0'
Expand Down Expand Up @@ -121,7 +121,7 @@ gem 'valkyrie-shrine'
gem 'web-console', '>= 3.3.0', group: %i[development] # <%= console %> in views
gem 'webdrivers', '~> 4.7.0', group: %i[test]
gem 'webmock', group: %i[test]
gem 'willow_sword', github: 'scientist-softserv/willow_sword', branch: 'main'
gem 'willow_sword', github: 'notch8/willow_sword', branch: 'main'

# Enabling the following gem breaks sidekiq. To Enable: assets.debug must be set to true in config/development.rb
# gem "xray-rails", git: "https://github.com/brentd/xray-rails.git", branch: "bugs/ruby-3.0.0", group: %i[development]
Expand Down
66 changes: 33 additions & 33 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,39 @@ GIT
aws-sdk-sqs (~> 1)
rails (>= 4.2)

GIT
remote: https://github.com/notch8/apartment.git
revision: 9ad4b0ef2ee6debb956e86ef9e7095c8358fef5e
branch: development
specs:
apartment (2.2.1)
activerecord (>= 3.1.2, < 7.0)
parallel (>= 0.7.1)
public_suffix (>= 2)
rack (>= 1.3.6)

GIT
remote: https://github.com/notch8/iiif_print.git
revision: acef382ce710d6aad63e11cfa83b5803a9f30fa2
branch: main
specs:
iiif_print (3.0.1)
blacklight_iiif_search (>= 1.0, < 3.0)
derivative-rodeo (~> 0.5)
hyrax (>= 2.5, < 6)
nokogiri (>= 1.13.2)
rdf-vocab (~> 3.0)

GIT
remote: https://github.com/notch8/willow_sword.git
revision: e4edebde9a29636d74c794efca423535db296880
branch: main
specs:
willow_sword (0.2.0)
bagit (~> 0.4)
rails (~> 6.1)
rubyzip (>= 1.0.0)

GIT
remote: https://github.com/rails/rails.git
revision: d16199e507086e3d54d94253b7e1d87ead394d9f
Expand Down Expand Up @@ -181,39 +214,6 @@ GIT
valkyrie (~> 3.3)
view_component (~> 2.74.1)

GIT
remote: https://github.com/scientist-softserv/apartment.git
revision: 9ad4b0ef2ee6debb956e86ef9e7095c8358fef5e
branch: development
specs:
apartment (2.2.1)
activerecord (>= 3.1.2, < 7.0)
parallel (>= 0.7.1)
public_suffix (>= 2)
rack (>= 1.3.6)

GIT
remote: https://github.com/scientist-softserv/iiif_print.git
revision: acef382ce710d6aad63e11cfa83b5803a9f30fa2
branch: main
specs:
iiif_print (3.0.1)
blacklight_iiif_search (>= 1.0, < 3.0)
derivative-rodeo (~> 0.5)
hyrax (>= 2.5, < 6)
nokogiri (>= 1.13.2)
rdf-vocab (~> 3.0)

GIT
remote: https://github.com/scientist-softserv/willow_sword.git
revision: e4edebde9a29636d74c794efca423535db296880
branch: main
specs:
willow_sword (0.2.0)
bagit (~> 0.4)
rails (~> 6.1)
rubyzip (>= 1.0.0)

GIT
remote: https://github.com/stanhu/omniauth-cas.git
revision: 4211e6d05941b4a981f9a36b49ec166cecd0e271
Expand Down
2 changes: 1 addition & 1 deletion app/jobs/create_large_derivatives_job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# @see CreateDerivativesJobDecorator
# @see Hydra::Derivatives::Processors::Ffmpeg
# @see https://github.com/scientist-softserv/palni-palci/issues/852
# @see https://github.com/notch8/palni-palci/issues/852
class CreateLargeDerivativesJob < CreateDerivativesJob
queue_as :auxiliary
end
2 changes: 1 addition & 1 deletion app/models/sushi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def coerce_author(params = {})
return true unless params.key?(:author)
@author = params[:author]

# See https://github.com/scientist-softserv/palni-palci/issues/721#issuecomment-1734215004 for details of this little nuance
# See https://github.com/notch8/palni-palci/issues/721#issuecomment-1734215004 for details of this little nuance
raise Sushi::Error::InvalidReportFilterValueError.new(data: "You may not query for multiple authors (as specified by the `#{DELIMITER}' delimiter.)") if @author.include?(DELIMITER)

# rubocop:disable Layout/LineLength
Expand Down
2 changes: 1 addition & 1 deletion app/models/sushi/platform_report.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def attribute_performance_for_resource_types
# We want to consider "or" behavior for multiple metric_types. Namely if you specify any
# metric type (other than Searches_Platform) you're going to get results.
#
# See https://github.com/scientist-softserv/palni-palci/issues/686#issuecomment-1785326034
# See https://github.com/notch8/palni-palci/issues/686#issuecomment-1785326034
return [] if metric_type_in_params && (metric_types & (ALLOWED_METRIC_TYPES - ['Searches_Platform'])).count.zero?

data_for_resource_types.map do |record|
Expand Down
2 changes: 1 addition & 1 deletion app/presenters/hyrax/collection_presenter_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def collection_featurable?
#
# @return [String]
#
# @see https://github.com/scientist-softserv/palni-palci/issues/951
# @see https://github.com/notch8/palni-palci/issues/951
# @see https://github.com/samvera/hyku/issues/1815
def collection_type_badge
return "" unless Site.account&.present?
Expand Down
2 changes: 1 addition & 1 deletion app/services/hyrax/work_uploads_handler_decorator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module WorkUploadsHandlerDecorator
##
# OVERRIDE
#
# @see https://github.com/scientist-softserv/palni-palci/blob/29f7e331a76751cf2c237e7fb2121bea38a9056b/app/jobs/attach_files_to_work_job.rb#L22
# @see https://github.com/notch8/palni-palci/blob/29f7e331a76751cf2c237e7fb2121bea38a9056b/app/jobs/attach_files_to_work_job.rb#L22
def file_set_args(file)
hash = super
# NOTE: The respond to is me (Jeremy) being cautios. I checked the
Expand Down
16 changes: 8 additions & 8 deletions app/services/iiif_print/tenant_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ module IiifPrint
# it is hopefully easier to understand the configuration requirements and scope to this
# change. At some point, this might make sense to bring into IIIF Print directly.
#
# @see https://github.com/scientist-softserv/palni-palci/issues/656 palni-palci#656
# @see https://github.com/scientist-softserv/palni-palci/issues/657 palni-palci#657
# @see https://github.com/scientist-softserv/palni-palci/issues/658 palni-palci#658
# @see https://github.com/scientist-softserv/palni-palci/issues/659 palni-palci#659
# @see https://github.com/notch8/palni-palci/issues/656 palni-palci#656
# @see https://github.com/notch8/palni-palci/issues/657 palni-palci#657
# @see https://github.com/notch8/palni-palci/issues/658 palni-palci#658
# @see https://github.com/notch8/palni-palci/issues/659 palni-palci#659
module TenantConfig
##
# When we were not planning on calling the underlying IiifPrint service but did due to some kind
Expand Down Expand Up @@ -94,8 +94,8 @@ def iiif_print_service_instance
# derivative_service_plugins: [ IiifPrint::TextExtractionDerivativeService ])
# end
#
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring
# @see https://github.com/scientist-softserv/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print.rb#L86-L138 Documentation for configuring
# @see https://github.com/notch8/adventist-dl/blob/d7676bdac2c672f09b28086d7145b68306978950/app/models/image.rb#L14-L20 Example implementation
module PdfSplitter
mattr_accessor :iiif_print_splitter
self.iiif_print_splitter = ::IiifPrint::SplitPdfs::PagesToJpgsSplitter
Expand All @@ -115,7 +115,7 @@ def self.call(*args)
end

##
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/split_pdfs/child_work_creation_from_pdf_service.rb#L10-L46 Interface of FileSetActor#service
module SkipSplittingPdfService
##
# @return [Symbol] Always :tenant_does_not_split_pdfs
Expand All @@ -134,7 +134,7 @@ def self.conditionally_enqueue(*_args)
# a relatively singular place for all of the configurations.
module FileSetActorDecorator
##
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/app/actors/iiif_print/actors/file_set_actor_decorator.rb#L33-L35 Method we're overriding
def service
return TenantConfig::SkipSplittingPdfService unless TenantConfig.use_iiif_print?

Expand Down
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module Hyku
# @see https://sentry.io/organizations/scientist-inc/issues/3773392603/?project=6745020&query=is%3Aunresolved&referrer=issue-stream
# @see https://github.com/samvera-labs/bulkrax/pull/689
# @see https://github.com/samvera-labs/bulkrax/issues/688
# @see https://github.com/scientist-softserv/adventist-dl/issues/179
# @see https://github.com/notch8/adventist-dl/issues/179
def self.utf_8_encode(string)
string
.encode(Encoding.find('UTF-8'), invalid: :replace, undef: :replace, replace: "?")
Expand Down Expand Up @@ -418,7 +418,7 @@ def self.work_types
##
# This needs to be in the after initialize so that the IiifPrint gem can do it's decoration.
#
# @see https://github.com/scientist-softserv/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/engine.rb#L54 Where we do the override.
# @see https://github.com/notch8/iiif_print/blob/9e7837ce4bd08bf8fff9126455d0e0e2602f6018/lib/iiif_print/engine.rb#L54 Where we do the override.
Hyrax::Actors::FileSetActor.prepend(IiifPrint::TenantConfig::FileSetActorDecorator)
Hyrax::WorkShowPresenter.prepend(IiifPrint::TenantConfig::WorkShowPresenterDecorator)
end
Expand Down
2 changes: 1 addition & 1 deletion spec/controllers/hyrax/homepage_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
end
end

xcontext "without solr" do # skip: see https://github.com/scientist-softserv/palni-palci/issues/154
xcontext "without solr" do # skip: see https://github.com/notch8/palni-palci/issues/154
before do
allow_any_instance_of(Hyrax::SearchService).to receive(:search_results).and_raise Blacklight::Exceptions::InvalidRequest
end
Expand Down
8 changes: 4 additions & 4 deletions spec/features/feature_flag_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# rubocop:enable RSpec/LetSetup

context 'as a repository admin' do
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933'
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933'
it 'has a setting for featured works' do
login_as admin
visit 'admin/features'
Expand All @@ -46,7 +46,7 @@
expect(page).to have_content 'Pandas'
end

skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933'
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933'
it 'has a setting for recently uploaded' do
login_as admin
visit 'admin/features'
Expand All @@ -65,7 +65,7 @@
expect(page).to have_css('div#recently_uploaded')
end

skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933'
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933'
it 'has settings for the default PDF viewer with a custom toggle switch' do
login_as admin
visit 'admin/features'
Expand All @@ -78,7 +78,7 @@
end

context 'when all home tabs and share work features are turned off' do
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/scientist-softserv/palni-palci/issues/933'
skip 'TODO: This consistently fails the CI pipeline, but passes locally. https://github.com/notch8/palni-palci/issues/933'
it 'the page only shows the collections tab' do
login_as admin
visit 'admin/features'
Expand Down

0 comments on commit 45ea8dc

Please sign in to comment.