logfile_interval 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14b39f20fbae9202297e5238d0f5b070ff6e74d3
-  data.tar.gz: e68b950bb73692646df7e003548294b29c57217a
+  metadata.gz: a422a1c2dd8f8e7f23f0383d0e136b092a759bb7
+  data.tar.gz: a00233a4c5d418409adebb04192f2ece523afd17
 SHA512:
-  metadata.gz: 4854a00f1ffc8a58dc6608c977a0cf6ed89b8affa9b9e81fc271d14f89a0c53edbeb33188255b0eba01893c8fc7c313d09e097a8b1eddc748a56f81efbe21fc4
-  data.tar.gz: af8d8ba8b2a23cc3d4985763d8f7653c36c1881085107542af2134e5ae4e7488fb345834bd34d06c3406b02671d0e33de2f35b318c60cfac9632e152eaf8f340
+  metadata.gz: 10ae89ce0a1634f7cb7f3dd12c9b729cf9b3423a69d6493ec61a185681adbcc5257422c2d9ca02ed353f34d67ec76e244042f1d984dcba0a826c74370f94c9c6
+  data.tar.gz: 3795d4971b016b9b5101f387d8fd7ee4dcb9e6551631f100cc7cbb22e49444622826ee8e594102f12fd588f3136f10281379a6f382452bad38f4b6d5b608b3ba

data/lib/logfile_interval/logfile_set.rb

@@ -6,10 +6,13 @@ module LogfileInterval
 
     def initialize(filenames, parser, order = :desc, &file_time_finder_block)
       @parser    = parser
-      @filenames = reject_empty_files(filenames)
+      @filenames = filenames
       @order    = order
       @file_time_finder_block = file_time_finder_block if block_given?
 
+      reject_empty_files!
+      reject_files_with_no_valid_line!
+
       raise ArgumentError, "invalid order value: #{@order}" unless ORDER_VALID_VALUES.include?(@order.to_sym)
     end
 
@@ -68,10 +71,17 @@ module LogfileInterval
       end
     end
 
-    def reject_empty_files(filenames)
-      filenames.reject do |fname|
+    def reject_empty_files!
+      @filenames.reject do |fname|
         !File.size?(fname)
       end
     end
+
+    def reject_files_with_no_valid_line!
+      @filenames.reject! do |fname|
+        file = Logfile.new(fname, parser)
+        !file.first_parsed_line
+      end
+    end
   end
 end

data/lib/logfile_interval/version.rb

@@ -1,3 +1,3 @@
 module LogfileInterval
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

data/spec/lib/logfile_set_spec.rb

@@ -6,7 +6,8 @@ module LogfileInterval
 
   describe LogfileSet do
     before :each do
-      @logfiles = ["#{data_dir}/access.log.2", "#{data_dir}/access.log.1", "#{data_dir}/access.log.empty"]
+      @logfiles = ["#{data_dir}/access.log.2",
+                   "#{data_dir}/access.log.1"]
       @set = LogfileSet.new(@logfiles, ParsedLine::AccessLog)
       @first_line = '66.249.67.176 - - [23/Jun/2013:17:00:01 -0800] "GET /package/core/raring/universe/proposed/openldap HTTP/1.1" 200 185 "-" "Google"'
       @second_line = '12.24.48.96 - - [23/Jun/2013:16:59:00 -0800] "GET /package/core/raring/universe/proposed/openldap HTTP/1.1" 200 4555 "-" "Bing)"'
@@ -55,13 +56,6 @@ module LogfileInterval
           lines.last.should  == @first_line
         end
       end
-
-      context 'emoty logfiles' do
-        it 'are ignored' do
-          set = LogfileSet.new(@logfiles, ParsedLine::AccessLog, :asc)
-          expect(set.ordered_filenames).to_not include("#{data_dir}/access.log.empty")
-        end
-      end
     end
 
     describe :each_parsed_line do
@@ -95,6 +89,32 @@ module LogfileInterval
         @set.ordered_filenames.should == @non_empty_logfiles.reverse
       end
 
+      context 'empty logfiles' do
+        before :each do
+          logfiles = ["#{data_dir}/access.log.2",
+              "#{data_dir}/access.log.1",
+              "#{data_dir}/access.log.empty"]
+          @set_with_empty = LogfileSet.new(logfiles, ParsedLine::AccessLog)
+        end
+
+        it 'are ignored' do
+          expect(@set_with_empty.ordered_filenames).to_not include("#{data_dir}/access.log.empty")
+        end
+      end
+
+      context 'logfiles with no valid line' do
+        before :each do
+          logfiles = ["#{data_dir}/access.log.2",
+              "#{data_dir}/access.log.1",
+              "#{data_dir}/access.log.invalid"]
+          @set_with_invalid = LogfileSet.new(logfiles, ParsedLine::AccessLog)
+        end
+
+        it 'are ignored' do
+          expect(@set_with_invalid.ordered_filenames).to_not include("#{data_dir}/access.log.invalid")
+        end
+      end
+
       context 'with file_time_finder_block' do
         it 'sorts the files in the order described in the block' do
           set = LogfileSet.new(@logfiles, ParsedLine::AccessLog) do |filename|

data/spec/support/logfiles/access.log.invalid

@@ -0,0 +1 @@
+no valid line

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logfile_interval
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Philippe Le Rohellec
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,6 +137,7 @@ files:
 - spec/support/logfiles/access.log.2
 - spec/support/logfiles/access.log.3
 - spec/support/logfiles/access.log.empty
+- spec/support/logfiles/access.log.invalid
 - spec/support/logfiles/timing.log
 - spec/support/logfiles/timing.log.1
 - spec/support/logfiles/timing.log.2
@@ -183,6 +184,7 @@ test_files:
 - spec/support/logfiles/access.log.2
 - spec/support/logfiles/access.log.3
 - spec/support/logfiles/access.log.empty
+- spec/support/logfiles/access.log.invalid
 - spec/support/logfiles/timing.log
 - spec/support/logfiles/timing.log.1
 - spec/support/logfiles/timing.log.2