pandocomatic 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ec8a6518098db9f2952411df8fafd55dec81a4c2ee5b619c3e87f39d8a50f41
-  data.tar.gz: e636bf8651e80540cb528509b4efc3ad59763f3e6b900fa6b60dff1989f073c6
+  metadata.gz: 64a6d28368a126d0db126154df753827ee3d79bc678dd570164da442cde462eb
+  data.tar.gz: 556a96419582f0f3a8d5a2ffb1679181bcb2d36ac917278b02cd50385eed3f9a
 SHA512:
-  metadata.gz: 56633baaf8c6d4258300482cb22803495cd056fecca84c9e1656a81c8f298003156b73ad45c4e23b27bcf6ebeca8678db1168f093a605962fa272c75b2bc7be6
-  data.tar.gz: 3cf496b5fa6554c0c8ccca302ef9c6c2d4523ca2b411e24dbbb0cad760e0bd10310ccf1de45ff2645ecae0357faf60a96eab01f6d5578e6f3e41104c5b38ef05
+  metadata.gz: d0b032a03165acc0fdae449d501d849925254a54c8bd88c27160672f0ca1aad189cf927c2ed10617b74d961e873a57019ddbaf8c47119d71b0830c455514b482
+  data.tar.gz: f111513bafd58c972ca246fdb07f6236b898058202542f6baf10d5dce54d26c15cc3acecd4e4dc9504ec7fabb52f586be56fe74b2f25dc63350c14c4346f16bb

data/lib/pandocomatic/command/convert_dir_command.rb

@@ -72,23 +72,23 @@ module Pandocomatic
       Dir.foreach @src_dir do |filename|
         src = File.join @src_dir, filename
 
-        next if config.skip? src
+        next if @config.skip? src
 
         @errors.push IOError.new(:file_or_directory_does_not_exist, nil, src) unless File.exist? src
 
         dst = File.join @dst_dir, filename
 
-        if File.symlink?(src) && !config.follow_links?
+        if File.symlink?(src) && !@config.follow_links?
           subcommand = CreateLinkCommand.new(src, dst)
         elsif File.directory? src
-          subcommand = if config.recursive?
-                         ConvertDirCommand.new(config, src, dst)
+          subcommand = if @config.recursive?
+                         ConvertDirCommand.new(@config, src, dst)
                        else
                          SkipCommand.new(src, :skipping_directory)
                        end
         elsif File.file? src
-          if config.convert? src
-            subcommand = ConvertFileMultipleCommand.new(config, src, dst)
+          if @config.convert? src
+            subcommand = ConvertFileMultipleCommand.new(@config, src, dst)
           elsif !modified_only? || file_modified?(src, dst)
             subcommand = CopyFileCommand.new(src, dst)
           end
@@ -149,7 +149,7 @@ module Pandocomatic
       if File.exist? config_file
         current_config.reconfigure config_file
       else
-        current_config
+        current_config.clone
       end
     end
   end

data/lib/pandocomatic/configuration.rb

@@ -255,24 +255,33 @@ module Pandocomatic
     def reconfigure(filename)
       settings = PandocomaticYAML.load_file filename
       new_config = Marshal.load(Marshal.dump(self))
-      new_config.configure settings, filename
+      new_config.configure settings, filename, recursive: true
       new_config
     rescue StandardError => e
       raise ConfigurationError.new(:unable_to_load_config_file, e, filename)
     end
 
+    #  Create a copy of this configuration
+    #
+    #  @return [Configuration] copy
+    def clone
+      Marshal.load(Marshal.dump(self))
+    end
+
     # Configure pandocomatic based on a settings Hash
     #
     # @param settings [Hash] a settings Hash to mixin in this
     # @param path [String] the configuration's path or filename
     # Configuration.
-    def configure(settings, path)
+    # @param recursive [Boolean] should this configuration be configured
+    # recursively? I.e., when running on a directory?
+    def configure(settings, path, recursive: false)
       reset_settings settings['settings'] if settings.key? 'settings'
 
       return unless settings.key? 'templates'
 
       settings['templates'].each do |name, template|
-        reset_template Template.new(name, template, path)
+        reset_template Template.new(name, template, path), recursive:
       end
     end
 
@@ -719,16 +728,18 @@ module Pandocomatic
       resolved_template
     end
 
-    # Reset the template with name in this Configuration based on a new
+    # Reset the template with same name in this Configuration based on a new
     # template
     #
     # @param template [Template] the template to use to update the template in
-    #   this Configuarion with
-    def reset_template(template)
+    #   this Configuration with
+    # @param recursive [Boolean] should this configuration be configured
+    # recursively? I.e., when running on a directory?
+    def reset_template(template, recursive: false)
       name = template.name
       extended_template = extend_template template
 
-      if @templates.key? name
+      if recursive && @templates.key?(name)
         @templates[name].merge! extended_template
       else
         @templates[name] = extended_template
@@ -771,11 +782,11 @@ module Pandocomatic
     end
 
     def marshal_dump
-      [@data_dir, @settings, @templates, @convert_patterns]
+      [@data_dir, @settings, @templates, @convert_patterns, @root_path]
     end
 
     def marshal_load(array)
-      @data_dir, @settings, @templates, @convert_patterns = array
+      @data_dir, @settings, @templates, @convert_patterns, @root_path = array
     end
 
     def to_stdout?(options)

data/lib/pandocomatic/pandocomatic.rb

@@ -216,6 +216,8 @@ module Pandocomatic
       ErrorPrinter.new(e).print
       exit ERROR_STATUS + 1
     rescue StandardError => e
+      warn e
+      warn e.backtrace
       # An unexpected error has occurred; break off the program drastically
       # for now. This is likely a bug: ask the user to report it.
       UnknownErrorPrinter.new(e).print

data/lib/pandocomatic/version.rb

@@ -20,5 +20,5 @@
 #++
 module Pandocomatic
   # Pandocomatic's current version.
-  VERSION = [2, 0, 1].freeze
+  VERSION = [2, 1, 0].freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Huub de Beer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -220,7 +219,6 @@ licenses:
 - GPL-3.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -236,8 +234,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - pandoc, a universal document converter
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Automate the use of pandoc
 test_files: []