simple-spreadsheet-extractor 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 928ed7d7088b8fe16a877bb1bed779ffa02503a48a009bcf2ec084c350443629
-  data.tar.gz: e0f345a7ef579ad5b9068096792127501aced335fe16b73c7e9a169e80b03982
+  metadata.gz: c1f09b5a39ba002c7a3c35d18c830ac88d7453a962e615e5a776e5c091edfc50
+  data.tar.gz: 8253440c0c1b754d7d9d65d3114c8fc5c11ce543fac6785ba0e06f645b729b36
 SHA512:
-  metadata.gz: 3b4d85813f7aa92d0c77b8897ea007de6346d32a5b11629e1d2e123b4758db266ac27279677fdf7fa9acc978a42e0c306b8ea9c121ba60cb093f54cdd3a0bafd
-  data.tar.gz: c7f88fe40795bb9a91b13cef3eceffe35f20601dc9d1d2a3ab88468468e53c12fe3b5d259cc01e3676d3c01912f2116ad6ce685dd829764cc93e0e99f8c031fe
+  metadata.gz: 7fcf27eb87ca55de77bc17062b078411168c0c388360b429ef537bf2fcaa6fc25e01c3d013252d2fa9276794aaa8f634a55903b6b45270dab1a27ccf65f8c8e8
+  data.tar.gz: 7a59b952710bc5d6f7846fe76a40cf856fcfacdee07bd1e5006f7ad2465fc637639292227d106cf7f4569aef42408c35d7740f6c57d55a833e7994caf1ba2d9f

data/lib/sysmodb/extractor.rb

@@ -6,7 +6,7 @@ module SysMODB
 
   # handles the delegation to java
   class Extractor
-    JAR_VERSION = '0.18.0'.freeze
+    JAR_VERSION = '0.18.1'.freeze
     DEFAULT_PATH = File.dirname(__FILE__) + "/../../jars/simple-spreadsheet-extractor-#{JAR_VERSION}.jar"
 
     def initialize(memory_allocation)
@@ -38,13 +38,15 @@ module SysMODB
       end
     end
 
-    def spreadsheet_extractor_command(filepath, format = 'xml', sheet = nil, trim = false)
-      command = "java -Xmx#{@memory_allocation} -jar #{(defined? SPREADSHEET_EXTRACTOR_JAR_PATH) ? SPREADSHEET_EXTRACTOR_JAR_PATH : DEFAULT_PATH}"
-      command += " -o #{format}"
-      command += " -s #{sheet}" if sheet
-      command += ' -t' if trim
-      command += " < #{filepath}"
-      command
+    def spreadsheet_extractor_command_line(filepath, format = 'xml', sheet = false, trim = false)
+
+      args  = "-Xmx#{@memory_allocation} -jar #{(defined? SPREADSHEET_EXTRACTOR_JAR_PATH) ? SPREADSHEET_EXTRACTOR_JAR_PATH : DEFAULT_PATH}"
+      args += " -o :format"
+      args += " -s :sheet" if sheet
+      args += ' -t' if trim
+      args += " < :filepath"
+      args += " 2>:error_log_path"
+      Terrapin::CommandLine.new("java", args)
     end
 
     def is_windows?
@@ -52,11 +54,13 @@ module SysMODB
     end
 
     def execute_command_line(filepath, format = 'xml', sheet = nil, trim = false)
-      command = spreadsheet_extractor_command filepath, format, sheet, trim
-      begin
-        Terrapin::CommandLine.new(command).run.strip
-      rescue Terrapin::ExitStatusError, Terrapin::CommandNotFoundError => e
-        raise SpreadsheetExtractionException, e.message
+      command_line = spreadsheet_extractor_command_line filepath, format, !!sheet, trim
+      Tempfile.create('spreadsheet-extraction-error-log') do |f|
+        begin
+          command_line.run(format: format, sheet: sheet, filepath: filepath, error_log_path: f.path).strip
+        rescue Terrapin::ExitStatusError, Terrapin::CommandNotFoundError
+          raise SpreadsheetExtractionException, f.read
+        end
       end
     end
 

data/lib/sysmodb/version.rb

@@ -1,3 +1,3 @@
 module SysMODB
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.18.1'.freeze
 end

data/simple-spreadsheet-extractor.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency('libxml-ruby', '~> 2.9')
-  spec.add_dependency('terrapin','~>0.6')
+  spec.add_dependency('terrapin','~>1.0')
 
   spec.add_development_dependency('rubocop','~>1.25')
   spec.add_development_dependency('rubycritic')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-spreadsheet-extractor
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Stuart Owen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2024-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ files:
 - jars/lib/xercesImpl-2.12.2.jar
 - jars/lib/xml-apis-1.4.01.jar
 - jars/lib/xmlbeans-5.1.1.jar
-- jars/simple-spreadsheet-extractor-0.18.0.jar
+- jars/simple-spreadsheet-extractor-0.18.1.jar
 - lib/simple-spreadsheet-extractor.rb
 - lib/sysmodb/extractor.rb
 - lib/sysmodb/simple-spreadsheet-extractor.rb