paru 0.3.0a2 → 0.3.0a3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19f82be37cb030a88a74527fbef0c91e75a77130
-  data.tar.gz: 1353cc90313623b40b3ad1180359ffcf8224e351
+  metadata.gz: 8e6c500a0b739b0dad6ed1e06336b5eae2e49bcd
+  data.tar.gz: 78d1a4e26f51d5cb7e4231b7978146618cd3726d
 SHA512:
-  metadata.gz: 7adfa9079dfe0f2ab45237929f662e1321294eaae8c25edb7d8c4bcabc68bb6974646c2f8f53d2f9399efe870f3df1afa0684cfa8d6b7682a561a422cdd61014
-  data.tar.gz: ee623452bd3b682b5ab1aaf6fbc8a29e905c31fba328552783f8454d91a46d5f196ec1702204b76f6183dbb2bb917c2814ec71a8b92a07e1ca271a74db662fc6
+  metadata.gz: e63bc28ecc944bbb69a33ba17d9638d62e0cfc0741ae2176c84cc0323a3dcbd3caba96f1c325b75afefb9678e17dd74c09b40f1ea2e22fd1448c8958642a0874
+  data.tar.gz: 382bf1d24b42cebb7d543a33e96441938eb56470904d95b6f09f86473272b91448ac55b7daa966830e0a1cc291d8fe5ef4d07fda4173e639b2c7e4937f43ef2f

data/lib/paru/pandoc.rb

@@ -16,6 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 #++
+require "open3"
 require "shellwords"
 require "yaml"
 
@@ -149,17 +150,7 @@ module Paru
         # @example Using <<
         #   output = converter << 'this is a *strong* word'
         def convert(input)
-            begin
-            output = ''
-            IO.popen(to_command, 'r+') do |p|
-                p << input
-                p.close_write
-                output << p.read
-            end
-            output
-            rescue StandardError => err
-                throw Error.new "Error while running '#{to_command}' on input:\n\n#{input}\n\nPandoc responds: '#{err.message}'"
-            end
+            run_converter to_command, input
         end
         alias << convert
 
@@ -175,17 +166,7 @@ module Paru
         # @example Using convert_file
         #   output = converter.convert_file 'files/document.md'
         def convert_file(input_file)
-            command = "#{to_command} #{input_file}"
-            begin
-                output = ''
-                IO.popen(command, 'r+') do |p|
-                    p.close_write
-                    output << p.read
-                end
-                output
-            rescue StandardError => err
-                throw Error.new "Error while running '#{command}' on input:\n\n#{input}\n\nPandoc responds: '#{err.message}'"
-            end
+            run_converter "#{to_command} #{input_file}"
         end
 
         # Create a string representation of this converter's pandoc command
@@ -295,6 +276,34 @@ module Paru
             end
         end
 
+        private 
+
+        def run_converter(command, input = nil)
+            begin
+                output = ''
+                error = ''
+                status = 0
+
+                Open3.popen3(command) do |stdin, stdout, stderr, thread|
+                    stdin << input unless input.nil?
+                    stdin.close
+                    output << stdout.read
+                    error << stderr.read
+                    status = thread.value.exitstatus
+                end
+
+                if 0 < status
+                    # pandoc exited with an error
+                    raise Paru::Error.new "error while running:\n\n#{command}\n\nPandoc responded with:\n\n#{error}\n"
+                end
+
+                output
+            rescue Paru::Error => err
+                raise err
+            rescue StandardError => err
+                throw Error.new "Unable to run pandoc via command '#{command}': #{err.message}"
+            end
+        end
     end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.3.0a2
+  version: 0.3.0a3
 platform: ruby
 authors:
 - Huub de Beer
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Paru is a ruby wrapper around pandoc (pandoc 2)