ptools 1.2.3-universal-mingw32 → 1.2.4-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aab93763e9329f79313e50cb5f7137312c9fc0d
-  data.tar.gz: e58c83afbb52f088b766b21e50b8c65ebae1348d
+  metadata.gz: ac21ce3ffb8aa8dcb92d1b68a643e8d2f16a3d3a
+  data.tar.gz: 66be57ae67363a6efa93269a4bcce4003ee45f08
 SHA512:
-  metadata.gz: 4b3c28fa6066055f6b68dbc169aadba02b46f0c31a0547c39508ec2252ec4ca9ba9e6e776d553fa7b06d8a10c5149a372a9b76701584fac0d03ab7632b12555d
-  data.tar.gz: efaf6a4e6a98ce9267febbf05a1dd320152dde55af0443e87b90794f9949585b010528ec0c5bca95f7f2571e16bae28fc2c39b8f0417fa8918e23733141b32d3
+  metadata.gz: 027fce7e6924732d99331c520cc2bcc37979c471f85a0dd28ea141c3dc582a579bea952072a4810b3d8ab544f398c01e59efafde44f353de0471e4fa6c84a337
+  data.tar.gz: 51ec3df25f8bfdab9ff0253f6bf97d8a1a626b9126edb8a1cb2de70a849502ff841ee9d9accf463c08c24777c7f29d4fa52fbd1b8d4224c1beb0f34c13373608

data/CHANGES

@@ -1,7 +1,14 @@
+== 1.2.4 - 25-Feb-2014
+* The File.binary method now always returns false for images. It is meant to
+  detect executables, shared objects, etc. Use File.image? to detect images.
+* Encoding fixes for the File.image? method.
+
 == 1.2.3 - 19-Feb-2014
 * Fixed a bug where File.binary? would return true for unicode text. Thanks go
   to Ben Hollis for the spot.
 * Updated the win32-file and test-unit dependencies.
+* Replace all instances of File.exists? with File.exist? because the former
+  is deprecated in Ruby 2.1 and later.
 
 == 1.2.2 - 6-Apr-2012
 * Yet another sparse file test fix for OSX, which does not support

data/Rakefile

@@ -68,6 +68,13 @@ namespace 'test' do
     t.test_files = FileList['test/test_head.rb']
   end
 
+  Rake::TestTask.new('image') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_image.rb']
+  end
+
   Rake::TestTask.new('middle') do |t|
     t.libs << 'test'
     t.verbose = true

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.2.3'
+  PTOOLS_VERSION = '1.2.4'
 
   # :stopdoc:
 
@@ -28,13 +28,12 @@ class File
   #
   # 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
-  # difficult to build on MS Windows), see the 'filemagic' library, available
-  # on the RAA.
+  # difficult to build on MS Windows), see the 'filemagic' library.
   #
   # Examples:
   #
   #    File.image?('somefile.jpg') # => true
-  #    File.image?('somefile.txt') # => true
+  #    File.image?('somefile.txt') # => false
   #--
   # The approach I used here is based on information found at
   # http://en.wikipedia.org/wiki/Magic_number_(programming)
@@ -75,9 +74,10 @@ class File
     alias null_device null
   end
 
-  # Returns whether or not +file+ is a binary file.  Note that this is
-  # not guaranteed to be 100% accurate.  It performs a "best guess" based
-  # on a simple test of the first +File.blksize+ characters.
+  # Returns whether or not +file+ is a binary non-image file, i.e. executable,
+  # shared object, ect. Note that this is NOT guaranteed to be 100% accurate.
+  # It performs a "best guess" based on a simple test of the first
+  # +File.blksize+ characters.
   #
   # Example:
   #
@@ -88,7 +88,9 @@ class File
   # based on Perl's -B switch).
   #
   def self.binary?(file)
-    s = (File.read(file, File.stat(file).blksize) || "").encode('US-ASCII', :undef => :replace).split(//)
+    return false if image?(file)
+    s = (File.read(file, File.stat(file).blksize) || "")
+    s = s.encode('US-ASCII', :undef => :replace).split(//)
     ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
   end
 
@@ -123,7 +125,7 @@ class File
 
     # Iterate over each path glob the dir + program.
     path.split(File::PATH_SEPARATOR).each{ |dir|
-      next unless File.exists?(dir) # In case of bogus second argument
+      next unless File.exist?(dir) # In case of bogus second argument
       file = File.join(dir, program)
 
       # Dir[] doesn't handle backslashes properly, so convert them. Also, if
@@ -182,7 +184,7 @@ class File
 
     # Iterate over each path glob the dir + program.
     path.split(File::PATH_SEPARATOR).each{ |dir|
-      next unless File.exists?(dir) # In case of bogus second argument
+      next unless File.exist?(dir) # In case of bogus second argument
       file = File.join(dir, program)
 
       # Dir[] doesn't handle backslashes properly, so convert them. Also, if
@@ -332,7 +334,7 @@ class File
   # byte file +filename+ if it doesn't already exist.
   #
   def self.touch(filename)
-    if File.exists?(filename)
+    if File.exist?(filename)
       time = Time.now
       File.utime(time, time, filename)
     else
@@ -416,11 +418,11 @@ class File
   end
 
   def self.jpg?(file)
-    IO.read(file, 10) == "\377\330\377\340\000\020JFIF"
+    IO.read(file, 10, encoding: 'binary') == "\377\330\377\340\000\020JFIF".force_encoding(Encoding::BINARY)
   end
 
   def self.png?(file)
-    IO.read(file, 4) == "\211PNG"
+    IO.read(file, 4, encoding: 'binary') == "\211PNG".force_encoding(Encoding::BINARY)
   end
 
   def self.gif?(file)

data/ptools.gemspec

@@ -3,7 +3,7 @@ require 'rbconfig'
 
 Gem::Specification.new do |gem|
   gem.name       = 'ptools'
-  gem.version    = '1.2.3'
+  gem.version    = '1.2.4'
   gem.license    = 'Artistic 2.0'
   gem.author     = 'Daniel J. Berger'
   gem.email      = 'djberg96@gmail.com'

data/test/test_binary.rb

@@ -10,38 +10,56 @@ require 'ptools'
 
 class TC_Ptools_Binary < Test::Unit::TestCase
   def self.startup
-    @@txt_file = 'test_binary.txt'
-
     if File::ALT_SEPARATOR
       @@bin_file = File.join(ENV['windir'], 'notepad.exe')
     else
       @@bin_file = '/bin/ls'
     end
 
-    Dir.chdir('test') if File.exists?('test')
+    Dir.chdir('test') if File.exist?('test')
+  end
 
-    File.open(@@txt_file, 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
+  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')
   end
 
   test "File.binary? basic functionality" do
     assert_respond_to(File, :binary?)
-    assert_nothing_raised{ File.binary?(@@txt_file) }
+    assert_nothing_raised{ File.binary?(@txt_file) }
   end
 
-  test "File.binary? returns expected results" do
-    assert_false(File.binary?(@@txt_file))
+  test "File.binary? returns true for binary files" do
     assert_true(File.binary?(@@bin_file))
   end
 
+  test "File.binary? returns false for text files" do
+    assert_false(File.binary?(@txt_file))
+    assert_false(File.binary?(@uni_file))
+  end
+
+  test "File.binary? returns false for image files" do
+    assert_false(File.binary?(@png_file))
+    assert_false(File.binary?(@jpg_file))
+    assert_false(File.binary?(@gif_file))
+  end
+
   test "File.binary? raises an error if the file cannot be found" do
     assert_raise_kind_of(SystemCallError){ File.binary?('bogus') }
   end
 
   test "File.binary? only accepts one argument" do
-    assert_raise_kind_of(ArgumentError){ File.binary?(@@txt_file, @@bin_file) }
+    assert_raise_kind_of(ArgumentError){ File.binary?(@txt_file, @@bin_file) }
   end
 
-  def self.shutdown
-    File.delete(@@txt_file) if File.exists?(@@txt_file)
+  def teardown
+    @txt_file = nil
+    @uni_file = nil
+    @png_file = nil
+    @jpg_file = nil
+    @gif_file = nil
   end
 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.2.3', File::PTOOLS_VERSION)
+    assert_equal('1.2.4', File::PTOOLS_VERSION)
   end
 
   test "IMAGE_EXT constant is set to array of values" do

data/test/test_head.rb

@@ -1,51 +1,48 @@
 ######################################################################
 # test_head.rb
-# 
+#
 # Test case for the File.head method. This test should be run via
 # the 'rake test_head' task.
 ######################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 
 class TC_FileHead < Test::Unit::TestCase
-   def self.startup
-      Dir.chdir('test') if File.exists?('test')
-      File.open('test_file1.txt', 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
-   end
-   
-   def setup
-      @test_file = 'test_file1.txt'
-      @expected_head1 = ["line1\n","line2\n","line3\n","line4\n","line5\n"]
-      @expected_head1.push("line6\n","line7\n","line8\n","line9\n","line10\n")
-      @expected_head2 = ["line1\n","line2\n","line3\n","line4\n","line5\n"]
-   end
+  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}" } }
+  end
+
+  def setup
+    @test_file = 'test_file1.txt'
+    @expected_head1 = ["line1\n","line2\n","line3\n","line4\n","line5\n"]
+    @expected_head1.push("line6\n","line7\n","line8\n","line9\n","line10\n")
+    @expected_head2 = ["line1\n","line2\n","line3\n","line4\n","line5\n"]
+  end
 
-   def test_head_basic
-      assert_respond_to(File, :head)
-      assert_nothing_raised{ File.head(@test_file) }
-      assert_nothing_raised{ File.head(@test_file, 5) }
-      assert_nothing_raised{ File.head(@test_file){} }
-   end
+  def test_head_basic
+    assert_respond_to(File, :head)
+    assert_nothing_raised{ File.head(@test_file) }
+    assert_nothing_raised{ File.head(@test_file, 5) }
+    assert_nothing_raised{ File.head(@test_file){} }
+  end
 
-   def test_head_expected_results
-      assert_kind_of(Array, File.head(@test_file))
-      assert_equal(@expected_head1, File.head(@test_file))
-      assert_equal(@expected_head2, File.head(@test_file, 5))
-   end
+  def test_head_expected_results
+    assert_kind_of(Array, File.head(@test_file))
+    assert_equal(@expected_head1, File.head(@test_file))
+    assert_equal(@expected_head2, File.head(@test_file, 5))
+  end
 
-   def test_head_expected_errors
-      assert_raises(ArgumentError){ File.head(@test_file, 5, "foo") }
-      assert_raises(Errno::ENOENT){ File.head("bogus") }
-   end
+  def test_head_expected_errors
+    assert_raises(ArgumentError){ File.head(@test_file, 5, "foo") }
+    assert_raises(Errno::ENOENT){ File.head("bogus") }
+  end
 
-   def teardown
-      @test_file = nil
-   end
+  def teardown
+    @test_file = nil
+  end
 
-   def self.shutdown
-      File.delete('test_file1.txt') if File.exists?('test_file1.txt')
-   end
+  def self.shutdown
+    File.delete('test_file1.txt') if File.exist?('test_file1.txt')
+  end
 end

data/test/test_image.rb

@@ -1,43 +1,57 @@
 #####################################################################
 # test_image.rb
-# 
+#
 # Test case for the File.image? method. You should run this test
-# via the 'rake test_image' task.
+# via the 'rake test:image' task.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 
 class TC_Ptools_Image < Test::Unit::TestCase
-   def self.startup
-      Dir.chdir('test') if File.exists?('test')
-      File.open('test_file1.txt', 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
-   end
-   
-   def setup   
-      @text_file = 'test_file1.txt'
-   end
-
-   def test_image_basic
-      assert_respond_to(File, :image?)
-      assert_nothing_raised{ File.image?(@text_file) }
-   end
-
-   def test_image_expected_results
-      assert_equal(false, File.image?(@text_file))
-   end
-
-   def test_image_expected_errors
-      assert_raises(Errno::ENOENT, ArgumentError){ File.image?('bogus') }
-   end
-
-   def teardown
-      @text_file = nil
-   end
-
-   def self.shutdown
-      File.delete('test_file1.txt') if File.exists?('test_file1.txt')
-   end
+  def self.startup
+    Dir.chdir('test') if File.exist?('test')
+  end
+
+  def setup
+    @txt_file  = File.join(Dir.pwd, 'txt', 'english.txt')
+    @uni_file  = File.join(Dir.pwd, 'txt', 'korean.txt')
+    @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')
+  end
+
+  test "image? method basic functionality" do
+    assert_respond_to(File, :image?)
+    assert_nothing_raised{ File.image?(@txt_file) }
+    assert_boolean(File.image?(@txt_file))
+  end
+
+  test "image? method returns false for a text file" do
+    assert_false(File.image?(@txt_file))
+    assert_false(File.image?(@uni_file))
+  end
+
+  test "image? method returns true for a gif" do
+    assert_true(File.image?(@gif_file))
+  end
+
+  test "image? method returns true for a jpeg" do
+    assert_true(File.image?(@jpg_file))
+  end
+
+  test "image? method returns true for a png" do
+    assert_true(File.image?(@png_file))
+  end
+
+  test "image? method raises an error if the file does not exist" do
+    assert_raises(Errno::ENOENT, ArgumentError){ File.image?('bogus') }
+  end
+
+  def teardown
+    @txt_file = nil
+    @uni_file = nil
+    @jpg_file = nil
+    @png_file = nil
+    @gif_file = nil
+  end
 end

data/test/test_is_sparse.rb

@@ -4,15 +4,12 @@
 # Test case for the File.sparse? method. You should run this test
 # via the 'rake test:is_sparse' task.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 
 class TC_IsSparse < Test::Unit::TestCase
   def self.startup
-    Dir.chdir("test") if File.exists?("test")
+    Dir.chdir("test") if File.exist?("test")
     @@win = RbConfig::CONFIG['host_os'] =~ /windows|mswin|dos|cygwin|mingw/i
     @@osx = RbConfig::CONFIG['host_os'] =~ /darwin|osx/i
     @@sun = RbConfig::CONFIG['host_os'] =~ /sunos|solaris/i

data/test/test_middle.rb

@@ -4,58 +4,55 @@
 # Test case for the File.middle method. You should run this test
 # via the 'rake test_middle' task.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 
 class TC_FileMiddle < Test::Unit::TestCase
-   def self.startup
-      Dir.chdir('test') if File.exists?('test')
-      File.open('test_file1.txt', 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
-   end
-   
-   def setup   
-      @test_file = 'test_file1.txt'
-
-      @expected_middle1 = ["line10\n", "line11\n", "line12\n", "line13\n", "line14\n"]
-      @expected_middle1.push("line15\n","line16\n", "line17\n", "line18\n")
-      @expected_middle1.push("line19\n","line20\n")
-
-      @expected_middle2 = ["line14\n","line15\n","line16\n","line17\n"]
-      @expected_middle2.push("line18\n","line19\n","line20\n")
-
-      @expected_middle3 = ["line5\n","line6\n","line7\n"]
-      @expected_middle3.push("line8\n","line9\n","line10\n")
-   end
-
-   def test_method_basic
-      assert_respond_to(File, :middle)
-      assert_nothing_raised{ File.middle(@test_file) }
-      assert_nothing_raised{ File.middle(@test_file, 14) }
-      assert_nothing_raised{ File.middle(@test_file, 5, 10) }
-      assert_nothing_raised{ File.middle(@test_file){} }
-   end
-
-   def test_middle_expected_results
-      assert_kind_of(Array, File.middle(@test_file))
-      assert_equal(@expected_middle1, File.middle(@test_file))
-      assert_equal(@expected_middle2, File.middle(@test_file, 14))
-      assert_equal(@expected_middle3, File.middle(@test_file, 5, 10))
-   end
-
-   def test_middle_expected_errors
-      assert_raises(ArgumentError){ File.middle }
-      assert_raises(ArgumentError){ File.middle(@test_file, 5, 10, 15) }
-      assert_raises(NoMethodError){ File.middle(@test_file, "foo") }
-      assert_raises(Errno::ENOENT){ File.middle("bogus") }
-   end
-
-   def teardown
-      @test_file = nil
-      @expected_middle1 = nil
-      @expected_middle2 = nil
-      @expected_middle3 = nil
-   end
+  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}" } }
+  end
+
+  def setup
+    @test_file = 'test_file1.txt'
+
+    @expected_middle1 = ["line10\n", "line11\n", "line12\n", "line13\n", "line14\n"]
+    @expected_middle1.push("line15\n","line16\n", "line17\n", "line18\n")
+    @expected_middle1.push("line19\n","line20\n")
+
+    @expected_middle2 = ["line14\n","line15\n","line16\n","line17\n"]
+    @expected_middle2.push("line18\n","line19\n","line20\n")
+
+    @expected_middle3 = ["line5\n","line6\n","line7\n"]
+    @expected_middle3.push("line8\n","line9\n","line10\n")
+  end
+
+  def test_method_basic
+    assert_respond_to(File, :middle)
+    assert_nothing_raised{ File.middle(@test_file) }
+    assert_nothing_raised{ File.middle(@test_file, 14) }
+    assert_nothing_raised{ File.middle(@test_file, 5, 10) }
+    assert_nothing_raised{ File.middle(@test_file){} }
+  end
+
+  def test_middle_expected_results
+    assert_kind_of(Array, File.middle(@test_file))
+    assert_equal(@expected_middle1, File.middle(@test_file))
+    assert_equal(@expected_middle2, File.middle(@test_file, 14))
+    assert_equal(@expected_middle3, File.middle(@test_file, 5, 10))
+  end
+
+  def test_middle_expected_errors
+    assert_raises(ArgumentError){ File.middle }
+    assert_raises(ArgumentError){ File.middle(@test_file, 5, 10, 15) }
+    assert_raises(NoMethodError){ File.middle(@test_file, "foo") }
+    assert_raises(Errno::ENOENT){ File.middle("bogus") }
+  end
+
+  def teardown
+    @test_file = nil
+    @expected_middle1 = nil
+    @expected_middle2 = nil
+    @expected_middle3 = nil
+  end
 end

data/test/test_nlconvert.rb

@@ -10,7 +10,7 @@ require 'ptools'
 
 class TC_Ptools_NLConvert < Test::Unit::TestCase
   def self.startup
-    Dir.chdir('test') if File.exists?('test')
+    Dir.chdir('test') if File.exist?('test')
     @@test_file1 = 'test_nl_convert1.txt'
     @@test_file2 = 'test_nl_convert2.txt'
     File.open(@@test_file1, 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
@@ -83,7 +83,7 @@ class TC_Ptools_NLConvert < Test::Unit::TestCase
 
   def teardown
     [@dos_file, @mac_file, @unix_file].each{ |file|
-      File.delete(file) if File.exists?(file)
+      File.delete(file) if File.exist?(file)
     }
     @dos_file   = nil
     @mac_file   = nil
@@ -93,7 +93,7 @@ class TC_Ptools_NLConvert < Test::Unit::TestCase
   end
 
   def self.shutdown
-    File.delete(@@test_file1) if File.exists?(@@test_file1)
-    File.delete(@@test_file2) if File.exists?(@@test_file2)
+    File.delete(@@test_file1) if File.exist?(@@test_file1)
+    File.delete(@@test_file2) if File.exist?(@@test_file2)
   end
 end

data/test/test_tail.rb

@@ -4,53 +4,50 @@
 # Test case for the File.tail method. This test should be run via
 # the 'rake test_tail' task.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 
 class TC_FileTail < Test::Unit::TestCase
-   def self.startup
-      Dir.chdir('test') if File.exists?('test')
-      File.open('test_file1.txt', 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
-   end
-   
-   def setup     
-      @test_file = 'test_file1.txt'
-
-      @expected_tail1 = ["line16\n","line17\n","line18\n","line19\n"]
-      @expected_tail1.push("line20\n","line21\n","line22\n", "line23\n")
-      @expected_tail1.push("line24\n","line25\n")
-
-      @expected_tail2 = ["line21\n","line22\n","line23\n","line24\n","line25\n"]
-   end
-
-   def test_tail_basic
-      assert_respond_to(File, :tail)
-      assert_nothing_raised{ File.tail(@test_file) }
-      assert_nothing_raised{ File.tail(@test_file, 5) }
-      assert_nothing_raised{ File.tail(@test_file){} }
-   end
-
-   def test_tail_expected_return_values
-      assert_kind_of(Array, File.tail(@test_file))
-      assert_equal(@expected_tail1, File.tail(@test_file))
-      assert_equal(@expected_tail2, File.tail(@test_file, 5))
-   end
-
-   def test_tail_expected_errors
-      assert_raises(ArgumentError){ File.tail }
-      assert_raises(ArgumentError){ File.tail(@test_file, 5, 5) }
-   end
-
-   def teardown
-      @test_file = nil
-      @expected_tail1 = nil
-      @expected_tail2 = nil
-   end
-
-   def self.shutdown
-      File.delete('test_file1.txt') if File.exists?('test_file1.txt')
-   end
+  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}" } }
+  end
+
+  def setup
+    @test_file = 'test_file1.txt'
+
+    @expected_tail1 = ["line16\n","line17\n","line18\n","line19\n"]
+    @expected_tail1.push("line20\n","line21\n","line22\n", "line23\n")
+    @expected_tail1.push("line24\n","line25\n")
+
+    @expected_tail2 = ["line21\n","line22\n","line23\n","line24\n","line25\n"]
+  end
+
+  def test_tail_basic
+    assert_respond_to(File, :tail)
+    assert_nothing_raised{ File.tail(@test_file) }
+    assert_nothing_raised{ File.tail(@test_file, 5) }
+    assert_nothing_raised{ File.tail(@test_file){} }
+  end
+
+  def test_tail_expected_return_values
+    assert_kind_of(Array, File.tail(@test_file))
+    assert_equal(@expected_tail1, File.tail(@test_file))
+    assert_equal(@expected_tail2, File.tail(@test_file, 5))
+  end
+
+  def test_tail_expected_errors
+    assert_raises(ArgumentError){ File.tail }
+    assert_raises(ArgumentError){ File.tail(@test_file, 5, 5) }
+  end
+
+  def teardown
+    @test_file = nil
+    @expected_tail1 = nil
+    @expected_tail2 = nil
+  end
+
+  def self.shutdown
+    File.delete('test_file1.txt') if File.exist?('test_file1.txt')
+  end
 end

data/test/test_touch.rb

@@ -1,55 +1,52 @@
 #####################################################################
-# tc_touch.rb
+# test_touch.rb
 #
 # Test case for the File.touch method. This test should be run
 # via the 'rake test_touch task'.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 
 class TC_FileTouch < Test::Unit::TestCase
-   def self.startup
-      Dir.chdir('test') if File.exists?('test')
-      File.open('test_file1.txt', 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
-   end
-   
-   def setup   
-      @test_file = 'delete.this'
-      @xfile = 'test_file1.txt'
-   end
-
-   def test_touch_basic
-      assert_respond_to(File, :touch)
-      assert_nothing_raised{ File.touch(@test_file) }
-   end
-
-   def test_touch_expected_results
-      assert_equal(File, File.touch(@test_file))
-      assert_equal(true, File.exists?(@test_file))
-      assert_equal(0, File.size(@test_file))
-   end
-
-   def test_touch_existing_file
-      stat = File.stat(@xfile)
-      sleep 1
-      assert_nothing_raised{ File.touch(@xfile) }
-      assert_equal(true, File.size(@xfile) == stat.size)
-      assert_equal(false, File.mtime(@xfile) == stat.mtime)
-   end
-
-   def test_touch_expected_errors
-      assert_raises(ArgumentError){ File.touch }
-   end
-
-   def teardown
-      File.delete(@test_file) if File.exists?(@test_file)
-      @test_file = nil
-   end
-
-   def self.shutdown
-      File.delete('test_file1.txt') if File.exists?('test_file1.txt')
-   end
+  def self.startup
+    Dir.chdir('test') if File.exist?('test')
+    File.open('test_file1.txt', 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
+  end
+
+  def setup
+    @test_file = 'delete.this'
+    @xfile = 'test_file1.txt'
+  end
+
+  def test_touch_basic
+    assert_respond_to(File, :touch)
+    assert_nothing_raised{ File.touch(@test_file) }
+  end
+
+  def test_touch_expected_results
+    assert_equal(File, File.touch(@test_file))
+    assert_equal(true, File.exist?(@test_file))
+    assert_equal(0, File.size(@test_file))
+  end
+
+  def test_touch_existing_file
+    stat = File.stat(@xfile)
+    sleep 1
+    assert_nothing_raised{ File.touch(@xfile) }
+    assert_equal(true, File.size(@xfile) == stat.size)
+    assert_equal(false, File.mtime(@xfile) == stat.mtime)
+  end
+
+  def test_touch_expected_errors
+    assert_raises(ArgumentError){ File.touch }
+  end
+
+  def teardown
+    File.delete(@test_file) if File.exist?(@test_file)
+    @test_file = nil
+  end
+
+  def self.shutdown
+    File.delete('test_file1.txt') if File.exist?('test_file1.txt')
+  end
 end

data/test/test_wc.rb

@@ -4,20 +4,17 @@
 # Test case for the File.wc method. This test should be run via
 # the 'rake test_wc' task.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'ptools'
 
 class TC_FileWC < Test::Unit::TestCase
   def self.startup
-    Dir.chdir('test') if File.exists?('test')      
+    Dir.chdir('test') if File.exist?('test')
     File.open('test_file1.txt', 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
     @@test_file = 'test_file1.txt'
   end
-   
-  def setup     
+
+  def setup
     @test_file = 'test_file1.txt'
   end
 
@@ -71,6 +68,6 @@ class TC_FileWC < Test::Unit::TestCase
   end
 
   def self.shutdown
-    File.delete(@@test_file) if File.exists?(@@test_file)
+    File.delete(@@test_file) if File.exist?(@@test_file)
   end
 end

data/test/test_which.rb

@@ -7,10 +7,7 @@
 # NOTE: I make the assumption that Ruby (or JRuby) is in your
 # PATH for these tests.
 #####################################################################
-require 'rubygems'
-gem 'test-unit'
-
-require 'test/unit'
+require 'test-unit'
 require 'rbconfig'
 require 'fileutils'
 require 'ptools'
@@ -21,7 +18,7 @@ class TC_FileWhich < Test::Unit::TestCase
     @@dir = File.join(Dir.pwd, 'tempdir')
     @@non_exe = File.join(Dir.pwd, 'tempfile')
 
-    Dir.mkdir(@@dir) unless File.exists?(@@dir)
+    Dir.mkdir(@@dir) unless File.exist?(@@dir)
     FileUtils.touch(@@non_exe)
     File.chmod(775, @@dir)
     File.chmod(644, @@non_exe)

data/test/txt/english.txt

@@ -0,0 +1 @@
+Hello World

data/test/txt/korean.txt

@@ -0,0 +1 @@
+한국어의 내용분석을 위한

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ptools
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -57,6 +57,9 @@ files:
 - Rakefile
 - lib/ptools.rb
 - ptools.gemspec
+- test/img/test.gif
+- test/img/test.jpg
+- test/img/test.png
 - test/test_binary.rb
 - test/test_constants.rb
 - test/test_head.rb
@@ -70,6 +73,8 @@ files:
 - test/test_wc.rb
 - test/test_whereis.rb
 - test/test_which.rb
+- test/txt/english.txt
+- test/txt/korean.txt
 homepage: https://github.com/djberg96/ptools
 licenses:
 - Artistic 2.0