dor-services 4.21.3 → 4.21.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk2MmExNWZiMDJhNDE5ZDMyM2QxYWE0YjliODdhNWY4NDAwNjIxZA==
+    OTRmNTc1ZDAyY2JmYWU1ZTA3NDE5YTRhODkzZjVkM2RlMzVkZjI3MQ==
   data.tar.gz: !binary |-
-    M2Y5ZDdkM2ZiYWIwNzU3YTU3NTE5NmE3MjE4NWRlZjkyNTg2MzM1Zg==
+    MjA0MDNhZTc4ODk0MDkzOTAyZjMxNjhjNmJmZjNhMjk1OWMyMzdhZQ==
 SHA512:
   metadata.gz: !binary |-
-    MjAxMDVlNzdjYjhmNjYzNDFkZDMzODQ0YjMxYjJlNWE4YzFkYTYxNWQ2ODRh
-    NDczMjRmMGFiZTZlMWNmZTRjM2MxYTUzMTljYjE3NjljZDI4MDBiYTAzNDgy
-    ZmQ3YTgyNTBmMjNiY2Y2M2ExODUwOTIwYzc1NGQ2MjcyMjM2MmU=
+    Y2E2ZTk4ZDY0ZDQzNjQ2MmI2NjY0MTcyZDZlMjY1NjI3YjYyOGFiYjRmMjAx
+    YTk0MGYwNDYyYmNlMjQ3NjAwMWQzN2YyNzkzOTUwOWZhZWRiYTA4ZjJhNTIy
+    N2Y5NWU3NzQzZjI5ZjkyZGY0ZGJlZmJiNWU1Y2Q0NWM1ZDZjODA=
   data.tar.gz: !binary |-
-    ZTFiMWI3MTNmOTY5YjQ1ZmUyZDZiZTg4NDQ4YTRhNTUzZDBjMzQ4YTU2NWE3
-    ZjM3YzM0MjEyNDdhZjQ5NzRlZWE5YjRlNzllYmU1ODFmNmZkYzE5NWZlZDJl
-    NWJmZWFiNmIxM2NmZTMxMmI1ZTc3MWE1YjdhY2Q1ZTg0OWU1NjE=
+    YmRlMmQxY2Q0ZWJmZWI2NTgxNGE5ZDYxMjY5MGY2MGM2MTcwODI4ZjQyYzNj
+    YzYxNmY4NzljZmFjMmRhOWFlMjVlN2Y3MDUzZGE2NTQ2MzUyYmRhZGYwMmE2
+    YWU2OWZlNjMyZDE2ZjlhYjY3MTU3MjYxYjdmZDI0NWI0NWRmNmY=

data/config/dev_console_env.rb

@@ -7,7 +7,7 @@ Dor::Config.configure do
     key_file  File.join(cert_dir,"robots-dor-dev.key")
     key_pass  ''
   end
-  
+
   suri do
     mint_ids true
     id_namespace 'druid'
@@ -15,19 +15,19 @@ Dor::Config.configure do
     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'
     local_stacks_root         '/stacks'
     local_document_cache_root '/purl/document_cache'
     local_workspace_root      '/dor/workspace'
   end
- 
+
   solrizer.url     'http://sul-solr.stanford.edu/solr/argo_test'
   fedora.url       'https://sul-dor-test.stanford.edu/fedora'
   workflow.url     'https://lyberservices-dev.stanford.edu/workflow/'
@@ -65,7 +65,6 @@ Dor::Config.configure do
 
 end
 
-
 #WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
 
 # Constants for Dor::WorkflowService

data/lib/dor/services/cleanup_reset_service.rb

@@ -10,7 +10,7 @@ module Dor
     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_assembly_content(druid, Config.cleanup.local_assembly_root)
       cleanup_reset_export(druid, last_version)
     end
     
@@ -97,5 +97,11 @@ module Dor
       return reset_bags      
     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 assembly area
+    def self.cleanup_assembly_content(druid, base)
+      DruidTools::Druid.new(druid, base).prune!
+    end
   end
 end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.21.3'
+  VERSION = '4.21.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.21.3
+  version: 4.21.4
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -67,6 +67,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
@@ -74,6 +77,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency