flnews_post_proc 1.72 → 1.74

data/lib/headers.rb

@@ -1,7 +1,7 @@
 #encoding: UTF-8
 =begin
 /***************************************************************************
- *   2023-2024, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   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/                                           *
@@ -31,7 +31,7 @@ class Headers
     debug('before split, article_text is : ' << article_text)
     line_array = article_text.split($LN)
 
-    # Emsure that all three headers are present.
+    # Ensure that all three headers are present.
     missing_header = ['From:', 'Newsgroups:', 'Message-ID:'].detect{|h| ! line_array.any?{|l| l.match(h) } } 
     if(missing_header)
       msg = "Input does not look like a news-article, no #{missing_header.delete(':')}; aborting."
@@ -79,13 +79,9 @@ class Headers
         # it should.
         #
         # value is all after the first colon
-        #  BUGGY: val = l.match(/:(.*)/)[1].strip
-        #  BUGFIX 3/2024, use lstrip
         val = l.match(/:(.*)/)[1].lstrip
       else # start_with?('  ')
         # a wrapped value is not devided
-        # BUGGY: val = l.strip
-        # BUGFIX 3/2024
         val = l
       end
       # add value to the existing 
@@ -95,10 +91,6 @@ class Headers
         # or add a new value
         @headers[cur_header] = val
       end
-      # CURRENTLY UNUSED
-      # @headers[l.match(/^(.*?):/)[1].to_sym] = l.match(/:(.*)/)[1].strip
-      # h = l.split(':')
-      # @headers[h[0].strip.to_sym] = h[1...h.size].join(':').strip
     end
     debug('headers are ' << @headers.to_s)
     @newsgroups = Newsgroups.new(header(:Newsgroups))
@@ -171,3 +163,4 @@ class Headers
 
 end
 # EOF
+

data/lib/newsgroups.rb

@@ -1,7 +1,7 @@
 #encoding: UTF-8
 =begin
 /***************************************************************************
- *   2023-2024, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   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/                                           *
@@ -116,8 +116,8 @@ class Newsgroups
           end # if no signature
         end # gsigs.each
       end # gsigs for group?
-      if tsig && tsig.start_with?('/')
-        tsig = pick_sig(tsig)
+      if tsig && tsig.strip.start_with?('/')
+        tsig = pick_sig(tsig.strip)
       end
       @signature = correct_linebreaks(tsig) if tsig
     else # gsigs and is hash?
@@ -129,25 +129,44 @@ class Newsgroups
 
   # pick a random signature, if a list is available.
   def pick_sig(sigfile)
-    debug 'picking signature from ' << sigfile.to_s
-    allSigs = nil
-    sig = nil
-    if sigfile && !sigfile.empty? && File.exist?(sigfile) && File.readable?(sigfile)
-      File.open(sigfile, 'r')  do |sfile|
-        allSigs = sfile.read.split("\n\n")
-        numSigs = allSigs.length
-        # srand(Time.now.nsec)
-        # use /dev/urandom
-        srand()
-        sig = allSigs[rand(numSigs)]
+    # finds sourced files
+    srcregex = /^\.\s(.*)/
+    # delimiter for signature blocks in the file
+    delim = "\n\n"
+
+    if File.exist?(sigfile) && File.readable?(sigfile)
+      ssigs = Array.new
+      all_sigs = Array.new
+      File::read(sigfile).split(delim).collect do |item| 
+        item.strip!
+        # find a sourced file
+        psrc = item.match(srcregex)
+        if(psrc ) 
+          psrc = psrc[1]
+          if File.exist?(psrc) && File.readable?(psrc) 
+            ssigs = File.read(psrc).split(delim)
+          else
+            warn 'cannot find or read sourced signature file: ' << psrc
+          end
+        else
+          # else take the block, as is
+          all_sigs << item 
+        end
       end
-      # improve hazard for the next time.
-      # rearrange_sigs(sigfile, allSigs)
+      
+      # add sourced signatures
+      all_sigs.concat(ssigs) if !ssigs.empty?
+      numSigs = all_sigs.length
+
+      # get that signature, already!
+
+      # srand(Time.now.nsec)
+      srand()
+      return all_sigs[rand(numSigs)]
     else
-      error 'Cannot read signature from file ' << sigfile
-      nil
+      warn 'cannot find or read signature file: ' << sigfile
     end
-    return sig
+    return nil
   end
 
   # write a new rearranged version of the signature file for 

data/lib/override.rb

@@ -1,7 +1,7 @@
 #encoding: UTF-8
 =begin
 /***************************************************************************
- *   2023-2024, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   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/                                           *

data/lib/version.rb

@@ -1,7 +1,7 @@
 #encoding: UTF-8
 =begin
 /***************************************************************************
- *   2023-2024, Michael Uplawski <michael.uplawski@uplawski.eu>            *
+ *   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/                                           *
@@ -14,9 +14,9 @@
 =end
 
 PROGNAME = 'flnews_post_proc'
-PROGVERSION = "1.72"
+PROGVERSION = "1.74"
 AUTHORS = "Michael Uplawski"
 EMAIL = "michael.uplawski@uplawski.eu"
 YEARS = "2023 - 2025"
-SUMMARY = "Override settings does not use Yad nor Zenity, only Whiptail or XTerm"
+SUMMARY = "new documentation- and homepage URIs"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: flnews_post_proc
 version: !ruby/object:Gem::Version
-  version: '1.72'
+  version: '1.74'
 platform: ruby
 authors:
 - Michael Uplawski
 bindir: bin
 cert_chain: []
-date: 2025-05-17 00:00:00.000000000 Z
+date: 2025-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -82,10 +82,11 @@ files:
 - lib/whiptail_dlg
 - lib/yad_dlg
 - lib/zenity_dlg
-homepage: https://rubygems.org
 licenses:
 - Nonstandard
-metadata: {}
+metadata:
+  homepage_uri: https://www.uplawski.eu/software/flnews_post_proc/flnews_post_proc.html
+  documentation_uri: https://www.uplawski.eu/div/flnews/gem_doc/html/flnews_post_proc.html
 rdoc_options: []
 require_paths:
 - lib
@@ -102,5 +103,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.7
 specification_version: 4
-summary: Override settings does not use Yad nor Zenity, only Whiptail or XTerm
+summary: new documentation- and homepage URIs
 test_files: []