From edd89902036bde18c91031470e19c871a182cf6d Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph@amissah.com>
Date: Wed, 23 Oct 2013 23:40:45 -0400
Subject: v5: options & downstream, more use of opt.act instead of opt.cmd

* opt.act.*.set==:on instead of opt.cmd =~/\S/
---
 lib/sisu/v5/sisupod_make.rb | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

(limited to 'lib/sisu/v5/sisupod_make.rb')

diff --git a/lib/sisu/v5/sisupod_make.rb b/lib/sisu/v5/sisupod_make.rb
index d4341abf..462e2ea4 100644
--- a/lib/sisu/v5/sisupod_make.rb
+++ b/lib/sisu/v5/sisupod_make.rb
@@ -69,17 +69,21 @@ module SiSU_Doc
     def initialize(opt,build=nil,place=nil)
       super(opt,build,place)
       @zipfile=@opt.fno.gsub(/(?:\~\S{2,3})?(\.ss[tm])$/,'\1')
-      unless @opt.cmd =~/q/
+      unless @opt.act[:quiet][:set]==:on
         pthinfo="#{@file.output_path.sisupod.dir}/#{@zipfile}.txz"
-        @opt.cmd=~/[MVv]/ \
-        ? SiSU_Screen::Ansi.new(@opt.cmd,'Assemble source for sisu document',"#{@opt.fns} -> file://#{pthinfo}").cyan_hi_blue
-        : SiSU_Screen::Ansi.new(@opt.cmd,'Assemble source for sisu document',pthinfo).cyan_title_hi
+        (@opt.act[:verbose][:set]==:on \
+        || @opt.act[:verbose_plus][:set]==:on \
+        || @opt.act[:maintenance][:set]==:on) \
+        ? SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Assemble source for sisu document',"#{@opt.fns} -> file://#{pthinfo}").cyan_hi_blue
+        : SiSU_Screen::Ansi.new(@opt.act[:color_state][:set],'Assemble source for sisu document',pthinfo).cyan_title_hi
       end
     end
     def sisupod_tar_xz
       begin
         FileUtils::mkdir_p(@file.output_path.sisupod.dir) unless FileTest.directory?(@file.output_path.sisupod.dir)
-        tree=(@opt.cmd =~/[vVM]/ \
+        tree=((@opt.act[:verbose][:set]==:on \
+        || @opt.act[:verbose_plus][:set]==:on \
+        || @opt.act[:maintenance][:set]==:on) \
         && SiSU_Env::SystemCall.new.program_found?('tree')) \
         ? 'tree sisupod'
         : ''
@@ -92,9 +96,17 @@ module SiSU_Doc
           })
           FileUtils::mv("#{@zipfile}.txz",@file.place_file.sisupod.dir)
           Dir.chdir(@env.path.pwd)
-          SiSU_Screen::Ansi.new('',"#{@opt.fns}.txz").blue_tab if @opt.cmd=~/[MVv]/
+          if (@opt.act[:verbose][:set]==:on \
+          || @opt.act[:verbose_plus][:set]==:on \
+          || @opt.act[:maintenance][:set]==:on)
+            SiSU_Screen::Ansi.new('',"#{@opt.fns}.txz").blue_tab
+          end
         else
-          SiSU_Screen::Ansi.new('',"#{@opt.fns}.txz not built").blue_tab if @opt.cmd=~/[MVv]/
+          if (@opt.act[:verbose][:set]==:on \
+          || @opt.act[:verbose_plus][:set]==:on \
+          || @opt.act[:maintenance][:set]==:on)
+            SiSU_Screen::Ansi.new('',"#{@opt.fns}.txz not built").blue_tab
+          end
         end
       rescue
       ensure
-- 
cgit v1.2.3