[DRE-commits] [ruby-file-tail] 01/06: Imported Upstream version 1.1.1
Lucas Moura
lucasmoura-guest at moszumanska.debian.org
Mon Jul 11 22:03:22 UTC 2016
This is an automated email from the git hooks/post-receive script.
lucasmoura-guest pushed a commit to branch master
in repository ruby-file-tail.
commit 838f54ff081888394bfb29b1795bb7103d5d74d9
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date: Mon Jul 11 17:37:58 2016 -0300
Imported Upstream version 1.1.1
---
.travis.yml | 12 ++---
VERSION | 2 +-
file-tail.gemspec | 52 ++++++++++----------
lib/file/tail.rb | 14 +++---
lib/file/tail/version.rb | 2 +-
metadata.yml | 122 -----------------------------------------------
tests/file_tail_test.rb | 70 +++++++++++++--------------
7 files changed, 76 insertions(+), 198 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e7700ba..fb9bfef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,11 @@
rvm:
- - 1.9.2
- - 1.9.3
- - 2.0.0
- - 2.1.2
+ - 2.1
+ - 2.2
+ - 2.3.0
- ruby-head
- - rbx-19mode
- - jruby-19mode
+ - jruby-head
+sudo: false
matrix:
allow_failures:
- rvm: ruby-head
+ - rvm: jruby-head
diff --git a/VERSION b/VERSION
index 9084fa2..524cb55 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.0
+1.1.1
diff --git a/file-tail.gemspec b/file-tail.gemspec
index 5d82c3e..7cb0c2b 100644
--- a/file-tail.gemspec
+++ b/file-tail.gemspec
@@ -1,40 +1,40 @@
# -*- encoding: utf-8 -*-
-# stub: file-tail 1.1.0 ruby lib
+# stub: file-tail 1.1.1 ruby lib
Gem::Specification.new do |s|
- s.name = "file-tail"
- s.version = "1.1.0"
+ s.name = "file-tail".freeze
+ s.version = "1.1.1"
- s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
- s.require_paths = ["lib"]
- s.authors = ["Florian Frank"]
- s.date = "2014-09-26"
- s.description = "Library to tail files in Ruby"
- s.email = "flori at ping.de"
- 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.licenses = ["GPL-2.0"]
- s.rdoc_options = ["--title", "File-tail - File::Tail for Ruby", "--main", "README.rdoc"]
- s.rubygems_version = "2.2.2"
- s.summary = "File::Tail for Ruby"
- s.test_files = ["tests/file_tail_group_test.rb", "tests/file_tail_test.rb", "tests/test_helper.rb"]
+ s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+ s.require_paths = ["lib".freeze]
+ s.authors = ["Florian Frank".freeze]
+ s.date = "2016-04-19"
+ s.description = "Library to tail files in Ruby".freeze
+ s.email = "flori at ping.de".freeze
+ s.extra_rdoc_files = ["README.rdoc".freeze, "lib/file-tail.rb".freeze, "lib/file/tail.rb".freeze, "lib/file/tail/group.rb".freeze, "lib/file/tail/line_extension.rb".freeze, "lib/file/tail/logfile.rb".freeze, "lib/file/tail/tailer.rb".freeze, "lib/file/tail/version.rb".freeze]
+ s.files = [".gitignore".freeze, ".travis.yml".freeze, "CHANGES".freeze, "COPYING".freeze, "Gemfile".freeze, "README.rdoc".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/rtail".freeze, "examples/pager.rb".freeze, "examples/tail.rb".freeze, "file-tail.gemspec".freeze, "lib/file-tail.rb".freeze, "lib/file/tail.rb".freeze, "lib/file/tail/group.rb".freeze, "lib/file/tail/line_extension.rb".freeze, "lib/file/tail/logfile.rb".freeze, "lib/file/tail/tailer.rb".freeze, "lib/file/tail/version [...]
+ s.homepage = "http://github.com/flori/file-tail".freeze
+ s.licenses = ["GPL-2.0".freeze]
+ s.rdoc_options = ["--title".freeze, "File-tail - File::Tail for Ruby".freeze, "--main".freeze, "README.rdoc".freeze]
+ s.rubygems_version = "2.6.3".freeze
+ s.summary = "File::Tail for Ruby".freeze
+ s.test_files = ["tests/file_tail_group_test.rb".freeze, "tests/file_tail_test.rb".freeze, "tests/test_helper.rb".freeze]
if s.respond_to? :specification_version then
s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
- s.add_development_dependency(%q<gem_hadar>, ["~> 1.0.0"])
- s.add_development_dependency(%q<test-unit>, ["~> 2.4.0"])
- s.add_runtime_dependency(%q<tins>, ["~> 1.0"])
+ s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.7.1"])
+ s.add_development_dependency(%q<test-unit>.freeze, ["~> 2.4.0"])
+ s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.0"])
else
- s.add_dependency(%q<gem_hadar>, ["~> 1.0.0"])
- s.add_dependency(%q<test-unit>, ["~> 2.4.0"])
- s.add_dependency(%q<tins>, ["~> 1.0"])
+ s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.7.1"])
+ s.add_dependency(%q<test-unit>.freeze, ["~> 2.4.0"])
+ s.add_dependency(%q<tins>.freeze, ["~> 1.0"])
end
else
- s.add_dependency(%q<gem_hadar>, ["~> 1.0.0"])
- s.add_dependency(%q<test-unit>, ["~> 2.4.0"])
- s.add_dependency(%q<tins>, ["~> 1.0"])
+ s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.7.1"])
+ s.add_dependency(%q<test-unit>.freeze, ["~> 2.4.0"])
+ s.add_dependency(%q<tins>.freeze, ["~> 1.0"])
end
end
diff --git a/lib/file/tail.rb b/lib/file/tail.rb
index 15786d4..9ccf7c3 100644
--- a/lib/file/tail.rb
+++ b/lib/file/tail.rb
@@ -125,7 +125,6 @@ class File
if bufsize < size
seek(0, File::SEEK_END)
while n > 0 and tell > 0 do
- start = tell
seek(-bufsize, File::SEEK_CUR)
buffer = read(bufsize)
n -= buffer.count("\n")
@@ -170,7 +169,7 @@ class File
block = lambda { |line| result << line }
array_result = true
end
- preset_attributes unless @lines
+ preset_attributes unless defined? @lines
loop do
begin
restat
@@ -182,7 +181,7 @@ class File
@n -= 1 if @n
end
reopen_file(e.mode)
- @after_reopen.call self if @after_reopen
+ @after_reopen.call self if defined? @after_reopen
rescue ReturnException
return array_result ? result : nil
end
@@ -219,15 +218,16 @@ class File
end
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?
- @return_if_eof = false if @return_if_eof.nil?
+ @reopen_deleted = true unless defined? @reopen_deleted
+ @reopen_suspicious = true unless defined? @reopen_suspicious
+ @break_if_eof = false unless defined? @break_if_eof
+ @return_if_eof = false unless defined? @return_if_eof
@max_interval ||= 10
@interval ||= @max_interval
@suspicious_interval ||= 60
@lines = 0
@no_read = 0
+ @stat = nil
end
def restat
diff --git a/lib/file/tail/version.rb b/lib/file/tail/version.rb
index 9cbbec5..e503eae 100644
--- a/lib/file/tail/version.rb
+++ b/lib/file/tail/version.rb
@@ -1,6 +1,6 @@
module File::Tail
# File::Tail version
- VERSION = '1.1.0'
+ VERSION = '1.1.1'
VERSION_ARRAY = VERSION.split('.').map(&:to_i) # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc:
diff --git a/metadata.yml b/metadata.yml
deleted file mode 100644
index ffcbcbd..0000000
--- a/metadata.yml
+++ /dev/null
@@ -1,122 +0,0 @@
---- !ruby/object:Gem::Specification
-name: file-tail
-version: !ruby/object:Gem::Version
- version: 1.1.0
-platform: ruby
-authors:
-- Florian Frank
-autorequire:
-bindir: bin
-cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
- name: gem_hadar
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- version: 1.0.0
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- version: 1.0.0
-- !ruby/object:Gem::Dependency
- name: test-unit
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- version: 2.4.0
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- version: 2.4.0
-- !ruby/object:Gem::Dependency
- name: tins
- requirement: !ruby/object:Gem::Requirement
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- version: '1.0'
- type: :runtime
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- requirements:
- - - ~>
- - !ruby/object:Gem::Version
- version: '1.0'
-description: Library to tail files in Ruby
-email: flori at 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
-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
-homepage: http://github.com/flori/file-tail
-licenses:
-- GPL-2.0
-metadata: {}
-post_install_message:
-rdoc_options:
-- --title
-- File-tail - File::Tail for Ruby
-- --main
-- README.rdoc
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
- requirements:
- - - '>='
- - !ruby/object:Gem::Version
- version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
- requirements:
- - - '>='
- - !ruby/object:Gem::Version
- version: '0'
-requirements: []
-rubyforge_project:
-rubygems_version: 2.2.2
-signing_key:
-specification_version: 4
-summary: File::Tail for Ruby
-test_files:
-- tests/file_tail_group_test.rb
-- tests/file_tail_test.rb
-- tests/test_helper.rb
diff --git a/tests/file_tail_test.rb b/tests/file_tail_test.rb
index 4ea470d..5b30691 100644
--- a/tests/file_tail_test.rb
+++ b/tests/file_tail_test.rb
@@ -59,58 +59,58 @@ class FileTailTest < Test::Unit::TestCase
end
def test_tail_with_block_without_n
- timeout(10) do
+ Timeout::timeout(10) do
lines = []
@in.backward(1)
- assert_raises(TimeoutError) do
- timeout(1) { @in.tail { |l| lines << l } }
+ assert_raises(Timeout::Error) do
+ Timeout::timeout(1) { @in.tail { |l| lines << l } }
end
assert_equal(1, lines.size)
#
lines = []
@in.backward(10)
- assert_raises(TimeoutError) do
- timeout(1) { @in.tail { |l| lines << l } }
+ assert_raises(Timeout::Error) do
+ Timeout::timeout(1) { @in.tail { |l| lines << l } }
end
assert_equal(10, lines.size)
#
lines = []
@in.backward(100)
- assert_raises(TimeoutError) do
- timeout(1) { @in.tail { |l| lines << l } }
+ assert_raises(Timeout::Error) do
+ Timeout::timeout(1) { @in.tail { |l| lines << l } }
end
assert_equal(100, lines.size)
#
lines = []
@in.backward(101)
- assert_raises(TimeoutError) do
- timeout(1) { @in.tail { |l| lines << l } }
+ assert_raises(Timeout::Error) do
+ Timeout::timeout(1) { @in.tail { |l| lines << l } }
end
end
end
def test_tail_with_block_with_n
- timeout(10) do
+ Timeout::timeout(10) do
@in.backward(1)
lines = []
- timeout(1) { @in.tail(0) { |l| lines << l } }
+ Timeout::timeout(1) { @in.tail(0) { |l| lines << l } }
assert_equal(0, lines.size)
#
@in.backward(1)
lines = []
- timeout(1) { @in.tail(1) { |l| lines << l } }
+ Timeout::timeout(1) { @in.tail(1) { |l| lines << l } }
assert_equal(1, lines.size)
#
@in.backward(10)
lines = []
- timeout(1) { @in.tail(10) { |l| lines << l } }
+ Timeout::timeout(1) { @in.tail(10) { |l| lines << l } }
assert_equal(10, lines.size)
#
@in.backward(100)
lines = []
@in.backward(1)
- assert_raises(TimeoutError) do
- timeout(1) { @in.tail(2) { |l| lines << l } }
+ assert_raises(Timeout::Error) do
+ Timeout::timeout(1) { @in.tail(2) { |l| lines << l } }
end
assert_equal(1, lines.size)
#
@@ -118,27 +118,27 @@ class FileTailTest < Test::Unit::TestCase
end
def test_tail_without_block_with_n
- timeout(10) do
+ Timeout::timeout(10) do
@in.backward(1)
lines = []
- timeout(1) { lines += @in.tail(0) }
+ Timeout::timeout(1) { lines += @in.tail(0) }
assert_equal(0, lines.size)
#
@in.backward(1)
lines = []
- timeout(1) { lines += @in.tail(1) }
+ Timeout::timeout(1) { lines += @in.tail(1) }
assert_equal(1, lines.size)
#
@in.backward(10)
lines = []
- timeout(1) { lines += @in.tail(10) }
+ Timeout::timeout(1) { lines += @in.tail(10) }
assert_equal(10, lines.size)
#
@in.backward(100)
lines = []
@in.backward(1)
- assert_raises(TimeoutError) do
- timeout(1) { lines += @in.tail(2) }
+ assert_raises(Timeout::Error) do
+ Timeout::timeout(1) { lines += @in.tail(2) }
end
assert_equal(0, lines.size)
end
@@ -149,8 +149,8 @@ class FileTailTest < Test::Unit::TestCase
lines = []
logger = Thread.new do
begin
- timeout(1) { @in.tail { |l| lines << l } }
- rescue TimeoutError
+ Timeout::timeout(1) { @in.tail { |l| lines << l } }
+ rescue Timeout::Error
end
end
appender = Thread.new { append(@out, 10) }
@@ -164,12 +164,12 @@ class FileTailTest < Test::Unit::TestCase
lines = []
logger = Thread.new do
begin
- timeout(10) do
+ Timeout::timeout(10) do
@in.tail do |l|
lines << l
end
end
- rescue TimeoutError
+ rescue Timeout::Error
end
end
appender = Thread.new do
@@ -194,12 +194,12 @@ class FileTailTest < Test::Unit::TestCase
lines = []
logger = Thread.new do
begin
- timeout(2) do
+ Timeout::timeout(2) do
@in.tail do |l|
lines << l
end
end
- rescue TimeoutError
+ rescue Timeout::Error
end
end
appender = Thread.new do
@@ -225,12 +225,12 @@ class FileTailTest < Test::Unit::TestCase
lines = []
logger = Thread.new do
begin
- timeout(2) do
+ Timeout::timeout(2) do
@in.tail do |l|
lines << l
end
end
- rescue TimeoutError
+ rescue Timeout::Error
end
end
appender = Thread.new do
@@ -261,12 +261,12 @@ class FileTailTest < Test::Unit::TestCase
lines = []
logger = Thread.new do
begin
- timeout(2) do
+ Timeout::timeout(2) do
@in.tail(15) do |l|
lines << l
end
end
- rescue TimeoutError
+ rescue Timeout::Error
end
end
appender = Thread.new do
@@ -298,12 +298,12 @@ class FileTailTest < Test::Unit::TestCase
lines = []
logger = Thread.new do
begin
- timeout(2) do
+ Timeout::timeout(2) do
@in.tail(110) do |l|
lines << l
end
end
- rescue TimeoutError
+ rescue Timeout::Error
end
end
appender = Thread.new do
@@ -331,12 +331,12 @@ class FileTailTest < Test::Unit::TestCase
lines = []
logger = Thread.new do
begin
- timeout(2) do
+ Timeout::timeout(2) do
@in.tail(110) do |l|
lines << l
end
end
- rescue TimeoutError
+ rescue Timeout::Error
end
end
appender = Thread.new do
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-file-tail.git
More information about the Pkg-ruby-extras-commits
mailing list