pandocomatic 0.2.1.1 → 0.2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741eb81107f1b196f3032903067452e0e502ad63
-  data.tar.gz: 145818d50f2c8dd74e7ee38dc7e32d11305ae27c
+  metadata.gz: 17475912055aaa53d0a3113b5f48c79326ed2b6a
+  data.tar.gz: f705fd3f20fa7b0b8136ff8b5673e0841fd27ad1
 SHA512:
-  metadata.gz: aadb3e5fb153ca4790ac558dc552a5193aceb518c7cd8966c04101aad0bfa883827addb9f01b02abbefbfa7c393c9b3622b110fd3e8d8f5b02e33ef1950d1717
-  data.tar.gz: 1993a9d9335a9899076729e68bb6220722154461493a274f2d0618fe827518f637f5515438e92939356446c65b326c9a301bccf00bfd1b47ec718b4af6f54b6a
+  metadata.gz: b7276c19b1871049a7b9c6ae49c46dae39ee8fd4942820ea3fc207cf66a2c94913dc507c40009cff520e493d726dda3a9c3c67e9840afaff9b6ec4ff9ddd65f3
+  data.tar.gz: 51e91ceb8504537f1646df08cc3b18f4f63e205ae0026eeb0e1871ada8a8b6d37fa809e193fb581558dbe1fb215ebf75b066d0fef85fc207047a90cb285f35db

data/lib/pandocomatic/command/convert_file_command.rb

@@ -199,7 +199,7 @@ 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'
                         # 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?

data/lib/pandocomatic/command/convert_file_multiple_command.rb

@@ -49,11 +49,34 @@ module Pandocomatic
         
         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
-    
-            if not modified_only? or file_modified? @src, dst then
-                subcommand = ConvertFileCommand.new(@config, @src, dst, template_name)
+        subcommands = []
+
+        if metadata.has_template?
+            # There are templates in this document's metadata, try to use
+            # those. 
+            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
+
+                subcommands.push ConvertFileCommand.new(@config, @src, dst, template_name)
+            end
+        else
+            # Try to match any global templates using the glob patterns
+            global_templates = @config.determine_templates(@src)
+                
+            if global_templates.empty?
+                
+                subcommands.push ConvertFileCommand.new(@config, @src, dst)
+            else
+                global_templates.each do |template_name|
+                    subcommands.push ConvertFileCommand.new(@config, @src, dst, template_name)
+                end
+            end
+        end
+
+        # Only run a command if the src file is modified, or if the modified
+        # setting is ignored.
+        subcommands.each do |subcommand|
+            if not modified_only? or file_modified? @src, subcommand.dst then
                 push subcommand unless subcommand.nil? or subcommand.skip?
             end
         end

data/lib/pandocomatic/configuration.rb

@@ -92,7 +92,8 @@ module Pandocomatic
             @settings = {
                 'skip' => ['.*', 'pandocomatic.yaml'],
                 'recursive' => true,
-                'follow-links' => false
+                'follow-links' => false,
+                'match-files' => 'first'
             } 
 
             @templates = {}
@@ -174,7 +175,7 @@ module Pandocomatic
         # @return [Boolean] True if the setting 'recursive' is true, false
         #   otherwise
         def recursive?()
-            @settings['recursive']
+            @settings.has_key? 'recursive' and @settings['recursive']
         end
 
         # Should pandocomatic follow symbolic links given this Configuration?
@@ -182,9 +183,30 @@ module Pandocomatic
         # @return [Boolean] True if the setting 'follow_links' is true, false
         #   otherwise
         def follow_links?()
-            @settings['follow_links']
+            @settings.has_key? 'follow_links' and @settings['follow_links']
         end
 
+        # Should pandocomatic convert a file with all matching templates or
+        # only with the first matching template? Note. A 'use-template'
+        # statement in a document will overrule this setting.
+        #
+        # @return [Boolean] True if the setting 'match-files' is 'all', false
+        # otherwise.
+        def match_all_templates?()
+            @settings.has_key? 'match-files' and 'all' == @settings['match-files']
+        end
+
+        # Should pandocomatic convert a file with the first matching templates
+        # or with all matching templates? Note. Multiple 'use-template'
+        # statements in a document will overrule this setting.
+        #
+        # @return [Boolean] True if the setting 'match-files' is 'first', false
+        # otherwise.
+        def match_first_template?()
+            @settings.has_key? 'match-files' and 'first' == @settings['match-files']
+        end
+
+
         # Set the extension of the destination file given this Confguration,
         # template, and metadata
         #
@@ -288,12 +310,12 @@ module Pandocomatic
                     end
                 end 
             else
-                # TODO: what if there is no pandoc.to?
                 if @templates[template_name].has_key? "pandoc"
                     pandoc = @templates[template_name]["pandoc"]
                     ext = use_extension.call pandoc
+
                     if not ext.nil?
-                        extension = nil
+                        extension = ext
                     elsif pandoc.has_key? "to"
                         extension = strip_extensions.call(pandoc["to"])
                     end
@@ -334,6 +356,25 @@ module Pandocomatic
             end.keys.first
         end
 
+        # Determine the templates to use with this source document given this
+        # Configuration.
+        #
+        # @param src [String] path to the source document
+        # @return [Array[String]] the template's name to use
+        def determine_templates(src)
+            matches = @convert_patterns.select do |template_name, globs|
+                globs.any? {|glob| File.fnmatch glob, File.basename(src)}
+            end.keys
+           
+            if matches.empty?
+               []
+            elsif match_all_templates?
+                matches
+            else
+                [matches.first]
+            end
+        end
+
         # Update the path to an executable processor or executor given this
         # Configuration
         #

data/lib/pandocomatic/default_configuration.yaml

@@ -2,3 +2,4 @@ settings:
     recursive: true
     follow-symlinks: false
     skip: ['.*', 'pandocomatic.yaml']
+    match-files: 'first'

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, 1, 1]
+        VERSION = [0, 2, 2, 0]
 
         # 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.1.1
+  version: 0.2.2.0
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru