file-tail 1.0.2 → 1.0.3

data/CHANGES

@@ -1,3 +1,11 @@
+2008-04-07 * 1.0.3 * Danny Colligan <danny.colligan@sendori.com> reported a
+                     memory leak in long running scripts using file-tail. I
+                     think this might be a ruby related problem, which is
+                     caused/aggravated by using yield after having &block
+                     parameter in a method. I changed file-tail to only use
+                     block.call, which seems to improve the memory behaviour. I
+                     am still not sure, where the problem actually stems
+                     from, though.
 2007-04-19 * 1.0.2 * make_doc.rb was missing from the source archive. Thanks to
                      Rick Ohnemus <rick.ohnemus@systemware.com> for reporting it.
 2007-04-19 * 1.0.1 * Bugfix: File::Tail::Logfile#open with block, now closes
@@ -55,5 +63,4 @@
                    * The API has changed - but I think very few people
                      care at the moment.
                    * Lots of tests added.
-
 2002-07-30 * 0.0.1 * Initial Release

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/examples/pager.rb

@@ -6,7 +6,6 @@ require 'file/tail'
 
 filename = ARGV.shift or fail "Usage: #$0 filename [height]"
 height = (ARGV.shift || ENV['LINES'] || 23).to_i - 1
-p height
 
 File::Tail::Logfile.open(filename, :break_if_eof => true) do |log|
   begin

data/lib/file/tail.rb

@@ -96,7 +96,7 @@ class File
       #
       # Every attribute of File::Tail can be set with a <code>:attributename =>
       # value</code> option.
-      def self.open(filename, opts = {}) # :yields: file
+      def self.open(filename, opts = {}, &block) # :yields: file
         file = new filename
         opts.each do |o, v|
           writer = o.to_s + "=" 
@@ -118,7 +118,7 @@ class File
         end
         if block_given?
           begin
-            yield file
+            block.call file
           ensure
             file.close
             nil
@@ -128,13 +128,14 @@ class File
         end
       end
 
-      # Like open, but yields to every new line encountered in the logfile.
-      def self.tail(filename, opts = {})
+      # Like open, but yields to every new line encountered in the logfile in
+      # +block+.
+      def self.tail(filename, opts = {}, &block)
         if ([ :forward, :backward ] & opts.keys).empty?
           opts[:backward] = 0
         end
         open(filename, opts) do |log|
-          log.tail { |line| yield line }
+          log.tail { |line| block.call line }
         end
       end
     end
@@ -296,7 +297,7 @@ class File
         block = lambda { |line| result << line }
         array_result = true
       end
-      preset_atts unless @lines
+      preset_attributes unless @lines
       loop do
         begin
           restat
@@ -317,10 +318,10 @@ class File
     
     private
 
-    def read_line
+    def read_line(&block)
       if @n
         until @n == 0
-          yield readline
+          block.call readline
           @lines += 1
           @no_read = 0
           @n -= 1
@@ -328,7 +329,7 @@ class File
         end
         raise ReturnException
       else
-        yield readline
+        block.call readline
         @lines += 1
         @no_read = 0
         debug
@@ -344,7 +345,7 @@ class File
       raise ReopenException
     end
 
-    def preset_atts
+    def preset_attributes
       @reopen_deleted       = true if @reopen_deleted.nil?
       @reopen_suspicious    = true if @reopen_suspicious.nil?
       @break_if_eof         = false if @break_if_eof.nil?
@@ -410,13 +411,12 @@ class File
 
     def debug
       $DEBUG or return
-      h = {
+      STDERR.puts({ 
         :lines    => @lines,
         :interval => @interval,
         :no_read  => @no_read,
         :n        => @n,
-      }
-      $stderr.print h.inspect, "\n"
+      }.inspect)
     end
   end
 end

data/lib/file/tail/version.rb

@@ -1,7 +1,7 @@
 class File
   module Tail
     # File::Tail version
-    VERSION         = '1.0.2'
+    VERSION         = '1.0.3'
     VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
     VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
     VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

metadata

@@ -1,63 +1,71 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: file-tail
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-04-19 00:00:00 +02:00
-summary: File::Tail for Ruby
-require_paths: 
-- lib
-email: flori@ping.de
-homepage: http://file-tail.rubyforge.org
-rubyforge_project: file-tail
-description: Library to tail files in Ruby
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.3
 platform: ruby
-signing_key: 
-cert_chain: 
 authors: 
 - Florian Frank
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-04-07 00:00:00 +02:00
+default_executable: 
+dependencies: []
+
+description: Library to tail files in Ruby
+email: flori@ping.de
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
-- VERSION
-- tests
-- GPL
-- README.en
 - install.rb
-- Rakefile
-- examples
 - lib
-- make_doc.rb
-- CHANGES
-- tests/test_file-tail.rb
-- examples/pager.rb
-- examples/tail.rb
 - lib/file
 - lib/file/tail
-- lib/file/tail.rb
 - lib/file/tail/version.rb
-test_files: 
+- lib/file/tail.rb
+- make_doc.rb
+- README
+- CHANGES
+- VERSION
+- tests
 - tests/test_file-tail.rb
+- Rakefile
+- GPL
+- examples
+- examples/tail.rb
+- examples/pager.rb
+has_rdoc: true
+homepage: http://file-tail.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --title
 - File::Tail
 - --line-numbers
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: file-tail
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: File::Tail for Ruby
+test_files: 
+- tests/test_file-tail.rb