file-tail 1.0.9 → 1.0.10

data/.gitignore

@@ -1,5 +1,6 @@
 *.rbc
 .*.sw[pon]
+.rbx
 Gemfile.lock
 coverage
 pkg

data/.travis.yml

@@ -4,5 +4,7 @@ rvm:
   - 1.9.3
   - ruby-head
   - ree
-#  - rbx
-  - jruby
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode

data/CHANGES

@@ -1,3 +1,4 @@
+2012-05-31 * 1.0.10 * Use rewind to force IO#lineno to be reset.
 2012-05-31 * 1.0.9 * Reopen file in :top mode at the beginning.
 2011-12-24 * 1.0.8 * Support simplecov.
 2011-07-15 * 1.0.7 * Use gem_hadar to shorten Rakefile.

data/Gemfile

@@ -5,4 +5,5 @@ source :rubygems
 gemspec
 group :development do
   gem 'simplecov'
+  gem 'utils'
 end

data/Rakefile

@@ -11,10 +11,10 @@ GemHadar do
   summary     "#{path_name.camelize} for Ruby"
   description 'Library to tail files in Ruby'
   test_dir    'tests'
-  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', 'coverage', '*.rbc'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', 'coverage', '*.rbc', '.rbx'
   readme      'README.rdoc'
 
-  dependency  'tins', '~>0.3'
+  dependency  'tins', '~>0.4.3'
 
   development_dependency 'test-unit', '~>2.4.0'
 

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.10

data/file-tail.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = "file-tail"
-  s.version = "1.0.9"
+  s.version = "1.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2012-05-31"
+  s.date = "2012-06-02"
   s.description = "Library to tail files in Ruby"
   s.email = "flori@ping.de"
-  s.extra_rdoc_files = ["README.rdoc", "lib/file/tail/group.rb", "lib/file/tail/line_extension.rb", "lib/file/tail/logfile.rb", "lib/file/tail/tailer.rb", "lib/file/tail/version.rb", "lib/file/tail.rb", "lib/file-tail.rb"]
+  s.extra_rdoc_files = ["README.rdoc", "lib/file-tail.rb", "lib/file/tail.rb", "lib/file/tail/group.rb", "lib/file/tail/line_extension.rb", "lib/file/tail/logfile.rb", "lib/file/tail/tailer.rb", "lib/file/tail/version.rb"]
   s.files = [".gitignore", ".travis.yml", "CHANGES", "COPYING", "Gemfile", "README.rdoc", "Rakefile", "VERSION", "bin/rtail", "examples/pager.rb", "examples/tail.rb", "file-tail.gemspec", "lib/file-tail.rb", "lib/file/tail.rb", "lib/file/tail/group.rb", "lib/file/tail/line_extension.rb", "lib/file/tail/logfile.rb", "lib/file/tail/tailer.rb", "lib/file/tail/version.rb", "tests/file_tail_group_test.rb", "tests/file_tail_test.rb", "tests/test_helper.rb"]
   s.homepage = "http://github.com/flori/file-tail"
   s.rdoc_options = ["--title", "File-tail - File::Tail for Ruby", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.12"
   s.summary = "File::Tail for Ruby"
   s.test_files = ["tests/file_tail_group_test.rb", "tests/file_tail_test.rb", "tests/test_helper.rb"]
 
@@ -24,15 +24,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.8"])
       s.add_development_dependency(%q<test-unit>, ["~> 2.4.0"])
-      s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
+      s.add_runtime_dependency(%q<tins>, ["~> 0.4.3"])
     else
       s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
       s.add_dependency(%q<test-unit>, ["~> 2.4.0"])
-      s.add_dependency(%q<tins>, ["~> 0.3"])
+      s.add_dependency(%q<tins>, ["~> 0.4.3"])
     end
   else
     s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
     s.add_dependency(%q<test-unit>, ["~> 2.4.0"])
-    s.add_dependency(%q<tins>, ["~> 0.3"])
+    s.add_dependency(%q<tins>, ["~> 0.4.3"])
   end
 end

data/lib/file/tail.rb

@@ -97,7 +97,7 @@ class File
     # Skip the first <code>n</code> lines of this file. The default is to don't
     # skip any lines at all and start at the beginning of this file.
     def forward(n = 0)
-      seek(0, File::SEEK_SET)
+      rewind
       while n > 0 and not eof?
         readline
         n -= 1
@@ -132,10 +132,10 @@ class File
             seek(-bufsize, File::SEEK_CUR)
           end
         else
-          seek(0, File::SEEK_SET)
+          rewind
           buffer = read(size)
           n -= buffer.count("\n")
-          seek(0, File::SEEK_SET)
+          rewind
         end
       rescue Errno::EINVAL
         size = tell

data/lib/file/tail/version.rb

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

data/tests/file_tail_test.rb

@@ -164,7 +164,7 @@ class FileTailTest < Test::Unit::TestCase
     lines = []
     logger = Thread.new do
       begin
-        timeout(1) do
+        timeout(10) do
           @in.tail do |l|
             lines << l
           end
@@ -293,6 +293,7 @@ class FileTailTest < Test::Unit::TestCase
     return if File::PATH_SEPARATOR == ';' # Grmpf! Windows...
     @in.forward
     reopened = false
+    assert_equal 0, @in.lineno
     @in.after_reopen { |f| reopened = true }
     lines = []
     logger = Thread.new do
@@ -318,12 +319,14 @@ class FileTailTest < Test::Unit::TestCase
     logger.join
     assert_equal(110, lines.size)
     assert reopened
+    assert_equal 10, @in.lineno
   end
 
   def test_tail_change2
     return if File::PATH_SEPARATOR == ';' # Grmpf! Windows...
     @in.forward
     reopened = false
+    assert_equal 0, @in.lineno
     @in.after_reopen { |f| reopened = true }
     lines = []
     logger = Thread.new do
@@ -349,6 +352,7 @@ class FileTailTest < Test::Unit::TestCase
     logger.join
     assert_equal(110, lines.size)
     assert reopened
+    assert_equal 10, @in.lineno
   end
 
   def teardown

metadata

@@ -1,77 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: file-tail
 version: !ruby/object:Gem::Version
-  version: 1.0.9
   prerelease: 
+  version: 1.0.10
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-31 00:00:00.000000000 Z
+date: 2012-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: gem_hadar
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.8
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &30508 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.8
+  version_requirements: *30508
+  name: gem_hadar
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &30568 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.4.0
+  version_requirements: *30568
+  name: test-unit
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &30612 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
-- !ruby/object:Gem::Dependency
+        version: 0.4.3
+  version_requirements: *30612
   name: tins
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
 description: Library to tail files in Ruby
 email: flori@ping.de
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- lib/file-tail.rb
+- lib/file/tail.rb
 - lib/file/tail/group.rb
 - lib/file/tail/line_extension.rb
 - lib/file/tail/logfile.rb
 - lib/file/tail/tailer.rb
 - lib/file/tail/version.rb
-- lib/file/tail.rb
-- lib/file-tail.rb
 files:
 - .gitignore
 - .travis.yml
@@ -110,10 +95,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -1118280401649333258
+      hash: 2002549777813010636
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: File::Tail for Ruby