logfile_interval 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39928b6833d0ca8c626a982ce27793e46cd56e09
-  data.tar.gz: 5f439c3e89fdae163a11c2554e2ad0fb7db0bd9c
+  metadata.gz: 14b39f20fbae9202297e5238d0f5b070ff6e74d3
+  data.tar.gz: e68b950bb73692646df7e003548294b29c57217a
 SHA512:
-  metadata.gz: 1cf9f1135d847234001e625a8141e27bd930ea2e56d2f3806d4fe1b97e771adc2274fd54e6c2ef472144b823a33e9dd11b19a3b9d68e8615fe7c6e481b2a8e86
-  data.tar.gz: 5045943977e66bc7ac8a5cc24776edcb71dd15c2dd4b85914025406a7bc62094d0b7f82a6cba85f7c3e2212345b44b5b70323ef36d5db4abf3d1007c082d7238
+  metadata.gz: 4854a00f1ffc8a58dc6608c977a0cf6ed89b8affa9b9e81fc271d14f89a0c53edbeb33188255b0eba01893c8fc7c313d09e097a8b1eddc748a56f81efbe21fc4
+  data.tar.gz: af8d8ba8b2a23cc3d4985763d8f7653c36c1881085107542af2134e5ae4e7488fb345834bd34d06c3406b02671d0e33de2f35b318c60cfac9632e152eaf8f340

data/lib/logfile_interval/logfile_set.rb

@@ -6,7 +6,7 @@ module LogfileInterval
 
     def initialize(filenames, parser, order = :desc, &file_time_finder_block)
       @parser    = parser
-      @filenames = filenames
+      @filenames = reject_empty_files(filenames)
       @order    = order
       @file_time_finder_block = file_time_finder_block if block_given?
 
@@ -67,5 +67,11 @@ module LogfileInterval
         h
       end
     end
+
+    def reject_empty_files(filenames)
+      filenames.reject do |fname|
+        !File.size?(fname)
+      end
+    end
   end
 end

data/lib/logfile_interval/version.rb

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

data/spec/lib/logfile_set_spec.rb

@@ -6,7 +6,7 @@ module LogfileInterval
 
   describe LogfileSet do
     before :each do
-      @logfiles = ["#{data_dir}/access.log.2", "#{data_dir}/access.log.1"]
+      @logfiles = ["#{data_dir}/access.log.2", "#{data_dir}/access.log.1", "#{data_dir}/access.log.empty"]
       @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,6 +55,13 @@ 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
@@ -80,8 +87,12 @@ module LogfileInterval
     end
 
     describe :ordered_filenames do
-      it 'returns the most recent file first' do
-        @set.ordered_filenames.should == @logfiles.reverse
+      before :each do
+        @non_empty_logfiles = @logfiles.reject { |f| !File.size?(f) }
+      end
+
+      it 'returns the most recent non empty file first' do
+        @set.ordered_filenames.should == @non_empty_logfiles.reverse
       end
 
       context 'with file_time_finder_block' do
@@ -91,7 +102,7 @@ module LogfileInterval
               matchdata[:num].to_i
             end
           end
-          set.ordered_filenames.should == @logfiles
+          set.ordered_filenames.should == @non_empty_logfiles
         end
       end
     end

metadata

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