flnews_post_proc 1.99 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4206610148fccb0ab85d83b2bedaff817e605dd49e3663cb0babdf049000540b
-  data.tar.gz: aaf86ad30791ec939152a97a421e0cf472e8ef5673b8894ef4f3b52f5c851075
+  metadata.gz: f9d2ff5d6f33555a5059614972dcd6f01920b1a7274662509154e7092db9ca22
+  data.tar.gz: 9a75540a2daf3b02cd91d2a11f8087a8ddeabc1ccea42be76af23127e0bd9d06
 SHA512:
-  metadata.gz: 31f0fbb0c85a852e339f65e7103d48a4f031ac08ed5437216c328d3ce488722ca0e501bbbfed52da50e53305940d2260194371c8204427b0ba0de1dafd10ae07
-  data.tar.gz: 113daca4745e8cbf88fd62f85628e0626d53b0d2b49da5931ee1baf47a4b0e58f467b4b38c7266b372aeda45be76a4445b247fe0d08257762c90209259009ca1
+  metadata.gz: 78e67d90fbacd419f0b7d543bb4ea66ea6c06440b6eff215159462f725eef8eb736db604587aa1980929c1f9a65b64fd37ded814735398a84784125acc700da4
+  data.tar.gz: 45cec798380b42fd1b795a90c3dfd712a9b5f09da94ef592eb0123f9ec615204849781454ca50c386319edbbe280dab10a613e5c358fe2fb605891400a8c5163

data/changelog.txt

@@ -1,10 +1,13 @@
+v.2.0
+	*) Supersedes will have a new signature by default
+    *) Obsolete code for Yad and Zenity dialogs removed.
 v 1.99
     *) Bugfix: The value of a custom header can include a colon.
-	   Example:   x-my-header: apples: 2,90€, peers: 3,10€
-	   (before, the value would have been clipped after the first ':')
+       Example:   x-my-header: apples: 2,90, peers: 3,10
+       (before, the value would have been clipped after the first ':')
 v 1.98
-	*) New change log (this file) 
-	*) In the configuration file, log levels can be in upper case.
+    *) New change log (this file) 
+    *) In the configuration file, log levels can be in upper case.
 v 1.97
-	*) Custom headers are RFC 2047 encoded, if need be.
-	   (before, they had to be ASCII only or were discarded).
+    *) Custom headers are RFC 2047 encoded, if need be.
+       (before, they had to be ASCII only or were discarded).

data/doc/fr/html/flnews_post_proc.html

@@ -366,15 +366,15 @@
 
       <ul class="simple">
         <li>
-          <p>Variables qui décrivent des valeurs déterminées par
-          flnews. Elles peuvent être utilisées ou remplacées. Les
-          composants importants sont normalement spécifiés dans une
-          « capture group ».</p>
+          <p>Deux variables qui décrivent des valeurs déterminées
+          par flnews. Elles peuvent être utilisées ou remplacées.
+          Les composants importants sont normalement spécifiés dans
+          une « capture group ».</p>
         </li>
 
         <li>
-          <p>Variables qui définissent du nouveau contenu ou des
-          changements dans le contenu.</p>
+          <p>La grande majorité des variables définissent du
+          nouveau contenu ou des changements dans le contenu.</p>
         </li>
       </ul>
 
@@ -897,7 +897,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-09</p>
+        <p>Date: 2026-06-30</p>
 
         <p><strong>Ω</strong>
         </p>
@@ -906,7 +906,7 @@ alt.fr.test: /home/[utilisateur]/.signatures</pre>
   </main>
 
   <div id='page_dt'>
-    2026-06-09
+    2026-06-30
   </div>
 </body>
 </html>

data/doc/fr/rst/flnews_post_proc.rst

@@ -155,12 +155,12 @@ prochaine occasion, mais vos modifications seront perdues.
 Le fichier de `configuration`_ est en format YAML et plein d'explications. Les
 variables définies dans ce fichier peuvent être classées en deux catégories :
 
-* Variables qui décrivent des valeurs déterminées par flnews. Elles peuvent être
-  utilisées ou remplacées. Les composants importants sont normalement spécifiés
-  dans une « capture group ».
+* Deux variables qui décrivent des valeurs déterminées par flnews. Elles
+  peuvent être utilisées ou remplacées. Les composants importants sont
+  normalement spécifiés dans une « capture group ».
 
-* Variables qui définissent du nouveau contenu ou des changements dans le
-  contenu.
+* La grande majorité des variables définissent du nouveau contenu ou des
+  changements dans le contenu.
 
 Options de configuration
 ------------------------

data/doc/html/flnews_post_proc.html

@@ -334,13 +334,14 @@
 
         <ol class="arabic simple">
           <li>
-            <p>Variables that represent values originally set by
-            flnews, which can be used or replaced. These elements
-            are typically captured using regular expressions.</p>
+            <p>Two variables that represent values originally set
+            by flnews, which can be used or replaced. These
+            elements are typically captured using regular
+            expressions.</p>
           </li>
 
           <li>
-            <p>Variables that define new or modified content.</p>
+            <p>Most variables define new or modified content.</p>
           </li>
         </ol>
       </blockquote>
@@ -800,7 +801,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-06-19</p>
+          <p>Date: 2026-07-16</p>
         </blockquote>
 
         <p><strong>Ω</strong>
@@ -810,7 +811,7 @@ comp.*: /home/[user]/.my_sigs</pre>
   </main>
 
   <div id='page_dt'>
-    2026-06-19
+    2026-07-16
   </div>
 </body>
 </html>

data/doc/rst/flnews_post_proc.rst

@@ -135,11 +135,11 @@ CONFIGURATION
   The configuration file uses YAML syntax and includes detailed explanations. The
   variables within it fall into two categories:
 
-  1. Variables that represent values originally set by flnews, which can be used
-     or replaced.  These elements are typically captured using regular
-     expressions.
+  1. Two variables that represent values originally set by flnews, which can be
+     used or replaced. These elements are typically captured using regular
+     expressions. 
 
-  2. Variables that define new or modified content.
+  2. Most variables define new or modified content. 
 
 Configuration Options
 -------------------------------

data/lib/body.rb

@@ -151,23 +151,18 @@ class Body
   end
 
   def set_signature(signature)
-    unless @@config.SUPERSEDES
-      debug 'is not a supersedes'
-      # unless no changes requested.
-      debug 'signature is ' << (signature ? signature.to_s : 'NIL')
-      if signature && !signature.empty? 
-        # remove any signature(s) from 
-        # the current article
-        sigpos = @lines.index('-- ')
-        debug('found signature in line ' << sigpos.to_s) if sigpos
-        @lines = @lines.slice(0, sigpos ) if sigpos
-        debug('setting signature ' << signature) if signature
-        @lines << "-- " << signature if signature
-      else
-        debug 'signature is ' << (signature ? signature.to_s : 'not set.' )
-      end
+    # unless no changes requested.
+    debug 'signature is ' << (signature ? signature.to_s : 'NIL')
+    if signature && !signature.empty? 
+      # remove any signature(s) from 
+      # the current article
+      sigpos = @lines.index('-- ')
+      debug('found signature in line ' << sigpos.to_s) if sigpos
+      @lines = @lines.slice(0, sigpos ) if sigpos
+      debug('setting signature ' << signature) if signature
+      @lines << "-- " << signature if signature
     else
-      debug 'ignoring signature in spersedes'
+      debug 'signature is ' << (signature ? signature.to_s : 'not set.' )
     end
   end
 
@@ -268,26 +263,11 @@ class Body
           refs << num << r <<  $LN
         end
         
-        # a previously set signature must stay intact
-        # in a supersedes.
-        # Either insert the references ...
-        sigpos = body.index('-- ')
-        if  @@config.SUPERSEDES && sigpos
-          debug 'inserting references'
-          # a line, separating the footnotes from the body of the article
-          body.insert(sigpos, $LN.dup << @@config.REFERENCES_SEPARATOR.strip << $LN)
-          # move the position lower than the separator
-          sigpos = body.index('-- ')
-          body.insert(sigpos, refs)
-        else
-          # ... or append references.
-          debug 'appending references'
-          # a line, separating the footnotes from the body of the article
-          body << $LN << @@config.REFERENCES_SEPARATOR.strip << $LN
-          body << refs
-        end
-
-
+        # append references.
+        debug 'appending references'
+        # a line, separating the footnotes from the body of the article
+        body << $LN << @@config.REFERENCES_SEPARATOR.strip << $LN
+        body << refs
       else
         debug('no refences found')
       end

data/lib/newsgroups.rb

@@ -29,9 +29,7 @@ class Newsgroups
 
     # set details for this post
     if @groups.size == 1
-      debug 'supersedes is ' << @config.SUPERSEDES.to_s
-      debug 'Signature will ' << (@config.SUPERSEDES ? 'NOT ' : '') << 'be set'
-      set_signature if !@config.SUPERSEDES
+      set_signature 
       set_intro 
       set_no_archive 
     end

data/lib/override.rb

@@ -30,13 +30,10 @@ class OverrideDlg
   XTERM    = 'xterm'
   # TERMINAL = 'x-terminal-emulator'
   WHIPTAIL = 'whiptail'
-  YAD      = 'yad'
-  ZENITY   = 'zenity'
   # 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 = [YAD, ZENITY, WHIPTAIL, XTERM]
   @@Executables = [WHIPTAIL, XTERM]
   @@LIBDIR = File::dirname(__FILE__)
   # The configuration variables that can be unset.
@@ -70,13 +67,6 @@ class OverrideDlg
       debug('found executables ' << @executables.join(', '))
       opts = nil
       begin
-=begin unresolved issues with YAD and Zenity
-        if has?(YAD)
-          return yad_dlg.split.collect {|o| o.to_s}.join(' ')
-        elsif has?(ZENITY)
-          return zenity_dlg.split.collect {|o| o.to_s}.join(' ')
-        elsif has? XTERM
-=end
         if has? XTERM
           if has?(WHIPTAIL)
             return whiptail_dlg.split.collect {|o| o.to_s}.join(' ')
@@ -172,36 +162,6 @@ class OverrideDlg
     tf.unlink
     return nopts 
   end
-
-  # creates a Zenity dialog.
-  def zenity_dlg
-    debug('Zenity dialog')
-    # dialog = @config.BINDIR << File::Separator << 'zenity_dlg'
-    dialog = @@LIBDIR << File::Separator << 'zenity_dlg'
-    io = IO.popen(dialog)
-    Process::wait(io.pid)
-    rc = $?.exitstatus 
-
-    exit true if rc != 0
-
-    nopts = io.read
-    return nopts
-  end
-
-  # creates a YAD dialog.
-  def yad_dlg
-    debug('yad dialog')
-    # dialog = @config.BINDIR << File::Separator << 'yad_dlg'
-    dialog = @@LIBDIR << File::Separator << 'yad_dlg'
-    debug('dialog will be ' << dialog)
-    io = IO::popen(dialog)
-    Process::wait(io.pid)
-    exit true if $?.exitstatus != 0
-
-    nopts = io.read
-    return nopts
-  end
-
 end 
 
 # EOF 

data/lib/version.rb

@@ -14,7 +14,7 @@
 =end
 
 PROGNAME = 'flnews_post_proc'
-PROGVERSION = "1.99"
+PROGVERSION = "2.0"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2026"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: flnews_post_proc
 version: !ruby/object:Gem::Version
-  version: '1.99'
+  version: '2.0'
 platform: ruby
 authors:
 - Michael Uplawski
 bindir: bin
 cert_chain: []
-date: 2026-06-30 00:00:00.000000000 Z
+date: 2026-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -68,7 +68,6 @@ files:
 - doc/man/flnews_post_proc.1.gz
 - doc/pdf/flnews_post_proc.pdf
 - doc/rst/flnews_post_proc.rst
-- lib/_quoting_style_regexp
 - lib/basic_logging.rb
 - lib/body.rb
 - lib/color_output.rb
@@ -81,8 +80,6 @@ files:
 - lib/ruby_dlg
 - lib/version.rb
 - lib/whiptail_dlg
-- lib/yad_dlg
-- lib/zenity_dlg
 licenses:
 - WTFPL
 metadata:
@@ -103,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.14
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Modify news posts, before flnews sends them.
 test_files: []

data/lib/_quoting_style_regexp

@@ -1,2 +0,0 @@
-# UNUSED
-" > >> > testerei ei ei".strip.gsub( /^>+(\s+>+)*/) {|m| m.to_s.delete(" ")}

data/lib/yad_dlg

@@ -1,57 +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
-
-TITLE="Override post-processor configuration"
-# These are the configuration variables which can be
-# unset.
-GROUP_SIGS=1
-CUSTOM_HEADERS=2
-NO_ARCHIVE_GROUPS=3
-#VFY_URLS=4
-DEBUG_LOG=4
-
-CONF=$(yad --item-separator=" " --title "$TITLE" --image="" --window-icon="" --form \
-  --field="Uncheck to disable options\n<b>Esc and Cancel</b> terminate the post-processor.":LBL ""\
-  --field="Signature":CHK 'true' \
-  --field="Custom-headers":CHK 'true' \
-  --field="No Archive":CHK 'true' \
-  --field="URL Correction":CHK 'true' \
-  --field="Log":CHK 'true' ) 
-
-
-if [ $? == 0 ]
-then
-  IFS="|"
-  read -ra C_ARR <<< $CONF
-  echo "$C_ARR"
-  CONF=''
-  # ------------->
-  # echo ${C_ARR[@]}
-  # <-------------
-
-  for i in GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS VFY_URLS DEBUG_LOG
-  do  
-	echo -e "$i: ${C_ARR[$i]}" 
-    echo -e "\n"
-	if [ 'FALSE' == "${C_ARR[$i]}" ]
-	then
-	  CONF="$i $CONF"
-	fi
-  done
-  # signal the fields to disable (others will be ignored)
-  echo $CONF
-else 
-  exit 1
-fi

data/lib/zenity_dlg

@@ -1,60 +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
-
-TITLE="Override post-processor configuration"
-# The options are the configuration variables which can be unset.
-
-CONF=$(zenity --title "$TITLE" --text "Deselect options to disable.\n<b>Esc and Cancel</b> terminate the post-processor."\
-  --height 450 --list --checklist --column 'set' --column 'Option' --column '' \
-  TRUE GROUP_SIGS Signature\
-  TRUE CUSTOM_HEADERS "Custom Headers"\
-  TRUE NO_ARCHIVE_GROUPS "No Archive"\
-  TRUE VFY_URLS "Correct URLs"\
-  TRUE DEBUG_LOG Log)
-
-if [ $? == 0 ]
-then
-  IFS="|"
-  read -ra C_ARR <<< $CONF
-  CONF=''
-  # ------------->
-  # echo ${C_ARR[@]}
-  # <-------------
-
-  # for c in GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS VFY_URLS DEBUG_LOG
-  for c in GROUP_SIGS CUSTOM_HEADERS NO_ARCHIVE_GROUPS DEBUG_LOG
-  do  
-	# disable only the options which are missing in
-	# the Zenity return value
-	disable=1
-
-	for o in "${C_ARR[@]}"
-	do
-	  if [ "$o" == "$c" ]
-	  then
-		disable=
-	  fi
-	done
-
-	if [ $disable ]
-	then
-	  CONF="$CONF $c"
-	fi
-  done
-  # signal the fields to disable (others will be ignored)
-  echo $CONF
-else
-  exit 1
-fi