pandocomatic 0.1.0.b → 0.1.0.b.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dffe0869e5d1d21dea4701c4a102be0965a5fb38
-  data.tar.gz: f0c876b6f2833288b1c70d02e64c65efee067985
+  metadata.gz: 217edd13fc750fb38bc89a581f4b3346d3209c78
+  data.tar.gz: ed4279ad947ba95dea74869ddac804637c07eb53
 SHA512:
-  metadata.gz: 13a606257cc004eb37f775f24aa561459e0d44adf4657ea0b28dcd7c5e4991a4d7bd5f34f985eca94eef1c972e1800f53be2cf54f8b65247c4edbd5a3e072ca2
-  data.tar.gz: 0c8bb7e39e23858b4a123a5e213005aaed34e63ff42fd213c8c55f54a1cb3583cba51f6eded036012a989dfca15e0b379c524da8dbfb926798aa534b4659ddc5
+  metadata.gz: 695974f4b25f9ca78b193ef07c663c313f8665ff4e20e6c57e3dc308b396c67d14cb6496665d10a923421a36132dfc200e766347259d0907004223466deee0d2
+  data.tar.gz: 1938a93c3ea57ac415af2baeebf6a1b759e653b8e56feb929369e1d726b786b17407ec0e57648b06256bae60110d57b636923a8009e54b17d8bdda03c3b648a5

data/lib/pandocomatic/command/command.rb

@@ -68,6 +68,10 @@ module Pandocomatic
       @errors
     end
 
+    def make_quiet()
+      @@quiet = true
+    end
+
     def index_to_s()
       "#{@@total - @index + 1}".rjust(@@total.to_s.size)
     end

data/lib/pandocomatic/command/convert_file_command.rb

@@ -50,7 +50,7 @@ module Pandocomatic
     end
 
     def to_s
-      "convert #{File.basename @src} -> #{File.basename @dst}"
+      "convert #{File.basename @src} #{"-> #{File.basename @dst}" unless @dst.nil?}"
     end
 
     private
@@ -58,17 +58,22 @@ module Pandocomatic
     def convert_file
       metadata = PandocMetadata.load_file @src
 
+      pandoc_options = metadata.pandoc_options || {}
+      template = {}
+
       if metadata.has_template? then
         template_name = metadata.template_name
       else
         template_name = @config.determine_template @src
       end
 
-      raise ConfigurationError.new(:no_such_template, nil, template_name) unless @config.has_template? template_name
+      if not template_name.nil? and not template_name.empty?
+        raise ConfigurationError.new(:no_such_template, nil, template_name) unless @config.has_template? template_name
 
-      template = @config.get_template template_name
+        template = @config.get_template template_name
 
-      pandoc_options = (template['pandoc'] || {}).merge(metadata.pandoc_options || {})
+        pandoc_options = (template['pandoc'] || {}).merge(pandoc_options)
+      end
 
       input = File.read @src
       input = FileInfoPreprocessor.run input, @src
@@ -112,9 +117,13 @@ module Pandocomatic
     def pandoc(input, options, src_dir)
       converter = Paru::Pandoc.new
       options.each do |option, value|
-
-        value = @config.update_path value, src_dir if 
-        PANDOC_OPTIONS_WITH_PATH.include? option
+        if PANDOC_OPTIONS_WITH_PATH.include? option
+          if value.is_a? Array
+            value = value.map {|v| @config.update_path v, src_dir}
+          else
+            value = @config.update_path value, src_dir
+          end
+        end
 
         converter.send option, value unless option == 'output'
         # don't let pandoc write the output to enable postprocessing

data/lib/pandocomatic/pandocomatic.rb

@@ -80,6 +80,7 @@ module Pandocomatic
             command = ConvertDirCommand.new(configuration, input, output)
           else
             command = ConvertFileCommand.new(configuration, input, output)
+            command.make_quiet
           end
 
           # Notify the user about all configuration errors collected when
@@ -92,7 +93,7 @@ module Pandocomatic
 
           # Pandocomatic is successfully configured: running the
           # actual conversion now.
-          SummaryPrinter.new(command, input, output).print unless quiet
+          SummaryPrinter.new(command, input, output).print unless quiet or not command.directory?
 
           # Depending on the options dry-run and quiet, the command.execute
           # method will actually performing the commands (dry-run = false) and

data/lib/pandocomatic/printer/summary_printer.rb

@@ -31,5 +31,9 @@ module Pandocomatic
       "#{@command.count} command#{'s' if @command.count != 1}"
     end
 
+    def has_output?()
+      not @output.nil? and not @output.empty?
+    end
+
   end
 end

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

@@ -1 +1 @@
-Pandocomatic needed <%=duration%> to convert '<%= @input %>' to '<%= @output %>'.
+Pandocomatic needed <%=duration%> to convert '<%= @input %>'<%if has_output?%> to '<%= @output %>'<%end%>.

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

@@ -1 +1 @@
-<% if @command.count <= 0 then%>Nothing to do<% else %><%= commands %> to execute to convert '<%= @input %>' to '<%= @output %>'<% end %>.
+<% if @command.count <= 0 then%>Nothing to do<% else %><%= commands %> to execute to convert '<%= @input %>'<%if has_output?%> to '<%= @output %>'<%end%><% end %>.

metadata

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