ptools 1.3.0-universal-mingw32 → 1.3.6-universal-mingw32

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODRjNGZmYTAzYTU4ZjE4NDA0OWVlZWZiZDlmMDNlNjExZWM4YWY3ZQ==
-  data.tar.gz: !binary |-
-    ZjVkYjQwMTQ0YWViOTJlMDI4NTFmYTYyYTc3MGJhNTQyNGM3NTU5Ng==
+SHA256:
+  metadata.gz: 7137b9d1e8f2be72fc7c5fecaad1101105dfcdec8b20ce4a14613290eb654d7f
+  data.tar.gz: f6277cd2a7c718b3fba6e219fcb67a550b97ce05986770b1badc760c9be527ba
 SHA512:
-  metadata.gz: !binary |-
-    YjcxOWU1MmNkZTBlZjg5YTIzMTU0NWZmNjM5ZjBlMmU4NGUyZTM0MTdjYzNk
-    NWFmNmRmZTYzZTUzYmE3N2U4NjMwZmM0MWEzZjc3M2EwNjUzMmY1NWM4NDc2
-    NjUxODhkZDczNWVhZjIzZTRjNWRmMDNiMzc0Zjc4YTUzZWJkMjY=
-  data.tar.gz: !binary |-
-    YTUyMzY2MGRjNzM4YzE5ZDhkMWQ3MWYyNjgwNDBkYjFmMzA4NjQyYmJmYjg5
-    ODdhMzFlNTZmZmQ4MzE0YzRiNGIwNGE5MjI2Y2MzZjdjNGYwYjkzNWI1NjMy
-    OTJiMmNjMjE2ZTY3M2M4MDhhMzQ5ZjhmMGUwM2M3ZmJjMDIxOGY=
+  metadata.gz: 35a63af1addb2fb3e5bce61393941586a2f5bdd137408afeb437207502e61bc21ed92f72ff392ffc8adf7b67a4353604f713ce5cbcbd64245d4e4860efdf46ba
+  data.tar.gz: 408a73f0219d50632a63265b3a72f13f120962f5bee89a3a36ece8f8671a896015b1f2442c129558b4b079b5723efee37beaac3d56893f8246d3cb298c648885

data/CHANGES

@@ -1,3 +1,35 @@
+== 1.3.6 - 7-Jun-2020
+* Updated gemspec, added more versions to .travis.yml file, fixed typo.
+  Thanks go to Al Snow for the updates.
+* Fixed a bug where the File.binary? method would return true for utf16
+  or utf32 encoded files. Thanks go to Andrew McAndre for the spot.
+* Updated cert.
+
+== 1.3.5 - 3-Sep-2017
+* The File.image? method now checks against .ico files.
+* Eliminated Fixnum warning that showed up in Ruby 2.4.x.
+* Updated cert.
+
+== 1.3.4 - 4-Jul-2017
+* The File.binary? method now lets you set your own percentage for the
+  internal heuristic as an optional second argument.
+* The VERSION constant is now frozen.
+* Minor updates to the Rakefile and gemspec.
+* Updated cert file.
+
+== 1.3.3 - 25-Sep-2015
+* This gem is now signed.
+* The Rakefile tasks now assume Rubygems 2.x.
+
+== 1.3.2 - 11-Dec-2014
+* Update to the File.tail method that deals prevents potential line ending
+  issues in JRuby.
+* Added known issues with JRuby to the README.
+
+== 1.3.1 - 9-Dec-2014
+* Fixed some potential issues with File.tail. Thanks go to Matt Hoyle for
+  the patch.
+
 == 1.3.0 - 8-Dec-2014
 * Made the File.tail method efficient. It's no longer slurpy, and it also no
   longer includes line endings in the result.

data/Gemfile.lock

@@ -0,0 +1,19 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    power_assert (1.1.5)
+    rake (13.0.1)
+    structured_warnings (0.4.0)
+    test-unit (3.3.5)
+      power_assert
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  structured_warnings
+  test-unit
+
+BUNDLED WITH
+   2.1.2

data/MANIFEST

@@ -3,6 +3,7 @@
 * MANIFEST
 * Rakefile
 * ptools.gemspec
+* certs/djberg96_pub.pem
 * lib/ptools.rb
 * test/test_constants.rb
 * test/test_head.rb
@@ -17,3 +18,4 @@
 * test/img/test.gif
 * test/img/test.jpg
 * test/img/test.png
+* test/img/test.ico

data/README

@@ -3,7 +3,7 @@
   File class based on Unix command line tools.
    
 == Prerequisites
-  On MS Windows you will need win32-file 0.5.4 or later.
+  On MS Windows you will need the win32-file gem.
 
 == Installation
   gem install ptools
@@ -27,7 +27,10 @@
   File.nl_convert("myfile", "newfile", "dos")
    
 == Known Bugs
-  None known. Please report any bugs on the github project page.
+  The File.which and File.whereis methods may fail when using JRuby on Windows.
+  See https://github.com/jruby/jruby/issues/2291 for details.
+
+  Please report any other issues on the github project page.
 
   http://www.github.com/djberg96/ptools
 
@@ -42,6 +45,10 @@
   The binary?() method was based almost entirely on a blog post by Ryan
   Davis (who, in turn, based his code on Perl's -B switch).
 
+  Thanks go to Matt Hoyle for help with the File.tail method.
+
+  And thanks to any and all contributors!
+
 == Future Plans
   Add whatever other tools people think might be useful.
    
@@ -49,7 +56,7 @@
   Artistic 2.0
     
 == Copyright
-  (C) 2003-2014 Daniel J. Berger
+  (C) 2003-2020 Daniel J. Berger
   All Rights Reserved.
     
 == Warranty

data/Rakefile

@@ -8,28 +8,28 @@ CLEAN.include("**/*.gem", "**/*.rbc", "**/*coverage*")
 
 desc 'Install the ptools package (non-gem)'
 task :install do
-   sitelibdir = CONFIG["sitelibdir"]
-   file = "lib/ptools.rb"
-   FileUtils.cp(file, sitelibdir, :verbose => true)
+  sitelibdir = CONFIG["sitelibdir"]
+  file = "lib/ptools.rb"
+  FileUtils.cp(file, sitelibdir, :verbose => true)
 end
 
 namespace 'gem' do
   desc 'Create the ptools gem'
   task :create => [:clean] do
-    Dir["*.gem"].each{ |f| File.delete(f) } # Clean first
+    require 'rubygems/package'
     spec = eval(IO.read('ptools.gemspec'))
-    if Gem::VERSION < "2.0.0"
-      Gem::Builder.new(spec).build
-    else
-      require 'rubygems/package'
-      Gem::Package.build(spec)
-    end
+    spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
+    Gem::Package.build(spec, true)
   end
 
   desc 'Install the ptools gem'
   task :install => [:create] do
     file = Dir["*.gem"].first
-    sh "gem install -l #{file}"
+    if RUBY_PLATFORM == 'java'
+      sh "jruby -S gem install -l #{file}"
+    else
+      sh "gem install -l #{file}"
+    end
   end
 end
 
@@ -75,13 +75,6 @@ namespace 'test' do
     t.test_files = FileList['test/test_image.rb']
   end
 
-  Rake::TestTask.new('middle') do |t|
-    t.libs << 'test'
-    t.verbose = true
-    t.warning = true
-    t.test_files = FileList['test/test_middle.rb']
-  end
-
   Rake::TestTask.new('nlconvert') do |t|
     t.libs << 'test'
     t.verbose = true

data/certs/djberg96_pub.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
+cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
+ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+/3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
+-----END CERTIFICATE-----

data/lib/ptools.rb

@@ -3,7 +3,7 @@ require 'win32/file' if File::ALT_SEPARATOR
 
 class File
   # The version of the ptools library.
-  PTOOLS_VERSION = '1.3.0'
+  PTOOLS_VERSION = '1.3.6'.freeze
 
   # :stopdoc:
 
@@ -23,8 +23,8 @@ class File
 
   # :startdoc:
 
-  # Returns whether or not the file is an image. Only JPEG, PNG, BMP and
-  # GIF are checked against.
+  # Returns whether or not the file is an image. Only JPEG, PNG, BMP,
+  # GIF, and ICO are checked against.
   #
   # This method does some simple read and extension checks. For a version
   # that is more robust, but which depends on a 3rd party C library (and is
@@ -39,8 +39,8 @@ class File
   # http://en.wikipedia.org/wiki/Magic_number_(programming)
   #
   def self.image?(file)
-    bool = IMAGE_EXT.include?(File.extname(file).downcase)      # Match ext
-    bool = bmp?(file) || jpg?(file) || png?(file) || gif?(file) || tiff?(file) # Check data
+    bool = IMAGE_EXT.include?(File.extname(file).downcase)
+    bool = bmp?(file) || jpg?(file) || png?(file) || gif?(file) || tiff?(file) || ico?(file)
     bool
   end
 
@@ -79,6 +79,10 @@ class File
   # It performs a "best guess" based on a simple test of the first
   # +File.blksize+ characters, or 4096, whichever is smaller.
   #
+  # By default it will check to see if more than 30 percent of the characters
+  # are non-text characters. If so, the method returns true. You can configure
+  # this percentage by passing your own as a second argument.
+  #
   # Example:
   #
   #   File.binary?('somefile.exe') # => true
@@ -87,13 +91,14 @@ class File
   # Based on code originally provided by Ryan Davis (which, in turn, is
   # based on Perl's -B switch).
   #
-  def self.binary?(file)
+  def self.binary?(file, percentage = 0.30)
     return false if image?(file)
+    return false if check_bom?(file)
     bytes = File.stat(file).blksize
     bytes = 4096 if bytes > 4096
     s = (File.read(file, bytes) || "")
     s = s.encode('US-ASCII', :undef => :replace).split(//)
-    ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
+    ((s.size - s.grep(" ".."~").size) / s.size.to_f) > percentage
   end
 
   # Looks for the first occurrence of +program+ within +path+.
@@ -247,35 +252,42 @@ class File
   # If you're looking for tail -f functionality, please use the file-tail
   # gem instead.
   #
+  #--
+  # Internally I'm using a 64 chunk of memory at a time. I may allow the size
+  # to be configured in the future as an optional 3rd argument.
+  #
   def self.tail(filename, num_lines=10)
     tail_size = 2**16 # 64k chunks
 
     # MS Windows gets unhappy if you try to seek backwards past the
     # end of the file, so we have some extra checks here and later.
-    file_size = File.size(filename)
-    tail_size = file_size if file_size <= tail_size
-    line_sep  = File::ALT_SEPARATOR ? "\r\n" : "\n"
+    file_size  = File.size(filename)
+    read_bytes = file_size % tail_size
+    read_bytes = tail_size if read_bytes == 0
+
+    line_sep = File::ALT_SEPARATOR ? "\r\n" : "\n"
 
     buf = ''
 
-    File.open(filename){ |fh|
-      fh.seek(-tail_size, File::SEEK_END)
+    # Open in binary mode to ensure line endings aren't converted.
+    File.open(filename, 'rb'){ |fh|
+      position = file_size - read_bytes # Set the starting read position
 
-      while buf.count(line_sep) <= num_lines
-        buf = fh.read(tail_size) + buf
-        break if buf.count(line_sep) >= num_lines
-        if tail_size * 2 < file_size
-          fh.seek(-tail_size * 2, File::SEEK_CUR)
-        else
-          fh.seek(-file_size, File::SEEK_CUR)
-        end
+      # Loop until we have the lines or run out of file
+      while buf.scan(line_sep).size <= num_lines and position >= 0
+        fh.seek(position, IO::SEEK_SET)
+        buf = fh.read(read_bytes) + buf
+        read_bytes = tail_size
+        position -= read_bytes
       end
     }
 
+    lines = buf.split(line_sep).pop(num_lines)
+
     if block_given?
-      buf.split(line_sep)[-num_lines..-1].each{ |line| yield line  }
+      lines.each{ |line| yield line  }
     else
-      buf.split(line_sep)[-num_lines..-1]
+      lines
     end
   end
 
@@ -421,6 +433,20 @@ class File
 
   private
 
+  # Returns whether or not the given +text+ contains a BOM marker.
+  # If present, we can generally assume it's a text file.
+  #
+  def self.check_bom?(file)
+    text = File.read(file, 4).force_encoding('utf-8')
+
+    bool = false
+    bool = true if text[0,3] == "\xEF\xBB\xBF"
+    bool = true if text[0,4] == "\x00\x00\xFE\xFF" || text[0,4] == "\xFF\xFE\x00\x00"
+    bool = true if text[0,2] == "\xFF\xFE" || text[0,2] == "\xFE\xFF"
+
+    bool
+  end
+
   def self.nl_for_platform(platform)
     platform = RbConfig::CONFIG["host_os"] if platform == 'local'
 
@@ -472,4 +498,8 @@ class File
 
     true
   end
+
+  def self.ico?(file)
+    ["\000\000\001\000", "\000\000\002\000"].include?(IO.read(file, 4, nil, :encoding => 'binary'))
+  end
 end

data/ptools.gemspec

@@ -1,30 +1,30 @@
-require 'rubygems'
 require 'rbconfig'
 
-Gem::Specification.new do |gem|
-  gem.name       = 'ptools'
-  gem.version    = '1.3.0'
-  gem.license    = 'Artistic 2.0'
-  gem.author     = 'Daniel J. Berger'
-  gem.email      = 'djberg96@gmail.com'
-  gem.homepage   = 'https://github.com/djberg96/ptools'
-  gem.summary    = 'Extra methods for the File class'
-  gem.test_files = Dir['test/test*']
-  gem.files      = Dir['**/*'] << '.gemtest'
+Gem::Specification.new do |spec|
+  spec.name       = 'ptools'
+  spec.version    = '1.3.6'
+  spec.license    = 'Artistic-2.0'
+  spec.author     = 'Daniel J. Berger'
+  spec.email      = 'djberg96@gmail.com'
+  spec.homepage   = 'https://github.com/djberg96/ptools'
+  spec.summary    = 'Extra methods for the File class'
+  spec.test_files = Dir['test/test*']
+  spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
+  spec.cert_chain = ['certs/djberg96_pub.pem']
 
-  gem.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
+  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
 
-  gem.description = <<-EOF
+  spec.description = <<-EOF
     The ptools (power tools) library provides several handy methods to
     Ruby's core File class, such as File.which for finding executables,
     File.null to return the null device on your platform, and so on.
   EOF
 
-  gem.add_development_dependency('rake')
-  gem.add_development_dependency('test-unit', '>= 2.5.0')
+  spec.add_development_dependency('rake')
+  spec.add_development_dependency('test-unit')
 
   if File::ALT_SEPARATOR
-    gem.platform = Gem::Platform.new(['universal', 'mingw32'])
-    gem.add_dependency('win32-file', '>= 0.7.0')
+    spec.platform = Gem::Platform.new(['universal', 'mingw32'])
+    spec.add_dependency('win32-file')
   end
 end

data/test/test_binary.rb

@@ -16,15 +16,16 @@ class TC_Ptools_Binary < Test::Unit::TestCase
       @@bin_file = '/bin/ls'
     end
 
-    Dir.chdir('test') if File.exist?('test')
+    @@dirname = File.dirname(__FILE__)
   end
 
   def setup
-    @txt_file = File.join('txt', 'english.txt')
-    @uni_file = File.join('txt', 'korean.txt')
-    @png_file = File.join('img', 'test.png')
-    @jpg_file = File.join('img', 'test.jpg')
-    @gif_file = File.join('img', 'test.gif')
+    @txt_file = File.join(@@dirname, 'txt', 'english.txt')
+    @uni_file = File.join(@@dirname, 'txt', 'korean.txt')
+    @utf_file = File.join(@@dirname, 'txt', 'english.utf16')
+    @png_file = File.join(@@dirname, 'img', 'test.png')
+    @jpg_file = File.join(@@dirname, 'img', 'test.jpg')
+    @gif_file = File.join(@@dirname, 'img', 'test.gif')
   end
 
   test "File.binary? basic functionality" do
@@ -39,6 +40,7 @@ class TC_Ptools_Binary < Test::Unit::TestCase
   test "File.binary? returns false for text files" do
     assert_false(File.binary?(@txt_file))
     assert_false(File.binary?(@uni_file))
+    assert_false(File.binary?(@utf_file))
   end
 
   test "File.binary? returns false for image files" do
@@ -47,6 +49,11 @@ class TC_Ptools_Binary < Test::Unit::TestCase
     assert_false(File.binary?(@gif_file))
   end
 
+  test "File.binary? accepts an optional percentage argument" do
+    assert_false(File.binary?(@txt_file, 0.50))
+    assert_true(File.binary?(@txt_file, 0.05))
+  end
+
   test "File.binary? raises an error if the file cannot be found" do
     assert_raise_kind_of(SystemCallError){ File.binary?('bogus') }
   end

data/test/test_constants.rb

@@ -15,7 +15,7 @@ class TC_Ptools_Constants < Test::Unit::TestCase
   end
 
   test "PTOOLS_VERSION constant is set to expected value" do
-    assert_equal('1.3.0', File::PTOOLS_VERSION)
+    assert_equal('1.3.6', File::PTOOLS_VERSION)
   end
 
   test "IMAGE_EXT constant is set to array of values" do
@@ -27,7 +27,7 @@ class TC_Ptools_Constants < Test::Unit::TestCase
     assert_not_nil(File::MSWINDOWS)
   end
 
-  test "WIN32EXTS constant is defiend on MS Windows" do
+  test "WIN32EXTS constant is defined on MS Windows" do
     omit_unless(@@windows, "Skipping on Unix systems")
     assert_not_nil(File::WIN32EXTS)
   end

data/test/test_image.rb

@@ -18,6 +18,7 @@ class TC_Ptools_Image < Test::Unit::TestCase
     @jpg_file  = File.join(Dir.pwd, 'img', 'test.jpg')
     @png_file  = File.join(Dir.pwd, 'img', 'test.png')
     @gif_file  = File.join(Dir.pwd, 'img', 'test.gif')
+    @ico_file  = File.join(Dir.pwd, 'img', 'test.ico')
   end
 
   test "image? method basic functionality" do
@@ -43,6 +44,10 @@ class TC_Ptools_Image < Test::Unit::TestCase
     assert_true(File.image?(@png_file))
   end
 
+  test "image? method returns true for an ico" do
+    assert_true(File.image?(@ico_file))
+  end
+
   test "image? method raises an error if the file does not exist" do
     assert_raises(Errno::ENOENT, ArgumentError){ File.image?('bogus') }
   end

data/test/test_nlconvert.rb

@@ -10,18 +10,18 @@ require 'ptools'
 
 class TC_Ptools_NLConvert < Test::Unit::TestCase
   def self.startup
-    Dir.chdir('test') if File.exist?('test')
-    @@test_file1 = 'test_nl_convert1.txt'
-    @@test_file2 = 'test_nl_convert2.txt'
+    @@dirname = File.dirname(__FILE__)
+    @@test_file1 = File.join(@@dirname, 'test_nl_convert1.txt')
+    @@test_file2 = File.join(@@dirname, 'test_nl_convert2.txt')
     File.open(@@test_file1, 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
     File.open(@@test_file2, 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
   end
 
   def setup
-    @test_file1 = 'test_nl_convert1.txt'
-    @test_file2 = 'test_nl_convert2.txt'
-    @dos_file   = 'dos_test_file.txt'
-    @mac_file   = 'mac_test_file.txt'
+    @test_file1 = File.join(@@dirname, 'test_nl_convert1.txt')
+    @test_file2 = File.join(@@dirname, 'test_nl_convert2.txt')
+    @dos_file   = File.join(@@dirname, 'dos_test_file.txt')
+    @mac_file   = File.join(@@dirname, 'mac_test_file.txt')
     @unix_file  = 'nix_test_file.txt'
   end
 
@@ -35,7 +35,7 @@ class TC_Ptools_NLConvert < Test::Unit::TestCase
     assert_equal( "\cM",    File.nl_for_platform('mac') )
     assert_nothing_raised{ File.nl_for_platform('local') }
   end
-  
+
   test "nl_convert basic functionality" do
     assert_respond_to(File, :nl_convert)
   end

data/test/test_tail.rb

@@ -9,18 +9,64 @@ require 'ptools'
 
 class TC_FileTail < Test::Unit::TestCase
   def self.startup
-    Dir.chdir('test') if File.exist?('test')
-    File.open('test_file1.txt', 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
+    @@dirname = File.dirname(__FILE__)
+
+    @@test_file1   = File.join(@@dirname, 'test_file1.txt')
+    @@test_file64  = File.join(@@dirname, 'test_file64.txt')
+    @@test_file128 = File.join(@@dirname, 'test_file128.txt')
+
+    @@test_file_trail = File.join(@@dirname, 'test_file_trail.txt')
+    @@test_file_trail_nl = File.join(@@dirname, 'test_file_trail_nl.txt')
+
+    File.open(@@test_file1, 'w'){ |fh|
+      25.times{ |n| fh.puts "line#{n+1}" }
+    }
+
+    # Trailing newline test
+    File.open(@@test_file_trail, 'w'){ |fh|
+      2.times{ |n| fh.puts "trail#{n+1}" }
+      fh.write "trail3"
+    }
+    File.open(@@test_file_trail_nl, 'w'){ |fh|
+      3.times{ |n| fh.puts "trail#{n+1}" }
+    }
+
+    # Larger files
+    test_tail_fmt_str = "line data data data data data data data %5s"
+
+    File.open(@@test_file64, 'w'){ |fh|
+      2000.times{ |n|
+        fh.puts test_tail_fmt_str % (n+1).to_s
+      }
+    }
+
+    File.open(@@test_file128, 'w'){ |fh|
+      4500.times{ |n|
+        fh.puts test_tail_fmt_str % (n+1).to_s
+      }
+    }
   end
 
   def setup
-    @test_file = 'test_file1.txt'
+    @test_file     = @@test_file1
+    @test_trail    = @@test_file_trail
+    @test_trail_nl = @@test_file_trail_nl
+    @test_file_64  = @@test_file64
+    @test_file_128 = @@test_file128
 
-    @expected_tail1 = ["line16","line17","line18","line19"]
-    @expected_tail1.push("line20","line21","line22", "line23")
-    @expected_tail1.push("line24","line25")
+    @expected_tail1 = %w{
+      line16 line17 line18 line19 line20
+      line21 line22 line23 line24 line25
+    }
 
     @expected_tail2 = ["line21","line22","line23","line24","line25"]
+
+    @expected_tail_more = []
+    25.times{ |n| @expected_tail_more.push "line#{n+1}" }
+
+    @expected_tail_trail = %w{ trail2 trail3 }
+
+    @test_tail_fmt_str = "line data data data data data data data %5s"
   end
 
   def test_tail_basic
@@ -36,11 +82,32 @@ class TC_FileTail < Test::Unit::TestCase
     assert_equal(@expected_tail2, File.tail(@test_file, 5))
   end
 
+  def test_more_lines_than_file
+    assert_equal( @expected_tail_more, File.tail(@test_file, 30) )
+  end
+
   def test_tail_expected_errors
     assert_raises(ArgumentError){ File.tail }
     assert_raises(ArgumentError){ File.tail(@test_file, 5, 5) }
   end
 
+  def test_no_trailing_newline
+    assert_equal( @expected_tail_trail, File.tail(@test_trail, 2) )
+    assert_equal( @expected_tail_trail, File.tail(@test_trail_nl, 2) )
+  end
+
+  def test_tail_larger_than_64k
+    expected_tail_64k=[]
+    2000.times{ |n| expected_tail_64k.push( @test_tail_fmt_str % (n+1).to_s ) }
+    assert_equal( expected_tail_64k, File.tail(@test_file_64, 2000) )
+  end
+
+  def test_tail_larger_than_128k
+    expected_tail_128k = []
+    4500.times{ |n| expected_tail_128k.push( @test_tail_fmt_str % (n+1).to_s ) }
+    assert_equal( expected_tail_128k, File.tail(@test_file_128, 4500) )
+  end
+
   def teardown
     @test_file = nil
     @expected_tail1 = nil
@@ -48,6 +115,10 @@ class TC_FileTail < Test::Unit::TestCase
   end
 
   def self.shutdown
-    File.delete('test_file1.txt') if File.exist?('test_file1.txt')
+    File.delete(@@test_file1) if File.exist?(@@test_file1)
+    File.delete(@@test_file64) if File.exist?(@@test_file64)
+    File.delete(@@test_file128) if File.exist?(@@test_file128)
+    File.delete(@@test_file_trail_nl) if File.exist?(@@test_file_trail_nl)
+    File.delete(@@test_file_trail) if File.exist?(@@test_file_trail)
   end
 end

data/test/test_touch.rb

@@ -9,13 +9,14 @@ require 'ptools'
 
 class TC_FileTouch < Test::Unit::TestCase
   def self.startup
-    Dir.chdir('test') if File.exist?('test')
-    File.open('test_file1.txt', 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
+    @@dirname = File.dirname(__FILE__)
+    @@xfile = File.join(@@dirname, 'test_file1.txt')
+    File.open(@@xfile, 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
   end
 
   def setup
-    @test_file = 'delete.this'
-    @xfile = 'test_file1.txt'
+    @test_file = File.join(@@dirname, 'delete.this')
+    @xfile = File.join(@@dirname, 'test_file1.txt')
   end
 
   def test_touch_basic
@@ -47,6 +48,6 @@ class TC_FileTouch < Test::Unit::TestCase
   end
 
   def self.shutdown
-    File.delete('test_file1.txt') if File.exist?('test_file1.txt')
+    File.delete(@@xfile) if File.exist?(@@xfile)
   end
 end

metadata

@@ -1,60 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: ptools
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.6
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
+  cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+  MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
+  ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+  bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+  A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+  u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+  75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+  6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+  iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+  ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+  74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+  058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+  AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+  YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+  /3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+  h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+  6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+  ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+  1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+  DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+  ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+  WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
+  -----END CERTIFICATE-----
+date: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: win32-file
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
-description: ! "    The ptools (power tools) library provides several handy methods
-  to\n    Ruby's core File class, such as File.which for finding executables,\n    File.null
-  to return the null device on your platform, and so on.\n"
+        version: '0'
+description: |2
+      The ptools (power tools) library provides several handy methods to
+      Ruby's core File class, such as File.which for finding executables,
+      File.null to return the null device on your platform, and so on.
 email: djberg96@gmail.com
 executables: []
 extensions: []
@@ -63,15 +91,21 @@ extra_rdoc_files:
 - CHANGES
 - MANIFEST
 files:
-- .gemtest
+- certs
+- certs/djberg96_pub.pem
 - CHANGES
 - Gemfile
-- MANIFEST
-- README
-- Rakefile
+- Gemfile.lock
+- lib
 - lib/ptools.rb
+- MANIFEST
 - ptools.gemspec
+- Rakefile
+- README
+- test
+- test/img
 - test/img/test.gif
+- test/img/test.ico
 - test/img/test.jpg
 - test/img/test.png
 - test/test_binary.rb
@@ -86,11 +120,13 @@ files:
 - test/test_wc.rb
 - test/test_whereis.rb
 - test/test_which.rb
+- test/txt
 - test/txt/english.txt
+- test/txt/english.utf16
 - test/txt/korean.txt
 homepage: https://github.com/djberg96/ptools
 licenses:
-- Artistic 2.0
+- Artistic-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -98,17 +134,16 @@ 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.4.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Extra methods for the File class