lib/scoutui/commands/utils.rb in scoutui-2.0.3.48.pre vs lib/scoutui/commands/utils.rb in scoutui-2.0.3.49.pre

- old
+ new

@@ -57,38 +57,38 @@ '__DATE__' => lambda { Time.now().to_s }, '__EMAIL__' => lambda { Faker::Internet.email.to_s}, '__DDMMYY__' => lambda { Date.parse(Time.now.to_s).strftime("%d%m%Y") }, '__MM/DD/YY__' => lambda { Date.parse(Time.now.to_s).strftime("%m/%d/%y") }, '__MM/DD/YY\+\d+__' => lambda { |s| - puts __FILE__ + (__LINE__).to_s + " Process s => #{s}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}" d=s.match(/__MM\/DD\/YY\+(\d+)__/)[1] d=(Date.today + d.to_i).strftime("%m/%d/%y") - puts __FILE__ + (__LINE__).to_s + " new date: #{d}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " new date: #{d}" d }, '__MMDDYY__' => lambda { Date.parse(Time.now.to_s).strftime("%m%d%y") }, '__MMDDYY\+\d+__' => lambda { |s| - puts __FILE__ + (__LINE__).to_s + " Process s => #{s}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}" d=s.match(/__MMDDYY\+(\d+)__/)[1] d=(Date.today + d.to_i).strftime("%m%d%y") - puts __FILE__ + (__LINE__).to_s + " new date: #{d}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " new date: #{d}" d }, '__MM/DD/YYYY__' => lambda { Date.parse(Time.now.to_s).strftime("%m/%d/%Y") }, '__MM/DD/YYYY\+\d+__' => lambda { |s| - puts __FILE__ + (__LINE__).to_s + " Process s => #{s}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}" d=s.match(/__MM\/DD\/YYYY\+(\d+)__/)[1] d=(Date.today + d.to_i).strftime("%m/%d/%Y") - puts __FILE__ + (__LINE__).to_s + " new date: #{d}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " new date: #{d}" d }, '__MMDDYYYY__' => lambda { Date.parse(Time.now.to_s).strftime("%m%d%Y") }, '__MMDDYYYY\+\d+__' => lambda { |s| - puts __FILE__ + (__LINE__).to_s + " Process s => #{s}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " Process s => #{s}" d=s.match(/__MMDDYYYY\+(\d+)__/)[1] d=(Date.today + d.to_i).strftime("%m%d%Y") - puts __FILE__ + (__LINE__).to_s + " new date: #{d}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " new date: #{d}" d }, '__PARAGRAPH__' => lambda { Faker::Lorem.paragraph.to_s }, '__PASSWORD__' => lambda { Faker::Internet.password.to_s }, '__PHONENUMBER__' => lambda { Faker::PhoneNumber.phone_number.to_s }, @@ -142,11 +142,11 @@ _dynamicStr = _v.call(_text_to_type.to_s) _text_to_type.gsub!(/#{_k.to_s}/, _dynamicStr) end end - puts __FILE__ + (__LINE__).to_s + " expandMacro : #{_text_to_type}" + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " expandMacro : #{_text_to_type}" _text_to_type.to_s end @@ -154,10 +154,10 @@ def reset(stanza=nil) setEnableFrameSearch(false) if stanza.is_a?(Hash) && stanza.has_key?('page') && stanza['page'].has_key?('frames') - puts __FILE__ + (__LINE__).to_s + " frames => #{stanza['page']['frames']}"; + Scoutui::Logger::LogMgr.instance.debug __FILE__ + (__LINE__).to_s + " frames => #{stanza['page']['frames']}"; setEnableFrameSearch(stanza['page']['frames']) # setEnableFrameSearch(!stanza['page']['frames'].to_s.match(/true/i).nil?) end end