cremefraiche 1.1.8 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48cc0065d28074c113f879f7dbc47e424b78a52e75f54eeb74f25d287658e8c6
-  data.tar.gz: 16b22c86a2c3843de9a3000c336108196bb2deb480eaff8761f8d22b2cb07075
+  metadata.gz: f77d80c3b68961a05dfe0b13fa1573b6412a6fafe7668252849d421939900dc8
+  data.tar.gz: 1cde51638355051748a080f4efee166131c78d0a6c843003045595c9ded61331
 SHA512:
-  metadata.gz: 6a668022a9d83c0977c6f53fd0b8ab19cb9ebfb5b74ddc8d3203862ce7daf369a28b7abc55259dcde290f7224cbba4f1edc1ce4a4b6d8ff4680aee646d824830
-  data.tar.gz: ee181963d9fbf566b13a40777c78295d01503d449145746a64a76bdb10d1050e96d2d4e39ba0db8622b4c54a97a1c6b969c03491d005d5829f14b69790406b8a
+  metadata.gz: d35e374c6350f5b0adf4ed09c18ffcd3345389af0ed80fc93279d8e9a0a69fea477b07bc63a6fea4c202cf9ad93cde4702509572f035c144ebd67e00c0a3debd
+  data.tar.gz: 07a8ffd0601e565c9cef6869862a70537bc2cb35b3a5e831be0d9b8ac805f1fa55cbae1f4dd37da7f85cdb1ff63152568ae0591f0ec97f16f4bb8b515cdcc573

data/bin/cremefraiche

@@ -26,6 +26,37 @@ require_relative '../lib/version'
 extend(BasicLogging)
 extend(Translating)
 
+# Should a user wish to either update her/his private version of the configuration-file by the current
+# contents of the file originally found in the downloaded program package, this function does the job.
+# It creates a copy of the original file, also, if there is not yet one, in ~/.cremefraiche/config or 
+# whatever the Configuration-singleton returns as file-name for user_configuration.
+def handle_user_conf
+  conf_check = ConfCheck.new()
+  diffs = conf_check.diffs
+  replace = false
+  if( diffs)
+    if(diffs && diffs[:missing].empty? && diffs[:additional].empty?)
+      puts trl("No changes to your user-configuration are necessary.")
+      return false;
+    else
+      m = diffs[:missing]
+      a = diffs[:additional]
+      puts trl("\nThe following changes can be effectuated on your user-configuration")
+      puts "\t+ " << trl("New options") << ":\n\t\t" << m.join('\n\t\t ') if !m.empty?
+      puts "\t- " << trl("Obsolete Options") << ":\n\t\t" << a.join(', ') if !a.empty?
+      puts trl("Do you want to replace your current user-configuration?")
+      puts trl("If you answer 'yes' a back-up copy of your old file will still be available.")
+      puts trl("But your old settings will be replaced by the defaults.")
+      print trl("Your answer (Y/n): ")
+      replace = STDIN.getc.downcase == trl("y") ? true : false
+    end
+    if(! replace)
+      return false;
+    end
+  end
+  conf_check.write_user_conf	
+  return replace;
+end
 # prints the usage message
 def usage
   if $WIN
@@ -84,34 +115,3 @@ end
 cf = CremeFraiche.instance()
 cf.process(*ARGV)
 
-# Should a user wish to either update her/his private version of the configuration-file by the current
-# contents of the file originally found in the downloaded program package, this function does the job.
-# It creates a copy of the original file, also, if there is not yet one, in ~/.cremefraiche/config or 
-# whatever the Configuration-singleton returns as file-name for user_configuration.
-def handle_user_conf
-  conf_check = ConfCheck.new()
-  diffs = conf_check.diffs
-  replace = false
-  if( diffs)
-    if(diffs && diffs[:missing].empty? && diffs[:additional].empty?)
-      puts trl("No changes to your user-configuration are necessary.")
-      return false;
-    else
-      m = diffs[:missing]
-      a = diffs[:additional]
-      puts trl("\nThe following changes can be effectuated on your user-configuration")
-      puts "\t+ " << trl("New options") << ":\n\t\t" << m.join('\n\t\t ') if !m.empty?
-      puts "\t- " << trl("Obsolete Options") << ":\n\t\t" << a.join(', ') if !a.empty?
-      puts trl("Do you want to replace your current user-configuration?")
-      puts trl("If you answer 'yes' a back-up copy of your old file will still be available.")
-      puts trl("But your old settings will be replaced by the defaults.")
-      print trl("Your answer (Y/n): ")
-      replace = STDIN.getc.downcase == trl("y") ? true : false
-    end
-    if(! replace)
-      return false;
-    end
-  end
-  conf_check.write_user_conf	
-  return replace;
-end

data/cremefraiche.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.description = "transforms EML files to PDF"
   s.authors     = Author
   s.email       = Author_mail
-  s.files  	=  Dir.children('doc').collect{|f| 'doc/' << File::path(f)} + Dir.children('bin').collect{|f| 'bin/' << File::path(f)} + Dir.children('lib').collect{|f| 'lib/' << File::path(f) } + Dir.children('lib/gui/').collect{|f| 'lib/gui/' << File::path(f) } + Dir.children('lib/icon').collect{|f| 'lib/icon/' << File::path(f) } + Dir.children('lib/busy_indicator').collect{|f| 'lib/busy_indicator/' << File::path(f) } + %w~cremefraiche.gemspec~.collect{|f|f} << "README.md"
+  s.files  	=  Dir.children('doc').collect{|f| 'doc/' << File::path(f)} + Dir.children('bin').collect{|f| 'bin/' << File::path(f)} + Dir.children('lib').collect{|f| 'lib/' << File::path(f) } + Dir.children('lib/gui/').collect{|f| 'lib/gui/' << File::path(f) } + Dir.children('lib/icon').collect{|f| 'lib/icon/' << File::path(f) } + Dir.children('lib/busy_indicator').collect{|f| 'lib/busy_indicator/' << File::path(f) } + ["cremefraiche.gemspec", "README.md"]
   s.homepage    = ''
   s.requirements = 'prawn prawn-table escape nokogiri mail gtk3'
   s.add_runtime_dependency 'prawn', '~> 2.4', '>= 2.4.0'
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'mail', '~> 2.8', '>= 2.8.0'
   s.add_runtime_dependency 'gtk3', '~> 4.0', '>= 4.0.5'
   s.executables = 'cremefraiche', 'cremefraicheGui'
-  s.license     = 'GPL-3.0'
+  s.license     = 'Nonstandard'
+  s.homepage    = Web_page
   s.required_ruby_version = '>= 2.5'
 end

data/lib/config

@@ -39,7 +39,7 @@ log level: info
 # 	Value:		a file-path
 #
 # log file: /tmp/cremefraiche.log
-# log file: 
+log file: 
 
 # Page-size 
 # 	Default: 	A4

data/lib/configuration.rb

@@ -34,8 +34,10 @@ class Configuration
   # file.	
   def initialize
     read_config
-    set_level(@conf["log level"])
-    set_target(@conf["log file"])
+    v = @conf["log level"] 
+    set_level( v ? BasicLogging::Levels[v.to_sym] : nil)
+    v = @conf["log file"]
+    set_target(v ? v : STDOUT)
 
     check_programs_installed
   end
@@ -227,8 +229,6 @@ class Configuration
     end
     return false
   end
-
-
 end
 
 $CONF = Configuration.instance

data/lib/emlfile.rb

@@ -23,7 +23,7 @@ require 'mail'
 # Wraps the Mail-object (from the Mail-gem).
 class EmlFile
   include BasicLogging
-
+  # do not log for the time.
   BasicLogging::mute(self)
   include File_Checking
   include Translating

data/lib/gui/AboutDialog.rb

@@ -19,6 +19,8 @@ require_relative '../translating'
 require_relative '../file_checking'
 require_relative '../license.rb'
 require_relative '../basic_logging.rb'
+require_relative '../version.rb'
+
 
 GD = File::expand_path(File::dirname(__FILE__) ) + File::Separator if !defined?(GD)
 
@@ -38,12 +40,12 @@ class AboutDialog
   def initialize( options = {})
 
     @adialog = Gtk::AboutDialog.new 
-    @adialog.name = @@prog_info[:app_name]
-    @adialog.title = @@prog_info[:app_name]
-    @adialog.set_program_name @@prog_info[:app_name]
-    @adialog.version = @@prog_info[:version]
-    @adialog.copyright = "© #{@@prog_info[:years]} #{@@prog_info[:author]} #{@@prog_info[:author_mail]}"
-    @adialog.website = "#{@@prog_info[:web_page]}"
+    @adialog.name = App_name
+    @adialog.title = App_name
+    @adialog.set_program_name App_name
+    @adialog.version = VERSION
+    @adialog.copyright = "© #{YEARS} #{Author} #{Author_mail}"
+    @adialog.website = "#{Web_page}"
 
     @adialog.comments = @@info
     @adialog.license = LICENSE_TEXT

data/lib/html2text.rb

@@ -36,14 +36,15 @@ class Html2Text
     html.gsub!("<br/>", "\n")
     html.gsub!("<br />", "\n")
     # Try to remove html-comments
-    html.gsub! /\<!--.*(-->?)/, ''
+    #debug('removing comments')
+    html.gsub! /\<!--(.|\s)*?-->/m, ''
+    #debug('   comments removed')
     html.gsub! /\s+/, ' '
     @html = Nokogiri::HTML::fragment(html)
     define_tag_handlers if @html
     @out_text = ''
   end
 
-  # def text(tag = @html)
   def text()
     @out_text = handle(@html)
     # remove empty lines
@@ -145,7 +146,6 @@ class Html2Text
       handle(value)
     end
 
-
     @@tag_handlers['title'] = Proc.new() do |value|
       "<b>" << handle(value ) << "</b>\n"
     end

data/lib/translations

@@ -222,6 +222,9 @@ Use literally 'user-conf' as argument.:
 This either creates or overwrites a configuration file in a sub-directory '.cremefraiche' of the current user's home-directory: 
   de: Damit wird eine Konfigurationsdatei im Unterverzeichnis '.cremefraiche' des Benutzerverzeichnisses aktualisiert oder überschrieben 
   fr: Ainsi, un fichier de configuration dans le sous-répertoire '.cremefraiche' dans le répertoire de l'utilisateur est actualisé ou remplacé.
+No changes to your user-configuration are necessary.:
+  de: Keine Änderungen in Ihrer Konfiguration erforderlich.
+  fr: Aucun changent nécessaire dans votre configuration.
 ##### Configuration-options ####
 pdf prefix:
   de: PDF Prefix

data/lib/version.rb

@@ -16,8 +16,8 @@
 =end
 
 YEARS="2011 - 2023"
-VERSION="1.1.8"
-SUMMARY="README for rubygems.org"
+VERSION="1.2"
+SUMMARY="Better HTML-handling, more HTML supported."
 
 App_name = 'Creme Fraiche'
 Author = 'Michael Uplawski'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cremefraiche
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: '1.2'
 platform: ruby
 authors:
 - Michael Uplawski
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-31 00:00:00.000000000 Z
+date: 2024-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -143,6 +143,17 @@ files:
 - bin/cremefraicheGui
 - cremefraiche.gemspec
 - doc/gui_howto.pdf
+- lib/.basic_logging.rb.swp
+- lib/.cfprawn.rb.swp
+- lib/.confcheck.rb.swp
+- lib/.configuration.rb.swp
+- lib/.cremefraiche.rb.swp
+- lib/.emlfile.rb.swp
+- lib/.file_checking.rb.swp
+- lib/.html2text.rb.swp
+- lib/.license.rb.swp
+- lib/.tag_munging.rb.swp
+- lib/.version.rb.swp
 - lib/LANG
 - lib/basic_logging.rb
 - lib/busy_indicator/.busy_function_test.rb.swp
@@ -194,9 +205,9 @@ files:
 - lib/translating.rb
 - lib/translations
 - lib/version.rb
-homepage: ''
+homepage: http://www.rubygems.org/gems/cremefraiche
 licenses:
-- GPL-3.0
+- Nonstandard
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -217,5 +228,5 @@ requirements:
 rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
-summary: README for rubygems.org
+summary: Better HTML-handling, more HTML supported.
 test_files: []