file-tail 1.0.3 → 1.0.4

data/CHANGES

@@ -1,3 +1,6 @@
+2009-08-21 * 1.0.4 * Fixed the threaded tests for Ruby 1.9.
+                   * Create a gem spec file.
+                   * Some cleanup.
 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

data/{GPL → COPYING}

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
                        59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it

data/Rakefile

@@ -1,13 +1,17 @@
 # vim: set filetype=ruby et sw=2 ts=2:
 
-require 'rake/gempackagetask'
+begin
+  require 'rake/gempackagetask'
+rescue LoadError
+end
+require 'rake/clean'
 require 'rbconfig'
-
 include Config
 
 PKG_NAME = 'file-tail'
 PKG_VERSION = File.read('VERSION').chomp
 PKG_FILES = FileList["**/*"].exclude(/^(pkg|coverage|doc)/)
+CLEAN.include 'coverage', 'doc'
 
 desc "Installing library"
 task :install  do
@@ -29,35 +33,43 @@ task :coverage  do
   system %{rcov -x '\\btests\/' -Ilib tests/test_file-tail.rb}
 end
 
-desc "Removing generated files"
-task :clean do
-  rm_rf 'doc'
-  rm_rf 'coverage'
-end
-
-spec = Gem::Specification.new do |s|
-  s.name = 'file-tail'
-  s.version = PKG_VERSION
+if defined? Gem
+  spec_src =<<GEM
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name = '#{PKG_NAME}'
+  s.version = '#{PKG_VERSION}'
   s.summary = "File::Tail for Ruby"
   s.description = "Library to tail files in Ruby"
 
-  s.files = PKG_FILES
+  s.files = #{PKG_FILES.to_a.sort.inspect}
 
   s.require_path = 'lib'
 
   s.has_rdoc = true
-  s.rdoc_options << '--title' <<  'File::Tail' << '--line-numbers'
+  s.rdoc_options << '--main' <<  'doc-main.txt'
+  s.extra_rdoc_files << 'doc-main.txt'
   s.test_files << 'tests/test_file-tail.rb'
 
   s.author = "Florian Frank"
   s.email = "flori@ping.de"
-  s.homepage = "http://file-tail.rubyforge.org"
-  s.rubyforge_project = "file-tail"
+  s.homepage = "http://#{PKG_NAME}.rubyforge.org"
+  s.rubyforge_project = "#{PKG_NAME}"
 end
+GEM
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-  pkg.package_files += PKG_FILES
+  desc 'Create a gemspec file'
+  task :gemspec do
+    File.open("#{PKG_NAME}.gemspec", 'w') do |f|
+      f.puts spec_src
+    end
+  end
+
+  spec = eval(spec_src)
+  Rake::GemPackageTask.new(spec) do |pkg|
+    pkg.need_tar = true
+    pkg.package_files += PKG_FILES
+  end
 end
 
 desc m = "Writing version information for #{PKG_VERSION}"
@@ -79,4 +91,6 @@ EOT
   end
 end
 
-task :release => [ :clean, :version, :package ]
+task :default => [ :version, :gemspec, :test ]
+
+task :release => [ :clean, :version, :gemspec, :package ]

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/doc-main.txt

@@ -0,0 +1,54 @@
+== File::Tail - Tailing files in Ruby
+
+=== Description
+
+This is a small ruby library that allows it to "tail" files in Ruby,
+including following a file, that still is growing like the unix command 'tail
+-f' can.
+
+=== Author
+
+Florian Frank mailto:flori@ping.de
+
+=== License
+
+This is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License Version 2 as published by
+the Free Software Foundation: http://www.gnu.org/copyleft/gpl.html
+
+=== Download
+
+The latest version of <b>File::Tail</b> (file-tail) can be found at
+
+http://rubyforge.org/frs/?group_id=393
+
+Online Documentation should be located at
+
+http://file-tail.rubyforge.org
+
+=== Usage
+
+File::Tail is a module in the File class. A lightweight class interface for
+logfiles can be seen under File::Tail::Logfile.
+
+Direct extension of File objects with File::Tail works like that:
+ File.open(filename) do |log|
+   log.extend(File::Tail)
+   log.interval = 10
+   log.backward(10)
+   log.tail { |line| puts line }
+ end
+
+It's also possible to mix File::Tail in your own File classes
+(see also File::Tail::Logfile):
+ class MyFile < File
+   include File::Tail
+ end
+ log = MyFile.new("myfile")
+ log.interval = 10
+ log.backward(10)
+ log.tail { |line| print line }
+
+The forward/backward method returns self, so it's possible to chain
+methods together like that:
+ log.backward(10).tail { |line| puts line }

data/examples/pager.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# vim: set et sw=2 ts=2:
 # A poor man's pager... :)
 
 require 'file/tail'

data/examples/tail.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# vim: set et sw=2 ts=2:
 
 require 'file/tail'
 

data/file-tail.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+Gem::Specification.new do |s|
+  s.name = 'file-tail'
+  s.version = '1.0.4'
+  s.summary = "File::Tail for Ruby"
+  s.description = "Library to tail files in Ruby"
+
+  s.files = ["CHANGES", "COPYING", "README", "Rakefile", "VERSION", "examples", "examples/pager.rb", "examples/tail.rb", "file-tail.gemspec", "install.rb", "lib", "lib/file", "lib/file/tail", "lib/file/tail.rb", "lib/file/tail/version.rb", "make_doc.rb", "tests", "tests/test_file-tail.rb"]
+
+  s.require_path = 'lib'
+
+  s.has_rdoc = true
+  s.rdoc_options << '--main' <<  'doc-main.txt'
+  s.extra_rdoc_files << 'doc-main.txt'
+  s.test_files << 'tests/test_file-tail.rb'
+
+  s.author = "Florian Frank"
+  s.email = "flori@ping.de"
+  s.homepage = "http://file-tail.rubyforge.org"
+  s.rubyforge_project = "file-tail"
+end

data/install.rb

@@ -19,4 +19,3 @@ cd 'lib' do
   file = File.join('file', 'tail', 'version.rb')
   install(file, dest)
 end
-  # vim: set et sw=2 ts=2:

data/lib/file/tail.rb

@@ -1,61 +1,6 @@
 require 'file/tail/version'
 
 class File
-  # = File::Tail - Tailing files in Ruby
-  #
-  # == Description
-  #
-  # This is a small ruby library that allows it to "tail" files in Ruby,
-  # including following a file, that still is growing like the unix command 'tail
-  # -f' can.
-  #
-  # == Author
-  #
-  # Florian Frank mailto:flori@ping.de
-  #
-  # == License
-  #
-  # This is free software; you can redistribute it and/or modify it under
-  # the terms of the GNU General Public License Version 2 as published by
-  # the Free Software Foundation: http://www.gnu.org/copyleft/gpl.html
-  #
-  # == Download
-  #
-  # The latest version of <b>File::Tail</b> (file-tail) can be found at
-  #
-  # http://rubyforge.org/frs/?group_id=393
-  #
-  # Online Documentation should be located at
-  #
-  # http://file-tail.rubyforge.org
-  #
-  # == Usage
-  #
-  # File::Tail is a module in the File class. A lightweight class interface for
-  # logfiles can be seen under File::Tail::Logfile.
-  #
-  # Direct extension of File objects with File::Tail works like that:
-  #  File.open(filename) do |log|
-  #    log.extend(File::Tail)
-  #    log.interval = 10
-  #    log.backward(10)
-  #    log.tail { |line| puts line }
-  #  end
-  #
-  # It's also possible to mix File::Tail in your own File classes
-  # (see also File::Tail::Logfile):
-  #  class MyFile < File
-  #    include File::Tail
-  #  end
-  #  log = MyFile.new("myfile")
-  #  log.interval = 10
-  #  log.backward(10)
-  #  log.tail { |line| print line }
-  #
-  # The forward/backward method returns self, so it's possible to chain
-  # methods together like that:
-  #  log.backward(10).tail { |line| puts line }
-  #
   module Tail
     # This is an easy to use Logfile class that includes
     # the File::Tail module.
@@ -440,4 +385,3 @@ if $0 == __FILE__
     log.tail { |line| puts line }
   end
 end
-# vim: set et sw=2 ts=2:

data/lib/file/tail/version.rb

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

data/make_doc.rb

@@ -2,5 +2,4 @@
 
 $outdir = 'doc/'
 puts "Creating documentation in '#$outdir'."
-system "rdoc -t File::Tail -m File::Tail -o #$outdir #{Dir['lib/**/*.rb'] * ' '}"
-  # vim: set et sw=2 ts=2:
+system "rdoc -m doc-main.txt -o #$outdir doc-main.txt #{Dir['lib/**/*.rb'] * ' '}"

data/tests/test_file-tail.rb

@@ -2,8 +2,8 @@
 
 base = File.basename(Dir.pwd)
 if base == 'tests' || base =~ /file-tail/
-	Dir.chdir('..') if base == 'tests'
-	$LOAD_PATH.unshift(File.join(Dir.pwd, 'lib'))
+    Dir.chdir('..') if base == 'tests'
+    $LOAD_PATH.unshift(File.join(Dir.pwd, 'lib'))
 end
 
 require 'test/unit'
@@ -135,148 +135,152 @@ class TC_FileTail < Test::Unit::TestCase
   def test_tail_withappend
     @in.backward
     lines = []
-    threads = []
-    threads << Thread.new do
+    logger = Thread.new do
       begin
         timeout(1) { @in.tail { |l| lines << l } }
       rescue TimeoutError
       end
     end
-    threads << Thread.new { append(@out, 10) }
-    threads.collect { |t| t.join }
+    appender = Thread.new { append(@out, 10) }
+    appender.join
+    logger.join
     assert_equal(10, lines.size)
   end
 
   def test_tail_truncated
     @in.backward
     lines = []
-    threads = []
-    threads << appender = Thread.new do
-      Thread.stop
-      @out.close
-      File.truncate(@out.path, 0)
-      @out = File.new(@in.path, "ab")
-      append(@out, 10)
-    end
-    threads << Thread.new do
+    logger = Thread.new do
       begin
         timeout(1) do
           @in.tail do |l|
             lines << l
-            lines.size == 100 and appender.wakeup
           end
         end
       rescue TimeoutError
       end
     end
-    threads.collect { |t| t.wakeup and t.join }
+    appender = Thread.new do
+      until logger.stop?
+        sleep 0.1
+      end
+      @out.close
+      File.truncate(@out.path, 0)
+      @out = File.new(@in.path, "ab")
+      append(@out, 10)
+    end
+    appender.join
+    logger.join
     assert_equal(10, lines.size)
   end
 
   def test_tail_remove
-		return if File::PATH_SEPARATOR == ';' # Grmpf! Windows...
+    return if File::PATH_SEPARATOR == ';' # Grmpf! Windows...
     @in.backward
-		reopened = false
-		@in.after_reopen { |f| reopened = true }
+    reopened = false
+    @in.after_reopen { |f| reopened = true }
     lines = []
-    threads = []
-    threads << appender = Thread.new do
-      Thread.stop
-      @out.close
-      File.unlink(@out.path)
-      @out = File.new(@in.path, "wb")
-      append(@out, 10)
-    end
-    threads << Thread.new do
+    logger = Thread.new do
       begin
         timeout(2) do
           @in.tail do |l|
             lines << l
-            lines.size == 100 and appender.wakeup
           end
         end
       rescue TimeoutError
       end
     end
-    threads.collect { |t| t.wakeup and t.join }
+    appender = Thread.new do
+      until logger.stop?
+        sleep 0.1
+      end
+      @out.close
+      File.unlink(@out.path)
+      @out = File.new(@in.path, "wb")
+      append(@out, 10)
+    end
+    appender.join
+    logger.join
     assert_equal(10, lines.size)
-		assert reopened
+    assert reopened
   end
 
   def test_tail_remove2
-		return if File::PATH_SEPARATOR == ';' # Grmpf! Windows...
+    return if File::PATH_SEPARATOR == ';' # Grmpf! Windows...
     @in.backward
-		reopened = false
-		@in.after_reopen { |f| reopened = true }
+    reopened = false
+    @in.after_reopen { |f| reopened = true }
     lines = []
-    threads = []
-    threads << appender = Thread.new do
-      Thread.stop
-      @out.close
-      File.unlink(@out.path)
-      @out = File.new(@in.path, "wb")
-      append(@out, 10)
-			sleep 1
-      append(@out, 10)
-      File.unlink(@out.path)
-      @out = File.new(@in.path, "wb")
-      append(@out, 10)
-    end
-    threads << Thread.new do
+    logger = Thread.new do
       begin
         timeout(2) do
           @in.tail do |l|
             lines << l
-            lines.size == 100 and appender.wakeup
           end
         end
       rescue TimeoutError
       end
     end
-    threads.collect { |t| t.wakeup and t.join }
-    assert_equal(30, lines.size)
-		assert reopened
-  end
-
-  def test_tail_remove3
-		return if File::PATH_SEPARATOR == ';' # Grmpf! Windows...
-    @in.backward
-		reopened = false
-		@in.after_reopen { |f| reopened = true }
-    lines = []
-    threads = []
-    threads << appender = Thread.new do
-      Thread.stop
+    appender = Thread.new do
+      until logger.stop?
+        sleep 0.1
+      end
       @out.close
       File.unlink(@out.path)
       @out = File.new(@in.path, "wb")
       append(@out, 10)
-			sleep 1
+      sleep 1
       append(@out, 10)
       File.unlink(@out.path)
       @out = File.new(@in.path, "wb")
       append(@out, 10)
     end
-    threads << Thread.new do
+    appender.join
+    logger.join
+    assert_equal(30, lines.size)
+    assert reopened
+  end
+
+  def test_tail_remove3
+    return if File::PATH_SEPARATOR == ';' # Grmpf! Windows...
+    @in.backward
+    reopened = false
+    @in.after_reopen { |f| reopened = true }
+    lines = []
+    logger = Thread.new do
       begin
         timeout(2) do
           @in.tail(15) do |l|
             lines << l
-            lines.size == 100 and appender.wakeup
           end
         end
       rescue TimeoutError
       end
     end
-    threads.collect { |t| t.wakeup and t.join }
+    appender = Thread.new do
+      until logger.stop?
+        sleep 0.1
+      end
+      @out.close
+      File.unlink(@out.path)
+      @out = File.new(@in.path, "wb")
+      append(@out, 10)
+      sleep 1
+      append(@out, 10)
+      File.unlink(@out.path)
+      @out = File.new(@in.path, "wb")
+      append(@out, 10)
+    end
+    appender.join
+    logger.join
     assert_equal(15, lines.size)
-		assert reopened
+    assert reopened
   end
 
   def teardown
     @in.close
     @out.close
-		File.unlink(@out.path)
+    File.unlink(@out.path)
   end
 
   private
@@ -295,4 +299,3 @@ class TC_FileTail < Test::Unit::TestCase
     file.flush
   end
 end
-  # vim: set noet sw=2 ts=2:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: file-tail
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Florian Frank
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-07 00:00:00 +02:00
+date: 2009-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -19,33 +19,31 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- doc-main.txt
 files: 
+- CHANGES
+- COPYING
+- README
+- Rakefile
+- VERSION
+- examples/pager.rb
+- examples/tail.rb
+- file-tail.gemspec
 - install.rb
-- lib
-- lib/file
-- lib/file/tail
-- lib/file/tail/version.rb
 - lib/file/tail.rb
+- lib/file/tail/version.rb
 - make_doc.rb
-- README
-- CHANGES
-- VERSION
-- tests
 - tests/test_file-tail.rb
-- Rakefile
-- GPL
-- examples
-- examples/tail.rb
-- examples/pager.rb
+- doc-main.txt
 has_rdoc: true
 homepage: http://file-tail.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
-- --title
-- File::Tail
-- --line-numbers
+- --main
+- doc-main.txt
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -63,9 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: file-tail
-rubygems_version: 1.0.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: File::Tail for Ruby
 test_files: 
 - tests/test_file-tail.rb