Drop the migrations dir--everything now rolled into the backend.

archivesspace · Jan 6, 2014 · 09ef628 · 09ef628
1 parent 091399b
commit 09ef628
Show file tree

Hide file tree

Showing 56 changed files with 6 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,12 +23,9 @@ build/*.tmp
 build/.gem
 build/shared
 backend/tests/ladle-server*
-/migrations/examples/csv/accessions-sample.csv
 webdriver-profile*
 common/ARCHIVESSPACE_VERSION
-migrations/spec/doc.xml
 .yardoc
 API.md
-migrations/spec/ead.xml
 config/gemnasium.yml
 build/demo_db_backups
diff --git a/.yardopts b/.yardopts
@@ -13,11 +13,8 @@
 'common/*.rb'
 'common/db/*.rb'
 'common/schemas/*.rb'
-'migrations/lib/*.rb'
-'migrations/models/*.rb'
-'migrations/serializers/*.rb'
 -
 API.md
 ARCHITECTURE.md
 README_TOMCAT.md
-UPGRADING.md
+UPGRADING.md
diff --git a/_yard/yard-aspace.rb b/_yard/yard-aspace.rb
@@ -25,7 +25,7 @@
 class ASpaceYARD
   def self.subreadmes
     objects = []
-    Dir.glob('{frontend,backend,common,migrations}/**/*.md').each do |file|
+    Dir.glob('{frontend,backend,common}/**/*.md').each do |file|
       objects << YARD::CodeObjects::ExtraFileObject.new(file.gsub(/\//, '_').upcase, IO.read(file))
     end
     objects

diff --git a/backend/app/lib/export.rb b/backend/app/lib/export.rb
@@ -1,4 +1,4 @@
-require_relative "../../../migrations/lib/exporter"
+require_relative "../migrations/lib/exporter"
 
 module ExportHelpers
 

diff --git a/backend/app/main.rb b/backend/app/main.rb
@@ -54,8 +54,6 @@ def self.loaded_hook(&block)
     config.dont_reload File.join("app", "lib", "rest.rb")
     config.dont_reload File.join("**", "migrations", "*.rb")
     config.dont_reload File.join("**", "spec", "*.rb")
-    config.also_reload File.join("../", "migrations", "lib", "exporter.rb")
-    config.also_reload File.join("../", "migrations", "serializers", "*.rb")
 
     set :server, :puma
   end

diff --git a/migrations/Gemfile → backend/app/migrations/Gemfile b/migrations/Gemfile → backend/app/migrations/Gemfile
diff --git a/migrations/Gemfile.lock → backend/app/migrations/Gemfile.lock b/migrations/Gemfile.lock → backend/app/migrations/Gemfile.lock
diff --git a/migrations/examples/csv/do_tracer_v2.csv → .../migrations/examples/csv/do_tracer_v2.csv b/migrations/examples/csv/do_tracer_v2.csv → .../migrations/examples/csv/do_tracer_v2.csv
diff --git a/migrations/examples/eac/FRAF_P_00014.xml → .../migrations/examples/eac/FRAF_P_00014.xml b/migrations/examples/eac/FRAF_P_00014.xml → .../migrations/examples/eac/FRAF_P_00014.xml
diff --git a/migrations/examples/eac/RCR00174.xml → .../app/migrations/examples/eac/RCR00174.xml b/migrations/examples/eac/RCR00174.xml → .../app/migrations/examples/eac/RCR00174.xml
diff --git a/.../examples/eac/SIA_Charles_Walcott_EAC.xml → .../examples/eac/SIA_Charles_Walcott_EAC.xml b/.../examples/eac/SIA_Charles_Walcott_EAC.xml → .../examples/eac/SIA_Charles_Walcott_EAC.xml
diff --git a/...eac/eac.p020169_d20120621_t181718_906.xml → ...eac/eac.p020169_d20120621_t181718_906.xml b/...eac/eac.p020169_d20120621_t181718_906.xml → ...eac/eac.p020169_d20120621_t181718_906.xml
diff --git a/...feynman-richard-phillips-1918-1988-cr.xml → ...feynman-richard-phillips-1918-1988-cr.xml b/...feynman-richard-phillips-1918-1988-cr.xml → ...feynman-richard-phillips-1918-1988-cr.xml
diff --git a/...ster-richard-buckminster-1895-1983-cr.xml → ...ster-richard-buckminster-1895-1983-cr.xml b/...ster-richard-buckminster-1895-1983-cr.xml → ...ster-richard-buckminster-1895-1983-cr.xml
diff --git a/migrations/examples/eac/yale_cadell.xml → ...p/migrations/examples/eac/yale_cadell.xml b/migrations/examples/eac/yale_cadell.xml → ...p/migrations/examples/eac/yale_cadell.xml
diff --git a/migrations/examples/ead/afcu.xml → backend/app/migrations/examples/ead/afcu.xml b/migrations/examples/ead/afcu.xml → backend/app/migrations/examples/ead/afcu.xml
diff --git a/migrations/examples/ead/archon-tracer.xml → ...migrations/examples/ead/archon-tracer.xml b/migrations/examples/ead/archon-tracer.xml → ...migrations/examples/ead/archon-tracer.xml
diff --git a/migrations/examples/ead/at-tracer.xml → ...app/migrations/examples/ead/at-tracer.xml b/migrations/examples/ead/at-tracer.xml → ...app/migrations/examples/ead/at-tracer.xml
diff --git a/migrations/examples/ead/ferris.xml → ...nd/app/migrations/examples/ead/ferris.xml b/migrations/examples/ead/ferris.xml → ...nd/app/migrations/examples/ead/ferris.xml
diff --git a/migrations/examples/ead/hornstein.xml → ...app/migrations/examples/ead/hornstein.xml b/migrations/examples/ead/hornstein.xml → ...app/migrations/examples/ead/hornstein.xml
diff --git a/migrations/examples/ead/voorhis.xml → ...d/app/migrations/examples/ead/voorhis.xml b/migrations/examples/ead/voorhis.xml → ...d/app/migrations/examples/ead/voorhis.xml
diff --git a/migrations/examples/ead/wegmann.xml → ...d/app/migrations/examples/ead/wegmann.xml b/migrations/examples/ead/wegmann.xml → ...d/app/migrations/examples/ead/wegmann.xml
diff --git a/migrations/examples/ead/wnyu.xml → backend/app/migrations/examples/ead/wnyu.xml b/migrations/examples/ead/wnyu.xml → backend/app/migrations/examples/ead/wnyu.xml
diff --git a/...ions/examples/marc/american-communist.xml → ...ions/examples/marc/american-communist.xml b/...ions/examples/marc/american-communist.xml → ...ions/examples/marc/american-communist.xml
diff --git a/...ations/examples/marc/at-tracer-marc-1.xml → ...ations/examples/marc/at-tracer-marc-1.xml b/...ations/examples/marc/at-tracer-marc-1.xml → ...ations/examples/marc/at-tracer-marc-1.xml
diff --git a/migrations/examples/marc/samuel-morse.xml → ...migrations/examples/marc/samuel-morse.xml b/migrations/examples/marc/samuel-morse.xml → ...migrations/examples/marc/samuel-morse.xml
diff --git a/migrations/examples/marc/sula-benet.xml → ...p/migrations/examples/marc/sula-benet.xml b/migrations/examples/marc/sula-benet.xml → ...p/migrations/examples/marc/sula-benet.xml
diff --git a/migrations/lib/exporter.rb → backend/app/migrations/lib/exporter.rb b/migrations/lib/exporter.rb → backend/app/migrations/lib/exporter.rb
diff --git a/migrations/lib/utils.rb → backend/app/migrations/lib/utils.rb b/migrations/lib/utils.rb → backend/app/migrations/lib/utils.rb
diff --git a/migrations/models/dc.rb → backend/app/migrations/models/dc.rb b/migrations/models/dc.rb → backend/app/migrations/models/dc.rb
diff --git a/migrations/models/eac.rb → backend/app/migrations/models/eac.rb b/migrations/models/eac.rb → backend/app/migrations/models/eac.rb
diff --git a/migrations/models/ead.rb → backend/app/migrations/models/ead.rb b/migrations/models/ead.rb → backend/app/migrations/models/ead.rb
diff --git a/migrations/models/labels.rb → backend/app/migrations/models/labels.rb b/migrations/models/labels.rb → backend/app/migrations/models/labels.rb
diff --git a/migrations/models/marc21.rb → backend/app/migrations/models/marc21.rb b/migrations/models/marc21.rb → backend/app/migrations/models/marc21.rb
diff --git a/migrations/models/mets.rb → backend/app/migrations/models/mets.rb b/migrations/models/mets.rb → backend/app/migrations/models/mets.rb
diff --git a/migrations/models/mods.rb → backend/app/migrations/models/mods.rb b/migrations/models/mods.rb → backend/app/migrations/models/mods.rb
diff --git a/migrations/rakefile.rb → backend/app/migrations/rakefile.rb b/migrations/rakefile.rb → backend/app/migrations/rakefile.rb
diff --git a/migrations/scripts/ead_merge.rb → backend/app/migrations/scripts/ead_merge.rb b/migrations/scripts/ead_merge.rb → backend/app/migrations/scripts/ead_merge.rb
diff --git a/migrations/scripts/validate.rb → backend/app/migrations/scripts/validate.rb b/migrations/scripts/validate.rb → backend/app/migrations/scripts/validate.rb
diff --git a/migrations/serializers/dc.rb → backend/app/migrations/serializers/dc.rb b/migrations/serializers/dc.rb → backend/app/migrations/serializers/dc.rb
diff --git a/migrations/serializers/eac.rb → backend/app/migrations/serializers/eac.rb b/migrations/serializers/eac.rb → backend/app/migrations/serializers/eac.rb
diff --git a/migrations/serializers/ead.rb → backend/app/migrations/serializers/ead.rb b/migrations/serializers/ead.rb → backend/app/migrations/serializers/ead.rb
diff --git a/migrations/serializers/marc21.rb → backend/app/migrations/serializers/marc21.rb b/migrations/serializers/marc21.rb → backend/app/migrations/serializers/marc21.rb
diff --git a/migrations/serializers/mets.rb → backend/app/migrations/serializers/mets.rb b/migrations/serializers/mets.rb → backend/app/migrations/serializers/mets.rb
diff --git a/migrations/serializers/mods.rb → backend/app/migrations/serializers/mods.rb b/migrations/serializers/mods.rb → backend/app/migrations/serializers/mods.rb
diff --git a/migrations/serializers/tsv.rb → backend/app/migrations/serializers/tsv.rb b/migrations/serializers/tsv.rb → backend/app/migrations/serializers/tsv.rb
diff --git a/migrations/xsd/cpf.xsd → backend/app/migrations/xsd/cpf.xsd b/migrations/xsd/cpf.xsd → backend/app/migrations/xsd/cpf.xsd
diff --git a/migrations/xsd/mets.xsd → backend/app/migrations/xsd/mets.xsd b/migrations/xsd/mets.xsd → backend/app/migrations/xsd/mets.xsd
diff --git a/migrations/xsd/mods.xsd → backend/app/migrations/xsd/mods.xsd b/migrations/xsd/mods.xsd → backend/app/migrations/xsd/mods.xsd
diff --git a/migrations/xsd/simpledc.xsd → backend/app/migrations/xsd/simpledc.xsd b/migrations/xsd/simpledc.xsd → backend/app/migrations/xsd/simpledc.xsd
diff --git a/backend/spec/lib_ead_converter_spec.rb b/backend/spec/lib_ead_converter_spec.rb
@@ -37,7 +37,7 @@
   describe "EAD Import Mappings" do
 
     def convert_test_file
-      converter = EADConverter.new(File.expand_path("../../migrations/examples/ead/at-tracer.xml", File.dirname(__FILE__)))
+      converter = EADConverter.new(File.expand_path("../app/migrations/examples/ead/at-tracer.xml", File.dirname(__FILE__)))
       converter.run
       parsed = JSON(IO.read(converter.get_output_path))
 

diff --git a/backend/spec/lib_marcxml_converter_spec.rb b/backend/spec/lib_marcxml_converter_spec.rb
@@ -109,7 +109,7 @@
 
 
     def convert_test_file
-      converter = MarcXMLConverter.new(File.expand_path("../../migrations/examples/marc/at-tracer-marc-1.xml", File.dirname(__FILE__)))
+      converter = MarcXMLConverter.new(File.expand_path("../app/migrations/examples/marc/at-tracer-marc-1.xml", File.dirname(__FILE__)))
       converter.run
       parsed = JSON(IO.read(converter.get_output_path))
 

diff --git a/build/build.xml b/build/build.xml
@@ -96,7 +96,6 @@
     <antcall target="bundler"><param name="gemfile" value="../frontend/Gemfile" /></antcall>
     <antcall target="bundler"><param name="gemfile" value="../selenium/Gemfile" /></antcall>
     <antcall target="bundler"><param name="gemfile" value="../_yard/Gemfile" /></antcall>
-    <antcall target="bundler"><param name="gemfile" value="../migrations/Gemfile" /></antcall>
     <antcall target="bundler"><param name="gemfile" value="../public/Gemfile" /></antcall>
     <antcall target="bundler"><param name="gemfile" value="../selenium-public/Gemfile" /></antcall>
     <antcall target="bundler"><param name="gemfile" value="../indexer/Gemfile" /></antcall>
@@ -338,30 +337,6 @@
   </target>
 
 
-  <!-- Migrations -->
-  <target name="migrations:import:help" description="Show help for import in the migrations module">
-    <java classpath="${jruby_file}" classname="org.jruby.Main" fork="true" 
-          failonerror="true"
-          dir="../migrations">
-      <jvmarg line="${default_java_options} ${env.JAVA_OPTS}"/>
-      <env key="GEM_HOME" value="${gem_home}" />
-      <env key="GEM_PATH" value="" />
-      <arg line="--1.9 ./import.rb --help" />
-    </java>
-  </target>
-
-  <target name="migrations:import:list" description="List available importers in the migrations module">
-    <java classpath="${jruby_file}" classname="org.jruby.Main" fork="true" 
-          failonerror="true"
-          dir="../migrations">
-      <jvmarg line="${default_java_options} ${env.JAVA_OPTS}"/>
-      <env key="GEM_HOME" value="${gem_home}" />
-      <env key="GEM_PATH" value="" />
-      <arg line="--1.9 ./import.rb --list-importers" />
-    </java>
-  </target>
-
-
   <!-- Selenium -->
   <target name="selenium:test" depends="set-classpath, frontend:clean" description="Run the Selenium tests">
     <property name="spec" value=""/>

diff --git a/common/aspace_coverage.rb b/common/aspace_coverage.rb
@@ -16,7 +16,6 @@ def self.start(test_name, env = nil)
       add_filter "common/spec"
       add_filter "backend/spec"
       add_filter "backend/tests"
-      add_filter "migrations/spec"
       add_filter "frontend/spec"
       add_filter "selenium"
     end

diff --git a/frontend/config/warble.rb b/frontend/config/warble.rb
@@ -11,7 +11,7 @@
   config.features = []
 
   # Application directories to be included in the webapp.
-  config.dirs = %w(app config lib log vendor tmp ../migrations)
+  config.dirs = %w(app config lib log vendor tmp)
 
   # Additional files/directories to include, above those in config.dirs
   #

diff --git a/public/config/boot.rb b/public/config/boot.rb
@@ -8,5 +8,3 @@
 ASpaceGems.setup
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-
-$:.unshift File.join(File.dirname(__FILE__), "../../migrations/lib")