paru 0.2.5 → 0.2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185b75188642b10c09282a90bfc79cf3668881f7
-  data.tar.gz: a6ad0e6180196916b569e92c855bb6d0f5bca2c7
+  metadata.gz: e35691d50c4e8cf7e53951d9ba6988dc42137720
+  data.tar.gz: c9f3c94e69dd101e0f9f369e531ae7e5ce74681b
 SHA512:
-  metadata.gz: 6e6140070d0709f90fbd9c23ef86c01685fe1e2f7421203cb8c732f00ece343fe8bdf0c87eee5d4d302697c54153fa37321d2e515b6a077c2354fe6dfb365d30
-  data.tar.gz: 19606ebcbbf9bed59c9c2cbaa694f56d9b2998dd07c8d1b6067f5715d5fde07e3c145fbad059c3458ffc757e7193acfa97e50e08fd915a028ba671fbb874898e
+  metadata.gz: cd6440963be644a3833c2902bd403d30f66785efdfe0c7f34997b172dac19356da484e232b924339c35e7fb3905940e723f875834da2a68b16976758929c4b42
+  data.tar.gz: 3d4c0c55ab5ab82c4d129afdbe2a779ea54f20ecdcec1dd6a42e1680d6e26eae37ad98a07871a7160e4f9167c80743bab8adca4d91b22d293fa71bec1ab6a0b2

data/lib/paru/pandoc.rb

@@ -19,6 +19,8 @@
 require "shellwords"
 require "yaml"
 
+require_relative "error.rb"
+
 module Paru
     # Pandoc is a wrapper around the pandoc document converter. See
     # <http://pandoc.org/README.html> for details about pandoc.  The Pandoc
@@ -76,6 +78,9 @@ module Paru
     #
     #
     class Pandoc
+        
+        # Path to the pandoc executatble to use by paru.
+        PARU_PANDOC_PATH = "PARU_PANDOC_PATH"
 
         # Gather information about the pandoc installation. It runs +pandoc
         # --version+ and extracts pandoc's version number and default data
@@ -85,18 +90,7 @@ module Paru
         # @return [Hash{:version => String, :data_dir => String}] Pandoc's
         #   version, such as "1.17.0.4" and the data directory, such as "/home/huub/.pandoc".
         def self.info()
-            output = ''
-            IO.popen('pandoc --version', 'r+') do |p|
-                p.close_write
-                output << p.read
-            end
-            version = output.match(/pandoc (\d+\.\d+.*)$/)[1]
-            data_dir = output.match(/Default user data directory: (.+)$/)[1]
-
-            {
-                :version => version,
-                :data_dir => data_dir
-            }
+            @@info
         end
 
         # Create a new Pandoc converter, optionally configured by a block with
@@ -153,6 +147,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
@@ -160,6 +155,9 @@ module Paru
                 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
         end
         alias << convert
 
@@ -169,7 +167,7 @@ module Paru
         # @param option_sep [String] the string to separate options with
         # @return [String] This converter's command line invocation string.
         def to_command(option_sep = " \\\n\t")
-            "pandoc\t#{to_option_string option_sep}"
+            "#{@@pandoc_exec.shellescape}\t#{to_option_string option_sep}"
         end
 
         private
@@ -199,8 +197,42 @@ module Paru
             options_arr.join(option_sep)
         end
 
+        # determine pandoc_executable to use in paru
+        @@pandoc_exec = if ENV.has_key? PARU_PANDOC_PATH
+                            ENV[PARU_PANDOC_PATH]
+                        else
+                            "pandoc"
+                        end
+
+        begin
+            version_string = ''
+            IO.popen("#{@@pandoc_exec} --version", 'r+') do |p|
+                p.close_write
+                version_string << p.read
+            end
+        rescue StandardError => err
+            throw Error.new "Unable to run pandoc via command '#{@@pandoc_exec} --version': #{err.message}"
+        end
+
+        version = version_string.match(/pandoc (\d+\.\d+.*)$/)[1]
+        data_dir = version_string.match(/Default user data directory: (.+)$/)[1]
+
+        @@info = {
+            :version => version,
+            :data_dir => data_dir
+        }
+
+        # Load the options for the appropriate major version of pandoc
+        major_version = @@info[:version].split(".").first.to_i
+
+        if not [1, 2].include? major_version 
+            throw Error.new "Unknown major pandoc version: '#{major_version}'. Expected the major version to be '1' or '2'. Please check the pandoc path: '#{@@pandoc_exec}'."
+            # defaults to version 1
+            major_version = 1
+        end
+
         # For each pandoc command line option a method is defined as follows:
-        OPTIONS = YAML.load_file File.join(__dir__, 'pandoc_options.yaml')
+        OPTIONS = YAML.load_file File.join(__dir__, "pandoc_options_version_#{major_version}.yaml")
 
         OPTIONS.keys.each do |option|
             if OPTIONS[option].is_a? Array then

data/lib/paru/{pandoc_options.yaml → pandoc_options_version_1.yaml}

@@ -17,6 +17,7 @@
 # along with Paru.  If not, see <http://www.gnu.org/licenses/>.
 # See http://pandoc.org/README.html for an overview of all options
 #++
+# Options for pandoc version 1.x, in order of occurrence in the pandoc manual.
 # General options
 from:                     ""
 read:                     ""

data/lib/paru/pandoc_options_version_2.yaml

@@ -0,0 +1,111 @@
+#--
+# Copyright 2015, 2016, 2017 Huub de Beer <Huub@heerdebeer.org>
+#
+# This file is part of Paru
+#
+# Paru is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Paru is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Paru.  If not, see <http://www.gnu.org/licenses/>.
+# See http://pandoc.org/README.html for an overview of all options
+#++
+# In order as listed in the output of `pandoc- h` for pandoc version 2.x
+from:                       ""
+read:                       ""
+to:                         ""
+write:                      ""
+output:                     ""
+data_dir:                   ""
+base_header_level:          1
+indented-code-classes:      ""
+filter:                     [""]
+lua-filter:                 [""]
+preserver-tabs:             true
+tab-stop:                   4
+track-changes:              "accept"
+file-scope:                 ""
+extract-media:              ""
+standalone:                 true
+template:                   ""
+metadata:                   [""]
+variable:                   [""]
+print-default-template:     ""
+print-default-data-file:    ""
+dpi:                        96
+eol:                        "native"
+wrap:                       "auto"
+columns:                    78
+toc:                        true
+table-of-contents:          true
+no-highlight:               true
+highlight-style:            ""
+syntax-definition:          ""
+include-in-header:          [""]
+include-before-body:        [""]
+include-after-body:         [""]
+resource-path:              ""
+self-contained:             true
+html-q-tags:                true
+ascii:                      true
+reference-links:            true
+reference-location:         "block"
+atx-headers:                ""
+top-level-division:         "section"
+number-sections:            true
+number-offset:              2
+listings:                   true
+incremental:                true
+slide-level:                1
+section-divs:               true
+default-image-extension:    "png"
+email-obfuscation:          "none"
+id-prefix:                  ""
+title-prefix:               ""
+css:                        [""]
+reference-doc:              ""
+epub-subdirectory:          ""
+epub-cover-image:           ""
+epub-metadata:              ""
+epub-embed-font:            ""
+epub-chapter-level:         1
+latex-engine:               ""
+latex-engine-opt:           ""
+bibliography:               ""
+csl:                        ""
+citation-abbreviation:      ""
+natbib:                     true
+biblatex:                   true
+latexmathml:                ""
+asciimathml:                ""
+mathml:                     true
+mimetex:                    ""
+webtex:                     ""
+jsmath:                     ""
+mathjax:                    ""
+katex:                      ""
+katex-stylesheet:           ""
+gladtex:                    true
+abbreviations:              ""
+trace:                      true
+dump-args:                  true
+ignore-args:                true
+verbose:                    true
+quiet:                      true
+fail-if-warnings:           true
+log:                        ""
+bash-completion:            true
+list_input_formats:         true
+list_output_formats:        true
+list_extensions:            true
+list_highlight_languages:   true
+list_highlight_styles:      true
+version:                    true
+help:                       true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.5.1
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies: []
 description: Use Pandoc (http://www.pandoc.org) with ruby
 email: Huub@heerdebeer.org
@@ -84,7 +84,8 @@ files:
 - lib/paru/filter_error.rb
 - lib/paru/pandoc.rb
 - lib/paru/pandoc2yaml.rb
-- lib/paru/pandoc_options.yaml
+- lib/paru/pandoc_options_version_1.yaml
+- lib/paru/pandoc_options_version_2.yaml
 - lib/paru/selector.rb
 homepage: https://heerdebeer.org/Software/markdown/paru/
 licenses:
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Paru is a ruby wrapper around pandoc