From d9763aebaf71cf9629fdcf3c0e8818a1edb2b528 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 1 May 2010 01:44:04 -0400 Subject: reduce screen output unless some verbose flag (such as -v) is used --- lib/sisu/v2/hub.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/sisu/v2/hub.rb') diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index 58f62d0f..b54ebc51 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -152,8 +152,9 @@ module SiSU when /^dbi$/; SiSU_DBI::SiSU_SQL.new(@opt).connect # -D -d end @n_do=@n_do+1 - tell=SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed") - tell.files_processed unless @opt.cmd =~/q/ + unless @opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/ + end ObjectSpace.garbage_collect else #print "not processed --> ", fns, "\n" end -- cgit v1.2.3 From 24469afbbe17cb840c301e2ccc9f083d367b3ac8 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 1 May 2010 10:25:55 -0400 Subject: urls, screen info control tuning --- lib/sisu/v2/hub.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/sisu/v2/hub.rb') diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index b54ebc51..36470fd1 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -173,8 +173,9 @@ module SiSU end end @n_do=@n_do+1 - tell=SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed") - tell.files_processed unless @opt.cmd =~/q/ + unless @opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/ + end end else Operations.new(@opt).not_found end @@ -489,7 +490,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ end else end - if @opt.cmd =~/[QuUvVM]/; op('urls','urls') #% -Q -u -v -V -M urls + unless @opt.cmd =~/[q]/; op('urls','urls') #% unless -q end @msg,@msgs="\tsisu -W [to start ruby web-server on output directory]\n",nil @tell.call.print_brown if @opt.cmd =~/[uUvVM]/ unless @opt.files.join.empty? -- cgit v1.2.3 From 67e49a2b278b1512fb39a33a779f68a1389f9849 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Mon, 3 May 2010 19:09:54 -0400 Subject: ansi, screen info related, arranging --- lib/sisu/v2/hub.rb | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib/sisu/v2/hub.rb') diff --git a/lib/sisu/v2/hub.rb b/lib/sisu/v2/hub.rb index 36470fd1..bab13ed1 100644 --- a/lib/sisu/v2/hub.rb +++ b/lib/sisu/v2/hub.rb @@ -95,8 +95,7 @@ module SiSU if fns =~ /sisupod(?:\.zip)?|\S+?(?:\.ss[mt]\.zip|\.ssp)$/ require "#{SiSU_lib}/remote" # remote.rb #check pod_name=SiSU_Remote::Remote_download.new(fns).pod.name - tell=SiSU_Screen::Ansi.new(@opt.cmd,pod_name) - tell.puts_blue unless @opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@opt.cmd,pod_name).puts_blue unless @opt.cmd =~/q/ @opt.files.shift pod_output(pod_name) break @@ -152,9 +151,7 @@ module SiSU when /^dbi$/; SiSU_DBI::SiSU_SQL.new(@opt).connect # -D -d end @n_do=@n_do+1 - unless @opt.cmd =~/q/ - SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/ - end + SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/ ObjectSpace.garbage_collect else #print "not processed --> ", fns, "\n" end @@ -173,9 +170,7 @@ module SiSU end end @n_do=@n_do+1 - unless @opt.cmd =~/q/ - SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/ - end + SiSU_Screen::Ansi.new(@opt.cmd,@n_do,"#{@req.upcase} processed").files_processed if @opt.cmd =~/[MVv]/ end else Operations.new(@opt).not_found end @@ -227,8 +222,7 @@ p "here #{__FILE__} #{__LINE__}" if @opt =~/M/ def termsheet # -t system("sisu_termsheet #{@opt.cmd} #{@opt.fns}\n") @@n_do=@@n_do+1 - tell=SiSU_Screen::Ansi.new(@opt.cmd,@@n_do,'Termsheet(s) processed') - tell.term_sheet_title unless @opt.cmd =~/q/ + SiSU_Screen::Ansi.new(@opt.cmd,@@n_do,'Termsheet(s) processed').term_sheet_title unless @opt.cmd =~/q/ end def webrick # -W port=prt=@fns -- cgit v1.2.3