datadryad · ryscher · May 28, 2024 · May 28, 2024 · May 28, 2024
diff --git a/.gitignore b/.gitignore
@@ -19,8 +19,8 @@ public/uploads/
 uploads/
 reports/
 test-reports/
-stash/script/counter-uploader/reports/*.json
-stash/script/counter-uploader/tmp/*.json
+script/stash/counter-uploader/reports/*.json
+script/stash/counter-uploader/tmp/*.json
 
 # notifier state which is shared/linked and not comitted
 config/notifier_state.json

diff --git a/Gemfile b/Gemfile
@@ -13,13 +13,6 @@ gem 'react-rails', '~> 2.6.2'
 gem 'sprockets', '~> 3.0' # going to 4 breaks lots of things unless doing manual upgrade of files
 gem 'webpacker', '6.0.0.rc.6'
 
-# ############################################################
-# Local engines
-
-path 'stash' do
-  gem 'stash-wrapper'
-end
-
 # ############################################################
 # Deployment
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,13 +14,6 @@ GIT
     jquery-ui-rails (7.0.0)
       railties (>= 3.2.16)
 
-PATH
-  remote: stash
-  specs:
-    stash-wrapper (0.1.16)
-      typesafe_enum (~> 0.1.9)
-      xml-mapping_extensions (~> 0.4.9)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -886,7 +879,6 @@ DEPENDENCIES
   spring
   spring-commands-rspec
   sprockets (~> 3.0)
-  stash-wrapper!
   stripe (~> 5.50.0)
   sync (~> 0.5.0)
   tins (~> 1.31.0)

diff --git a/documentation/counter_stats.md b/documentation/counter_stats.md
@@ -36,7 +36,7 @@ lots of workarounds in place.
 
 ## The Counter Uploader tool
 
-We reworked the [counter-uploader](../stash/script/counter-uploader/readme.md) so that it can independently
+We reworked the [counter-uploader](../script/stash/counter-uploader/readme.md) so that it can independently
 upload counter files outside of the Python tool.  (At least for the time being) the idea
 is that we'll process the counter files, populate numbers into our daatabase manually and
 then once a month we can upload any missing reports to DataCite.  The tool should be

diff --git a/lib/stash/repo/stash_wrapper_builder.rb b/lib/stash/repo/stash_wrapper_builder.rb
@@ -1,5 +1,3 @@
-require 'stash/wrapper'
-
 module Stash
   module Repo
     class StashWrapperBuilder < ValidatingXMLBuilder

diff --git a/...per/lib/stash/wrapper/descriptive_node.rb → lib/stash/wrapper/descriptive_node.rb b/...per/lib/stash/wrapper/descriptive_node.rb → lib/stash/wrapper/descriptive_node.rb
diff --git a/...tash-wrapper/lib/stash/wrapper/embargo.rb → lib/stash/wrapper/embargo.rb b/...tash-wrapper/lib/stash/wrapper/embargo.rb → lib/stash/wrapper/embargo.rb
@@ -1,5 +1,4 @@
 require 'xml/mapping_extensions'
-require 'stash/wrapper/embargo_type'
 
 module Stash
   module Wrapper

diff --git a/...wrapper/lib/stash/wrapper/embargo_type.rb → lib/stash/wrapper/embargo_type.rb b/...wrapper/lib/stash/wrapper/embargo_type.rb → lib/stash/wrapper/embargo_type.rb
diff --git a/...h-wrapper/lib/stash/wrapper/identifier.rb → lib/stash/wrapper/identifier.rb b/...h-wrapper/lib/stash/wrapper/identifier.rb → lib/stash/wrapper/identifier.rb
@@ -1,5 +1,4 @@
 require 'xml/mapping_extensions'
-require 'stash/wrapper/identifier_type'
 
 module Stash
   module Wrapper

diff --git a/...pper/lib/stash/wrapper/identifier_type.rb → lib/stash/wrapper/identifier_type.rb b/...pper/lib/stash/wrapper/identifier_type.rb → lib/stash/wrapper/identifier_type.rb
diff --git a/...sh-wrapper/lib/stash/wrapper/inventory.rb → lib/stash/wrapper/inventory.rb b/...sh-wrapper/lib/stash/wrapper/inventory.rb → lib/stash/wrapper/inventory.rb
@@ -1,5 +1,4 @@
 require 'xml/mapping'
-require 'stash/wrapper/stash_file'
 
 module Stash
   module Wrapper

diff --git a/...tash-wrapper/lib/stash/wrapper/license.rb → lib/stash/wrapper/license.rb b/...tash-wrapper/lib/stash/wrapper/license.rb → lib/stash/wrapper/license.rb
diff --git a/...h/stash-wrapper/lib/stash/wrapper/size.rb → lib/stash/wrapper/size.rb b/...h/stash-wrapper/lib/stash/wrapper/size.rb → lib/stash/wrapper/size.rb
@@ -1,5 +1,4 @@
 require 'xml/mapping'
-require 'stash/wrapper/size_unit'
 
 module Stash
   module Wrapper

diff --git a/...sh-wrapper/lib/stash/wrapper/size_unit.rb → lib/stash/wrapper/size_unit.rb b/...sh-wrapper/lib/stash/wrapper/size_unit.rb → lib/stash/wrapper/size_unit.rb
diff --git a/...lib/stash/wrapper/stash_administrative.rb → lib/stash/wrapper/stash_administrative.rb b/...lib/stash/wrapper/stash_administrative.rb → lib/stash/wrapper/stash_administrative.rb
@@ -1,8 +1,4 @@
 require 'xml/mapping'
-require 'stash/wrapper/version'
-require 'stash/wrapper/license'
-require 'stash/wrapper/embargo'
-require 'stash/wrapper/inventory'
 
 module Stash
   module Wrapper

diff --git a/...h-wrapper/lib/stash/wrapper/stash_file.rb → lib/stash/wrapper/stash_file.rb b/...h-wrapper/lib/stash/wrapper/stash_file.rb → lib/stash/wrapper/stash_file.rb
diff --git a/...rapper/lib/stash/wrapper/stash_wrapper.rb → lib/stash/wrapper/stash_wrapper.rb b/...rapper/lib/stash/wrapper/stash_wrapper.rb → lib/stash/wrapper/stash_wrapper.rb
@@ -1,9 +1,5 @@
 require 'xml/mapping'
 
-require 'stash/wrapper/descriptive_node'
-require 'stash/wrapper/identifier'
-require 'stash/wrapper/stash_administrative'
-
 module Stash
   module Wrapper
     # Mapping for the root `<st:stash_wrapper>` element

diff --git a/...tash-wrapper/lib/stash/wrapper/version.rb → lib/stash/wrapper/version.rb b/...tash-wrapper/lib/stash/wrapper/version.rb → lib/stash/wrapper/version.rb
diff --git a/lib/tasks/counter.rake b/lib/tasks/counter.rake
@@ -111,9 +111,9 @@ namespace :counter do
     # RAILS_ENV=production REPORT_DIR="/my/report/dir" FORCE_SUBMISSION="2021-11" bundle exec rails counter:datacite_pusher
     $stdout.sync = true
 
-    require_relative '../../stash/script/counter-uploader/submitted_reports'
-    require_relative '../../stash/script/counter-uploader/uploader'
-    require_relative '../../stash/script/counter-uploader/utility_methods'
+    require_relative '../../script/stash/counter-uploader/submitted_reports'
+    require_relative '../../script/stash/counter-uploader/uploader'
+    require_relative '../../script/stash/counter-uploader/utility_methods'
 
     if ENV['REPORT_DIR'].blank?
       puts 'You must set an environment variable for REPORT_DIR to upload to DataCite.'

diff --git a/stash/script/README.md → script/stash/README.md b/stash/script/README.md → script/stash/README.md
diff --git a/stash/script/counter-uploader/readme.md → script/stash/counter-uploader/readme.md b/stash/script/counter-uploader/readme.md → script/stash/counter-uploader/readme.md
diff --git a/...ipt/counter-uploader/submitted_reports.rb → ...ash/counter-uploader/submitted_reports.rb b/...ipt/counter-uploader/submitted_reports.rb → ...ash/counter-uploader/submitted_reports.rb
diff --git a/stash/script/counter-uploader/reports/.keep → script/stash/counter-uploader/tmp/.keep b/stash/script/counter-uploader/reports/.keep → script/stash/counter-uploader/tmp/.keep
diff --git a/stash/script/counter-uploader/uploader.rb → script/stash/counter-uploader/uploader.rb b/stash/script/counter-uploader/uploader.rb → script/stash/counter-uploader/uploader.rb
diff --git a/...cript/counter-uploader/utility_methods.rb → ...stash/counter-uploader/utility_methods.rb b/...cript/counter-uploader/utility_methods.rb → ...stash/counter-uploader/utility_methods.rb
diff --git a/stash/script/log-analysis/README.md → script/stash/log-analysis/README.md b/stash/script/log-analysis/README.md → script/stash/log-analysis/README.md
diff --git a/stash/script/log-analysis/get_timings.rb → script/stash/log-analysis/get_timings.rb b/stash/script/log-analysis/get_timings.rb → script/stash/log-analysis/get_timings.rb
diff --git a/stash/script/mdc-to-log/.ruby-version → script/stash/mdc-to-log/.ruby-version b/stash/script/mdc-to-log/.ruby-version → script/stash/mdc-to-log/.ruby-version
diff --git a/stash/script/mdc-to-log/Gemfile → script/stash/mdc-to-log/Gemfile b/stash/script/mdc-to-log/Gemfile → script/stash/mdc-to-log/Gemfile
diff --git a/stash/script/mdc-to-log/Gemfile.lock → script/stash/mdc-to-log/Gemfile.lock b/stash/script/mdc-to-log/Gemfile.lock → script/stash/mdc-to-log/Gemfile.lock
diff --git a/stash/script/mdc-to-log/README.md → script/stash/mdc-to-log/README.md b/stash/script/mdc-to-log/README.md → script/stash/mdc-to-log/README.md
diff --git a/stash/script/mdc-to-log/main.rb → script/stash/mdc-to-log/main.rb b/stash/script/mdc-to-log/main.rb → script/stash/mdc-to-log/main.rb
diff --git a/stash/script/mdc-to-log/test.sh → script/stash/mdc-to-log/test.sh b/stash/script/mdc-to-log/test.sh → script/stash/mdc-to-log/test.sh
diff --git a/spec/lib/stash_datacite/indexing_resource_spec.rb b/spec/lib/stash_datacite/indexing_resource_spec.rb
@@ -1,5 +1,3 @@
-require_relative '../../../stash/spec_helpers/factory_helper'
-
 module Datacite
   module Mapping
 

diff --git a/spec/models/stash_engine/curation_activity_spec.rb b/spec/models/stash_engine/curation_activity_spec.rb
@@ -16,7 +16,6 @@
 #  index_stash_engine_curation_activities_on_resource_id_and_id  (resource_id,id)
 #
 require 'ostruct'
-require_relative '../../../stash/spec_helpers/factory_helper'
 require 'byebug'
 
 module StashEngine

diff --git a/spec/script/counter_uploader_spec.rb b/spec/script/counter_uploader_spec.rb
@@ -1,6 +1,6 @@
-require_relative '../../stash/script/counter-uploader/submitted_reports'
-require_relative '../../stash/script/counter-uploader/uploader'
-require_relative '../../stash/script/counter-uploader/utility_methods'
+require_relative '../../script/stash/counter-uploader/submitted_reports'
+require_relative '../../script/stash/counter-uploader/uploader'
+require_relative '../../script/stash/counter-uploader/utility_methods'
 require 'webmock/rspec'
 require 'byebug'
 require 'digest'

diff --git a/spec/support/resource_builder.rb b/spec/support/resource_builder.rb
@@ -1,5 +1,4 @@
 require 'datacite/mapping'
-require 'stash/wrapper'
 require 'time'
 
 # rubocop:disable Naming/AccessorMethodName

diff --git a/spec/tasks/dash_updater_spec.rb b/spec/tasks/dash_updater_spec.rb
@@ -1,6 +1,5 @@
 require 'ostruct'
 require_relative '../../lib/tasks/dash_updater'
-require_relative '../../stash/spec_helpers/factory_helper'
 require 'byebug'
 
 describe 'datacite_target:update_dash', type: :task do

diff --git a/stash/.gitignore b/stash/.gitignore
diff --git a/stash/.rubocop.yml b/stash/.rubocop.yml
diff --git a/stash/LICENSE.md b/stash/LICENSE.md
diff --git a/stash/README.md b/stash/README.md
diff --git a/stash/documentation/images/Screenshot from 2017-01-12 14-05-55.png b/stash/documentation/images/Screenshot from 2017-01-12 14-05-55.png
diff --git a/stash/documentation/images/Screenshot from 2017-01-12 14-06-35.png b/stash/documentation/images/Screenshot from 2017-01-12 14-06-35.png
diff --git a/stash/documentation/images/Screenshot from 2017-01-12 14-07-26.png b/stash/documentation/images/Screenshot from 2017-01-12 14-07-26.png
diff --git a/stash/documentation/images/Screenshot from 2017-01-12 14-12-32.png b/stash/documentation/images/Screenshot from 2017-01-12 14-12-32.png
diff --git a/stash/documentation/images/dash_home.png b/stash/documentation/images/dash_home.png
diff --git a/stash/documentation/images/dev_login1.png b/stash/documentation/images/dev_login1.png
diff --git a/stash/documentation/images/dev_login2.png b/stash/documentation/images/dev_login2.png
diff --git a/stash/documentation/images/explore1.png b/stash/documentation/images/explore1.png
diff --git a/stash/documentation/images/explore2.png b/stash/documentation/images/explore2.png
diff --git a/stash/documentation/images/explore3.png b/stash/documentation/images/explore3.png
diff --git a/stash/documentation/images/solr1.png b/stash/documentation/images/solr1.png
diff --git a/stash/documentation/images/solr2.png b/stash/documentation/images/solr2.png
diff --git a/stash/documentation/images/solr3.png b/stash/documentation/images/solr3.png
diff --git a/stash/documentation/images/solr4.png b/stash/documentation/images/solr4.png
diff --git a/stash/documentation/images/solr5.png b/stash/documentation/images/solr5.png
diff --git a/stash/documentation/images/solr6.png b/stash/documentation/images/solr6.png
diff --git a/stash/documentation/images/structure.png b/stash/documentation/images/structure.png