pandocomatic 0.2.5.1 → 0.2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a91e1ee77a00b1064990b56b389a42ac5d81941d77165c983b100ec1642d13
-  data.tar.gz: 56233af1ce48cc32a24aba970d08972760bd9b21c4fe31151bac14ceccae6c8e
+  metadata.gz: 3e92a9d840a361de049ef2e4781ea01aadd9c0d01dcc59e797d8aae008130468
+  data.tar.gz: 4270db08e6f9a2af1ba3557fa5f4ae5feb5e03737c67ae4111f4ff74dd32ef3d
 SHA512:
-  metadata.gz: 3df9df16cc6950d3f58396b722fbcaa78a2d29fbb0ca9a9cebb9dd9d2c4cc1047c0f4a1bcfd8306b48559d6df6bfce327ff319116f0a6fc5ec5451af95578eda
-  data.tar.gz: bda77fdbe40a60ac3e4d9f681009b745f83769382de0d6d313a685a7545533ae1953b054a7cfdd29e404aab1fe1f22d416e3abae367d7acc9822af67d9ba794b
+  metadata.gz: bc6f2c56cb966587b761351649959588388963113fb8dde40dc889e3a6a37b3492a15458a4392fa505e12b0bbe3917c5dd4efd3f0ea47d806d152642d35f38de
+  data.tar.gz: 3abde8331232dd42beac15feccf00d040aed211d501c6aa02dcba6ac7771c2702f299c3dc6c1525017f15af8e3ffb931a6b945309d73ddad8780d4274385c41e

data/lib/pandocomatic/configuration.rb

@@ -242,7 +242,7 @@ module Pandocomatic
         #
         # @return [Boolean]
         def output?()
-            @options[:output_given] and @options[:output]
+          not @options.nil? and @options[:output_given] and @options[:output]
         end
 
         # Get the output file name
@@ -409,6 +409,10 @@ module Pandocomatic
                     destination = rename_destination(rename_script, destination)
                 end
             end
+
+            # If there is a single file input without output specified, set
+            # the output now that we know what the output filename is.
+            @output = destination.delete_prefix "./" if not output?
             
             destination
         end

data/lib/pandocomatic/pandoc_metadata.rb

@@ -188,21 +188,10 @@ module Pandocomatic
             metadata_blocks = input
                 .scan(METADATA_BLOCK)
                 .map {|match| YAML.load "---#{match.join()}..."}
-
-            pandocomatic_blocks = 0
-
-            metadata_blocks = metadata_blocks
-                .select {|m| not m.nil? and not m.empty?}
-                .each do |metadata|
-                    metadata.delete_if do |key|
-                        if key == "pandocomatic_" or key == "pandocomatic"
-                            pandocomatic_blocks += 1
-                            
-                            1 < pandocomatic_blocks 
-                        else 
-                            false
-                        end
-                end
+                .select {|block| not block.nil? and not block.empty?}
+            
+            pandocomatic_blocks = metadata_blocks.count do |block|
+                block.key? "pandocomatic_" or block.key? "pandocomatic"
             end
 
             # According to the pandoc manual: "A document may contain multiple
@@ -211,10 +200,9 @@ module Pandocomatic
             # same field, the value from the first block will be taken."
             #
             # Here we do the same
-            full_metadata = Hash.new
-            metadata_blocks
+            full_metadata = metadata_blocks
                 .reverse
-                .each {|block| full_metadata.merge!(block)}
+                .reduce(Hash.new) {|metadata, block| metadata.merge!(block)}
 
             yaml_string = YAML.dump(full_metadata) + "..."
 

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

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.5.1
+  version: 0.2.5.2
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-10 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.2
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - pandoc, a universal document converter
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.0.beta1
 signing_key: 
 specification_version: 4
 summary: Automate the use of pandoc