pandocomatic 0.2.7.0 → 0.2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6777ab9ccebbe75dff8b2e818b9092604517db7039035a11612f2cc93dd5ad81
-  data.tar.gz: eae1fffb172cecd76b805cc1b59e72546a4950d2689356d36bacca0dcd67618f
+  metadata.gz: 18dc7f810b75440eda7e6186e30062b2912d984c1b9e5688bbf201dfc0a3ba15
+  data.tar.gz: 06c2f7dccc619bf274471675c3ad3cff5940edf29179a92ae10ea3b7e9a30dab
 SHA512:
-  metadata.gz: c4b1ff0b99853e723c9f8cdda7d4340e81cf2bc649864e35544a596e4d4d8370507b6a1737e64b754cc77a31f2150759734671a336543b05af07fccb86a1831a
-  data.tar.gz: 84320c981c1100d36ac44c575358439899e612652fc82b22e1af3154d7d11e92a23bbbb97759a609c53092898bdf06932ede70a6ae6c275a460bbdf4cc121cce
+  metadata.gz: 8630dd61fac6049714be13fccd69783e9d4559ea308f6ced12bac67521ea7243879ee396dfe045e22eb8cefa36a07bb5642919afc38ce588212c7bd95133c173
+  data.tar.gz: 1e2a6fc78ea0c8a52f88add42a8267c1153f625d00969ffca0917e3d3cd8990bce79149421070f849d3b22c92b8c7db8d2af25aa5a8aeaa0d468a9d5a3015a1d

data/lib/pandocomatic/cli.rb

@@ -125,8 +125,9 @@ module Pandocomatic
           raise CLIError.new(:no_output_given) if not multiple_inputs and File.directory? input.first
         end
 
+        # No check for root_path: a user can supply one that does not exists
+        # at this location and still work on the output location.
         if options[:root_path_given]
-            options[:root_path] = File.absolute_path options[:root_path]    
         end
 
         # Data dir, if specified, should be an existing and readable directory

data/lib/pandocomatic/command/convert_file_command.rb

@@ -126,7 +126,7 @@ module Pandocomatic
             # 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 = FileInfoPreprocessor.run input, @src, src_root, 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

data/lib/pandocomatic/command/convert_file_multiple_command.rb

@@ -64,7 +64,6 @@ module Pandocomatic
             global_templates = @config.determine_templates(@src)
                 
             if global_templates.empty?
-                
                 subcommands.push ConvertFileCommand.new(@config, @src, dst)
             else
                 global_templates.each do |template_name|

data/lib/pandocomatic/configuration.rb

@@ -55,7 +55,9 @@ module Pandocomatic
         'slideous' => 'html',
         'dzslides' => 'html',
         'revealjs' => 'html',
-        's5' => 'html'
+        's5' => 'html',
+        'bibtex' => 'bib',
+        'biblatex' => 'bib'
     }
 
     # Indicator for paths that should be treated as "relative to the root
@@ -301,6 +303,7 @@ module Pandocomatic
             # If a temporary file has been created while concatenating
             # multiple input files, ensure it is removed.
             if @input.is_a? MultipleFilesInput then
+                warn "CLEAN UP"
                 @input.destroy!
             end
         end
@@ -851,7 +854,7 @@ module Pandocomatic
             
             path.delete_prefix! ROOT_PATH_INDICATOR if is_root_relative_path? path
 
-            if File.realpath("#{dst_dir}").start_with? File.realpath(root) then
+            if File.exist? root and File.realpath("#{dst_dir}").start_with?(File.realpath(root)) then
                 rel_start = ""
 
                 until File.identical?(File.realpath("#{dst_dir}/#{rel_start}"), File.realpath(root)) do
@@ -868,11 +871,10 @@ module Pandocomatic
                 # Because the destination is not in a subdirectory of root, a
                 # relative path to that root cannot be created. Instead,
                 # the path is assumed to be absolute relative to root
-                if root.end_with? "/" or path.start_with? "/"
-                    "#{root}#{path}"
-                else
-                    "#{root}/#{path}"
-                end
+                root = root.delete_suffix "/" if root.end_with? "/"
+                path = path.delete_prefix "/" if path.start_with? "/"
+
+                "#{root}/#{path}"
             end
 
 

data/lib/pandocomatic/pandocomatic.rb

@@ -47,7 +47,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, 7, 0]
+        VERSION = [0, 2, 7, 5]
 
         # Run pandocomatic given options
         #

data/lib/pandocomatic/printer/printer.rb

@@ -42,7 +42,7 @@ module Pandocomatic
         #
         # @return [String]
         def to_s()
-            erb = ERB.new(File.read(@template), 0, '>')
+            erb = ERB.new(File.read(@template), trim_mode: '>')
             erb.result(binding())
         end
 

data/lib/pandocomatic/printer/views/help.txt

@@ -150,7 +150,7 @@ AUTHOR
 
 LICENSE
 
-  Copyright 2014—2019 Huub de Beer <Huub@heerdebeer.org>
+  Copyright 2014—2020 Huub de Beer <huub@heerdebeer.org>
 
   Pandocomatic is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by the

data/lib/pandocomatic/printer/views/version.txt

@@ -1,6 +1,6 @@
 Pandocomatic version <%=@version.join('.')%>
 
-© 2014—2019 Huub de Beer <Huub@heerdebeer.org>
+© 2014—2020 Huub de Beer <Huub@heerdebeer.org>
 
 Pandocomatic is free software; pandocomatic is released under the GPLv3.
 

data/lib/pandocomatic/processors/fileinfo_preprocessor.rb

@@ -31,7 +31,7 @@ module Pandocomatic
         # @param path [String] the path to the input document
         # @param options [Hash] pandoc options collected by pandocomatic to run on
         #   this file
-        def self.run input, path, options
+        def self.run input, path, src_path, options
             created_at = File.stat(path).ctime
             modified_at = File.stat(path).mtime
             output = input
@@ -41,6 +41,7 @@ module Pandocomatic
             output << "  to: #{options['to']}\n" if options.has_key? 'to'
             output << "  template: #{options['template']}\n" if options.has_key? 'template'
             output << "  path: '#{path}'\n"
+            output << "  src_path: '#{src_path}'\n"
             output << "  created: #{created_at.strftime '%Y-%m-%d'}\n"
             output << "  modified: #{modified_at.strftime '%Y-%m-%d'}\n"
             output << "...\n\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.7.0
+  version: 0.2.7.5
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru
@@ -19,7 +19,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2.1
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -155,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - pandoc, a universal document converter
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Automate the use of pandoc