soda 1.4.1 → 1.4.2

data/lib/SodaLogReporter.rb

@@ -241,7 +241,7 @@ HTML
    def FormatTestResults (line)
       row_data = Hash.new()
       table_html = "<table>\n"
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "Results"
       rpt_msg = "#{$3}"
@@ -341,7 +341,7 @@ HTML
    def FormatHTMLSavedResults (line)
       row_data = Hash.new()
 
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "#{$2}"
       sav_msg = "#{$3}" 
@@ -412,7 +412,7 @@ HTML
    def FormatMajorException(line)
       row_data = Hash.new()
 
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "#{$2}"
       msg = "#{$3}"
@@ -446,7 +446,7 @@ HTML
    def FormatAssertionFailed (line)
       row_data = Hash.new()
       
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "#{$2}"
       msg = "#{$3}"
@@ -492,7 +492,7 @@ HTML
    def FormatAssertionPassed (line)
       row_data = Hash.new()
       
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "AP"
       msg = "#{$3}"
@@ -517,7 +517,7 @@ HTML
       href_id = "href_div_ed_#{@EventDumpID}"
       @EventDumpID += 1
       row_data = Hash.new()
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "#{$2}"
       msg = "#{$3}"
@@ -560,7 +560,7 @@ HTML
 ###############################################################################
    def FormatJSError(line)
       row_data = Hash.new()
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "#{$2}"
       msg = "#{$3}"
@@ -594,7 +594,7 @@ HTML
 ###############################################################################
    def FormatModuleLine(type, line)
       row_data = Hash.new()
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "M"
       msg = "#{$3}"
@@ -628,7 +628,7 @@ HTML
 ###############################################################################
    def FormatScreenShot(line)
       row_data = Hash.new()
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "#{$2}"
       msg = "#{$3}"
@@ -661,7 +661,7 @@ HTML
       row_data = Hash.new()
       msg = ""
 
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "#{$2}"
       
@@ -694,7 +694,7 @@ HTML
    def FormatClickingElement(line)
       row_data = {}
       tmp = ""
-      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+      line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
       row_data['date'] = "#{$1}"
       row_data['msg_type'] = "#{$2}"
       tmp = "#{$3}"
@@ -760,7 +760,7 @@ HTML
 			when /screenshot\staken/i
 				row_data = FormatScreenShot(line)
          else
-            line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+)\](\(.\))(.*)/
+            line =~ /\[(\d+\/\d+\/\d+-\d+:\d+:\d+\.\d+)\](\(.\))(.*)/
             row_data['date'] = "#{$1}"
             row_data['msg_type'] = "#{$2}"
             row_data['msg'] = SafeHTMLStr("#{$3}")

data/lib/SodaReporter.rb

@@ -56,6 +56,8 @@ class SodaReporter
       @debug = debug
       @start_time = nil
       @end_time = nil
+      @start_time_obj = nil
+      @end_time_obj = nil
       @js_error_count = 0
       @css_error_count = 0
       @asserts_count = 0
@@ -128,7 +130,14 @@ class SodaReporter
       log("[New Test]\n")
       log("Starting soda test: #{@sodatest_file}\n")
       log("Saving HTML files => #{@saveHtmlFiles.to_s()}.\n")
-      @start_time = Time.now().strftime("%m/%d/%Y-%H:%M:%S")
+
+      # this is because ruby 1.8.7 strftime doesn't support fractions of a
+      # second.  Lame...
+      now = Time.now()
+      @start_time_obj = now
+      time_str = now.strftime("%m/%d/%Y-%H:%M:%S")
+      time_str = "#{time_str}.#{now.usec}"
+      @start_time = time_str
    end
 
 ###############################################################################
@@ -144,12 +153,14 @@ class SodaReporter
 ###############################################################################
    def GetRawResults()
 
-      @end_time = Time.now().strftime("%m/%d/%Y-%H:%M:%S") if (@end_time == nil)
-      start = DateTime.strptime("#{@start_time}",
-         "%m/%d/%Y-%H:%M:%S")
-      stop = DateTime.strptime("#{@end_time}",
-         "%m/%d/%Y-%H:%M:%S")
-      total_time = (stop - start)
+      if (@end_time == nil)
+         now = Time.now()
+         @end_time_obj = now
+         @end_time = now.strftime("%m/%d/%Y-%H:%M:%S")
+         @end_time = "#{@end_time}.#{now.usec}"
+      end
+
+      total_time = (@end_time_obj - @start_time_obj)
 
       results = {
          'Test Failure Count' => @failureCount,
@@ -472,7 +483,11 @@ class SodaReporter
       log("Soda test: #{@sodatest_file} finished.\n")
       log("[End Test]\n")
       @logfile.close()
-      @end_time = Time.now().strftime("%m/%d/%Y-%H:%M:%S")
+
+      now = Time.now()
+      now_str = now.strftime("%m/%d/%Y-%H:%M:%S")
+      @end_time_obj = now
+      @end_time = "#{now_str}.#{now.usec}"
    end
 
 ###############################################################################

data/lib/SodaUtils.rb

@@ -159,8 +159,9 @@ def SodaUtils.PrintSoda (str, error = 0, file = nil, debug = 0, notime = 0,
    stackmsg = ""
    now = nil
 
-   now = Time.now().strftime("%m/%d/%Y-%H:%M:%S")
-   header = "[#{now}]"
+   now = Time.now()
+   time_str = now.strftime("%m/%d/%Y-%H:%M:%S")
+   header = "[#{time_str}.#{now.usec}]"
    
    if (debug != 0)
       cstak = caller()   

data/lib/sodainfo.rb

@@ -1,4 +1,4 @@
 require 'Soda'
 
-SODA_GEM_VERSION = "1.4.1"
+SODA_GEM_VERSION = "1.4.2"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soda
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Trampus Richmond
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 Z
+date: 2011-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: firewatir