RubyGems - flnews_post_proc - Versions diffs - 2.02 → 2.05 - Mend

flnews_post_proc 2.02 → 2.05

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

checksums.yaml +4 -4
data/bin/flnews_post_proc +12 -10
data/changes.txt +15 -1
data/doc/fr/html/flnews_post_proc.html +28 -17
data/doc/fr/man/flnews_post_proc.1.gz +0 -0
data/doc/fr/pdf/flnews_post_proc.pdf +0 -0
data/doc/fr/rst/flnews_post_proc.rst +12 -9
data/doc/html/flnews_post_proc.html +47 -6
data/doc/man/flnews_post_proc.1.gz +0 -0
data/doc/pdf/flnews_post_proc.pdf +0 -0
data/doc/rst/flnews_post_proc.rst +23 -3
data/lib/body.rb +9 -45
data/lib/color_output.rb +3 -3
data/lib/configuration.rb +12 -13
data/lib/flnews_post_proc.conf +12 -12
data/lib/flnews_post_proc.rb +14 -12
data/lib/headers.rb +12 -17
data/lib/newsgroups.rb +12 -12
data/lib/override.rb +17 -56
data/lib/ruby_dlg +10 -11
data/lib/version.rb +12 -12
metadata +50 -11
data/lib/whiptail_dlg +0 -87

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8817d100431b3efc184a9d04d9dd4e9f167522bedc1c18fafe73f8f53aa6a593
-  data.tar.gz: c4edcbcff7e0aa31e9a98a1b77009a8e34fba8697d652b5723285e6e5ec7c1ff
+  metadata.gz: 87bf0a3e9a8c5ab513c440c94fd798aba136a4fd72fb351cfbf133f1270e2758
+  data.tar.gz: 32f644c07859db2b6569621b471a786e4409e0cdaffb5e67a193e54d7f7e99a7
 SHA512:
-  metadata.gz: 415eb0c42645803f583cdafbfb6972d524175cb1ce7968f9089081ed946e9f5058e12181cea53ce978aed25942c64e52aad18f152276c967fe1b4cbdb08a86da
-  data.tar.gz: ca800a99b820edbdef0eaff62dde3aca16b790593cc3358cc6da8399b8730b4d73fb6e925338ca046bb6a4ee45b6f535af302e11e5cae299ac2a6813786528b5
+  metadata.gz: ae7465a7d6e9ec4dee294344bbdb1d6c10950351f6d5eeddb84c324d3700e653d4bb305170415071632208b3f5ec0e2f4ec05ada59dee07d9426cde2f7e87a1d
+  data.tar.gz: e0180d504592a9ab223d46c994b5a79ae81bb5a2b62970915b0b683d546c79ef2affdd12c6b17932f71a63639d9fc8c25ad41289ec69ce03a429ae71db6c92b0

data/bin/flnews_post_proc CHANGED Viewed

@@ -3,7 +3,7 @@
 =begin
 /***************************************************************************
- *   ©2023-2024, Michael Uplawski <michael.uplawski@uplawski.eu>           *
+ *   ©2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>           *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE *
@@ -22,8 +22,7 @@ if ! (/linux/ =~ RUBY_PLATFORM)
   exit false
 end
-# needs the ruby-filemagic gem
-require 'filemagic'
+require 'mimemagic'
 require 'tempfile'
 require_relative '../lib/override'
@@ -68,21 +67,24 @@ if (!STDIN.tty?)
   if !artext.strip.empty?
     # Be sure to know what you are doing.
     # Ask around in case of doubt.
-    mime = FileMagic.mime.buffer artext
-    debug('mime is ' << mime.split(';')[0])
-    if (['news', 'rfc822'].none? {|m|  mime.start_with?('message/' << m) } )
+    type = ''
+    magic = MimeMagic.by_magic(artext)
+    # mime = FileMagic.mime.buffer artext
+    debug('magic is ' << magic.to_s)
+    type = magic.type if magic
+    if (['news', 'rfc822'].none? {|m| type.start_with?('message/' << m) } )
       # Not a pure news message
       # Add more reactions, as you stumble upon them ...
-      warn ("Input is of wrong mime-type " << mime.split(';')[0])
+      warn ("Input is of wrong type " << type)
       # Javascript okay
-      if (['javascript'].any? {|m| mime.start_with?('application/' << m)} )
+      if (['javascript'].any? {|m| type.start_with?('application/' << m)} )
         warn 'Input contains java-script code!'
       # C okay
-      elsif(['x-c'].any? {|m| mime.start_with?('text/' << m)} )
+      elsif(['x-c'].any? {|m| type.start_with?('text/' << m)} )
         warn 'Input contains C- or C++ code!'
       # Ruby okay
-      elsif(['x-ruby'].any? {|m| mime.start_with?('text/' << m) })
+      elsif(['x-ruby'].any? {|m| type.start_with?('text/' << m) })
         warn 'Input contains Ruby-code!'
       else
         warn 'Input contains other things than plain-text, but I cannot say, what.'

data/changes.txt CHANGED Viewed

@@ -1,6 +1,20 @@
+v.2.05
+    *) Gemspec: Dependency for io-console added.
+v.2.04
+    *) Gemspec: Dependencies added
+       -) gem New_rfc_2047 was missing from the specs.
+       -) MimeMagic was already in the specs
+v.2.03
+    *) Ruby-Filemagic has been replaced by MimeMagic.
+    *) Calls to force_encoding() prior String.gsub have been added
+       Ruby 4.1.0 appears to be stricter in handling encoding mismatches.
+    *) Bugfix: A typo in a require statement had been corrected.
+    *) Whiptail dialog code removed
 v.2.02
     *) Bugfix: There was output to STDOUT unrelated to the message in
-       preparation and made Flnews complain. Also, posting was impossible.
+       preparation which made Flnews complain. Also, posting was impossible.
 v.2.01
     *) The documentation has been updated.
     *) Corrected behavior when logging is disabled in the interactive dialog

data/doc/fr/html/flnews_post_proc.html CHANGED Viewed

@@ -57,7 +57,7 @@
             <li>
               <p><a class="reference internal" href=
-              "#dialogue-pour-desactiver-des-options" id=
+              "#dialogue-pour-desactiver-des-options-1" id=
               "toc-entry-4">Dialogue pour désactiver des
               options</a>
               </p>
@@ -289,10 +289,19 @@
             "#creation-des-notes-de-bas-de-page">Création des notes
             de bas de page</a>)</p>
           </li>
+          <li>
+            <p>flnews ne propose actuellement pas la sauvegarde
+            d'un article dont vous voulez retarder la publication.
+            <strong>flnews_post_proc</strong> vous laisse cette
+            option, si un répertoire pour les brouillons a été
+            configuré.</p>
+          </li>
         </ul>
       </section>
-      <section id="dialogue-pour-desactiver-des-options">
+      <section id="dialogue-pour-desactiver-des-options-1">
+        <span id="dialogue-pour-desactiver-des-options"></span>
         <h3>Dialogue pour désactiver des options</h3>
         <p>ATTN! Depuis la version 1.72, YAD et Zenity ne sont plus
@@ -767,16 +776,15 @@ alt.fr.test: /home/[utilisateur]/.signatures</pre>
       <section id="remplacement-avec-signature">
         <h3>Remplacement avec signature</h3>
-        <p>Lors du remplacement d'un article existant, aucune
-        signature n'est appliquée automatiquement. Ceci permet de
-        conserver autant de contenu original que possible.</p>
-        <p>Pour conserver la signature originale dans la nouvelle
-        version de l'article :</p>
+        <p>Depuis version 2.0, lors du remplacement d'un article
+        existant, la signature est appliquée de la même manière que
+        pour d'autres nouvelles articles. Quand même, si vous
+        souhaitez garder la signature de l'article que vous
+        remplacez, vous pouvez:</p>
         <ol class="arabic simple">
           <li>
-            <p>Dans flnews, sélectionnez l'intégralité de l'article
+            <p>dans flnews, sélectionnez l'intégralité de l'article
             avec la souris – de la première ligne (y compris toute
             introduction) jusqu'à la dernière ligne de la
             signature.</p>
@@ -795,14 +803,17 @@ alt.fr.test: /home/[utilisateur]/.signatures</pre>
           </li>
           <li>
-            <p>Envoyez l'article.</p>
+            <p>Dans le <a class="reference internal" href=
+            "#dialogue-pour-desactiver-des-options">Dialogue pour
+            désactiver des options</a> désactiver l'option pour les
+            signatures.</p>
           </li>
-        </ol>
-        <p><strong>Note :</strong> Le dialogue de configuration
-        (voir ci-dessous : <a class="reference internal" href=
-        "#override-config">OVERRIDE_CONFIG</a>) n'affecte pas les
-        signatures lors d'un remplacement.</p>
+          <li>
+            <p>Appuyez sur '0' pour valider vos choix et faire
+            flnews envoyer l'article.</p>
+          </li>
+        </ol>
       </section>
       <section id="tester">
@@ -897,7 +908,7 @@ alt.fr.test: /home/[utilisateur]/.signatures</pre>
         "https://creativecommons.org/licenses/by-nd/4.0/deed.fr">CC
         BY-ND 4.0</a></p>
-        <p>Date: 2026-06-30</p>
+        <p>Date: 2026-08-11</p>
         <p><strong>Ω</strong>
         </p>
@@ -906,7 +917,7 @@ alt.fr.test: /home/[utilisateur]/.signatures</pre>
   </main>
   <div id='page_dt'>
-    2026-06-30
+    2026-08-11
   </div>
 </body>
 </html>

data/doc/fr/man/flnews_post_proc.1.gz CHANGED Viewed

Binary file

data/doc/fr/pdf/flnews_post_proc.pdf CHANGED Viewed

Binary file

data/doc/fr/rst/flnews_post_proc.rst CHANGED Viewed

@@ -111,6 +111,12 @@ des raisons parfois arbitraires :
   l'objet plus précisément=% » (voir plus bas : `Création des notes de bas
   de page`_)
+* flnews ne propose actuellement pas la sauvegarde d'un article dont vous voulez
+  retarder la publication. |program| vous laisse cette option, si un répertoire
+  pour les brouillons a été configuré.
+.. _Dialogue pour désactiver des options:
 Dialogue pour désactiver des options
 ---------------------------------------
 ATTN! Depuis la version 1.72, YAD et Zenity ne sont plus utilisés pour le
@@ -458,13 +464,11 @@ fois que les marqueurs de notes de bas de page auront remplacé le texte intégr
 Remplacement avec signature
 ---------------------------
-Lors du remplacement d'un article existant, aucune signature n'est appliquée
-automatiquement. Ceci permet de conserver autant de contenu original que
-possible.
-Pour conserver la signature originale dans la nouvelle version de l'article :
+Depuis version 2.0, lors du remplacement d'un article existant, la signature est appliquée
+de la même manière que pour d'autres nouvelles articles. Quand même, si vous souhaitez
+garder la signature de l'article que vous remplacez, vous pouvez:
-1. Dans flnews, sélectionnez l'intégralité de l'article avec la souris – de la
+1. dans flnews, sélectionnez l'intégralité de l'article avec la souris – de la
    première ligne (y compris toute introduction) jusqu'à la dernière ligne de
    la signature.
@@ -474,10 +478,9 @@ Pour conserver la signature originale dans la nouvelle version de l'article :
    dans le texte modifiable, contrairement à la situation normale où flnews
    supprime les signatures avant d'ouvrir l'éditeur.
-4. Envoyez l'article.
+4. Dans le `Dialogue pour désactiver des options`_ désactiver l'option pour les signatures.
-**Note :** Le dialogue de configuration (voir ci-dessous : `OVERRIDE_CONFIG`_)
-n'affecte pas les signatures lors d'un remplacement.
+5. Appuyez sur '0' pour valider vos choix et faire flnews envoyer l'article.
 Tester
 ------

data/doc/html/flnews_post_proc.html CHANGED Viewed

@@ -257,6 +257,14 @@
               "#editing-footnotes">EDITING FOOTNOTES</a>,
               below.</p>
             </li>
+            <li>
+              <p>When you decide to postpone the publication of an
+              article, flnews does currently not offer a way to
+              keep draft messages. The post-processor lets you save
+              preliminary versions of your message in a configured
+              directory instead of posting them.</p>
+            </li>
           </ul>
         </blockquote>
       </section>
@@ -714,10 +722,43 @@ comp.*: /home/[user]/.my_sigs</pre>
         <span id="signatures-in-supersedes"></span>
         <h3>Signatures in Supersedes</h3>
-        <p>Since version 2.0, signatures in supersedes are not
-        handled differently from other articles. This paragraph
-        will be removed in the next version of the
-        documentation.</p>
+        <p>Since version 2.0, signatures in supersedes are by
+        default not handled differently from other articles, and
+        their signature is assigned in the same way as to a new
+        original article. However, if you want to maintain the
+        signature from the post that you want to replace, you
+        can:</p>
+        <blockquote>
+          <ul class="simple">
+            <li>
+              <p>select the complete message body of the original
+              article, including the signature</p>
+            </li>
+            <li>
+              <p>Trigger the supersedes in flnews.</p>
+            </li>
+            <li>
+              <p>Write your new version of the article while
+              leaving the current signature intact.</p>
+            </li>
+            <li>
+              <p>In the Override Dialog (see <a class=
+              "reference internal" href=
+              "#dialog-for-overriding-settings">Dialog for
+              Overriding Settings</a>), clear the signature
+              option.</p>
+            </li>
+            <li>
+              <p>Hit '0' to confirm your options and to make flnews
+              send the article.</p>
+            </li>
+          </ul>
+        </blockquote>
       </section>
       <section id="testing-1">
@@ -825,7 +866,7 @@ comp.*: /home/[user]/.my_sigs</pre>
           "https://creativecommons.org/licenses/by-nd/4.0/">CC
           BY-ND 4.0</a></p>
-          <p>Date: 2026-08-01</p>
+          <p>Date: 2026-08-11</p>
         </blockquote>
         <p><strong>Ω</strong>
@@ -835,7 +876,7 @@ comp.*: /home/[user]/.my_sigs</pre>
   </main>
   <div id='page_dt'>
-    2026-08-01
+    2026-08-11
   </div>
 </body>
 </html>

data/doc/man/flnews_post_proc.1.gz CHANGED Viewed

Binary file

data/doc/pdf/flnews_post_proc.pdf CHANGED Viewed

Binary file

data/doc/rst/flnews_post_proc.rst CHANGED Viewed

@@ -97,6 +97,11 @@ Limitations of Basic Newsreaders
     describing the object further=%". See also the hints under
     `EDITING FOOTNOTES`_, below.
+  * When you decide to postpone the publication of an article, flnews does
+    currently not offer a way to keep draft messages. The post-processor lets
+    you save preliminary versions of your message in a configured directory
+    instead of posting them.
 .. _Dialog for Overriding Settings:
 Dialog for Overriding Settings
@@ -409,9 +414,24 @@ Editing footnotes
 Signatures in Supersedes
 ------------------------
-Since version 2.0, signatures in supersedes are not handled differently from
-other articles. This paragraph will be removed in the next version of the
-documentation.
+Since version 2.0, signatures in supersedes are by default not handled
+differently from other articles, and their signature is assigned in the same
+way as to a new original article.
+However, if you want to maintain the signature from the post that you want to
+replace, you can:
+  * select the complete message body of the original article, including the
+    signature
+  * Trigger the supersedes in flnews.
+  * Write your new version of the article while leaving the current signature
+    intact.
+  * In the Override Dialog (see `Dialog for Overriding Settings`_), clear the
+    signature option.
+  * Hit '0' to confirm your options and to make flnews send the article.
 .. _Testing:

data/lib/body.rb CHANGED Viewed

@@ -2,7 +2,7 @@
 =begin
   /***************************************************************************
-   *   2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+   *   2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>            *
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the WTFPL 2.0 or later, see                     *
    *   http://www.wtfpl.net/about/                                           *
@@ -167,7 +167,8 @@ class Body
   end
   def join
-    new_body = @lines.join("\r\n") << "\r\n"
+    lines = @lines.collect{|l| l.force_encoding('utf-8')}
+    new_body = lines.join("\r\n") << "\r\n"
     # replace ellipsis
     new_body.gsub!('...', '…')
     return new_body
@@ -187,21 +188,11 @@ class Body
     if @@config.VFY_URLS
       debug 'verifying URLs'
       @lines.each_with_index do | l, i |
-        # leave cited lines as they are.
+        # leave quoted lines as they are.
         if !l.start_with?( '>')
-=begin Currently Unused
-          # IMPORTANT --------------------------------->
-          # IT IS HENCEFORTH PROHIBITED TO WRITE AN EMAIL-ADDRESS
-          # IN THE BODY OF A NEWS-POST AND TO NOT PREPEND IT WITH
-          # mailto:
-          #  ... Because I do not know what to do in these cases,
-          #  and I am the boss!
-          #  <----------------------------
-          # BUGFIX : Urls with @
-          # BUGFIX : email address in the intro
-          new_line = handle_news(l) if !@intro || l.strip != @intro.strip
-=end
+          #  Handling of news- and mail-links has been
+          #  removed.
+          #
           # http(s)
           if l.include?('http')
             new_line = handle_http(l)
@@ -218,7 +209,8 @@ class Body
     ref_delim = @@config.REFERENCES_DELIMITER
     debug('references delimiter is ' << ref_delim)
     references = Array.new
-    body = @lines.join($LN)
+    # avoids a lot of trouble
+    body = @lines.join($LN).force_encoding('utf-8')
     if ref_delim && !ref_delim.strip.empty?
       unless ref_delim == ref_delim.reverse
         ref_delim.strip!
@@ -276,34 +268,6 @@ class Body
   end
   private
-  # handle <news:..@...>
-  def handle_news(l)
-    # ... “Do not trust nobody!”
-    if l.include?('@') && ! l.include?('http:') && ! l.include?('https:')
-      # And I forgot how this works. It does.
-      l.split.collect do |ele|
-        # angular brackets are there alright. Hurra.
-        url = ele.match(/\<(.*)\>/)
-        unless !url
-          debug(' with angular brackets: ' << url.inspect)
-          l = l.sub(url[1], 'news:' << url[1]) if !url[1].start_with?('mailto') && !url[1].start_with?('news')
-        else
-          url = ele.match(/\S+@(\.|[^\p{P}]+)\S+/)
-          if url
-            debug(' withOUT angular brackets: ' << url.inspect)
-            if !url[0].start_with?('mailto') && !url[0].start_with?('news')
-              l.sub!(url[0], 'news:' << url[0] )
-            end
-            l.sub!('news:', '<news:')
-            l.sub!(url[0], url[0] << '>')
-          end
-        end
-      end # url_strs = collect
-      debug(' news: line is now ' << l)
-      return l
-    end
-  end
   # formatting http URLs, not much is done here.
   def handle_http(l)
     debug('handle http')

data/lib/color_output.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 #encoding: UTF-8
 =begin
-/***************************************************************************
- *   2023-2024, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ ***************************************************************************
+ *   2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>            *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the WTFPL 2.0 or later, see                     *
  *   http://www.wtfpl.net/about/                                           *
@@ -10,7 +10,7 @@
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
  *                                                                         *
- ***************************************************************************/
+ ***************************************************************************
 =end
 # Functions to apply colors to terminal output.

data/lib/configuration.rb CHANGED Viewed

@@ -1,16 +1,16 @@
 #encoding: UTF-8
 =begin
-/***************************************************************************
- *   2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>            *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the WTFPL 2.0 or later, see                     *
- *   http://www.wtfpl.net/about/                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
- *                                                                         *
- ***************************************************************************/
+***************************************************************************
+    2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the WTFPL 2.0 or later, see
+    http://www.wtfpl.net/about/
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ ***************************************************************************
 =end
 require_relative 'basic_logging'
@@ -131,8 +131,7 @@ class Configuration
       rescue Exception => ex
         msg = "Cannot use the configuration-file (" << @config_file << ")"
         msg << "\n\t" << ex.message
-        # No log.
-        # error msg
+        # No log. Use STDERR.
         STDERR.puts(msg << "\nAborting, bye\n")
         exit false
       end

data/lib/flnews_post_proc.conf CHANGED Viewed

@@ -1,14 +1,14 @@
-#/***************************************************************************
-# *   2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>           *
-# *                                                                         *
-# *   This program is free software; you can redistribute it and/or modify  *
-# *   it under the terms of the DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE *
-# *                                                                         *
-# *   This program is distributed in the hope that it will be useful,       *
-# *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-# *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
-# *                                                                         *
-# ***************************************************************************/
+# ***************************************************************************
+#    2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>
+#
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# ***************************************************************************
 # This is a YAML file. Keep intact these three dashes.
 ---
 # CONFIG_VERSION – DO NOT MODIFY
@@ -17,7 +17,7 @@
 # the process, if they are still valid.
 # ATTN! COMMENTS WILL BE REMOVED but a copy of your previous configuration
 # will be saved in a file with a version suffix.
-CONFIG_VERSION: 1.95
+CONFIG_VERSION: 2.02
 # FUP_NAME
 # A Regular Expression, describing the string which contains the name of

data/lib/flnews_post_proc.rb CHANGED Viewed

@@ -1,16 +1,16 @@
 #encoding: UTF-8
 =begin
-/***************************************************************************
- *   2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>            *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the WTFPL 2.0 or later, see                     *
- *   http://www.wtfpl.net/about/                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
- *                                                                         *
- ***************************************************************************/
+***************************************************************************
+    2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+    This program is free software; you can redistribute it and/or modify  *
+    it under the terms of the WTFPL 2.0 or later, see                     *
+    http://www.wtfpl.net/about/                                           *
+                                                                          *
+    This program is distributed in the hope that it will be useful,       *
+    but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+                                                                          *
+***************************************************************************
 =end
 require 'yaml'
@@ -50,6 +50,8 @@ class PostProcessor
       debug "\thave newsgroups " << @newsgroups.to_s
     rescue Exception => ex
       error "Cannot get Newsgroups: " << ex.message
+      error "Aborting, bye"
+      exit false
     end
     # Order matters. These actions work on a
@@ -68,7 +70,7 @@ class PostProcessor
     # get the headers and the body as a string.
     # Assemble.
-    @article = headers.join << $LN << @body.join
+    @article = headers.join.force_encoding('utf-8') << $LN << @body.join
     diff = Diffy::Diff.new(article_text, @article, :context => 2).to_s
     info("\n" << "–" * 20 << "\nDiffs\n" << "–" * 20 << "\n" << diff)

data/lib/headers.rb CHANGED Viewed

@@ -1,16 +1,16 @@
 #encoding: UTF-8
 =begin
-/***************************************************************************
- *   2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>            *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the WTFPL 2.0 or later, see                     *
- *   http://www.wtfpl.net/about/                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
- *                                                                         *
- ***************************************************************************/
+***************************************************************************
+    2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+    This program is free software; you can redistribute it and/or modify  *
+    it under the terms of the WTFPL 2.0 or later, see                     *
+    http://www.wtfpl.net/about/                                           *
+                                                                          *
+    This program is distributed in the hope that it will be useful,       *
+    but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+                                                                          *
+***************************************************************************
 =end
 require 'rfc_2047'
@@ -64,10 +64,6 @@ class Headers
         rescue Exception => ex
           exit false;
         end
-        # Consider the two following fixes as preliminary until proven.
-        # Getting older, this kind of problem occupies me a lot more than
-        # it should.
-        #
         # value is all after the first colon
         val = l.match(/:(.*)/)[1].lstrip
       else # start_with?('  ')
@@ -196,7 +192,6 @@ class Headers
         hv = @headers[:Subject]
         if hv
           debug 'checking for altered Subject'
           # Our own very first article with an altered subject line, uses:
           # (old:
@@ -220,7 +215,7 @@ class Headers
           olds << /\s*\(etait\s?:.*/i
           #decode subject from header value
-          subj = Rfc2047.decode(hv)
+          subj = Rfc2047.decode(hv.force_encoding('utf-8') )
           debug 'subject encoding: ' << hv.encoding.to_s
           debug 'decoded subject: ' << subj
           # check for each of those regexps

data/lib/newsgroups.rb CHANGED Viewed

@@ -1,16 +1,16 @@
 #encoding: UTF-8
 =begin
-/***************************************************************************
- *   2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>            *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the WTFPL 2.0 or later, see                     *
- *   http://www.wtfpl.net/about/                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
- *                                                                         *
- ***************************************************************************/
+***************************************************************************
+    2023-2026, Michael Uplawski <michael.uplawski@uplawski.eu>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the WTFPL 2.0 or later, see
+    http://www.wtfpl.net/about/
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+***************************************************************************
 =end
 # An object of this class concentrates the specificities of chosen
@@ -174,7 +174,7 @@ class Newsgroups
   # write a new rearranged version of the signature file for
   # better hazard.
-  # EXPERIMENTAL
+  # UNUSED
   def rearrange_sigs(sigfile, all_sigs)
     if File.writable?(sigfile)
       new_sigs = Array.new(all_sigs.length)

data/lib/override.rb CHANGED Viewed

@@ -1,16 +1,16 @@
 #encoding: UTF-8
 =begin
-/***************************************************************************
- *   2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>            *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the WTFPL 2.0 or later, see                     *
- *   http://www.wtfpl.net/about/                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
- *                                                                         *
- ***************************************************************************/
+***************************************************************************
+    2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+    This program is free software; you can redistribute it and/or modify  *
+    it under the terms of the WTFPL 2.0 or later, see                     *
+    http://www.wtfpl.net/about/                                           *
+                                                                          *
+    This program is distributed in the hope that it will be useful,       *
+    but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
+                                                                          *
+***************************************************************************
 =end
 # This class manages a dialog to alter the behavior of the
@@ -29,12 +29,10 @@ class OverrideDlg
   XTERM    = 'xterm'
   # TERMINAL = 'x-terminal-emulator'
-  WHIPTAIL = 'whiptail'
-  # The external programs which are supported for the time. They will be run in
-  # a new process (IO.popen() ).  The first program from this array, which is
-  # found in the Path, will be used. Whiptail and a pure ruby dialog
-  # necessitate that xterm be found, too.
-  @@Executables = [WHIPTAIL, XTERM]
+  # There used to be others, but only xterm remained.
+  @@Executables = [XTERM]
   @@LIBDIR = File::dirname(__FILE__)
   # The configuration variables that can be unset.
   # This class instance variable is exposed via a getter.
@@ -68,17 +66,7 @@ class OverrideDlg
       opts = nil
       begin
         if has? XTERM
-          # if has?(WHIPTAIL)
-          ########
-          # Version 2.01 needs additional options in the override dialog.
-          # The whiptail dialog is too cumbersome.
-          ########
-          #  return whiptail_dlg
-          #else
-          #  debug 'using naked xterm'
-            #return ruby_dlg.split.collect {|o| o.to_s}.join(' ')
-            return ruby_dlg
-          #end
+          return ruby_dlg
         end
       rescue SystemExit
         msg = 'Process is cancelled (SystemExit)'
@@ -121,34 +109,7 @@ class OverrideDlg
     @executables.include? ex_name
   end
-  ###### The following methods call a script, each, in an external process.
-  # There appears to be some Exception handling missing, but it does not
-  # hurt for the time being. Anyway, I do not care.
-  # creates a whiptail dialog in xterm.
-  def whiptail_dlg
-    debug('whiptail dialog')
-    # tf = Tempfile.new
-    tf = File.new('/tmp/whiptail_out', "w+")
-    debug 'writing Whiptail output to ' << tf.to_s
-    # dlg = @config.BINDIR << File::Separator << 'whiptail_dlg'
-    dlg = @@LIBDIR << File::Separator << 'whiptail_dlg'
-    dialog = XTERM.dup << ' -e ' << dlg << ' ' << tf.path
-    io = IO::popen(dialog)
-    Process.wait(io.pid )
-    nopts = []
-    nopts = tf.readlines
-    exit true if(nopts.empty? || 'exit' == nopts[0].strip)
-    # tf.unlink
-    return nopts
-  end
   # Creates a textual dialog in xterm.
-  # Some duplicate code, here, but I am afraid to oversee
-  # unique requirements of the external programs. It had
-  # not been necessary to correct the global behavior,
-  # but adaptations in each single method should be
-  # possible.
   def ruby_dlg
     debug('xterm dialog')
     tf = Tempfile.new
@@ -168,7 +129,7 @@ class OverrideDlg
     end
     nopts = tf.readlines
     debug 'nopts is ' << nopts.to_s
-    exit true if('exit' == nopts[0].strip)
+    exit true if(nopts && !nopts.empty? && 'exit' == nopts[0].strip)
     tf.unlink
     return nopts
   end

data/lib/ruby_dlg CHANGED Viewed

@@ -1,23 +1,22 @@
 #!/usr/bin/env ruby
 =begin
-/***************************************************************************
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the WTFPL 2.0 or later, see                     *
- *   http://www.wtfpl.net/about/                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
- *                                                                         *
- ***************************************************************************/
+***************************************************************************
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the WTFPL 2.0 or later, see
+    http://www.wtfpl.net/about/
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+***************************************************************************
 =end
 require 'readline'
 require_relative 'color_output'
 require 'io/wait'
 require 'io/console'
-require 'configuration'
 if !ARGV.empty? && ARGV.length > 0
   ofl = nil

data/lib/version.rb CHANGED Viewed

@@ -1,20 +1,20 @@
 #encoding: UTF-8
 =begin
-/***************************************************************************
- *   2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>            *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the WTFPL 2.0 or later, see                     *
- *   http://www.wtfpl.net/about/                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
- *                                                                         *
- ***************************************************************************/
+***************************************************************************
+    2023-2025, Michael Uplawski <michael.uplawski@uplawski.eu>
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the WTFPL 2.0 or later, see
+    http://www.wtfpl.net/about/
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+***************************************************************************
 =end
 PROGNAME = 'flnews_post_proc'
-PROGVERSION = "2.02"
+PROGVERSION = "2.05"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2026"

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: flnews_post_proc
 version: !ruby/object:Gem::Version
-  version: '2.02'
+  version: '2.05'
 platform: ruby
 authors:
 - Michael Uplawski
 bindir: bin
 cert_chain: []
-date: 2026-08-04 00:00:00.000000000 Z
+date: 2026-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -18,7 +18,7 @@ dependencies:
         version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,27 +28,67 @@ dependencies:
         version: '3.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: 3.4.4
 - !ruby/object:Gem::Dependency
-  name: ruby-filemagic
+  name: mimemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: new_rfc_2047
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: io-console
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 description: Post-processor for Usenet-articles created in flnews
 email: michael.uplawski@uplawski.eu
 executables:
@@ -79,7 +119,6 @@ files:
 - lib/override.rb
 - lib/ruby_dlg
 - lib/version.rb
-- lib/whiptail_dlg
 licenses:
 - WTFPL
 metadata:
@@ -100,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Modify news posts, before flnews sends them.
 test_files: []

data/lib/whiptail_dlg DELETED Viewed

@@ -1,87 +0,0 @@
-#!/bin/bash
-#/**************************************************************************
-#*   This program is free software; you can redistribute it and/or modify  *
-#*   it under the terms of the WTFPL 2.0 or later, see                     *
-#*   http://www.wtfpl.net/about/                                           *
-#*                                                                         *
-#*   This program is distributed in the hope that it will be useful,       *
-#*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *
-#*                                                                         *
-#***************************************************************************/
-# A dialog to override configuration options.
-# Whiptail is not as easily deployed here, as other dialogs.
-# The main difficulty arises from the fact that positive defaults
-# are negated, while a checklist wants to give positive results.
-if [ $# -eq 0 ]
-then
-  echo "ERROR: file-argument missing"
-  exit 1
-fi
-OUTFILE="$1"
-# empty the file
-truncate $OUTFILE -s0
-TITLE="Override post-processor configuration"
-CHECKTITLE="Deselect to disable. Esc or Cancel close the dialog and no changes will be applied."
-# These are the configuration variables which can be unset.
-VARS=(GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS VFY_URLS DEBUG_LOG)
-# Checklist options
-options=(GROUP_SIGS 'Signatures' ON CUSTOM_HEADERS "Custom headers" ON NO_ARCHIVE_GROUPS "No Archive" ON VFY_URLS "Correct URLs" ON DEBUG_LOG 'Log' ON)
-# show dialog and store results
-result=$(whiptail --title "$TITLE" --checklist "$CHECKTITLE" 13 55 6 "${options[@]}" 3>&1 1>&2 2>&3)
-# which button had been pushed?
-okcancel=$?
-# make an array
-read -ra opts <<< $result
-# comment out -------->
-echo "cancel/ok ? $okcancel"
-echo $result
-echo "${opts[@]}"
-echo "${#opts[@]}"
-echo "VARS: (${VARS[@]})"
-# <--------
-# Find deselected options which shall be written to the outfile.
-# Looks complicated.
-if [ "$okcancel" -eq 0 ]
-then
-  disable_list=''
-  enable_list=''
-  # 1) check each of the configuration variables ...
-  for c in ${OVARS[@]}
-  do
-    ignore=FALSE
-	# ... against the result from the dialog
-	for o in ${opts[@]}
-	do
-      if [ "$o" == "\"$c\"" ]
-      then
-        # ignore if a variable remained checked ...
-        ignore=TRUE
-      fi
-	done
-    if [ ! ignore ]
-    then
-      disable_list="$disable_list $c"
-    fi
-  done
-  # Heureka.
-  echo -e "$disable_list" > "$OUTFILE"
-  echo -e "$enable_list" >> "$OUTFILE"
-else
-  echo "exit" > "$OUTFILE"
-fi
-# Ω