diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-04-20 18:00:48 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-04-20 18:00:48 -0400 |
| commit | 7fc56d1de62d33980a9415d50792747ba4159d36 (patch) | |
| tree | e549c5de5d64a05c64573913c9d4898000ec7aff | |
| parent | update: changelog, version (2.1.1) (diff) | |
dal, minor cosmetic re-arrangement
| -rw-r--r-- | lib/sisu/v2/dal.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/sisu/v2/dal.rb b/lib/sisu/v2/dal.rb index 6fd23b60..b0a9df5d 100644 --- a/lib/sisu/v2/dal.rb +++ b/lib/sisu/v2/dal.rb @@ -210,6 +210,12 @@ module SiSU_DAL protected def create_dal dal_array=[] + unless @opt.cmd =~/q/ + tell=(@opt.cmd=~/[vVM]/) \ + ? SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction') \ + : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',@opt.fns) + tell.green_title_hi + end file_array=@env.read_source_file(@opt.fns) file_array.each do |l| if l =~/\r\n/; l.gsub!(/\r\n/,"\n") @@ -218,18 +224,12 @@ module SiSU_DAL meta=file_array.dup meta=meta.join.split("\n\n") #check whether can be eliminated, some of these are large objects to have twice @md=SiSU_Param::Parameters::Instructions.new(meta,@opt).extract - unless @opt.cmd =~/q/ - tell=(@md.cmd=~/[vVM]/) \ - ? SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction') \ - : SiSU_Screen::Ansi.new(@opt.cmd,'Document Abstraction',@md.fns) - tell.green_title_hi - end meta=nil dal=SiSU_DAL::Make.new(@md,file_array).song - if @md.cmd =~/[vM]/ - SiSU_Screen::Ansi.new(@md.cmd,@md.fns,"~meta/#{@md.fns}.meta").output if @md.cmd =~/v/i - tell=SiSU_Screen::Ansi.new(@md.cmd,"dal -> #{@make_fns.meta}") if @md.cmd =~/M/ - tell.txt_grey unless @md.cmd =~/q/ + if @opt.cmd =~/[vM]/ + SiSU_Screen::Ansi.new(@opt.cmd,@opt.fns,"~meta/#{@opt.fns}.meta").output if @opt.cmd =~/v/i + tell=SiSU_Screen::Ansi.new(@opt.cmd,"dal -> #{@make_fns.meta}") if @opt.cmd =~/M/ + tell.txt_grey unless @opt.cmd =~/q/ end dal.each{|s| dal_array << s} dal_array |