libreconv 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 771ed18ef3438a2fbe8aa0a213c57c97a7631e1d8ab25e63fbd791d0884ea81b
-  data.tar.gz: 568a8dacb50e126a828843dd142a3ad0209bd0daee230d5ec355566a7e9a1ed9
+  metadata.gz: 4b7109677cd71c5dd97fdc49de55639d0e48aadd30f3d8f110aca98bac953023
+  data.tar.gz: 3c125782142e2064eb7b0ad6cf9616fddd0c5a2f1d59492bd0da24bb26f84a92
 SHA512:
-  metadata.gz: fb1894b92d6c3f96b4e8955724969e7da080ef82db3d68495e87030f9210ba363b617c29e76efac5dc79428a91fafe108b31b746cab175268bd338c375fa8359
-  data.tar.gz: 7d7b25767c5467cd52a7446bd7f1c2d76219c985233167294337386c83e1f6a039e01bca6926517d9480907530b5feeddcf028b5f654871c01641f61ff8cd6f8
+  metadata.gz: 2bb657e3ae1f331a3adac2b6b1048b4dce58540431513e0302dd416d416412de4ded91cde2cce07340416fde5e2a74b5a2bf708bea4f4e0b09e719faae6fcffb
+  data.tar.gz: f7315df7d4ab60f008083dacb2e07f455f572c8bdddb80dc33c9f070bcfadd9f4ae1c37da62fe9b9f27920084f14c2e78b5b6ab7d6ce4b618a7307b48bb04a57

data/lib/libreconv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Libreconv
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/lib/libreconv.rb

@@ -53,11 +53,12 @@ module Libreconv
     end
 
     def convert
-      pipe_uuid = SecureRandom.uuid
+      pipe_name = 'soffice-pipe-' + SecureRandom.uuid.to_s
+      pipe_path = File.join Dir.tmpdir, pipe_name
 
       Dir.mktmpdir do |target_path|
         accept_args = [
-          "pipe,name=soffice-pipe-#{pipe_uuid}",
+          'pipe,name=' + pipe_name,
           'url',
           'StarOffice.ServiceManager'
         ].join(';')
@@ -65,7 +66,8 @@ module Libreconv
         command = [
           soffice_command,
           "--accept=\"#{accept_args}\"",
-          "-env:UserInstallation=file:///tmp/soffice-dir-#{pipe_uuid}",
+          '-env:UserInstallation=file:///' +
+            pipe_path.gsub('\\', '/').gsub(%r{^/}, ''),
           '--headless',
           '--convert-to',
           @convert_to,
@@ -79,22 +81,27 @@ module Libreconv
             'HOME' => ENV['HOME'],
             'PATH' => ENV['PATH'],
             'LANG' => ENV['LANG'],
-            'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH']
+            'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'],
+            'SYSTEMROOT' => ENV['SYSTEMROOT'],
+            'TEMP' => ENV['TEMP']
           },
           *command,
           unsetenv_others: true
         )
-        if !status.success?
+
+        FileUtils.rm_rf pipe_path if File.exist?(pipe_path)
+        unless status.success?
           raise ConversionFailedError,
-                "Conversion failed! Output: #{output.strip.inspect}, " \
-                "Error: #{error.strip.inspect}"
+                'Conversion failed! Output: ' + output.strip.inspect +
+                ', Error: ' + error.strip.inspect
         end
 
-        target_tmp_file = "#{target_path}/" \
-          "#{File.basename(@escaped_source_path, '.*')}." \
-          "#{File.basename(@convert_to, ':*')}"
+        target_tmp_file = File.join(
+          target_path,
+          File.basename(@escaped_source_path, '.*') + '.' +
+            File.basename(@convert_to, ':*')
+        )
         FileUtils.cp target_tmp_file, @target
-        FileUtils.rm_rf("/tmp/soffice-dir-#{pipe_uuid}")
       end
     end
 
@@ -103,14 +110,14 @@ module Libreconv
     def ensure_soffice_exists
       return if soffice_command && File.exist?(soffice_command)
 
-      raise IOError, "Can't find Libreoffice or Openoffice executable."
+      raise IOError, 'Can\'t find LibreOffice or OpenOffice executable.'
     end
 
     def which(cmd)
       exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
       ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
         exts.each do |ext|
-          exe = File.join(path, "#{cmd}#{ext}")
+          exe = File.join(path, cmd + ext)
           return exe if File.executable? exe
         end
       end

data/spec/libreconv_spec.rb

@@ -22,7 +22,7 @@ describe Libreconv do
     describe '#new' do
       it 'raises error if soffice command does not exists' do
         expect do
-          Libreconv::Converter.new(
+          described_class.new(
             doc_file, '/target', '/Whatever/soffice'
           )
         end.to raise_error(IOError)
@@ -30,7 +30,7 @@ describe Libreconv do
 
       it 'raises error if source does not exists' do
         expect do
-          Libreconv::Converter.new(
+          described_class.new(
             fixture_path('nonsense.txt'), '/target'
           )
         end.to raise_error(IOError)
@@ -40,35 +40,35 @@ describe Libreconv do
     describe '#convert' do
       it 'converts a docx do pdf specifying target_file' do
         target_file = "#{target_path}/#{File.basename(doc_file, '.doc')}.pdf"
-        converter = Libreconv::Converter.new(doc_file, target_file)
+        converter = described_class.new(doc_file, target_file)
         converter.convert
         expect(File.file?(target_file)).to eq true
       end
 
       it 'converts a doc to pdf' do
         target_file = "#{target_path}/#{File.basename(doc_file, '.doc')}.pdf"
-        converter = Libreconv::Converter.new(doc_file, target_path)
+        converter = described_class.new(doc_file, target_path)
         converter.convert
         expect(File.file?(target_file)).to eq true
       end
 
       it 'converts a docx to pdf' do
         target_file = "#{target_path}/#{File.basename(docx_file, '.docx')}.pdf"
-        converter = Libreconv::Converter.new(docx_file, target_path)
+        converter = described_class.new(docx_file, target_path)
         converter.convert
         expect(File.file?(target_file)).to eq true
       end
 
       it 'converts a pptx to pdf' do
         target_file = "#{target_path}/#{File.basename(pptx_file, '.pptx')}.pdf"
-        converter = Libreconv::Converter.new(pptx_file, target_path)
+        converter = described_class.new(pptx_file, target_path)
         converter.convert
         expect(File.file?(target_file)).to eq true
       end
 
       it 'converts a ppt to pdf' do
         target_file = "#{target_path}/#{File.basename(ppt_file, '.ppt')}.pdf"
-        converter = Libreconv::Converter.new(ppt_file, target_path)
+        converter = described_class.new(ppt_file, target_path)
         converter.convert
         expect(File.file?(target_file)).to eq true
       end
@@ -76,7 +76,7 @@ describe Libreconv do
       # it 'raises ConversionFailedError when URL cannot be loaded' do
       #   stub_request(:get, url)
       #   expect do
-      #     converter = Libreconv::Converter.new(url, target_path)
+      #     converter = described_class.new(url, target_path)
       #     converter.convert
       #   end.to raise_error(
       #     Libreconv::ConversionFailedError,
@@ -89,13 +89,13 @@ describe Libreconv do
       it 'returns the user specified command path' do
         # Just faking that the command is present here
         cmd = fixture_path('soffice')
-        converter = Libreconv::Converter.new(doc_file, '/target', cmd)
+        converter = described_class.new(doc_file, '/target', cmd)
         expect(converter.soffice_command).to eq cmd
       end
 
       it 'returns the command found in path' do
         cmd = `which soffice`.strip
-        converter = Libreconv::Converter.new(doc_file, '/target')
+        converter = described_class.new(doc_file, '/target')
         expect(converter.soffice_command).to eq cmd
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libreconv
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Richard Nyström
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-07 00:00:00.000000000 Z
+date: 2019-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,7 +66,6 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,78 +0,0 @@
-PATH
-  remote: .
-  specs:
-    libreconv (0.9.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    byebug (10.0.2)
-    coderay (1.1.2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    hashdiff (0.3.7)
-    jaro_winkler (1.5.1)
-    method_source (0.9.2)
-    parallel (1.12.1)
-    parser (2.5.3.0)
-      ast (~> 2.4.0)
-    powerpack (0.1.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.6.0)
-      byebug (~> 10.0)
-      pry (~> 0.10)
-    public_suffix (3.0.3)
-    rainbow (3.0.0)
-    rake (12.3.2)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.61.1)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
-    rubocop-rspec (1.30.1)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.0)
-    safe_yaml (1.0.4)
-    unicode-display_width (1.4.0)
-    webmock (3.4.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler
-  libreconv!
-  pry-byebug
-  rake
-  rspec (~> 3.8.0)
-  rubocop
-  rubocop-rspec
-  webmock
-
-BUNDLED WITH
-   1.17.1