pandocomatic 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd24956dd80cddb7d00b97c85b67f273aaac352
-  data.tar.gz: a7e58aca8742f9dd3257f7402bf7b91f641b240f
+  metadata.gz: 8f309756a052d15289809ed50817aab915542e43
+  data.tar.gz: ccdebf26491d9731513ff08523bd96884745c1a3
 SHA512:
-  metadata.gz: 8a9a03171aba28b925e30434ead0a1aae0664a1d78bf322e6e828cc7434c4597947703a04894ce242781fcb5ac9195c252e529eb6fcd4221ab610a6f4464f88b
-  data.tar.gz: 31f06d733453f38c5d02da008fb1da0a632f4b8255f586c9dca839601dbaa3c8770a92f98a1471a8350ca5f9c0bdd6d5ae438bbbcc5060d61de6bcf32c566a3a
+  metadata.gz: 960aeb18970b6f4b0bd1aae7507a2dbe0ce4a3edb93332b8f194654ddf781ffe2dd21d3f6323e83dd88feb4c601094bd246326418133b25085a52f27f785de91
+  data.tar.gz: 1c0e60f1571f89322890fc6aef04105f9f8760b019d0e352868b55c51035fc93c910829ede0a18919c16acce1f8862ee5ccc3dbbe6c83c3f220d835f68457d3c

data/lib/pandocomatic/configuration.rb

@@ -57,7 +57,14 @@ module Pandocomatic
             reset_settings settings['settings'] if settings.has_key? 'settings'
             if settings.has_key? 'templates' then
                 settings['templates'].each do |name, template|
-                    reset_template name, template
+                    full_template = {
+                        'glob' => [],
+                        'preprocessors' => [],
+                        'pandoc' => {},
+                        'postprocessors' => []
+                    }
+
+                    reset_template name, full_template.merge(template)
                 end
             end
         end
@@ -146,7 +153,16 @@ module Pandocomatic
 
         def reset_template name, template
             if @templates.has_key? name then
-                @templates[name].merge! template
+                @templates[name].merge!(template) do |setting, oldval, newval|
+                    case setting
+                    when 'preprocessors', 'postprocessors', 'glob'
+                        oldval.concat(newval).uniq
+                    when 'pandoc'
+                        oldval.merge newval
+                    else
+                        newval
+                    end
+                end
             else
                 @templates[name] = template
             end

data/lib/pandocomatic/dir_converter.rb

@@ -8,8 +8,8 @@ module Pandocomatic
   class DirConverter
 
     def initialize src, dst, config
-      @src_root = src
-      @dst_root = dst
+      @src_root = File.absolute_path src
+      @dst_root = File.absolute_path dst
       @config = config
     end
 
@@ -26,7 +26,15 @@ module Pandocomatic
 
         dst = File.join dst_dir, filename
 
-        if File.directory? src then
+        if File.symlink? src and not config.follow_links?
+            # Symlinks are also recognized as files and directories, so first
+            # check if they should be followed (and treated as files and
+            # directories), or if they should be recreated (if follow-links
+            # setting is false
+            recreate_link src, dst
+            
+        elsif File.directory? src then
+
             if config.recursive? then
           
               # Convert subdirectories only when the recursivity is set in the
@@ -35,9 +43,6 @@ module Pandocomatic
             else
               next # skip directories when not recursive
             end
-        elsif File.symlink? src and not config.follow_links
-
-          recreate_link src, dst
 
         elsif File.file? src 
 
@@ -90,15 +95,17 @@ module Pandocomatic
     end
 
     # Recreate source link in destination tree if it points to somewhere inside
-    # the source tree
+    # the source tree using relative paths
     def recreate_link src, dst
-      src_target = File.readlink(src)
-      full_src_target = File.realpath src_target
-      if full_src_target.start_with? @src_root
-        dst_target = File.join @dst_root, src_target
-        File.symlink dst_target, dst
-      else
-        warn "Skipping link #{src} because it points to outside the source tree"
+      src_target = File.readlink src
+      if src_target.start_with? '.' then
+        full_src_target = File.expand_path src_target, File.dirname(src)
+        dst_target = src_target
+          if full_src_target.start_with? @src_root
+            File.symlink dst_target, dst unless File.exist? dst
+          else
+            warn "Skipping link #{src} because it points to outside the source tree"
+          end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Huub de Beer