From 3c8feda22db639de2dad6521773e3e8ca25359ae Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 6 Jun 2012 22:42:41 -0400 Subject: v3: screen reporting, ansi colors, cosmetic --- data/doc/sisu/CHANGELOG_v3 | 2 ++ lib/sisu/v3/dal.rb | 2 +- lib/sisu/v3/manifest.rb | 2 +- lib/sisu/v3/urls.rb | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index f5f722f2..d3ed60d4 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -25,6 +25,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.2.12.orig.tar.xz * v3: shared_images, fix +v3: screen reporting, ansi colors, cosmetic + * Rake, Rant installer sisu installer require ruby >= 1.9.3 %% 3.2.11.orig.tar.xz (2012-06-03:22/7) diff --git a/lib/sisu/v3/dal.rb b/lib/sisu/v3/dal.rb index 24f29bd3..6c7fef79 100644 --- a/lib/sisu/v3/dal.rb +++ b/lib/sisu/v3/dal.rb @@ -265,7 +265,7 @@ module SiSU_DAL tell=(@opt.cmd=~/[vVM]/) \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction') : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}") - tell.green_title_hi + tell.grey_title_hi end fn=(@fnx && @fnx =~/\.ss[tmi]$/) \ ? @fnx diff --git a/lib/sisu/v3/manifest.rb b/lib/sisu/v3/manifest.rb index b2982aae..092418fb 100644 --- a/lib/sisu/v3/manifest.rb +++ b/lib/sisu/v3/manifest.rb @@ -87,7 +87,7 @@ module SiSU_Manifest url_html="file://#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}" @opt.cmd=~/[MVvz]/ \ ? SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"#{xbrowser} #{url_html}").green_hi_blue - : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").green_title_hi + : SiSU_Screen::Ansi.new(@opt.cmd,'Manifest',"[#{@opt.f_pth[:lng_is]}] #{@opt.fno}").grey_title_hi SiSU_Screen::Ansi.new(@opt.cmd,"#{browser} #{url_html}").grey_tab if @opt.cmd =~/v/i end data=SiSU_HTML::Source::HTML_Environment.new(@particulars).tuned_file_instructions diff --git a/lib/sisu/v3/urls.rb b/lib/sisu/v3/urls.rb index a75cfc1a..29c2f791 100644 --- a/lib/sisu/v3/urls.rb +++ b/lib/sisu/v3/urls.rb @@ -284,8 +284,8 @@ module SiSU_Urls unless @opt.cmd =~/q/ i="(output manifest) [#{@opt.f_pth[:lng_is]}] #{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}" @opt.cmd=~/[MVvz]/ \ - ? SiSU_Screen::Ansi.new(@opt.cmd,'URLs').grey_title_hi - : SiSU_Screen::Ansi.new(@opt.cmd,'URL',i).green_hi_blue + ? SiSU_Screen::Ansi.new(@opt.cmd,'URLs').green_title_hi + : SiSU_Screen::Ansi.new(@opt.cmd,'URL',i).grey_title_hi SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"#{@md.file.output_path.manifest.dir}/#{@md.file.base_filename.manifest}").flow if @opt.cmd =~/[MVv]/ end m=/.+\/(?:src\/)?(\S+)/im # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m -- cgit v1.2.3