geo_works 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53a8932ef1ba631342a8328ec7eaf7cca993de94
-  data.tar.gz: 580c364352f569f95dcc63beacd48e5399460161
+  metadata.gz: f0533a41de0604673a4376d3597656459ecbbaf9
+  data.tar.gz: 4c0f1211b8313e5c5531d37152ce9332b9b2e50d
 SHA512:
-  metadata.gz: 2dc0210e5f06b05a69192c1115b694a934175653cecc9f593b0944a3e818f1fc578be329269be74541eb406c603e722f9880e3967f208b40f699e42666d19d25
-  data.tar.gz: ab82e6645185eaa54cf56258aa1877fd31314434d8c8c29af05b480dea7b249e5ed41f5738d3e605fc24632c7f35401531826723a40ee23776c07087994015c8
+  metadata.gz: 32233c2443c74edd7eece43f1558a399fb4444527cf7df4bac7658b0ea877257a1beb22807d10328ac54b8b672628d77472b5a7ee28174837aa6e3628fa85e5b
+  data.tar.gz: 37fe03c153f448b27fb28522eb98d92ffb5eea0b44e4d90b13120efcbb34510478408ca8976a9ce33582454a8f27c4f3a7ff79f825629caa1a670686f9c43d0d

data/.rubocop.yml

@@ -46,6 +46,7 @@ Metrics/AbcSize:
     - 'lib/geo_works/fgdc_metadata_extractor.rb'
 
 Metrics/MethodLength:
+  Max: 14
   Exclude:
     - 'Rakefile'
     - 'app/models/concerns/geo_works/extractors/iso19139_helper.rb'

data/app/processors/geo_works/processors/base_geo_processor.rb

@@ -15,17 +15,25 @@ module GeoWorks
         # @param out_path [String] processor output file path
         # @param method_queue [Array] set of commands to run
         # @param options [Hash] creation options to pass
+        # rubocop:disable Metrics/MethodLength
         def self.run_commands(in_path, out_path, method_queue, options)
           next_step = method_queue.shift
-          if method_queue.empty?
-            method(next_step).call(in_path, out_path, options)
-          else
-            temp = temp_path(out_path)
-            method(next_step).call(in_path, temp, options)
-            run_commands(temp, out_path, method_queue, options)
-            FileUtils.rm_rf(temp)
+          temp = temp_path(out_path)
+          begin
+            if method_queue.empty?
+              method(next_step).call(in_path, out_path, options)
+            else
+              method(next_step).call(in_path, temp, options)
+              run_commands(temp, out_path, method_queue, options)
+              FileUtils.rm_rf(temp)
+            end
+          rescue => e
+            FileUtils.rm_rf(in_path) if Dir.exist?(in_path)
+            FileUtils.rm_rf(temp) if Dir.exist?(temp)
+            raise e
           end
         end
+        # rubocop:enable Metrics/MethodLength
 
         # Returns a path to an intermediate temp file or directory.
         # @param path [String] input file path to base temp path on

data/app/processors/geo_works/processors/image.rb

@@ -12,7 +12,6 @@ module GeoWorks
         # @param out_path [String] processor output file path.
         # @param options [Hash] creation options
         # @option options [String] `:output_size` as "w h" or "wxh"
-        # rubocop:disable Metrics/MethodLength
         def self.convert(in_path, out_path, options)
           size = options[:output_size].tr(' ', 'x')
           convert = MiniMagick::Tool::Convert.new(whiny: false)
@@ -30,7 +29,6 @@ module GeoWorks
           # suppress stderr b/c geotiffs return 'unknown field' warnings
           convert.call { |_stdout, _stderr| }
         end
-        # rubocop:enable Metrics/MethodLength
 
         # Trims extra whitespace.
         # @param in_path [String] file input path

data/lib/geo_works/version.rb

@@ -1,3 +1,3 @@
 module GeoWorks
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

data/spec/processors/geo_works/processors/base_geo_processor_spec.rb

@@ -36,6 +36,18 @@ describe GeoWorks::Processors::BaseGeoProcessor do
       expect(FileUtils).to receive(:rm_rf).twice
       subject.class.run_commands(file_name, output_file, method_queue, options)
     end
+
+    context 'when the processor raises an error' do
+      before do
+        allow(method_queue).to receive(:empty?).and_raise('error')
+        allow(Dir).to receive(:exist?).and_return(true)
+      end
+
+      it 'cleans the derivative intermediates' do
+        expect(FileUtils).to receive(:rm_rf).twice
+        expect { subject.class.run_commands(file_name, output_file, method_queue, options) }.to raise_error
+      end
+    end
   end
 
   describe '#temp_path' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_works
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - James Griffin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-22 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyrax
@@ -689,7 +689,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rails engine for Hydra Geo models. Built around the Hyrax engine.