dor-services 4.12.2 → 4.12.3

data/config/certs/dlss-dev-test.crt

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC3zCCAccCCQC3NmcDpol4lzANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJV
+UzETMBEGA1UECBMKQ2FsaWZvcm5pYTERMA8GA1UEBxMIU3RhbmZvcmQxETAPBgNV
+BAoTCFN0YW5mb3JkMQ0wCwYDVQQLEwRETFNTMRQwEgYDVQQDEwtMeWJlclRlc3RD
+QTAeFw0xMTAyMjMxNjUzNTlaFw0yMTAyMjAxNjUzNTlaMHoxCzAJBgNVBAYTAlVT
+MRMwEQYDVQQIEwpDYWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UE
+ChMTU3RhbmZvcmQgVW5pdmVyc2l0eTENMAsGA1UECxMERExTUzEWMBQGA1UEAxMN
+ZGxzcy1kZXYtdGVzdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAl70WWl1c
+eC50SwKDCr+vhNFH9N+YdTzh3rIRVKzJFPKvNqkye0jwq9MApyEtQzdyk3eDInlK
+dOwKX0XpoLnzm9SgBIY714ojYKZMRPPaIc2k5D7mYgyAUYyWLTJnO93KH3PhMbZY
+79BrNIMaYu7FGu/SVqQB44j9VnlG36mpmUUCAwEAATANBgkqhkiG9w0BAQUFAAOC
+AQEAlAn5InW1y7GCH/I4t9FgL3nkaOkaO9EzdU8EGtQpQ3YuNqy7IWfqFUm0r06w
+C9CkvEeaZe2GhzQ0ppKXFGI/oWOxETQhgr50HUlXp6hb+zvgrgD1daKbeBCseYF3
+yni37BoPrmQbfA+kmrskRTPpxNnTyQqXCLF2IY+1oAsLC9LyZ3wit/x6oTHwFB6a
+ME/9gJ49UkXaHqvfXy76/qWCBjDZOgMlR0O2y4gi1NPR4+EvEuxcyaXqu9wvAnm2
+z+UPjqi8dBji8T5eWxtiqnawBN5457L80z9EGHCEADHzlyVFUVmHFbFCs/lTzQj7
+fDH+2wlD4o4TMaztLAE3IR6Gtg==
+-----END CERTIFICATE-----

data/config/certs/dlss-dev-test.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCXvRZaXVx4LnRLAoMKv6+E0Uf035h1POHeshFUrMkU8q82qTJ7
+SPCr0wCnIS1DN3KTd4MieUp07ApfRemgufOb1KAEhjvXiiNgpkxE89ohzaTkPuZi
+DIBRjJYtMmc73cofc+Extljv0Gs0gxpi7sUa79JWpAHjiP1WeUbfqamZRQIDAQAB
+AoGAT5Rgm8XpEDK01P4dQc7kO5ES3u9BYwMqJoRXKIRx9SWOFOnJyvSnHEZOSljR
+BzaWRZbhVHwuO4HrsqnU7HF5vAqWQvWfMFVnImIFnIY2hIai4MlB3HMljuosJ5jE
+RRWng6FcalWq5AeWM5hjNG0yhULhKN5y+AI9mHkzIlpWSsECQQDILiA2uSh7zLBa
+hcq2ODPfB42G9xJVXn4oxLdn2zlyKXWvVXoYWGMQWZnnxvrt75n4Iif1y6G/Imhq
+C6DenWXRAkEAwgz1QYd7Ei+Sl3adTtKRVe6jtXrD3JEA7/JtY+mcgCpD8fbUynsS
+7rFA4c8dIa5BkOSvp8kQWJ/Dl3uwnpt1NQJAKSZSOO2XBNvu5KzcHtku0Ioc7cGc
+YzApfvfxO8g05uLe7kwD7T0+H/5LRPoCWycF35wl2sEhXskT7bi2OQziAQJAWtak
+DMv2MdoxPlQZaaeqv1ZaLn9Mprj+flS3HpliWKDwc5l/nVWl1DUH0W0aDwU6zjAv
+hlTaIRKRBh2x3V2arQJBAIwzwimH6SDiXqZUZ5pBxX1GETNvegHeeIj0Bmu+jFhN
+0KDbvoWrJe0Hw1UpBlWiZdrD9Ht3mQdNiPyorL+DDJs=
+-----END RSA PRIVATE KEY-----

data/config/certs/robots-dor-dev.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE9zCCAt8CCQCcUJVDTu7rTjANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
+VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
+BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
+CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyNjE1
+NTQzNVoXDTIyMDkyNDE1NTQzNVowgboxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
+YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
+VW5pdmVyc2l0eTEyMDAGA1UEAxQpcm9ib3RzQHN1bC1seWJlcnNlcnZpY2VzLWRl
+di5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0BCQEWImRsc3MtZGV2ZWxvcGVyc0Bs
+aXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC1t+PPhLTDFQBuAf4f1GOj7jHdXMN0tvSHL1OCaibe0d8iKbXCMMIE0z8lbBpZ
+1pA+8terIvxoTlly92EEvGkywZb+DIxnjyG0b9ftDJ64pARJMcnvwJMW/w3WdHCd
+5uJ5HVM8ZCbEItUfskFukS6tfNBpG8ri6cIQ2ulJzOWYxPV5R2eRneM6vtFD0xtu
+RJb/uMwiOwB79qk4QazbEQtkeZsrvomDFkIuHO/nf9wmgYG99H7q1kXplIrzDDX+
+fvD+JHvuMr5YXfmBQ9wmaZf6YIL7CXj79HUF4uG/a0SjrLZyLh262zWJQFVpjSW8
+Brl/fAyjeZvWJMyCDXRqsedjAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAG0jIfTj
+1FJsxTzcD938vtKuNo5XEIX8phqW1MA2eJ5Ojgu1hpW5Jf7fmUHKVnamm7eya5QR
+356KCJzZzwdCS4xVFq/l43gCA2j8TYrwO6/0EfM/5psUZS3ecwahzcJXfHPHvd9u
+qaXRqbjJYi+Ls70uStTC/JBIIu48atDF0DeXJ21hAbstZ1OKKNzAcYgZk14GKxCi
+ArgAzdg8UDtC4KsdqgxP6vF8Vc/gcHSu9AkVHgPVXbITjV0/kaKNgFi0bVqP7bJD
+hrUFYrS+S+hflQJCmVrDwW0JU2HnJ3EJOFX5F4FYHL4vt6ZjVsMzucraMqiLyUaO
+s6DVaWO8WMlphmFUfb3ChQjrKxFZZ6vKJPD/ExnQHa0kWwOELyMJuXw2PLk7k+qD
+rmjX+K3Ed+JiJuiDG5k8f1BDZE24lvxDwye5fQyDWPfib1yTClYYy4PRh4AI688f
+qgMyv51Qx82o0IJ1On1rNg5/iB7OEVcYSol3U5xiY9gRUd3vq637agZzMuRQnKXs
+Uj0+Vl4OrZ54F8MVsUKfi7Je1oVUEhuHqFt/tSOGlHg1XyR/ExwulCNBKIVdhhrF
+rxZCYrGDSUCF6tteJXpOBTtFT9b7hbMmBohKyS4XjfPSPRh9QHx7wepqSp3aHpmR
+4gY8Go40mS83xHCKBooqsy2/Z9vQlSb9Cr8u
+-----END CERTIFICATE-----

data/config/certs/robots-dor-dev.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAtbfjz4S0wxUAbgH+H9Rjo+4x3VzDdLb0hy9Tgmom3tHfIim1
+wjDCBNM/JWwaWdaQPvLXqyL8aE5ZcvdhBLxpMsGW/gyMZ48htG/X7QyeuKQESTHJ
+78CTFv8N1nRwnebieR1TPGQmxCLVH7JBbpEurXzQaRvK4unCENrpSczlmMT1eUdn
+kZ3jOr7RQ9MbbkSW/7jMIjsAe/apOEGs2xELZHmbK76JgxZCLhzv53/cJoGBvfR+
+6tZF6ZSK8ww1/n7w/iR77jK+WF35gUPcJmmX+mCC+wl4+/R1BeLhv2tEo6y2ci4d
+uts1iUBVaY0lvAa5f3wMo3mb1iTMgg10arHnYwIDAQABAoIBAQCmlDzsZZ2C24S6
+U29OZFc21kq1vqyaGIEOT48BFSguyDsAyTWKH0IsRC41suRxCGTQn7KeegLh5zjO
+UAGK4uCYm6g7mOs4n5fpHUHWVuRFJG2dX1vbQTBVO1fHCJSX2ygumHhN+w0ibT/r
+v2+F2ObuOGWghM62tkylQNfsRD0QjalE8ST2xp9p4xwPrAwEuURlA04qnLYNi4+6
+qexDtrLG8E6JV/dd3dY95WjKPscadR1fAKm9sebD0XO31Lu6BGCvpmBU0OmYVfrY
+BN/ofhEmJh+Xgwfxx6PicRDvu9bPnffqbGhDO4ckGDlqXp1fDBgf1I7CclXdrVMH
+Qsxunh5pAoGBAN7929V1aw0S7Rqvuf4N+o1XwBExa2DL7EYI1Oea/nuBMPqvfeNh
+SrbM0gYejEzLmeRUUKRhMMoAgXQnxcg3Kz/5pUXT3b4YtzeskX8nkJ6/2gEU3M7E
+lJj7c5wW1otqMH19+iDNR4N8vjPh98kDJW1HZUHSAcdyE+dZiFP2ofMfAoGBANCe
+AJgA9EkdwZsom+I7Ty9LSrTWx6cKmNEbLVn1iSlyJx1kHoWyTMtuZszCWBjiXx70
+84WpX2B4MuJBq6sSoEiUahNsphks82glOd6i+eoE/I+NtZehOFnkAMyGux+FbMyG
+q/9ZlQgsbWpFHxS59vX/kvlNun2RpJkaF6QPBuc9AoGBAIGdscCb5cPNsoCGkGf6
+HB84WG4l+bJkFkyHKaoOT8neSGgOxe/7R4CGAbaI3yhsWGF+GPnTfJaOQLERxUch
+ukQPil/STNwIZcc4ycHNb6S3A7MJO2f8oBtkXcjnBYI4EUOAjHmwmNb3FV/3Ax6W
+c5TXoSXnOh2CU8twIWwcufolAoGATqnFf4uckZVu05rUbNIAYcz6NoZmck5EoVSm
+HS3Asqggp6yA9djtrCfNC5icr4VsaLfku5nKJQ4t4bLxkGhNmBCejwSA/S09+x9O
+Wu0JX3zR3y+IMczQ+tRGmNiU5qXhCJ4fbQHSeGqIN3Io7h/RR6E/QlJU59RrRG/a
+SjqAV+ECgYEA2mA5VFK3jECnLde+biEaXidIOuBMcqaP0VG6sBwz2wTGSTBE1WkG
+6prCD0McWVAgDTm3MMKxeuMaoW5eEi83+G+CywLaTBpc8Hz7qgRhBpKhRirCfHMW
+EfQV5k32vEGoSI+eG8zcGb9mwDeb/EWXAMGXrx2YuYFu7txtwC2mZXc=
+-----END RSA PRIVATE KEY-----

data/config/dev_console_env.rb

@@ -0,0 +1,66 @@
+# Copied from common-accessioning config/environments
+
+cert_dir = File.join(File.dirname(__FILE__), ".", "certs")
+
+Dor::Config.configure do
+  fedora do
+    url 'https://sul-dor-dev.stanford.edu/fedora'
+  end
+
+  ssl do
+    cert_file File.join(cert_dir,"robots-dor-dev.crt")
+    key_file File.join(cert_dir,"robots-dor-dev.key")
+    key_pass ''
+  end
+
+  suri do
+    mint_ids true
+    id_namespace 'druid'
+    url 'https://lyberservices-dev.stanford.edu'
+    user 'labware'
+    pass 'lyberteam'
+  end
+
+  metadata do
+    exist.url 'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
+    catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
+  end
+
+  stacks do
+    document_cache_host 'purl-dev.stanford.edu'
+    document_cache_user 'lyberadmin'
+    local_workspace_root '/dor/workspace'
+    storage_root '/stacks'
+    host 'stacks-dev.stanford.edu'
+    user 'lyberadmin'
+    local_stacks_root '/stacks'
+    local_document_cache_root '/purl/document_cache'
+  end
+
+  gsearch.url 'https://dor-dev.stanford.edu/solr/gsearch'
+  solrizer.url 'https://dor-dev.stanford.edu/solr'
+  workflow.url 'https://lyberservices-dev.stanford.edu/workflow/'
+  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor/v1'
+
+  cleanup do
+    local_workspace_root '/dor/workspace'
+    local_export_home '/dor/export'
+  end
+
+  sdr do
+    local_workspace_root '/dor/workspace'
+    local_export_home '/dor/export'
+    datastreams do
+      contentMetadata 'required'
+      descMetadata 'required'
+      identityMetadata 'required'
+      provenanceMetadata 'required'
+      relationshipMetadata 'required'
+      rightsMetadata 'optional'
+      sourceMetadata 'optional'
+    end
+  end
+
+  accessioning_robot_sleep_time 30
+
+end

data/lib/dor-services.rb

@@ -139,7 +139,8 @@ module Dor
   autoload :ProvenanceMetadataService, 'dor/services/provenance_metadata_service'
   autoload :TechnicalMetadataService, 'dor/services/technical_metadata_service'
   autoload :MergeService, 'dor/services/merge_service'
-  autoload :ArchiveWorkspaceService, 'dor/services/archive_workspace_service'
+  autoload :ResetWorkspaceService, 'dor/services/reset_workspace_service'
+  autoload :CleanupResetService, 'dor/services/cleanup_reset_service'
 
   # Versioning Classes
   module Versioning

data/lib/dor/models/governable.rb

@@ -120,28 +120,28 @@ module Dor
       end
     end
     def groups_which_manage_item
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
+      ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_manage_desc_metadata
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor', 'dor-apo-metadata']
+      ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor', 'dor-apo-metadata']
     end
     def groups_which_manage_system_metadata
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
+      ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_manage_content
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
+      ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_manage_rights
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
+      ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_manage_embargo
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor']
+      ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor']
     end
     def groups_which_view_content
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor', 'dor-viewer']
+      ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor', 'dor-viewer', 'sdr-viewer']
     end
     def groups_which_view_metadata
-      ['dor-administrator','dor-apo-manager', 'dor-apo-depositor', 'dor-viewer']
+      ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor', 'dor-viewer', 'sdr-viewer']
     end
     def intersect arr1, arr2
       return (arr1 & arr2).length > 0

data/lib/dor/services/cleanup_reset_service.rb

@@ -0,0 +1,101 @@
+require 'pathname'
+
+module Dor
+
+  # Remove all traces of the object's data files from the workspace and export areas
+  class CleanupResetService
+    
+    # @param [String] druid The identifier for the object whose reset data is to be removed
+    # @return [void] remove copy of the reset data that was exported to preservation core
+    def self.cleanup_by_reset_druid(druid)
+      last_version = get_druid_last_version(druid) 
+      cleanup_reset_workspace_content(druid, last_version, Config.cleanup.local_workspace_root)
+      cleanup_reset_workspace_content(druid, last_version, Config.cleanup.local_assembly_root)
+      cleanup_reset_export(druid, last_version)
+    end
+    
+    def self.get_druid_last_version(druid)
+      druid_obj = Dor::Item.find(druid)
+      last_version = druid_obj.current_version.to_i
+      
+      #if the current version is still open, avoid this versioned directory
+      if Dor::WorkflowService.get_lifecycle('dor', druid, 'accessioned').nil? then 
+        last_version = last_version - 1 
+      end
+      return last_version
+    end
+    
+    # @param [String] druid The identifier for the object whose reset data is to be removed
+    # @param [String] base The base directory to delete from
+    # @param [Integer] last_version The last version that the data should be removed until version 1
+    # @return [void] remove all the object's reset data files from the workspace area equal to less than the last_version
+    def self.cleanup_reset_workspace_content(druid,last_version, base)
+      base_druid = DruidTools::Druid.new(druid, base)
+      base_druid_tree = base_druid.pathname.to_s
+      #if it is truncated tree /aa/111/aaa/1111/content, 
+      #we should follow the regular cleanup technique
+
+      reset_directories = get_reset_dir_list(last_version, base_druid_tree)
+      reset_directories.each do |path| 
+        FileUtils.rm_rf(path)
+      end
+      base_druid.prune_ancestors(base_druid.pathname.parent)
+    end
+    
+    
+    # @param [String] druid The identifier for the object whose reset data is to be removed
+    # @param [String] base The base directory to delete from
+    # @param [Integer] last_version The last version that the data should be removed until version 1
+    # @return [void] prepares a list of reset directories that should be removed
+    def self.get_reset_dir_list(last_version, base_druid_tree)
+      reset_directories = []    
+      for i in 1..last_version 
+        reset_path = "#{base_druid_tree}_v#{i}"
+        reset_directories.append(reset_path) if File.exists?(reset_path) 
+      end
+      return reset_directories      
+    end
+
+    # @param [String] druid The identifier for the object whose reset bags data is to be removed
+    # @return [void] remove copy of the reset data that was exported to preservation core
+    def self.cleanup_reset_export(druid, last_version)
+      id = druid.split(':').last
+      base_bag_directory = File.join(Config.cleanup.local_export_home, id)
+      
+      bag_dir_list = get_reset_bag_dir_list(last_version, base_bag_directory)
+      bag_dir_list.each do |bag_dir| 
+        Pathname(bag_dir).rmtree
+      end
+      
+      bag_tar_list = get_reset_bag_tar_list(last_version, base_bag_directory)
+      bag_tar_list.each do |bag_tar| 
+        Pathname(bag_tar).rmtree
+      end
+    end
+    
+    # @param [Integer] last_version The last version that the data should be removed until version 1
+    # @param [String] base_bag_directory The base bag directory including the export home and druid id
+    # @return [void] prepares a list of reset bag directories that should be removed
+    def self.get_reset_bag_dir_list(last_version, base_bag_directory)
+      reset_bags = []    
+      for i in 1..last_version do
+        reset_path = "#{base_bag_directory}_v#{i}"
+        reset_bags.append(reset_path) if File.exists?(reset_path) 
+      end
+      return reset_bags      
+    end
+
+    # @param [String] base_bag_directory The base bag directory including the export home and druid id
+    # @param [Integer] last_version The last version that the data should be removed until version 1
+    # @return [void] prepares a list of reset bag tars that should be removed
+    def self.get_reset_bag_tar_list(last_version, base_bag_directory)
+      reset_bags = []    
+      for i in 1..last_version do
+        reset_path = "#{base_bag_directory}_v#{i}.tar"
+        reset_bags.append(reset_path)  if File.exists?(reset_path) 
+      end
+      return reset_bags      
+    end
+
+  end
+end

data/lib/dor/services/cleanup_service.rb

@@ -18,31 +18,13 @@ module Dor
       cleanup_export(druid)
     end
 
-    # Tries to remove any exsitence of the object in our systems
-    #   Does the following:
-    #   - Removes item from Dor/Fedora/Solr
-    #   - Removes content from dor workspace
-    #   - Removes content from assembly workspace
-    #   - Removes content from sdr export area
-    #   - Removes content from stacks
-    #   - Removes content from purl
-    #   - Removes active workflows
-    # @param [String] druid id of the object you wish to remove
-    def self.nuke!(druid)
-      cleanup_by_druid druid
-      cleanup_stacks druid
-      cleanup_purl_doc_cache druid
-      remove_active_workflows druid
-      delete_from_dor druid
-    end
-
     # @param [String] druid The identifier for the object whose data is to be removed
     # @param [String] base The base directory to delete from
     # @return [void] remove the object's data files from the workspace area
     def self.cleanup_workspace_content(druid, base)
       DruidTools::Druid.new(druid, base).prune!
     end
-
+    
     # @param [String] druid The identifier for the object whose data is to be removed
     # @return [void] remove copy of the data that was exported to preservation core
     def self.cleanup_export(druid)
@@ -60,6 +42,24 @@ module Dor
       pathname.rmtree if pathname.exist?
     end
 
+    # Tries to remove any exsitence of the object in our systems
+    #   Does the following:
+    #   - Removes item from Dor/Fedora/Solr
+    #   - Removes content from dor workspace
+    #   - Removes content from assembly workspace
+    #   - Removes content from sdr export area
+    #   - Removes content from stacks
+    #   - Removes content from purl
+    #   - Removes active workflows
+    # @param [String] druid id of the object you wish to remove
+    def self.nuke!(druid)
+      cleanup_by_druid druid
+      cleanup_stacks druid
+      cleanup_purl_doc_cache druid
+      remove_active_workflows druid
+      delete_from_dor druid
+    end
+
     def self.cleanup_stacks(druid)
       DruidTools::StacksDruid.new(druid, Config.stacks.local_storage_root).prune!
     end
@@ -83,7 +83,9 @@ module Dor
       Dor::SearchService.solr.delete_by_id(pid)
       Dor::SearchService.solr.commit
     end
+  end 
+
+end
 
-  end
 
-end
+    

data/lib/dor/services/reset_workspace_service.rb

@@ -0,0 +1,35 @@
+module Dor
+
+  # Rename the druid trees  at the end of the accessionWF in order to be cleaned/deleted later.
+  class ResetWorkspaceService
+
+    def self.reset_workspace_druid_tree(druid, version, workspace_root)
+      
+      druid_tree_path = DruidTools::Druid.new(druid, workspace_root).pathname.to_s
+      
+      raise "The archived directory #{druid_tree_path}_v#{version} already existed." if  File.exists?("#{druid_tree_path}_v#{version}") 
+      
+      if File.exists?(druid_tree_path) 
+        FileUtils.mv(druid_tree_path, "#{druid_tree_path}_v#{version}")
+      end #Else is a truncated tree where we shouldn't do anything
+
+    end
+
+    def self.reset_export_bag(druid, version, export_root)
+      
+      id = druid.split(':').last
+      bag_dir = File.join(export_root, id)
+
+      raise "The archived bag #{bag_dir}_v#{version} already existed." if  File.exists?("#{bag_dir}_v#{version}") 
+      
+      if File.exists?(bag_dir) 
+        FileUtils.mv(bag_dir, "#{bag_dir}_v#{version}")
+      end 
+      
+      if File.exists?("#{bag_dir}.tar") 
+        FileUtils.mv("#{bag_dir}.tar", "#{bag_dir}_v#{version}.tar")
+      end 
+    end
+        
+  end
+end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.12.2'
+  VERSION = '4.12.3'
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.12.2
+  version: 4.12.3
+  prerelease: 
 platform: ruby
 authors:
 - Michael Klein
@@ -12,11 +13,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,6 +26,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,6 +34,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +45,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -51,6 +56,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: confstruct
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -58,6 +64,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,6 +72,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -72,6 +80,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,6 +88,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,6 +96,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -93,6 +104,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -100,6 +112,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -107,6 +120,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -114,6 +128,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -121,6 +136,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -128,6 +144,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -135,6 +152,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: om
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,6 +160,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -149,6 +168,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -156,6 +176,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -163,6 +184,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -170,6 +192,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -177,6 +200,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -184,6 +208,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -191,6 +216,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rsolr-ext
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,6 +224,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -205,6 +232,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-cache
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -212,6 +240,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -219,6 +248,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-graphviz
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -226,6 +256,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -233,6 +264,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubydora
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -240,6 +272,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -247,6 +280,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: solrizer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -254,6 +288,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -261,6 +296,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -268,6 +304,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -275,6 +312,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -282,6 +320,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -289,6 +328,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: validatable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -296,6 +336,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -303,6 +344,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: dor-workflow-service
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -313,6 +355,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -323,20 +366,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: lyber-utils
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -344,6 +390,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -351,6 +398,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: moab-versioning
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -358,6 +406,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -365,6 +414,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: stanford-mods
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -372,6 +422,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -379,6 +430,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -386,6 +438,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -393,6 +446,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -400,6 +454,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -407,6 +462,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jhove-service
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -414,6 +470,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -421,6 +478,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -428,6 +486,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -435,6 +494,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -442,6 +502,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -449,6 +510,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -456,6 +518,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -463,6 +526,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -470,6 +534,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -532,7 +597,7 @@ files:
 - lib/dor/models/upgradable.rb
 - lib/dor/models/versionable.rb
 - lib/dor/models/workflow_object.rb
-- lib/dor/services/archive_workspace_service.rb
+- lib/dor/services/cleanup_reset_service.rb
 - lib/dor/services/cleanup_service.rb
 - lib/dor/services/digital_stacks_service.rb
 - lib/dor/services/merge_service.rb
@@ -540,6 +605,7 @@ files:
 - lib/dor/services/metadata_handlers/mdtoolkit_handler.rb
 - lib/dor/services/metadata_service.rb
 - lib/dor/services/registration_service.rb
+- lib/dor/services/reset_workspace_service.rb
 - lib/dor/services/sdr_ingest_service.rb
 - lib/dor/services/search_service.rb
 - lib/dor/services/suri_service.rb
@@ -558,34 +624,40 @@ files:
 - lib/gsearch/schema.xml
 - lib/tasks/dor.rake
 - lib/tasks/rdoc.rake
+- config/certs/dlss-dev-test.crt
+- config/certs/dlss-dev-test.key
 - config/certs/README
+- config/certs/robots-dor-dev.crt
+- config/certs/robots-dor-dev.key
 - config/config_defaults.yml
+- config/dev_console_env.rb
 - config/dev_console_env.rb.example
 - config/predicate_mappings.yml
 - bin/dor-indexer
 - bin/dor-indexerd
 homepage: 
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTI2ZjBkOTExNzRmMGZhNTlmYzNjOTg0MzUyYWFlMzAyYzMwMjMzMA==
-  data.tar.gz: !binary |-
-    MDNmMjQzNzU1YTBhYzIwMmJmNzcwNzEzNmUwNWUyYThjYzY2Njg1YQ==
-SHA512:
-  metadata.gz: !binary |-
-    MjNmY2RhNmVkZGVkNTRjMWU3NzU4ZTlhZjY2OTkxMTg2ZmI5OWIxMGNhMTU5
-    M2QyYzE1OGM1MzA4NmNjY2M4ZDE3ZDY5ZDEwZDQwNmNkMmYyYWY5Y2UzYjNk
-    MWM4OTFkMDFlOWZjMzUwODM0MmU4NzBmMzI2OTllMGEyMDE5MTg=
-  data.tar.gz: !binary |-
-    MzQ0YzQ2OGQ5M2Q0NGQ1MmIwMzY0NjgzOGIwMmI3MDc3OGZmMGNiMTllZWQ1
-    YjlmZTQ4MzUyNmQ0NzZjYjgzNzI3MjY4ODFhZjZiZTUyZWM4MTJkMzM5NjAy
-    MTdhNGJiMGVlNGU4NmRhYTQzZjRmYzAzNjc1ZDVkODc1YjY4MTY=

data/lib/dor/services/archive_workspace_service.rb

@@ -1,19 +0,0 @@
-module Dor
-
-  # Rename the druid trees  at the end of the accessionWF in order to be cleaned/deleted later.
-  class ArchiveWorkspaceService
-
-    def self.archive_workspace_druid_tree(druid, version, workspace_root)
-      
-      druid_tree_path = DruidTools::Druid.new(druid, workspace_root).pathname.to_s
-      
-      raise "The archived directory #{druid_tree_path}_v#{version} already existed." if  File.exists?("#{druid_tree_path}_v#{version}") 
-      
-      if File.exists?(druid_tree_path) 
-        FileUtils.mv(druid_tree_path, "#{druid_tree_path}_v#{version}")
-      end #Else is a truncated tree where we shouldn't do anything
-
-    end
-    
-  end
-end