pandocomatic 0.2.2.0 → 0.2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17475912055aaa53d0a3113b5f48c79326ed2b6a
-  data.tar.gz: f705fd3f20fa7b0b8136ff8b5673e0841fd27ad1
+  metadata.gz: 855c75e46b4727ccd6acf84d9ba735ffd800d8b5
+  data.tar.gz: a9f5e62d4e9fb6e857e6aea6ff5b8c7d9f8bf740
 SHA512:
-  metadata.gz: b7276c19b1871049a7b9c6ae49c46dae39ee8fd4942820ea3fc207cf66a2c94913dc507c40009cff520e493d726dda3a9c3c67e9840afaff9b6ec4ff9ddd65f3
-  data.tar.gz: 51e91ceb8504537f1646df08cc3b18f4f63e205ae0026eeb0e1871ada8a8b6d37fa809e193fb581558dbe1fb215ebf75b066d0fef85fc207047a90cb285f35db
+  metadata.gz: da17a2290744567aadb6327a6cf20c88ed700366e653ce73ea17f8fb422347a418c7747d81d47fe12e5e00dc493d5f4ed4343cbe45e8be06f96646dd6aea6419
+  data.tar.gz: 736633dc32721b84a7c62743cd11c77f944b12ced0f8b9378f4b2b11401ebef494aab32df5afb3a115cca642c780dc4cc9021b5d2a5c757042b05ddfb51b86df

data/lib/pandocomatic/command/convert_file_command.rb

@@ -66,7 +66,7 @@ module Pandocomatic
             @config = config
             @src = src
             @dst = dst
-            
+
             if template_name.nil? or template_name.empty?
                 @template_name = @config.determine_template @src
             else
@@ -199,7 +199,10 @@ module Pandocomatic
                         # Pandoc multi-word options can have the multiple words separated by
                         # both underscore (_) and dash (-).
                         option = option.gsub "-", "_"
-                        converter.send option, value unless option == 'output' or option == 'use_extension'
+                        converter.send option, value unless 
+                                option == 'output' or 
+                                option == 'use_extension' or
+                                option == 'rename'
                         # don't let pandoc write the output to enable postprocessing
                     rescue
                         warn "The pandoc option '#{option}' (with value '#{value}') is not recognized by paru. This option is skipped." if debug?
@@ -217,24 +220,43 @@ module Pandocomatic
             end
         end
 
+        # Preprocess the input
+        #
+        # @param input [String] the input to preprocess
+        # @param config [Hash] template
+        #
+        # @return [String] the generated output
         def preprocess(input, config = {})
             process input, 'preprocessors', config
         end
 
+        # Postprocess the input
+        #
+        # @param input [String] the input to postprocess
+        # @param config [Hash] template
+        #
+        # @return [String] the generated output
         def postprocess(input, config = {})
             process input, 'postprocessors', config
         end
 
+        # Run setup scripts
+        #
+        # @param config [Hash] template
         def setup(config = {})
             process "", 'setup', config
         end
 
+        # Run cleanup scripts
+        #
+        # @param config [Hash] template
         def cleanup(config = {})
             process "", 'cleanup', config
         end
 
         # Run the input string through a list of filters called processors. There
-        # are to types: preprocessors and postprocessors
+        # are various types: preprocessors and postprocessors, setup and
+        # cleanup, and rename
         def process(input, type, config = {})
             if config.has_key? type then
                 processors = config[type]
@@ -267,6 +289,9 @@ module Pandocomatic
 
         private
 
+        def run_processor
+        end
+
         def use_output_option(dst) 
             OUTPUT_FORMATS.include?(File.extname(dst).slice(1..-1))
         end

data/lib/pandocomatic/configuration.rb

@@ -231,35 +231,39 @@ module Pandocomatic
         def set_destination(dst, template_name, metadata)
             dir = File.dirname dst
 
+            # Use the output option when set.
             determine_output_in_pandoc = lambda do |pandoc|
                 if pandoc.has_key? "output"
                     output = pandoc["output"]
-                    if output.start_with? "/"
-                        # Treat as an absolute path. Note. this probably
-                        # does not work on windows?
-                        return output
-                    else
+                    if not output.start_with? "/"
                         # Put it relative to the current directory
-                        return File.join dir, output
+                        output = File.join dir, output
                     end
+                    output
+                else
+                    nil
                 end
-                return nil
             end
 
             destination = nil
+            rename_script = nil
 
             # Output option in pandoc property has precedence
             if metadata.has_pandocomatic?
                 pandocomatic = metadata.pandocomatic
                 if pandocomatic.has_key? "pandoc"
-                    destination = determine_output_in_pandoc.call pandocomatic["pandoc"]
+                    pandoc = pandocomatic["pandoc"]
+                    destination = determine_output_in_pandoc.call pandoc
+                    rename_script = pandoc["rename"]
                 end
             end
 
             # Output option in template's pandoc property is next
             if destination.nil? and not template_name.nil? and not template_name.empty? then
                 if @templates[template_name].has_key? "pandoc"
-                    destination = determine_output_in_pandoc.call @templates[template_name]["pandoc"]
+                    pandoc = @templates[template_name]["pandoc"]
+                    destination = determine_output_in_pandoc.call pandoc
+                    rename_script ||= pandoc["rename"]
                 end
             end
 
@@ -267,6 +271,10 @@ module Pandocomatic
             # extension updated to the output format
             if destination.nil?
                 destination = set_extension dst, template_name, metadata
+
+                if not rename_script.nil? then
+                    destination = rename_destination(rename_script, destination)
+                end
             end
             
             destination
@@ -620,6 +628,39 @@ module Pandocomatic
             end
             return nil
         end
+
+        # Rename path by using rename script. If script fails somehow, warn
+        # and return the original destination.
+        #
+        # @param rename_script [String] absolute path to script to run
+        # @param dst [String] original destination to rename
+        def rename_destination(rename_script, dst)
+            script = update_path(rename_script, File.dirname(dst))
+
+            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
+                renamed_dst = Processor.run(script, dst)
+                if not renamed_dst.nil? and not renamed_dst.empty?
+                    renamed_dst.strip
+                else
+                    raise StandardError,new("Running rename script '#{script}' on destination '#{dst}' did not result in a renamed destination.")
+                    dst
+                end
+            rescue StandardError => e
+                ProcessorError.new(:error_processing_script, e, [script, dst])
+                dst
+            end
+        end
         
         def marshal_dump()
             [@data_dir, @settings, @templates, @convert_patterns]

data/lib/pandocomatic/pandocomatic.rb

@@ -50,7 +50,7 @@ module Pandocomatic
         ERROR_STATUS = 1266 # This is the sum of the ascii values of the characters in 'pandocomatic'
 
         # Pandocomatic's current version
-        VERSION = [0, 2, 2, 0]
+        VERSION = [0, 2, 2, 1]
 
         # Pandocomatic's default configuration file
         CONFIG_FILE = 'pandocomatic.yaml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.2.0
+  version: 0.2.2.1
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru