simple-spreadsheet-extractor 0.18.0 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 928ed7d7088b8fe16a877bb1bed779ffa02503a48a009bcf2ec084c350443629
-  data.tar.gz: e0f345a7ef579ad5b9068096792127501aced335fe16b73c7e9a169e80b03982
+  metadata.gz: 62b7eb3171c50d0f7cbe73787ea3da3fa4036670471ad4986e2f6ecfdd659b30
+  data.tar.gz: 6b8d5973890fb97c883dd39a1a4dddaebc3d6448971a44d96ada510ca1aaee02
 SHA512:
-  metadata.gz: 3b4d85813f7aa92d0c77b8897ea007de6346d32a5b11629e1d2e123b4758db266ac27279677fdf7fa9acc978a42e0c306b8ea9c121ba60cb093f54cdd3a0bafd
-  data.tar.gz: c7f88fe40795bb9a91b13cef3eceffe35f20601dc9d1d2a3ab88468468e53c12fe3b5d259cc01e3676d3c01912f2116ad6ce685dd829764cc93e0e99f8c031fe
+  metadata.gz: 8e0dbece9cb1ee8a19f2b5bd6fa9ef2799f701d3d84cb1a1ff2de1705b27f2eb3b253f6eda88064a25a7de28e62d8275d2e263bb4fd52a90c2ee6d2b684ef891
+  data.tar.gz: 3ca526ca2ec583d0b5e2a3dbef1d73c6fa7ba3fb11c302eb563e8fc4d248a776b0986efcd0fd6e8b66bb3b1b303cc543fed2ac87837e51705792b1e9a9c0a2d7

data/.ruby-version

@@ -1 +1 @@
-ruby-3.1.4
+ruby-3.3.6

data/README.rdoc

@@ -4,7 +4,7 @@ Authors::    Stuart Owen, Finn Bacall
 Version::    0.17.0
 Contact::    mailto:stuart.owen@manchester.ac.uk
 Licence::    BSD (See LICENCE or http://www.opensource.org/licenses/bsd-license.php)
-Copyright::  (c) 2010-2015 The University of Manchester, UK
+Copyright::  (c) 2010-2025 The University of Manchester, UK
 
 {<img src="https://codeclimate.com/github/myGrid/simple-spreadsheet-extractor-gem/badges/gpa.svg" />}[https://codeclimate.com/github/myGrid/simple-spreadsheet-extractor-gem]
 

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.2'.freeze
 end

data/simple-spreadsheet-extractor.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency('libxml-ruby', '~> 2.9')
-  spec.add_dependency('terrapin','~>0.6')
+  spec.add_dependency('libxml-ruby', '~> 5.0')
+  spec.add_dependency('terrapin','~>1.0')
 
   spec.add_development_dependency('rubocop','~>1.25')
   spec.add_development_dependency('rubycritic')

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: simple-spreadsheet-extractor
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.2
 platform: ruby
 authors:
 - Stuart Owen
 - Finn Bacall
 - Quyen Nguyen
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2025-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.9'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: terrapin
   requirement: !ruby/object:Gem::Requirement
     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
@@ -119,7 +119,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-gemspec"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
@@ -144,7 +143,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
@@ -154,7 +153,7 @@ homepage: http://github.com/myGrid/simple-spreadsheet-extractor-gem
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +168,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Basic spreadsheet content extraction using Apache POI
 test_files: []

data/.ruby-gemspec

@@ -1 +0,0 @@
-simple-spreadsheet-extractor