regression for filename too long is fixed by minitar 0.7

ualbertalib · Nov 29, 2018 · 51f1262 · 51f1262
1 parent 8d71774
commit 51f1262
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/lib/pushmi_pullyu/swift_depositer.rb b/lib/pushmi_pullyu/swift_depositer.rb
@@ -50,7 +50,7 @@ def deposit_file(file_name, swift_container)
     else
       # for creating new: construct hash with symbols as keys, add metadata as a hash within the header hash
       headers = { etag: checksum,
-                  content_type:  'application/x-tar',
+                  content_type: 'application/x-tar',
                   metadata: metadata }
       deposited_file = era_container.create_object(file_base_name, headers, File.open(file_name))
     end

diff --git a/pushmi_pullyu.gemspec b/pushmi_pullyu.gemspec
@@ -26,19 +26,20 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'bagit', '~> 0.4'
   spec.add_runtime_dependency 'connection_pool', '~> 2.2'
   spec.add_runtime_dependency 'daemons', '~> 1.2', '>= 1.2.4'
-  spec.add_runtime_dependency 'minitar', '~> 0.6'
+  spec.add_runtime_dependency 'minitar', '~> 0.7'
   spec.add_runtime_dependency 'openstack', '~> 3.3', '>= 3.3.10'
   spec.add_runtime_dependency 'pg', '>= 1.0', '< 1.2'
   spec.add_runtime_dependency 'rdf', '>= 1.99', '< 4.0'
   spec.add_runtime_dependency 'rdf-n3', '>= 1.99', '< 4.0'
   spec.add_runtime_dependency 'redis', '>= 3.3', '< 5.0'
   spec.add_runtime_dependency 'rest-client', '>= 1.8', '< 3.0'
-  spec.add_runtime_dependency 'rollbar', '~> 2.14'
+  spec.add_runtime_dependency 'rollbar', '~> 2.18'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'danger', '~> 5.2'
   spec.add_development_dependency 'pry', '~> 0.10', '>= 0.10.4'
+  spec.add_development_dependency 'pry-byebug', '~> 3.6'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.51'

diff --git a/...09-974d-478b-8826-2c606a447606/theses.jpg → ...PpjknJhu4y8bs3qVMvBXA5A2aFBxY6EiIyxRS.jpg b/...09-974d-478b-8826-2c606a447606/theses.jpg → ...PpjknJhu4y8bs3qVMvBXA5A2aFBxY6EiIyxRS.jpg
diff --git a/spec/pushmi_pullyu/aip/creator_spec.rb b/spec/pushmi_pullyu/aip/creator_spec.rb
@@ -87,7 +87,9 @@
          '30604fd556c96aac01abddf1e8b4e0369fc90ba5 '\
          'data/objects/metadata/files_metadata/856444b6-8dd5-4dfa-857d-435e354a2ead/original_file_metadata.n3',
          '9ea739a91eff6ba99e0227e3a909436d1dfd7ca7 '\
-         'data/objects/files/01bb1b09-974d-478b-8826-2c606a447606/theses.jpg',
+         'data/objects/files/01bb1b09-974d-478b-8826-2c606a447606/'\
+         'Archive_Tar_Minitar_FileNameTooLongHjMQh5EggUDWgpsfoXfyN'\
+         'GoEbvcUcN34YPpjknJhu4y8bs3qVMvBXA5A2aFBxY6EiIyxRS.jpg',
          'e559f7cea3fc307524bccdedb6d012a30b4e6c86 '\
          'data/objects/files/837977d6-de61-49ea-a912-a65af5c9005e/image-sample.jpeg',
          '49b1dc60dc20a270cf59ee04a564393bba2bf6c8 '\