lib/scoutui/commands/utils.rb in scoutui-2.0.3.27.pre vs lib/scoutui/commands/utils.rb in scoutui-2.0.3.28.pre

@@ -46,18 +46,41 @@
           '__COMPANY.EIN__' => lambda { Faker::Company.ein.to_s },
           '__COUNTRY__' => lambda { Faker::Address.country.to_s },
           '__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}"
+            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}"
+            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}"
             d=s.match(/__MMDDYY\+(\d+)__/)[1]
             d=(Date.today + d.to_i).strftime("%m%d%y")
             puts __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}"
+            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}"
+            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}"
+            d=s.match(/__MMDDYYYY\+(\d+)__/)[1]
+            d=(Date.today + d.to_i).strftime("%m%d%Y")
+            puts __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 },
           '__PHONENUMBER.AREACODE__' => lambda { Faker::Config.locale = 'en-US'; Faker::PhoneNumber.area_code.to_s },
           '__PHONENUMBER.EXCHANGE__' => lambda { Faker::Config.locale = 'en-US'; Faker::PhoneNumber.exchange_code.to_s },