flnews_post_proc 2.02 → 2.03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8817d100431b3efc184a9d04d9dd4e9f167522bedc1c18fafe73f8f53aa6a593
-  data.tar.gz: c4edcbcff7e0aa31e9a98a1b77009a8e34fba8697d652b5723285e6e5ec7c1ff
+  metadata.gz: f37b5df3705857c5beb712e4e0a98abb59992fc528254a73a733543c84502a19
+  data.tar.gz: a9484bb151adcf28bc8548ab1210a2b9c324ae0e52258be15097144b6ae88cb4
 SHA512:
-  metadata.gz: 415eb0c42645803f583cdafbfb6972d524175cb1ce7968f9089081ed946e9f5058e12181cea53ce978aed25942c64e52aad18f152276c967fe1b4cbdb08a86da
-  data.tar.gz: ca800a99b820edbdef0eaff62dde3aca16b790593cc3358cc6da8399b8730b4d73fb6e925338ca046bb6a4ee45b6f535af302e11e5cae299ac2a6813786528b5
+  metadata.gz: f7a31cc97c93e1c0661fccdf811f013cbd81cd87ce6555d9017d3c7ccaf8af5df9aae690343bfd5cc144719e16ae5594ecbf41638c3ed816e45c712d97e0b8fc
+  data.tar.gz: 36dccfce186d13b5f8dff277cdde94c4fc3e12008306880cc0cd063e76b0bbe3ac29ec72d035e04cd76c972daf75f02230f8ee0991b15c6d2130fe669879019b

data/bin/flnews_post_proc

@@ -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

@@ -1,6 +1,13 @@
+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/lib/body.rb

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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.03"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2026"

metadata

@@ -1,106 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: flnews_post_proc
 version: !ruby/object:Gem::Version
-  version: '2.02'
+  version: "2.03"
 platform: ruby
 authors:
-- Michael Uplawski
+  - Michael Uplawski
 bindir: bin
 cert_chain: []
-date: 2026-08-04 00:00:00.000000000 Z
+date: 2026-08-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: diffy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.2
-- !ruby/object:Gem::Dependency
-  name: ruby-filemagic
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.3
+  - !ruby/object:Gem::Dependency
+    name: diffy
+    requirement: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ~>
+          - !ruby/object:Gem::Version
+            version: "3.4"
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: 3.4.4
+    type: :runtime
+    prerelease: false
+    version_requirements: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ~>
+          - !ruby/object:Gem::Version
+            version: "3.4"
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: 3.4.4
+  - !ruby/object:Gem::Dependency
+    name: mimemagic
+    requirement: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ~>
+          - !ruby/object:Gem::Version
+            version: "0.4"
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: 0.4.3
+    type: :runtime
+    prerelease: false
+    version_requirements: !ruby/object:Gem::Requirement
+      requirements:
+        -
+          - ~>
+          - !ruby/object:Gem::Version
+            version: "0.4"
+        -
+          - ">="
+          - !ruby/object:Gem::Version
+            version: 0.4.3
 description: Post-processor for Usenet-articles created in flnews
 email: michael.uplawski@uplawski.eu
 executables:
-- flnews_post_proc
+  - flnews_post_proc
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
-- bin/flnews_post_proc
-- changes.txt
-- doc/fr/html/flnews_post_proc.html
-- doc/fr/man/flnews_post_proc.1.gz
-- doc/fr/pdf/flnews_post_proc.pdf
-- doc/fr/rst/flnews_post_proc.rst
-- doc/html/flnews_post_proc.html
-- doc/license.txt
-- doc/man/flnews_post_proc.1.gz
-- doc/pdf/flnews_post_proc.pdf
-- doc/rst/flnews_post_proc.rst
-- lib/basic_logging.rb
-- lib/body.rb
-- lib/color_output.rb
-- lib/configuration.rb
-- lib/flnews_post_proc.conf
-- lib/flnews_post_proc.rb
-- lib/headers.rb
-- lib/newsgroups.rb
-- lib/override.rb
-- lib/ruby_dlg
-- lib/version.rb
-- lib/whiptail_dlg
+  - README.md
+  - bin/flnews_post_proc
+  - changes.txt
+  - doc/fr/html/flnews_post_proc.html
+  - doc/fr/man/flnews_post_proc.1.gz
+  - doc/fr/pdf/flnews_post_proc.pdf
+  - doc/fr/rst/flnews_post_proc.rst
+  - doc/html/flnews_post_proc.html
+  - doc/license.txt
+  - doc/man/flnews_post_proc.1.gz
+  - doc/pdf/flnews_post_proc.pdf
+  - doc/rst/flnews_post_proc.rst
+  - lib/basic_logging.rb
+  - lib/body.rb
+  - lib/color_output.rb
+  - lib/configuration.rb
+  - lib/flnews_post_proc.conf
+  - lib/flnews_post_proc.rb
+  - lib/headers.rb
+  - lib/newsgroups.rb
+  - lib/override.rb
+  - lib/ruby_dlg
+  - lib/version.rb
 licenses:
-- WTFPL
+  - WTFPL
 metadata:
-  homepage_uri: https://www.uplawski.eu/software/flnews_post_proc/
-  documentation_uri: https://www.uplawski.eu/div/flnews/gem_doc/html/flnews_post_proc.html
-  changelog_uri: https://www.uplawski.eu/div/flnews/gem_doc/changes.txt
+  homepage_uri: "https://www.uplawski.eu/software/flnews_post_proc/"
+  documentation_uri: "https://www.uplawski.eu/div/flnews/gem_doc/html/flnews_post_proc.html"
+  changelog_uri: "https://www.uplawski.eu/div/flnews/gem_doc/changes.txt"
 rdoc_options: []
 require_paths:
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '4.0'
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: "4.0"
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    -
+      - ">="
+      - !ruby/object:Gem::Version
+        version: "0"
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.1.0.dev
 specification_version: 4
-summary: Modify news posts, before flnews sends them.
+summary: "Modify news posts, before flnews sends them."
 test_files: []

data/lib/whiptail_dlg

@@ -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
-
-# Ω