paru 0.4.1.1 → 0.4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c8e2c7d691eaaea71734ab1934a67f2a32890bd63d688ca0b6130143aa19093
-  data.tar.gz: 7fa3ac4f409b8efc0a9803ac59b51223f71c8e50bd74ff10c569ee05da0bf69c
+  metadata.gz: cd33d3d1738034e8ffeb4edcf0430d51f8f0dc05f23511535a4ba3e33c923d23
+  data.tar.gz: c430452f484459c451088ad84db7b603748ed67b3397250c6ad0e1c1773fb89d
 SHA512:
-  metadata.gz: 3e721edcff3239553dc40c970b077da4a23fc9fa21785cc0ce9234c8ef7599a9a9b6b5d8a2e6ffb57648100eea4e1cde0414b19c270e72cf4ee83881492224cf
-  data.tar.gz: 577821db0a3656f5a1ee0a667457249090fee45f269f2a8c24bbb5900a662cf1a564a1be17f1768f97372b232acc94804e78fb69a9d653e0aef49121f8414141
+  metadata.gz: 89f884fd65ffa81c1be750c5d5ad82d96805c81cfedd3d52c9481e817f9d3cdc47d4a4c79f8d396264d18e9ac4d5dc574e7e5a720ce288a38441eefbc32649e7
+  data.tar.gz: 3c12fd5b577195595dec08a398a01dcec4d1297b41a97768fa3077b13c224a385aa0eec624275b98c2db5a938a12efccdc6cfc984f968331ddaf1b6b98c9bf48

data/lib/paru.rb

@@ -18,5 +18,5 @@
 #++
 module Paru
     # Paru's current version
-    VERSION = [0, 4, 1, 0]
+    VERSION = [0, 4, 1, 2]
 end

data/lib/paru/pandoc.rb

@@ -92,8 +92,8 @@ module Paru
         # directory. This method is typically used in scripts that use Paru to
         # automate the use of pandoc.
         #
-        # @return [Hash{:version => String, :data_dir => String}] Pandoc's
-        #   version, such as "1.17.0.4" and the data directory, such as "/home/huub/.pandoc".
+        # @return [Hash{:version => Array<Integer>, :data_dir => String}] Pandoc's
+        #   version, such as "[2.10.1]" and the data directory, such as "/home/huub/.pandoc".
         def self.info()
             @@info
         end
@@ -226,9 +226,13 @@ module Paru
             throw Error.new "Unable to run pandoc via command '#{@@pandoc_exec} --version': #{err.message}"
         end
 
-        version = version_string.match(/pandoc.* (\d+\.\d+.*)$/)[1]
+        version = version_string
+                    .match(/pandoc.* (\d+\.\d+.*)$/)[1]
+                    .split(".")
+                    .map {|s| s.to_i}
+        major_version, minor_version = version
 
-        if "2.7" <= version then
+        if major_version >= 2 and minor_version >= 7 then
             # Pandoc version 2.7 introduced a new default data dir to comply
             # with XDG Base Directory Specification
             xdg_data_dir, old_data_dir = version_string.match(/Default user data directory: (.+)$/)[1].split(" or ")
@@ -254,8 +258,6 @@ module Paru
         }
 
         # Load the options for the appropriate major version of pandoc
-        major_version = @@info[:version].split(".").first.to_i
-
         if not [1, 2].include? major_version 
             throw Error.new "Unknown major pandoc version: '#{major_version}'. Expected the major version to be '1' or '2'. Please check the pandoc path: '#{@@pandoc_exec}'."
             # defaults to version 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paru
 version: !ruby/object:Gem::Version
-  version: 0.4.1.1
+  version: 0.4.1.2
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-13 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies: []
 description: Control pandoc with Ruby and write pandoc filters in Ruby
 email: Huub@heerdebeer.org