ptools 1.4.2-universal-mingw32 → 1.5.0-universal-mingw32

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.4.2'.freeze
+  PTOOLS_VERSION = '1.5.0'.freeze
 
   # :stopdoc:
 
@@ -11,9 +11,9 @@ class File
   if File::ALT_SEPARATOR
     MSWINDOWS = true
     if ENV['PATHEXT']
-      WIN32EXTS = ('.{' + ENV['PATHEXT'].tr(';', ',').tr('.','') + '}').downcase
+      WIN32EXTS = ".{#{ENV['PATHEXT'].tr(';', ',').tr('.', '')}}".downcase
     else
-      WIN32EXTS = '.{exe,com,bat}'
+      WIN32EXTS = '.{exe,com,bat}'.freeze
     end
   else
     MSWINDOWS = false
@@ -24,7 +24,7 @@ class File
     private_constant :MSWINDOWS
   end
 
-  IMAGE_EXT = %w[.bmp .gif .jpg .jpeg .png .ico]
+  IMAGE_EXT = %w[.bmp .gif .jpg .jpeg .png .ico].freeze
 
   # :startdoc:
 
@@ -47,42 +47,34 @@ class File
   # The approach I used here is based on information found at
   # http://en.wikipedia.org/wiki/Magic_number_(programming)
   #
-  def self.image?(file, check_file_extension = true)
+  def self.image?(file, check_file_extension: true)
     bool = bmp?(file) || jpg?(file) || png?(file) || gif?(file) || tiff?(file) || ico?(file)
 
-    if check_file_extension
-      bool = bool && IMAGE_EXT.include?(File.extname(file).downcase)
-    end
+    bool &&= IMAGE_EXT.include?(File.extname(file).downcase) if check_file_extension
 
     bool
   end
 
   # 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, or 4096, whichever is smaller.
+  # shared object, etc.
   #
-  # 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.
+  # Internally this method simply looks for a double null sequence. This will
+  # work for the vast majority of cases, but it is not guaranteed to be
+  # absolutely accurate.
   #
   # Example:
   #
   #   File.binary?('somefile.exe') # => true
   #   File.binary?('somefile.txt') # => false
-  #--
-  # Based on code originally provided by Ryan Davis (which, in turn, is
-  # based on Perl's -B switch).
   #
-  def self.binary?(file, percentage = 0.30)
+  def self.binary?(file)
     return false if File.stat(file).zero?
     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) > percentage
+    (File.read(file, bytes) || '').include?("\u0000\u0000")
   end
 
   # Looks for the first occurrence of +program+ within +path+.
@@ -98,10 +90,8 @@ class File
   #   File.which('ruby') # => '/usr/local/bin/ruby'
   #   File.which('foo')  # => nil
   #
-  def self.which(program, path=ENV['PATH'])
-    if path.nil? || path.empty?
-      raise ArgumentError, "path cannot be empty"
-    end
+  def self.which(program, path = ENV['PATH'])
+    raise ArgumentError, 'path cannot be empty' if path.nil? || path.empty?
 
     # Bail out early if an absolute path is provided.
     if program =~ /^\/|^[a-z]:[\\\/]/i
@@ -115,16 +105,17 @@ class File
     end
 
     # Iterate over each path glob the dir + program.
-    path.split(File::PATH_SEPARATOR).each{ |dir|
+    path.split(File::PATH_SEPARATOR).each do |dir|
       dir = File.expand_path(dir)
 
       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
       # the program name doesn't have an extension, try them all.
       if MSWINDOWS
-        file = file.tr("\\", "/")
+        file = file.tr(File::ALT_SEPARATOR, File::SEPARATOR)
         file += WIN32EXTS if File.extname(program).empty?
       end
 
@@ -135,7 +126,7 @@ class File
         found.tr!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
         return found
       end
-    }
+    end
 
     nil
   end
@@ -152,21 +143,19 @@ class File
   #   File.whereis('ruby') # => ['/usr/bin/ruby', '/usr/local/bin/ruby']
   #   File.whereis('foo')  # => nil
   #
-  def self.whereis(program, path=ENV['PATH'])
-    if path.nil? || path.empty?
-      raise ArgumentError, "path cannot be empty"
-    end
+  def self.whereis(program, path = ENV['PATH'])
+    raise ArgumentError, 'path cannot be empty' if path.nil? || path.empty?
 
     paths = []
 
     # Bail out early if an absolute path is provided.
     if program =~ /^\/|^[a-z]:[\\\/]/i
       program += WIN32EXTS if MSWINDOWS && File.extname(program).empty?
-      program = program.tr("\\", '/') if MSWINDOWS
+      program = program.tr(File::ALT_SEPARATOR, File::SEPARATOR) if MSWINDOWS
       found = Dir[program]
       if found[0] && File.executable?(found[0]) && !File.directory?(found[0])
         if File::ALT_SEPARATOR
-          return found.map{ |f| f.tr('/', "\\") }
+          return found.map{ |f| f.tr(File::SEPARATOR, File::ALT_SEPARATOR) }
         else
           return found
         end
@@ -176,14 +165,15 @@ class File
     end
 
     # Iterate over each path glob the dir + program.
-    path.split(File::PATH_SEPARATOR).each{ |dir|
+    path.split(File::PATH_SEPARATOR).each do |dir|
       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
       # the program name doesn't have an extension, try them all.
       if MSWINDOWS
-        file = file.tr("\\", "/")
+        file = file.tr(File::ALT_SEPARATOR, File::SEPARATOR)
         file += WIN32EXTS if File.extname(program).empty?
       end
 
@@ -194,7 +184,7 @@ class File
         found.tr!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
         paths << found
       end
-    }
+    end
 
     paths.empty? ? nil : paths.uniq
   end
@@ -210,20 +200,21 @@ class File
   #  # Use a block
   #  File.head('somefile.txt'){ |line| puts line }
   #
-  def self.head(filename, num_lines=10)
+  def self.head(filename, num_lines = 10)
     a = []
 
-    IO.foreach(filename){ |line|
+    File.foreach(filename) do |line|
       break if num_lines <= 0
+
       num_lines -= 1
       if block_given?
         yield line
       else
         a << line
       end
-    }
+    end
 
-    return a.empty? ? nil : a # Return nil in block form
+    a.empty? ? nil : a # Return nil in block form
   end
 
   # In block form, yields the last +num_lines+ of file +filename+.
@@ -240,7 +231,7 @@ class File
   # 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)
+  def self.tail(filename, num_lines = 10, &block)
     tail_size = 2**16 # 64k chunks
 
     # MS Windows gets unhappy if you try to seek backwards past the
@@ -254,7 +245,7 @@ class File
     buf = ''
 
     # Open in binary mode to ensure line endings aren't converted.
-    File.open(filename, 'rb'){ |fh|
+    File.open(filename, 'rb') do |fh|
       position = file_size - read_bytes # Set the starting read position
 
       # Loop until we have the lines or run out of file
@@ -264,12 +255,12 @@ class File
         read_bytes = tail_size
         position -= read_bytes
       end
-    }
+    end
 
     lines = buf.split(line_sep).pop(num_lines)
 
     if block_given?
-      lines.each{ |line| yield line  }
+      lines.each(&block)
     else
       lines
     end
@@ -290,47 +281,33 @@ class File
   # ArgumentError is raised.
   #
   def self.nl_convert(old_file, new_file = old_file, platform = 'local')
-    unless File::Stat.new(old_file).file?
-      raise ArgumentError, 'Only valid for plain text files'
-    end
+    raise ArgumentError, 'Only valid for plain text files' unless File::Stat.new(old_file).file?
 
     format = nl_for_platform(platform)
 
-    orig = $\ # $OUTPUT_RECORD_SEPARATOR
-    $\ = format
-
     if old_file == new_file
-      require 'fileutils'
       require 'tempfile'
+      temp_name = Time.new.strftime('%Y%m%d%H%M%S')
+      nf = Tempfile.new("ruby_temp_#{temp_name}")
+    else
+      nf = File.new(new_file, 'w')
+    end
 
-      begin
-        temp_name = Time.new.strftime("%Y%m%d%H%M%S")
-        tf = Tempfile.new('ruby_temp_' + temp_name)
-        tf.open
-
-        IO.foreach(old_file){ |line|
-          line.chomp!
-          tf.print line
-        }
-      ensure
-        tf.close if tf && !tf.closed?
+    begin
+      nf.open if old_file == new_file
+      File.foreach(old_file) do |line|
+        line.chomp!
+        nf.print("#{line}#{format}")
       end
-
-      File.delete(old_file)
-      FileUtils.mv(tf.path, old_file)
-    else
-      begin
-        nf = File.new(new_file, 'w')
-        IO.foreach(old_file){ |line|
-          line.chomp!
-          nf.print line
-        }
-      ensure
-        nf.close if nf && !nf.closed?
+    ensure
+      nf.close if nf && !nf.closed?
+      if old_file == new_file
+        require 'fileutils'
+        File.delete(old_file)
+        FileUtils.mv(nf.path, old_file)
       end
     end
 
-    $\ = orig
     self
   end
 
@@ -353,49 +330,43 @@ class File
   # Valid options are 'bytes', 'characters' (or just 'chars'), 'words' and
   # 'lines'.
   #
-  def self.wc(filename, option='all')
+  def self.wc(filename, option = 'all')
     option.downcase!
-    valid = %w/all bytes characters chars lines words/
+    valid = %w[all bytes characters chars lines words]
 
-    unless valid.include?(option)
-      raise ArgumentError, "Invalid option: '#{option}'"
-    end
+    raise ArgumentError, "Invalid option: '#{option}'" unless valid.include?(option)
 
     n = 0
 
     if option == 'lines'
-      IO.foreach(filename){ n += 1 }
-      return n
+      File.foreach(filename){ n += 1 }
+      n
     elsif option == 'bytes'
-      File.open(filename){ |f|
+      File.open(filename) do |f|
         f.each_byte{ n += 1 }
-      }
-      return n
-    elsif option == 'characters' || option == 'chars'
-      File.open(filename){ |f|
-        while f.getc
-          n += 1
-        end
-      }
-      return n
+      end
+      n
+    elsif %w[characters chars].include?(option)
+      File.open(filename) do |f|
+        n += 1 while f.getc
+      end
+      n
     elsif option == 'words'
-      IO.foreach(filename){ |line|
+      File.foreach(filename) do |line|
         n += line.split.length
-      }
-      return n
+      end
+      n
     else
-      bytes,chars,lines,words = 0,0,0,0
-      IO.foreach(filename){ |line|
+      bytes, chars, lines, words = 0, 0, 0, 0
+      File.foreach(filename) do |line|
         lines += 1
         words += line.split.length
-        chars += line.split('').length
-      }
-      File.open(filename){ |f|
-        while f.getc
-          bytes += 1
-        end
-      }
-      return [bytes,chars,words,lines]
+        chars += line.chars.length
+      end
+      File.open(filename) do |f|
+        bytes += 1 while f.getc
+      end
+      [bytes, chars, words, lines]
     end
   end
 
@@ -422,9 +393,9 @@ class 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 = 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
@@ -434,42 +405,43 @@ class File
   # Returns the newline characters for the given platform.
   #
   def self.nl_for_platform(platform)
-    platform = RbConfig::CONFIG["host_os"] if platform == 'local'
+    platform = RbConfig::CONFIG['host_os'] if platform == 'local'
 
     case platform
       when /dos|windows|win32|mswin|mingw/i
-        return "\cM\cJ"
+        "\cM\cJ"
       when /unix|linux|bsd|cygwin|osx|darwin|solaris|sunos/i
-        return "\cJ"
+        "\cJ"
       when /mac|apple|macintosh/i
-        return "\cM"
+        "\cM"
       else
-        raise ArgumentError, "Invalid platform string"
+        raise ArgumentError, 'Invalid platform string'
     end
   end
 
   # Is the file a bitmap file?
   #
   def self.bmp?(file)
-    IO.read(file, 3) == "BM6"
+    data = File.read(file, 6, nil, :encoding => 'binary')
+    data[0,2] == 'BM' && File.size(file) == data[2,4].unpack('i').first
   end
 
   # Is the file a jpeg file?
   #
   def self.jpg?(file)
-    IO.read(file, 10, nil, :encoding => 'binary') == "\377\330\377\340\000\020JFIF".force_encoding(Encoding::BINARY)
+    File.read(file, 10, nil, :encoding => 'binary') == "\377\330\377\340\000\020JFIF".force_encoding(Encoding::BINARY)
   end
 
   # Is the file a png file?
   #
   def self.png?(file)
-    IO.read(file, 4, nil, :encoding => 'binary') == "\211PNG".force_encoding(Encoding::BINARY)
+    File.read(file, 4, nil, :encoding => 'binary') == "\211PNG".force_encoding(Encoding::BINARY)
   end
 
   # Is the file a gif?
   #
   def self.gif?(file)
-    ['GIF89a', 'GIF97a'].include?(IO.read(file, 6))
+    %w[GIF89a GIF97a].include?(File.read(file, 6))
   end
 
   # Is the file a tiff?
@@ -477,20 +449,14 @@ class File
   def self.tiff?(file)
     return false if File.size(file) < 12
 
-    bytes = IO.read(file, 4)
+    bytes = File.read(file, 4)
 
     # II is Intel, MM is Motorola
-    if bytes[0..1] != 'II' && bytes[0..1] != 'MM'
-      return false
-    end
+    return false if bytes[0..1] != 'II' && bytes[0..1] != 'MM'
 
-    if bytes[0..1] == 'II' && bytes[2..3].ord != 42
-      return false
-    end
+    return false if bytes[0..1] == 'II' && bytes[2..3].ord != 42
 
-    if bytes[0..1] == 'MM' && bytes[2..3].reverse.ord != 42
-      return false
-    end
+    return false if bytes[0..1] == 'MM' && bytes[2..3].reverse.ord != 42
 
     true
   end
@@ -498,6 +464,6 @@ class File
   # Is the file an ico file?
   #
   def self.ico?(file)
-    ["\000\000\001\000", "\000\000\002\000"].include?(IO.read(file, 4, nil, :encoding => 'binary'))
+    ["\000\000\001\000", "\000\000\002\000"].include?(File.read(file, 4, nil, :encoding => 'binary'))
   end
 end

data/ptools.gemspec

@@ -2,8 +2,8 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name       = 'ptools'
-  spec.version    = '1.4.2'
-  spec.license    = 'Artistic-2.0'
+  spec.version    = '1.5.0'
+  spec.license    = 'Apache-2.0'
   spec.author     = 'Daniel J. Berger'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'https://github.com/djberg96/ptools'
@@ -19,16 +19,19 @@ Gem::Specification.new do |spec|
   EOF
 
   spec.metadata = {
-    'homepage_uri'      => 'https://github.com/djberg96/ptools',
-    'bug_tracker_uri'   => 'https://github.com/djberg96/ptools/issues',
-    'changelog_uri'     => 'https://github.com/djberg96/ptools/blob/master/CHANGES.md',
-    'documentation_uri' => 'https://github.com/djberg96/ptools/wiki',
-    'source_code_uri'   => 'https://github.com/djberg96/ptools',
-    'wiki_uri'          => 'https://github.com/djberg96/ptools/wiki'
+    'homepage_uri'          => 'https://github.com/djberg96/ptools',
+    'bug_tracker_uri'       => 'https://github.com/djberg96/ptools/issues',
+    'changelog_uri'         => 'https://github.com/djberg96/ptools/blob/main/CHANGES.md',
+    'documentation_uri'     => 'https://github.com/djberg96/ptools/wiki',
+    'source_code_uri'       => 'https://github.com/djberg96/ptools',
+    'wiki_uri'              => 'https://github.com/djberg96/ptools/wiki',
+    'rubygems_mfa_required' => 'true'
   }
 
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rspec', '~> 3.9')
+  spec.add_development_dependency('rubocop')
+  spec.add_development_dependency('rubocop-rspec')
 
   if File::ALT_SEPARATOR
     spec.platform = Gem::Platform.new(['universal', 'mingw32'])

data/spec/binary_spec.rb

@@ -9,51 +9,52 @@ require 'rspec'
 require 'ptools'
 
 RSpec.describe File, :binary do
-  let(:dirname)  { File.dirname(__FILE__) }
-  let(:bin_file) { File::ALT_SEPARATOR ? File.join(ENV['windir'], 'notepad.exe') : '/bin/ls' }
+  let(:dirname)  { described_class.dirname(__FILE__) }
+  let(:bin_file) { File::ALT_SEPARATOR ? described_class.join(ENV['windir'], 'notepad.exe') : '/bin/ls' }
 
   before do
-    @txt_file = File.join(dirname, 'txt', 'english.txt')
-    @emp_file = File.join(dirname, 'txt', 'empty.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')
+    @txt_file = described_class.join(dirname, 'txt', 'english.txt')
+    @emp_file = described_class.join(dirname, 'txt', 'empty.txt')
+    @uni_file = described_class.join(dirname, 'txt', 'korean.txt')
+    @utf_file = described_class.join(dirname, 'txt', 'english.utf16')
+    @png_file = described_class.join(dirname, 'img', 'test.png')
+    @jpg_file = described_class.join(dirname, 'img', 'test.jpg')
+    @gif_file = described_class.join(dirname, 'img', 'test.gif')
   end
 
-  example "File.binary? basic functionality" do
-    expect(File).to respond_to(:binary?)
-    expect{ File.binary?(@txt_file) }.not_to raise_error
+  example 'File.binary? basic functionality' do
+    expect(described_class).to respond_to(:binary?)
+    expect{ described_class.binary?(@txt_file) }.not_to raise_error
   end
 
-  example "File.binary? returns true for binary files" do
-    expect(File.binary?(bin_file)).to be true
+  example 'File.binary? returns true for binary files' do
+    expect(described_class.binary?(bin_file)).to be true
   end
 
-  example "File.binary? returns false for text files" do
-    expect(File.binary?(@emp_file)).to be false
-    expect(File.binary?(@txt_file)).to be false
-    expect(File.binary?(@uni_file)).to be false
-    expect(File.binary?(@utf_file)).to be false
+  example 'File.binary? returns true for unix binary files', :unix_only => true do
+    expect(described_class.binary?('/bin/df')).to be true
+    expect(described_class.binary?('/bin/chmod')).to be true
+    expect(described_class.binary?('/bin/cat')).to be true
   end
 
-  example "File.binary? returns false for image files" do
-    expect(File.binary?(@png_file)).to be false
-    expect(File.binary?(@jpg_file)).to be false
-    expect(File.binary?(@gif_file)).to be false
+  example 'File.binary? returns false for text files' do
+    expect(described_class.binary?(@emp_file)).to be false
+    expect(described_class.binary?(@txt_file)).to be false
+    expect(described_class.binary?(@uni_file)).to be false
+    expect(described_class.binary?(@utf_file)).to be false
   end
 
-  example "File.binary? accepts an optional percentage argument" do
-    expect(File.binary?(@txt_file, 0.50)).to be false
-    expect(File.binary?(@txt_file, 0.05)).to be true
+  example 'File.binary? returns false for image files' do
+    expect(described_class.binary?(@png_file)).to be false
+    expect(described_class.binary?(@jpg_file)).to be false
+    expect(described_class.binary?(@gif_file)).to be false
   end
 
-  example "File.binary? raises an error if the file cannot be found" do
-    expect{ File.binary?('bogus') }.to raise_error(SystemCallError)
+  example 'File.binary? raises an error if the file cannot be found' do
+    expect{ described_class.binary?('bogus') }.to raise_error(SystemCallError)
   end
 
-  example "File.binary? only accepts one argument" do
-    expect{ File.binary?(@txt_file, bin_file) }.to raise_error(ArgumentError)
+  example 'File.binary? only accepts one argument' do
+    expect{ described_class.binary?(@txt_file, bin_file) }.to raise_error(ArgumentError)
   end
 end

data/spec/constants_spec.rb

@@ -12,12 +12,12 @@ require 'ptools'
 RSpec.describe File, :constants do
   let(:windows) { File::ALT_SEPARATOR }
 
-  example "PTOOLS_VERSION constant is set to expected value" do
-    expect(File::PTOOLS_VERSION).to eq('1.4.2')
+  example 'PTOOLS_VERSION constant is set to expected value' do
+    expect(File::PTOOLS_VERSION).to eq('1.5.0')
     expect(File::PTOOLS_VERSION.frozen?).to be true
   end
 
-  example "IMAGE_EXT constant is set to array of values" do
+  example 'IMAGE_EXT constant is set to array of values' do
     expect(File::IMAGE_EXT).to match_array(%w[.bmp .gif .ico .jpeg .jpg .png])
   end
 end

data/spec/head_spec.rb

@@ -11,31 +11,31 @@ RSpec.describe File, :head do
   let(:test_file) { 'test_file_head.txt' }
 
   before do
-    File.open(test_file, 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
-    @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"]
+    described_class.open(test_file, 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
+    @expected_head1 = %W[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 = %W[line1\n line2\n line3\n line4\n line5\n]
   end
 
-  example "head method basic functionality" do
-    expect(File).to respond_to(:head)
-    expect{ File.head(test_file) }.not_to raise_error
-    expect{ File.head(test_file, 5) }.not_to raise_error
-    expect{ File.head(test_file){} }.not_to raise_error
+  after do
+    described_class.delete(test_file) if described_class.exist?(test_file)
   end
 
-  example "head method returns the expected results" do
-    expect(File.head(test_file)).to be_kind_of(Array)
-    expect(File.head(test_file)).to eq(@expected_head1)
-    expect(File.head(test_file, 5)).to eq(@expected_head2)
+  example 'head method basic functionality' do
+    expect(described_class).to respond_to(:head)
+    expect{ described_class.head(test_file) }.not_to raise_error
+    expect{ described_class.head(test_file, 5) }.not_to raise_error
+    expect{ described_class.head(test_file){} }.not_to raise_error
   end
 
-  example "head method requires two arguments" do
-    expect{ File.head(test_file, 5, "foo") }.to raise_error(ArgumentError)
-    expect{ File.head("bogus") }.to raise_error(Errno::ENOENT)
+  example 'head method returns the expected results' do
+    expect(described_class.head(test_file)).to be_kind_of(Array)
+    expect(described_class.head(test_file)).to eq(@expected_head1)
+    expect(described_class.head(test_file, 5)).to eq(@expected_head2)
   end
 
-  after do
-    File.delete(test_file) if File.exists?(test_file)
+  example 'head method requires two arguments' do
+    expect{ described_class.head(test_file, 5, 'foo') }.to raise_error(ArgumentError)
+    expect{ described_class.head('bogus') }.to raise_error(Errno::ENOENT)
   end
 end