simple-spreadsheet-extractor 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5351032c2b34dfcce4bed0469415ab1b98e8f11f305d8e76bca707ed2554e1
-  data.tar.gz: 01d1abb6c2f8a025ab489f1a83e9b9c627bbc67f151fb3ace3968175b4c69cb2
+  metadata.gz: c1f09b5a39ba002c7a3c35d18c830ac88d7453a962e615e5a776e5c091edfc50
+  data.tar.gz: 8253440c0c1b754d7d9d65d3114c8fc5c11ce543fac6785ba0e06f645b729b36
 SHA512:
-  metadata.gz: 29bea0ec37798888a1e414ed947015c8c991450e8e017b0f4dde822c88ce5ceea32197cd3c93b5f8886bc704be2946c82edb9c7410235f17c53150509485e846
-  data.tar.gz: aad58ac8c66c8091ae3d9f1d05366c889727cc3f07981d2c9841a02e25dfc289060c57327d6d79b087ae9df8685ecf98ce3f63a9b1ea23300b5c870114802515
+  metadata.gz: 7fcf27eb87ca55de77bc17062b078411168c0c388360b429ef537bf2fcaa6fc25e01c3d013252d2fa9276794aaa8f634a55903b6b45270dab1a27ccf65f8c8e8
+  data.tar.gz: 7a59b952710bc5d6f7846fe76a40cf856fcfacdee07bd1e5006f7ad2465fc637639292227d106cf7f4569aef42408c35d7740f6c57d55a833e7994caf1ba2d9f

data/.ruby-version

@@ -1 +1 @@
-ruby-2.7.6
+ruby-3.1.4

data/doc/schema-v1.xsd

@@ -93,9 +93,9 @@
 			<xsd:element name="row" type="Row" minOccurs="0"
 				maxOccurs="unbounded" />
 		</xsd:sequence>
-		<xsd:attribute name="first_row" type="xsd:positiveInteger"
+		<xsd:attribute name="first_row" type="xsd:nonNegativeInteger"
 			use="required"></xsd:attribute>
-		<xsd:attribute name="last_row" type="xsd:positiveInteger"
+		<xsd:attribute name="last_row" type="xsd:nonNegativeInteger"
 			use="required"></xsd:attribute>
 	</xsd:complexType>
 	

data/lib/sysmodb/extractor.rb

@@ -6,7 +6,7 @@ module SysMODB
 
   # handles the delegation to java
   class Extractor
-    JAR_VERSION = '0.16.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.17.0'.freeze
+  VERSION = '0.18.1'.freeze
 end

data/simple-spreadsheet-extractor.gemspec

@@ -20,12 +20,12 @@ 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('rubocop','~>1.25')
   spec.add_development_dependency('rubycritic')
-  spec.add_development_dependency('bundler','~> 2.3')
+  spec.add_development_dependency('bundler')
 
-  spec.add_development_dependency('rake')
-  spec.add_development_dependency('minitest','~>5.14')
+  spec.add_development_dependency('rake','~>13.0')
+  spec.add_development_dependency('minitest','~>5.1')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-spreadsheet-extractor
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Stuart Owen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-16 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
@@ -72,44 +72,44 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '5.1'
 description: Takes a stream to a spreadsheet file and produces an XML or CSV representation
   of its contents
 email:
@@ -128,18 +128,23 @@ files:
 - Rakefile
 - doc/schema-v1.xsd
 - examples/example.rb
-- jars/lib/commons-codec-1.10.jar
-- jars/lib/commons-collections4-4.1.jar
-- jars/lib/curvesapi-1.04.jar
-- jars/lib/dom4j-1.6.1.jar
-- jars/lib/log4j-1.2.17.jar
-- jars/lib/poi-3.17.jar
-- jars/lib/poi-ooxml-3.17.jar
-- jars/lib/poi-ooxml-schemas-3.17.jar
-- jars/lib/xercesImpl-2.11.0.jar
+- jars/lib/SparseBitSet-1.2.jar
+- jars/lib/commons-codec-1.15.jar
+- jars/lib/commons-collections4-4.4.jar
+- jars/lib/commons-compress-1.21.jar
+- jars/lib/commons-io-2.11.0.jar
+- jars/lib/commons-math3-3.6.1.jar
+- jars/lib/curvesapi-1.07.jar
+- jars/lib/log4j-1.2-api-2.20.0.jar
+- jars/lib/log4j-api-2.18.0.jar
+- jars/lib/log4j-core-2.20.0.jar
+- jars/lib/poi-5.2.3.jar
+- jars/lib/poi-ooxml-5.2.3.jar
+- jars/lib/poi-ooxml-lite-5.2.3.jar
+- jars/lib/xercesImpl-2.12.2.jar
 - jars/lib/xml-apis-1.4.01.jar
-- jars/lib/xmlbeans-2.6.0.jar
-- jars/simple-spreadsheet-extractor-0.16.0.jar
+- jars/lib/xmlbeans-5.1.1.jar
+- jars/simple-spreadsheet-extractor-0.18.1.jar
 - lib/simple-spreadsheet-extractor.rb
 - lib/sysmodb/extractor.rb
 - lib/sysmodb/simple-spreadsheet-extractor.rb