pandocomatic 0.1.4.18 → 0.1.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 168ad85a67400c51df6abc8d7d96dc87191592f4
-  data.tar.gz: 8c092032d858ea267dc547cb728ac33886722c6a
+  metadata.gz: 54c948376695229144be170c711bc475b0bffa5c
+  data.tar.gz: 4541871677bad952bd4c44b7aed1461cc981ccb6
 SHA512:
-  metadata.gz: 89455ed3265e4a986bdc20ce49f5fc880e0f6d74e5b5b5c9bec5718f6fb3df08a5c74d04feb3f659cb734bcb9f4981fb9c7196276d97e794c0dc75aec791f151
-  data.tar.gz: a43671773818e2b9d3c4ef45c955706b43b414ee27fb7951f212569560105801dcb565bdff0ed9ccd7cfa95605b71216e9c89dd6542f67d28120d5af55f0948e
+  metadata.gz: 61a2ccb51775f8c610c4abeab3c9f410567561ea4e684bddac519cdd2520eeabcd65126cc4272c93c56eef604aad82d52a8b15ff3dbc9cebdb52d501e25dbda3
+  data.tar.gz: e115b839f4fbc09d3e4a747f47acba53ce6873106bd9fe7364ea04aca791b1583ba0712e3fb07e9d6813da65ce80f4e37d22ab8043a6107a818b991fa5b48f2c

data/lib/pandocomatic/command/convert_file_command.rb

@@ -62,6 +62,7 @@ module Pandocomatic
         #   this file
         def initialize(config, src, dst, template_name = nil)
             super()
+
             @config = config
             @src = src
             @dst = dst
@@ -104,6 +105,8 @@ module Pandocomatic
 
                 pandoc_options = Configuration.extend_value(pandoc_options, template['pandoc'])
             end
+               
+            template = Configuration.extend_value(metadata.pandocomatic, template) if metadata.has_pandocomatic?
 
             # Run setup scripts
             setup template

data/lib/pandocomatic/command/convert_file_multiple_command.rb

@@ -48,6 +48,7 @@ module Pandocomatic
         @src = src
         
         metadata = PandocMetadata.load_file @src
+
         metadata.templates.each do |template_name|
             raise ConfigurationError.new(:no_such_template, nil, template_name) unless template_name.empty? or config.has_template? template_name
 

data/lib/pandocomatic/configuration.rb

@@ -259,8 +259,9 @@ module Pandocomatic
         def update_path(path, src_dir, check_executable = false)
             updated_path = path
             if path.start_with? './' 
-                # refers to a local dir
-                updated_path = File.join src_dir, path
+                # refers to a local dir; strip the './' before appending it to
+                # the source directory as to prevent /some/path/./to/path
+                updated_path = File.join src_dir, path[2..-1]
             else
                 if path.start_with? '/'
                     updated_path = path

data/lib/pandocomatic/processor.rb

@@ -18,6 +18,7 @@
 #++
 module Pandocomatic
     require 'open3'
+    require_relative 'error/processor_error.rb'
 
     # Generic class for processors used to preprocess, postproces, setup, and
     # cleanup with external scripts or programs during the conversion process.
@@ -34,7 +35,14 @@ module Pandocomatic
         # 
         # @return [String] output of script.
         def self.run script, input
-            output, _ = Open3.capture2(script, :stdin_data => input)
+            output, error, status = Open3.capture3(script, :stdin_data => input)
+
+            warn error unless error.empty?
+
+            if status.exitstatus > 0
+                raise ProcessorError.new(:error_processing_script, StandardError.new(error), [script, input]) 
+            end
+
             output
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.1.4.18
+  version: 0.1.4.19
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru
@@ -19,7 +19,7 @@ dependencies:
         version: 0.2.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5.7
+        version: 0.2.5.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.2.5
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.5.7
+        version: 0.2.5.9
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - pandoc, a universal document converer <http://pandoc.org>
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Automating the use of pandoc