picky-statistics 1.2.1 → 1.2.2

data/lib/picky-statistics/statistics/logfile_reader.rb

@@ -37,19 +37,16 @@ module Statistics
     end
     def initialize_full_totals
       full[:totals] = {}
-      full[:totals][0] = Count.new "^>|.*|       0|"
-      full[:totals][1] = Count.new "^>|.*|       1|"
-      full[:totals][2] = Count.new "^>|.*|       2|"
-      full[:totals][3] = Count.new "^>|.*|       3|"
-      
-      full[:totals][:'4+'] = Count.new("^>|.*|       [4-9]|", # 4-9, with one or more allocs
-                                       "^>|.*|      [1-9].|")     # but less than 100
-                                       
-      full[:totals][:cloud]     = Count.new("^>|.*|[1-9].|",          # allocs 10+
-                                            "^>|.*|.*|......[1-9].|....|.[2-9]|")        # allocs 2-9, more than 10 results
-      
-      full[:totals][:'100+']   = Count.new "^>|.*|.*|     [1-9]..|"
+      full[:totals][0]         = Count.new "^>|.*|       0|"
+      full[:totals][1]         = Count.new "^>|.*|       1|"
+      full[:totals][2]         = Count.new "^>|.*|       2|"
+      full[:totals][3]         = Count.new "^>|.*|       3|"
+      full[:totals][:'4+']     = Count.new("^>|.*|       [4-9]|", "^>|.*|      [1-9][0-9]|") # 4-9, 10+, but less than 100
+      full[:totals][:'100+']   = Count.new "^>|.*|.*|     [1-9][0-9][0-9]|"
       full[:totals][:'1000+']  = Count.new "^>|.*|.*|....[0-9]...|"
+                                       
+      full[:totals][:cloud]     = Count.new("^>|.*|[1-9].|",                      # allocs 10+
+                                            "^>|.*|.*|......[1-9].|....|.[2-9]|") # allocs 2-9, more than 10 results
     end
     def initialize_live_totals
       
@@ -60,14 +57,17 @@ module Statistics
       full[:very_long_running] = Count.new "^>|.\\+\\?|[1-9]\\.......|"
       
       full[:offset]            = Count.new("^>|.*|[ 1-9][ 0-9][0-9][0-9]|", # offset 10+
-                                           "^>|.*|   [1-9]") # offset 1-9
+                                           "^>|.*|   [1-9]")                # offset 1-9
     end
 
     #
     #
     def since_last
       @last_offset ||= 0
-      puts "Parsing log files from last parse point at line #{@last_offset}."
+      
+      log_offset = @last_offset
+      start_time = Time.now
+      
       with_temp_file(@last_offset) do |statistics|
         calculate_last_offset_from statistics
         
@@ -92,7 +92,8 @@ module Statistics
         full[:offset].add_from statistics
       end
       
-      puts "Statistics generated."
+      duration = Time.now - start_time
+      puts "Parsed log from line #{log_offset} in #{duration}s"
       
       @counts
     end
@@ -113,14 +114,13 @@ module Statistics
     # Use the offset to speed up statistics gathering.
     #
     def with_temp_file offset = 0
-      # Tempfile.open 'picky' do |temp_file| # TODO Use temp file.
-      File.open('picky_statistics.tmp', 'w+') do |temp_file|
-        temp_path = temp_file.path
-        puts "Copying #{@path} to #{temp_path} beginning at line #{offset}."
-        `tail -n +#{offset} #{@path} > #{temp_path}`
-        yield temp_path
-        File.delete temp_path
-      end
+      temp_file = Tempfile.new 'picky'
+      
+      temp_path = temp_file.path
+      `tail -n +#{offset} #{@path} > #{temp_path}`
+      yield temp_path
+      
+      temp_file.delete
     end
   
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 1
-  version: 1.2.1
+  - 2
+  version: 1.2.2
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2010-12-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency