pandocomatic 0.1.4.7 → 0.1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9dde99bc773690e6b0ebb3bbdbbd84e828cb1d3
-  data.tar.gz: 4b03ed3fb5fa5d90bb6956d583ae9e54fef498e6
+  metadata.gz: b0734cbbb6eb522f731ca8327ab9fcf5ae511a98
+  data.tar.gz: e8f266ce4bece89cd72b6d9a01bde7b0a87685d8
 SHA512:
-  metadata.gz: f9e21f62f03a0528d9a93481959b9172184aca2198ef3779d7f80e9b1e827ae4b8691fe1f5c35acf3b684d944eddbbd53cb7c9f040fae4a2319fefcad191c269
-  data.tar.gz: 647a7a4977665fdae9e4e763303479388608d5721695ca6bec339888b0de151c7077ca11435bc8af4f079844e272084e1c31a80f6f5a65eec563deebe64f2db2
+  metadata.gz: bbfc1ed17b98565d55972b95827438153e9d7b9d06a81432f69275c86e9f91ab10c848fe468f683596eae82a79e09830589aa33e18b647bac0906eb9ddb8af32
+  data.tar.gz: afde83d1a2639beb117f86349c241289df49c66e5654da6e9a8aac4efb9db513fe3cf891e30b8d9af22a7ff03ae4434a75ebc080e840c3fb067bb86943d2445e

data/lib/pandocomatic/command/convert_file_command.rb

@@ -18,231 +18,235 @@
 #++
 module Pandocomatic
 
-  require 'paru'
+    require 'paru'
+    require 'shellwords'
 
-  require_relative '../pandoc_metadata.rb'
+    require_relative '../pandoc_metadata.rb'
 
-  require_relative '../processor.rb'
-  require_relative '../processors/fileinfo_preprocessor'
-  require_relative '../processors/metadata_preprocessor'
+    require_relative '../processor.rb'
+    require_relative '../processors/fileinfo_preprocessor'
+    require_relative '../processors/metadata_preprocessor'
 
-  require_relative '../configuration.rb'
+    require_relative '../configuration.rb'
 
-  require_relative '../error/io_error.rb'
-  require_relative '../error/configuration_error.rb'
-  require_relative '../error/processor_error.rb'
+    require_relative '../error/io_error.rb'
+    require_relative '../error/configuration_error.rb'
+    require_relative '../error/processor_error.rb'
 
-  require_relative 'command.rb'
+    require_relative 'command.rb'
 
-  OUTPUT_FORMATS = ["docx", "odt", "pdf", "beamer"]
+    OUTPUT_FORMATS = ["docx", "odt", "pdf", "beamer"]
 
-  class ConvertFileCommand < Command
+    class ConvertFileCommand < Command
 
-    attr_reader :config, :src, :dst
+        attr_reader :config, :src, :dst
 
-    # Create a new ConvertFileCommand
-    #
-    # @param config [Configuration] pandocomatic's configuration
-    # @param src [String] the path to the file to convert
-    # @param dst [String] the path to save the output of the conversion
-    # @param template_name [String = nil] the template to use while converting
-    #   this file
-    def initialize(config, src, dst, template_name = nil)
-      super()
-      @config = config
-      @src = src
-      @dst = dst
+        # Create a new ConvertFileCommand
+        #
+        # @param config [Configuration] pandocomatic's configuration
+        # @param src [String] the path to the file to convert
+        # @param dst [String] the path to save the output of the conversion
+        # @param template_name [String = nil] the template to use while converting
+        #   this file
+        def initialize(config, src, dst, template_name = nil)
+            super()
+            @config = config
+            @src = src
+            @dst = dst
 
-      if template_name.nil? or template_name.empty?
-          @template_name = @config.determine_template @src
-      else
-          @template_name = template_name
-      end
+            if template_name.nil? or template_name.empty?
+                @template_name = @config.determine_template @src
+            else
+                @template_name = template_name
+            end
 
-      @errors.push IOError.new(:file_does_not_exist, nil, @src) unless File.exist? @src
-      @errors.push IOError.new(:file_is_not_a_file, nil, @src) unless File.file? @src
-      @errors.push IOError.new(:file_is_not_readable, nil, @src) unless File.readable? @src
-    end
-
-    # Execute this ConvertFileCommand
-    def run
-      convert_file
-    end
-
-    # Create a string representation of this ConvertFileCommand
-    #
-    # @return [String]
-    def to_s
-      "convert #{File.basename @src} #{"-> #{File.basename @dst}" unless @dst.nil?}"
-    end
-
-    private
-
-    def convert_file
-      metadata = PandocMetadata.load_file @src
-      pandoc_options = metadata.pandoc_options || {}
-      template = {}
-
-      # Determine the actual options and settings to use when converting this
-      # file.
-      if not @template_name.nil? and not @template_name.empty?
-        raise ConfigurationError.new(:no_such_template, nil, @template_name) unless @config.has_template? @template_name
-        template = @config.get_template @template_name
-
-        pandoc_options = (template['pandoc'] || {}).merge(pandoc_options) do |key, oldval, newval| 
-          # Options that can occur more than once, such as 'filter' or
-          # 'metadata' are merged, not replaced like options that can occur
-          # only once, such as 'toc' or 'from'
-          if oldval.is_a? Array
-            oldval + newval
-          else
-            newval
-          end
+            @errors.push IOError.new(:file_does_not_exist, nil, @src) unless File.exist? @src
+            @errors.push IOError.new(:file_is_not_a_file, nil, @src) unless File.file? @src
+            @errors.push IOError.new(:file_is_not_readable, nil, @src) unless File.readable? @src
         end
-      end
-
-      # Run setup scripts
-      setup template
-
-      # Read in the file to convert
-      input = File.read @src
-
-      # Run the default preprocessors to mix-in information about the file
-      # that is being converted and mix-in the template's metadata section as
-      # well
-      input = FileInfoPreprocessor.run input, @src, pandoc_options
-      input = MetadataPreprocessor.run input, template['metadata'] if template.has_key? 'metadata' and not template['metadata'].empty?
-
-      # Convert the file by preprocessing it, run pandoc on it, and
-      # postprocessing the output
-      input = preprocess input, template
-      input = pandoc input, pandoc_options, File.dirname(@src)
-      output = postprocess input, template
-
-      # Write out the results of the conversion process to file.
-      if @dst.to_s.empty? and metadata.pandoc_options.has_key? 'output'
-        @dst = metadata.pandoc_options['output']
-      end
-
-      begin
-          unless OUTPUT_FORMATS.include? pandoc_options["to"] then
-              File.open(@dst, 'w') do |file| 
-                  raise IOError.new(:file_is_not_a_file, nil, @dst) unless File.file? @dst
-                  raise IOError.new(:file_is_not_writable, nil, @dst) unless File.writable? @dst
-                  file << output
-              end
-          end
-      rescue StandardError => e
-        raise IOError.new(:error_writing_file, e, @dst)
-      end
-
-      # run cleanup scripts
-      cleanup template
-    end
-    
-    # TODO: update this list
-    PANDOC_OPTIONS_WITH_PATH = [
-      'filter', 
-      'template', 
-      'css', 
-      'include-in-header', 
-      'include-before-body',
-      'include-after-body',
-      'reference-odt',
-      'reference-docx',
-      'epub-stylesheet',
-      'epub-cover-image',
-      'epub-metadata',
-      'epub-embed-font',
-      'epub-subdirectory',
-      'bibliography',
-      'csl',
-      'syntax-definition',
-      'reference-doc',
-      'lua-filter',
-      'extract-media',
-      'resource-path',
-      'citation-abbreviations',
-      'abbreviations',
-      'log'
-    ]
-
-    def pandoc(input, options, src_dir)
-      converter = Paru::Pandoc.new
-      options.each do |option, value|
-        # Pandoc multi-word options can have the multiple words separated by
-        # both underscore (_) and dash (-).
-        option= option.gsub "-", "_"
-
-        if PANDOC_OPTIONS_WITH_PATH.include? option
-          if value.is_a? Array
-              value = value.map {|v| @config.update_path(v, src_dir, option == "filter")}
-          else
-              value = @config.update_path(value, src_dir, option == "filter")
-          end
-        end
-
-        # There is no "pdf" output format; change it to latex but keep the
-        # extension.
-        value = "latex" if option == "to" and value == "pdf"
-
-        converter.send option, value unless option == 'output'
-        # don't let pandoc write the output to enable postprocessing
-      end
-
-      converter.send "output", @dst if OUTPUT_FORMATS.include? options["to"]
-
-      begin
-        puts converter.to_command if debug?
-        converter << input
-      rescue Paru::Error => e
-        raise PandocError.new(:error_running_pandoc, e, input_document)
-      end
-    end
 
-    def preprocess(input, config = {})
-      process input, 'preprocessors', config
-    end
+        # Execute this ConvertFileCommand
+        def run
+            convert_file
+        end
 
-    def postprocess(input, config = {})
-      process input, 'postprocessors', config
-    end
+        # Create a string representation of this ConvertFileCommand
+        #
+        # @return [String]
+        def to_s
+            "convert #{File.basename @src} #{"-> #{File.basename @dst}" unless @dst.nil?}"
+        end
 
-    def setup(config = {})
-        process "", 'setup', config
-    end
+        private
+
+        def convert_file
+            metadata = PandocMetadata.load_file @src
+            pandoc_options = metadata.pandoc_options || {}
+            template = {}
+
+            # Determine the actual options and settings to use when converting this
+            # file.
+            if not @template_name.nil? and not @template_name.empty?
+                raise ConfigurationError.new(:no_such_template, nil, @template_name) unless @config.has_template? @template_name
+                template = @config.get_template @template_name
+
+                pandoc_options = (template['pandoc'] || {}).merge(pandoc_options) do |key, oldval, newval| 
+                    # Options that can occur more than once, such as 'filter' or
+                    # 'metadata' are merged, not replaced like options that can occur
+                    # only once, such as 'toc' or 'from'
+                    if oldval.is_a? Array
+                        oldval + newval
+                    else
+                        newval
+                    end
+                end
+            end
+
+            # Run setup scripts
+            setup template
+
+            # Read in the file to convert
+            input = File.read @src
+
+            # Run the default preprocessors to mix-in information about the file
+            # that is being converted and mix-in the template's metadata section as
+            # well
+            input = FileInfoPreprocessor.run input, @src, pandoc_options
+            input = MetadataPreprocessor.run input, template['metadata'] if template.has_key? 'metadata' and not template['metadata'].empty?
+
+            # Convert the file by preprocessing it, run pandoc on it, and
+            # postprocessing the output
+            input = preprocess input, template
+            input = pandoc input, pandoc_options, File.dirname(@src)
+            output = postprocess input, template
+
+            # Write out the results of the conversion process to file.
+            if @dst.to_s.empty? and metadata.pandoc_options.has_key? 'output'
+                @dst = metadata.pandoc_options['output']
+            end
+
+            begin
+                unless OUTPUT_FORMATS.include? pandoc_options["to"] then
+                    File.open(@dst, 'w') do |file| 
+                        raise IOError.new(:file_is_not_a_file, nil, @dst) unless File.file? @dst
+                        raise IOError.new(:file_is_not_writable, nil, @dst) unless File.writable? @dst
+                        file << output
+                    end
+                end
+            rescue StandardError => e
+                raise IOError.new(:error_writing_file, e, @dst)
+            end
+
+            # run cleanup scripts
+            cleanup template
+        end
 
-    def cleanup(config = {})
-        process "", 'cleanup', config
-    end
+        # TODO: update this list
+        PANDOC_OPTIONS_WITH_PATH = [
+            'filter', 
+            'template', 
+            'css', 
+            'include-in-header', 
+            'include-before-body',
+            'include-after-body',
+            'reference-odt',
+            'reference-docx',
+            'epub-stylesheet',
+            'epub-cover-image',
+            'epub-metadata',
+            'epub-embed-font',
+            'epub-subdirectory',
+            'bibliography',
+            'csl',
+            'syntax-definition',
+            'reference-doc',
+            'lua-filter',
+            'extract-media',
+            'resource-path',
+            'citation-abbreviations',
+            'abbreviations',
+            'log'
+        ]
+
+        def pandoc(input, options, src_dir)
+            converter = Paru::Pandoc.new
+            options.each do |option, value|
+                # Pandoc multi-word options can have the multiple words separated by
+                # both underscore (_) and dash (-).
+                option= option.gsub "-", "_"
+
+                if PANDOC_OPTIONS_WITH_PATH.include? option
+                    if value.is_a? Array
+                        value = value.map {|v| @config.update_path(v, src_dir, option == "filter")}
+                    else
+                        value = @config.update_path(value, src_dir, option == "filter")
+                    end
+                end
+
+                # There is no "pdf" output format; change it to latex but keep the
+                # extension.
+                value = "latex" if option == "to" and value == "pdf"
+
+                converter.send option, value unless option == 'output'
+                # don't let pandoc write the output to enable postprocessing
+            end
+
+            converter.send "output", @dst if OUTPUT_FORMATS.include? options["to"]
+
+            begin
+                puts converter.to_command if debug?
+                converter << input
+            rescue Paru::Error => e
+                raise PandocError.new(:error_running_pandoc, e, input_document)
+            end
+        end
 
-    # Run the input string through a list of filters called processors. There
-    # are to types: preprocessors and postprocessors
-    def process(input, type, config = {})
-      if config.has_key? type then
-        processors = config[type]
-        output = input
-        processors.each do |processor|
-          script = @config.update_path(processor, File.dirname(@src))
+        def preprocess(input, config = {})
+            process input, 'preprocessors', config
+        end
 
-          if not File.exists? script
-            script = Configuration.which(script)
+        def postprocess(input, config = {})
+            process input, 'postprocessors', config
+        end
 
-            raise ProcessorError.new(:script_does_not_exist, nil, script) if script.nil?
-          end
+        def setup(config = {})
+            process "", 'setup', config
+        end
 
-          raise ProcessorError.new(:script_is_not_executable, nil, script) unless File.executable? script
+        def cleanup(config = {})
+            process "", 'cleanup', config
+        end
 
-          begin
-            output = Processor.run(script, output)
-          rescue StandardError => e
-            ProcessorError.new(:error_processing_script, e, [script, @src])
-          end
+        # Run the input string through a list of filters called processors. There
+        # are to types: preprocessors and postprocessors
+        def process(input, type, config = {})
+            if config.has_key? type then
+                processors = config[type]
+                output = input
+                processors.each do |processor|
+                    script = @config.update_path(processor, File.dirname(@src))
+
+                    command, *parameters = script.shellsplit # split on spaces unless it is preceded by a backslash
+
+                    if not File.exists? command
+                        command = Configuration.which(command)
+                        script = "#{command} #{parameters.join(' ')}"
+
+                        raise ProcessorError.new(:script_does_not_exist, nil, command) if command.nil?
+                    end
+
+                    raise ProcessorError.new(:script_is_not_executable, nil, command) unless File.executable? command
+
+                    begin
+                        output = Processor.run(script, output)
+                    rescue StandardError => e
+                        ProcessorError.new(:error_processing_script, e, [script, @src])
+                    end
+                end
+                output
+            else
+                input
+            end
         end
-        output
-      else
-        input
-      end
     end
-  end
 end

data/lib/pandocomatic/pandocomatic.rb

@@ -44,7 +44,7 @@ module Pandocomatic
   require_relative './command/convert_file_multiple_command.rb'
 
   class Pandocomatic
-    VERSION = [0, 1, 4, 7]
+    VERSION = [0, 1, 4, 8]
     CONFIG_FILE = 'pandocomatic.yaml'
 
     def self.run(args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.1.4.7
+  version: 0.1.4.8
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-08 00:00:00.000000000 Z
+date: 2017-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru