v5 v6: error/warn messages

12 files changed, 36 insertions, 30 deletions

diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index c44bb54b..198b7dfd 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -38,7 +38,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.1.orig.tar.xz
   sisu_5.3.1.orig.tar.xz
   sisu_5.3.1-1.dsc
 
-* wrappers round require
+* error/warn messages, including wrappers round require
 
 %% 5.3.0.orig.tar.xz (2014-01-26:03/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.0
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
index 0f5eff45..69e35f83 100644
--- a/data/doc/sisu/CHANGELOG_v6
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -28,7 +28,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.1.orig.tar.xz
   sisu_6.0.1.orig.tar.xz
   sisu_6.0.1-1.dsc
 
-* wrappers round require
+* error/warn messages, including wrappers round require
 
 %% 6.0.0.orig.tar.xz (2014-01-26:03/7)
 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.0
diff --git a/lib/sisu/v5/digests.rb b/lib/sisu/v5/digests.rb
index 2b010374..7099b646 100644
--- a/lib/sisu/v5/digests.rb
+++ b/lib/sisu/v5/digests.rb
@@ -91,9 +91,13 @@ module SiSU_DigestView
           if @opt.act[:verbose_plus][:set]==:on \
           or @opt.act[:maintenance][:set]==:on
             SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}").flow
+            end
+          end
+          if SiSU_Env::SystemCall.new.openssl
+            SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
+          else
+            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('*EXITED* hash digests will not run without openssl')
           end
-        end
-        SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
diff --git a/lib/sisu/v5/hub.rb b/lib/sisu/v5/hub.rb
index b7d62a38..8a430e71 100644
--- a/lib/sisu/v5/hub.rb
+++ b/lib/sisu/v5/hub.rb
@@ -760,7 +760,7 @@ module SiSU
           STDERR.puts %{requested action requires valid sisu markup file [filename (.sst .ssm)] or wildcard (that includes a valid filename)}
           if (@opt.act[:verbose_plus][:set]==:on \
           || @opt.act[:maintenance][:set]==:on)
-            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).mark(:fuchsia)
+            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).warn(:fuchsia)
           end
         end
       elsif @opt.mod.inspect =~/--query/
diff --git a/lib/sisu/v5/param.rb b/lib/sisu/v5/param.rb
index ad29ff92..ba75bfb0 100644
--- a/lib/sisu/v5/param.rb
+++ b/lib/sisu/v5/param.rb
@@ -99,8 +99,7 @@ module SiSU_Param
         # you may need to change Dir.pwd to @opt.f_pth[:pth] where the latter
         # has a path value that is different, however, f_pth is not always set!
         Dir.chdir(@opt.f_pth[:pth])
-        p '-- bug alert -- '
-        p __FILE__ + ':' + __LINE__.to_s
+        SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('-- bug alert --')
         p 'f_pth ' + @opt.f_pth[:pth]
         p 'pwd   ' + Dir.pwd
       end
diff --git a/lib/sisu/v5/sysenv.rb b/lib/sisu/v5/sysenv.rb
index 5563513f..23e15244 100644
--- a/lib/sisu/v5/sysenv.rb
+++ b/lib/sisu/v5/sysenv.rb
@@ -752,7 +752,7 @@ module SiSU_Env
       program='rcs'
       program_ref="\n\t\tdocument version information requested"
       if program_found?(program); true
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -760,7 +760,7 @@ module SiSU_Env
       program='cvs'
       program_ref="\n\t\tdocument version information requested"
       if program_found?(program); true
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -768,7 +768,7 @@ module SiSU_Env
       program='openssl'
       program_ref="\n\t\tused to generate requested source document identification digest"
       if program_found?(program); true
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -781,7 +781,7 @@ module SiSU_Env
         dgst=%x{openssl dgst -md5 #{File.basename(filename)}}.strip #use file name without file path
         Dir.chdir(pwd)
         dgst.scan(/\S+/)
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -794,7 +794,7 @@ module SiSU_Env
         dgst=%x{openssl dgst -sha256 #{File.basename(filename)}}.strip #use file name without file path
         Dir.chdir(pwd)
         dgst.scan(/\S+/)
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -802,7 +802,7 @@ module SiSU_Env
       program='psql'
       program_ref="\n\t\tpsql requested"
       if program_found?(program); true
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -1120,7 +1120,7 @@ module SiSU_Env
       elsif  output_dir_structure.by_filename?
         ''
       else
-        SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).mark('set output type, by: language, filetype or filename')
+        SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn('set output type, by: language, filetype or filename')
       end
       @stub_set_manifest=stub + '/manifest'
     end
diff --git a/lib/sisu/v5/texpdf.rb b/lib/sisu/v5/texpdf.rb
index dc64bd4c..b67bb545 100644
--- a/lib/sisu/v5/texpdf.rb
+++ b/lib/sisu/v5/texpdf.rb
@@ -278,7 +278,7 @@ module SiSU_TeX
                         and File.size(texfile) > 0
                           #@tex_f_no+=1
                         else
-                          SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).mark("\tzero file size #{@env.processing_path.tex}/#{texfile}")
+                          SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error("\tzero file size #{@env.processing_path.tex}/#{texfile}")
                         end
                       end
                     end
@@ -373,7 +373,7 @@ module SiSU_TeX
           elsif @md.opt.act[:pdf_p][:set]==:on
             'pdfTex portrait'
           else
-            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).mark('error: neither landscape nor portrait')
+            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('error: neither landscape nor portrait')
           end
           if (@md.opt.act[:verbose][:set]==:on \
           || @md.opt.act[:verbose_plus][:set]==:on \
diff --git a/lib/sisu/v6/digests.rb b/lib/sisu/v6/digests.rb
index 954185d9..e708e4e9 100644
--- a/lib/sisu/v6/digests.rb
+++ b/lib/sisu/v6/digests.rb
@@ -91,9 +91,13 @@ module SiSU_DigestView
           if @opt.act[:verbose_plus][:set]==:on \
           or @opt.act[:maintenance][:set]==:on
             SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],@opt.fns,"file://#{@md.file.output_path.hash_digest.dir}/#{@md.file.base_filename.hash_digest}").flow
+            end
+          end
+          if SiSU_Env::SystemCall.new.openssl
+            SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
+          else
+            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('*EXITED* hash digests will not run without openssl')
           end
-        end
-        SiSU_DigestView::Source::Scroll.new(@particulars).songsheet
       rescue
         SiSU_Errors::Rescued.new($!,$@,@opt.cmd,@opt.fns).location do
           __LINE__.to_s + ':' + __FILE__
diff --git a/lib/sisu/v6/hub.rb b/lib/sisu/v6/hub.rb
index 62b8eaa0..35e9140d 100644
--- a/lib/sisu/v6/hub.rb
+++ b/lib/sisu/v6/hub.rb
@@ -760,7 +760,7 @@ module SiSU
           STDERR.puts %{requested action requires valid sisu markup file [filename (.sst .ssm)] or wildcard (that includes a valid filename)}
           if (@opt.act[:verbose_plus][:set]==:on \
           || @opt.act[:maintenance][:set]==:on)
-            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).mark(:fuchsia)
+            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__).warn(:fuchsia)
           end
         end
       elsif @opt.mod.inspect =~/--query/
diff --git a/lib/sisu/v6/param.rb b/lib/sisu/v6/param.rb
index bc9bf9df..e3eaebae 100644
--- a/lib/sisu/v6/param.rb
+++ b/lib/sisu/v6/param.rb
@@ -99,8 +99,7 @@ module SiSU_Param
         # you may need to change Dir.pwd to @opt.f_pth[:pth] where the latter
         # has a path value that is different, however, f_pth is not always set!
         Dir.chdir(@opt.f_pth[:pth])
-        p '-- bug alert -- '
-        p __FILE__ + ':' + __LINE__.to_s
+        SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('-- bug alert --')
         p 'f_pth ' + @opt.f_pth[:pth]
         p 'pwd   ' + Dir.pwd
       end
diff --git a/lib/sisu/v6/sysenv.rb b/lib/sisu/v6/sysenv.rb
index 437d4088..7e81b2f4 100644
--- a/lib/sisu/v6/sysenv.rb
+++ b/lib/sisu/v6/sysenv.rb
@@ -752,7 +752,7 @@ module SiSU_Env
       program='rcs'
       program_ref="\n\t\tdocument version information requested"
       if program_found?(program); true
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -760,7 +760,7 @@ module SiSU_Env
       program='cvs'
       program_ref="\n\t\tdocument version information requested"
       if program_found?(program); true
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -768,7 +768,7 @@ module SiSU_Env
       program='openssl'
       program_ref="\n\t\tused to generate requested source document identification digest"
       if program_found?(program); true
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -781,7 +781,7 @@ module SiSU_Env
         dgst=%x{openssl dgst -md5 #{File.basename(filename)}}.strip #use file name without file path
         Dir.chdir(pwd)
         dgst.scan(/\S+/)
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -794,7 +794,7 @@ module SiSU_Env
         dgst=%x{openssl dgst -sha256 #{File.basename(filename)}}.strip #use file name without file path
         Dir.chdir(pwd)
         dgst.scan(/\S+/)
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -802,7 +802,7 @@ module SiSU_Env
       program='psql'
       program_ref="\n\t\tpsql requested"
       if program_found?(program); true
-      else STDERR.puts "\t*WARN* #{program} is not installed #{program_ref}"               #if @cmd =~/v/
+      else SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn("#{program} is not installed #{program_ref}")
         false
       end
     end
@@ -1120,7 +1120,7 @@ module SiSU_Env
       elsif  output_dir_structure.by_filename?
         ''
       else
-        SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).mark('set output type, by: language, filetype or filename')
+        SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).warn('set output type, by: language, filetype or filename')
       end
       @stub_set_manifest=stub + '/manifest'
     end
diff --git a/lib/sisu/v6/texpdf.rb b/lib/sisu/v6/texpdf.rb
index 102cf4b4..97961701 100644
--- a/lib/sisu/v6/texpdf.rb
+++ b/lib/sisu/v6/texpdf.rb
@@ -278,7 +278,7 @@ module SiSU_TeX
                         and File.size(texfile) > 0
                           #@tex_f_no+=1
                         else
-                          SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).mark("\tzero file size #{@env.processing_path.tex}/#{texfile}")
+                          SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error("\tzero file size #{@env.processing_path.tex}/#{texfile}")
                         end
                       end
                     end
@@ -373,7 +373,7 @@ module SiSU_TeX
           elsif @md.opt.act[:pdf_p][:set]==:on
             'pdfTex portrait'
           else
-            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).mark('error: neither landscape nor portrait')
+            SiSU_Utils::CodeMarker.new(__LINE__,__FILE__,:fuchsia).error('error: neither landscape nor portrait')
           end
           if (@md.opt.act[:verbose][:set]==:on \
           || @md.opt.act[:verbose_plus][:set]==:on \