ptools 1.1.7 → 1.1.9

data/CHANGES

@@ -1,3 +1,23 @@
+== 1.1.9 - 25-Mar-2010
+* Refactored File.which and File.whereis and added additional tests for each.
+* Removed the block form of File.whereis.
+* Reorganized the Rakefile a bit and put the test tasks under the 'test'
+  namespace, and the gem tasks under the 'gem' namespace.
+* Updated the test-unit development dependency.
+* Updates the README.
+
+== 1.1.8 - 6-Oct-2009
+* Fixed some bad variable names that crept into the File.nl_convert method.
+* Added the File.null_device alias for File.null.
+* Added cygwin and mingw to Windows detection code.
+* One of the nlconvert tests is now skipped on Windows.
+* Two text files that were previously bundled as part of this library for
+  testing purposes have been removed. Those are now dynamically generated
+  within the tests themselves.
+* Gemspec updates.
+* Documentation updates.
+* Added the :gem rake task.
+
 == 1.1.7 - 28-Jul-2009
 * Now compatible with Ruby 1.9.x.
 * Replaced RUBY_PLATFORM with rbconfig check for the sake of other

data/MANIFEST

@@ -15,5 +15,3 @@
 * test/test_wc.rb
 * test/test_which.rb
 * test/test_whereis.rb
-* test/test_file.txt
-* test/test_file2.txt

data/README

@@ -1,76 +1,64 @@
 == Description
-   The ptools (power tools) library is an additional set of commands for the
-   File class based on Unix command line tools.
+  The ptools (power tools) library is an additional set of commands for the
+  File class based on Unix command line tools.
    
 == Prerequisites
-   Ruby 1.8.0 or later is recommended.
-   On MS Windows you will need win32-file 0.5.4 or later.
+  On MS Windows you will need win32-file 0.5.4 or later.
 
 == Installation
-=== Gem
-   ruby ptools.gemspec
-   gem install ptools-x.y.z.gem
-=== Manual
-   rake test (optional)
-   rake install
+  gem install ptools
 
 == Synopsis
-   require "ptools"
+  require "ptools"
 
-   File.which("ruby")         # '/usr/local/bin/ruby'
-   File.whereis("ruby")       # ['/usr/local/bin/ruby','/opt/bin/ruby']
+  File.which("ruby")         # '/usr/local/bin/ruby'
+  File.whereis("ruby")       # ['/usr/local/bin/ruby','/opt/bin/ruby']
 
-   File.head("myfile")        # Returns first 10 lines of 'myfile'
-   File.middle("myfile",8,12) # Returns lines 8-12 of 'myfile'
-   File.tail("myfile",3)      # Returns last 3 lines of 'myfile'
-   File.wc("myfile",'words')  # Returns the number of words in 'myfile'
+  File.head("myfile")        # Returns first 10 lines of 'myfile'
+  File.middle("myfile",8,12) # Returns lines 8-12 of 'myfile'
+  File.tail("myfile",3)      # Returns last 3 lines of 'myfile'
+  File.wc("myfile",'words')  # Returns the number of words in 'myfile'
 
-   File.touch("newfile")      # "newfile" now exists
-   File.null                  # '/dev/null' on Unix, 'NUL' on Windows
-   File.binary?('some_file')  # true or false
+  File.touch("newfile")      # "newfile" now exists
+  File.null                  # '/dev/null' on Unix, 'NUL' on Windows
+  File.binary?('some_file')  # true or false
 
-   # Creates a copy of 'myfile' called 'newfile', in DOS format
-   File.nl_convert("myfile", "newfile", "dos")
+  # Creates a copy of 'myfile' called 'newfile', in DOS format
+  File.nl_convert("myfile", "newfile", "dos")
    
 == Known Bugs
-   There is a bug in 1.6.x that can cause $\ characters to accumulate when
-   converting to DOS or MAC format if nl_convert is run multiple times on
-   the same file. This appears to be fixed in 1.8.x. You're not still running
-   Ruby 1.6.x are you? I would hope not.
+  None known. Please report any bugs on the github or RubyForge project page.
 
-   One or two of The File.nl_convert tests may fail on Windows.  You can
-   ignore these.
+  http://www.rubyforge.org/projects/shards
+  http://www.github.com/djberg96/ptools
 
 == Acknowledgements
-   The which() method was adopted from the FileWhich code posted by Michael
-   Granger on http://www.rubygarden.org. The 'whereis' command is a minor
-   modification of that code as well.
+  The File.which method was originally adopted from the FileWhich code posted
+  by Michael Granger on the now defunct rubygarden.org website. That code was
+  later replaced by a version based on the ruby-which library.
 
-   The nl_convert() method was adopted (somewhat) from the nlcvt program
-   found at http://www.perl.com/language/ppt/src/nlcvt/nlcvt, written by
-   Tom Christiansen.
+  The File.nl_convert method is based on the nlcvt program found at
+  http://www.perl.com/language/ppt/src/nlcvt/nlcvt, written by Tom Christiansen.
     
-   The middle() method was provided by Shashank Date.
+  The middle() method was provided by Shashank Date.
 
-   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).
+  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).
 
 == Future Plans
-   Add whatever other tools people think might be useful.
+  Add whatever other tools people think might be useful.
    
 == License
-   Artistic 2.0
+  Artistic 2.0
     
 == Copyright
-   (C) 2003-2009 Daniel J. Berger
-   All Rights Reserved.
+  (C) 2003-2010 Daniel J. Berger
+  All Rights Reserved.
     
 == Warranty
-   This package is provided "as is" and without any express or
-   implied warranties, including, without limitation, the implied
-   warranties of merchantability and fitness for a particular purpose.
+  This package is provided "as is" and without any express or
+  implied warranties, including, without limitation, the implied
+  warranties of merchantability and fitness for a particular purpose.
 
 == Author
-   Daniel J. Berger
-   djberg96 at nospam at gmail dot com
-   imperator on IRC (irc.freenode.net)
+  Daniel J. Berger

data/Rakefile

@@ -0,0 +1,110 @@
+require 'rake'
+require 'rake/testtask'
+require 'rbconfig'
+include Config
+
+desc 'Install the ptools package (non-gem)'
+task :install do
+   sitelibdir = CONFIG["sitelibdir"]
+   file = "lib/ptools.rb"
+   FileUtils.cp(file, sitelibdir, :verbose => true)
+end
+
+namespace 'gem' do
+  desc 'Create the ptools gem'
+  task :create do
+    Dir["*.gem"].each{ |f| File.delete(f) } # Clean first
+    spec = eval(IO.read('ptools.gemspec'))
+    Gem::Builder.new(spec).build
+  end
+
+  desc 'Install the ptools gem'
+  task :install => [:create] do
+    file = Dir["*.gem"].first
+    sh "gem install #{file}"
+  end
+end
+
+Rake::TestTask.new do |t|
+  t.verbose = true
+  t.warning = true
+end
+
+namespace 'test' do
+  Rake::TestTask.new('binary') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_binary.rb']
+  end
+
+  Rake::TestTask.new('constants') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_constants.rb']
+  end
+
+  Rake::TestTask.new('head') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_head.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
+    t.warning = true
+    t.test_files = FileList['test/test_nlconvert.rb']
+  end
+
+  Rake::TestTask.new('null') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_null.rb']
+  end
+
+  Rake::TestTask.new('tail') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_tail.rb']
+  end
+
+  Rake::TestTask.new('touch') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_touch.rb']
+  end
+
+  Rake::TestTask.new('wc') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_wc.rb']
+  end
+
+  Rake::TestTask.new('whereis') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_whereis.rb']
+  end
+
+  Rake::TestTask.new('which') do |t|
+    t.libs << 'test'
+    t.verbose = true
+    t.warning = true
+    t.test_files = FileList['test/test_which.rb']
+  end
+end

data/lib/ptools.rb

@@ -1,152 +1,218 @@
 require 'rbconfig'
-require 'win32/file' if Config::CONFIG['host_os'].match('mswin')
+
+if Config::CONFIG['host_os'] =~ /mswin|dos|win32|cygwin|mingw/i
+  require 'win32/file'
+end
 
 class File
-   PTOOLS_VERSION = '1.1.7'
+  # The version of the ptools library.
+  PTOOLS_VERSION = '1.1.9'
+
+  # :stopdoc:
+
+  # The WIN32EXTS string is used as part of a Dir[] call in certain methods.
+  if Config::CONFIG['host_os'] =~ /mswin|dos|win32|cygwin|mingw/i
+    MSWINDOWS = true
+    if ENV['PATHEXT']
+      WIN32EXTS = ('.{' + ENV['PATHEXT'].tr(';', ',').tr('.','') + '}').downcase
+    else
+      WIN32EXTS = '.{exe,com,bat}'
+    end
+  else
+    MSWINDOWS = false
+  end
+
+  IMAGE_EXT = %w/.bmp .gif .jpg .jpeg .png/
+
+  # :startdoc:
+
+  # Returns whether or not the file is an image. Only JPEG, PNG, BMP and
+  # GIF 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
+  # difficult to build on MS Windows), see the 'filemagic' library, available
+  # on the RAA.
+  #
+  # Examples:
+  #
+  #    File.image?('somefile.jpg') # => true
+  #    File.image?('somefile.txt') # => true
+  #--
+  # The approach I used here is based on information found at
+  # 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) # Check data
+    bool
+  end
+
+  # Returns the name of the null device (aka bitbucket) on your platform.
+  #
+  # Examples:
+  #
+  #   # On Linux
+  #   File.null # => '/dev/null'
+  #
+  #   # On MS Windows
+  #   File.null # => 'NUL'
+  #--
+  # The values I used here are based on information from
+  # http://en.wikipedia.org/wiki//dev/null
+  #
+  def self.null
+    case Config::CONFIG['host_os']
+      when /mswin|win32|msdos|cygwin|mingw/i
+        'NUL'
+      when /amiga/i
+        'NIL:'
+      when /openvms/i
+        'NL:'
+      else
+        '/dev/null'
+    end
+  end
+
+  class << self
+    alias null_device null
+  end
 
-   # :stopdoc:
+  # 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.
+  #
+  # 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)
+    s = (File.read(file, File.stat(file).blksize) || "").split(//)
+    ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
+  end
+   
+  # Looks for the first occurrence of +program+ within +path+.
+  # 
+  # On Windows, it looks for executables ending with the suffixes defined
+  # in your PATHEXT environment variable, or '.exe', '.bat' and '.com' if
+  # that isn't defined, which you may optionally include in +program+.
+  #
+  # Returns nil if not found. 
+  #
+  # Examples:
+  #
+  #   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
 
-   if Config::CONFIG['host_os'].match('mswin')
-      IS_WINDOWS = true
-      begin
-         WIN32EXTS = ENV['PATHEXT'].split(';').map{ |e| e.downcase }
-      rescue
-         WIN32EXTS = %w/.exe .com .bat/
+    # Bail out early if an absolute path is provided.
+    if program =~ /^\/|^[a-z]:[\\\/]/i
+      program += WIN32EXTS if MSWINDOWS && File.extname(program).empty?
+      found = Dir[program].first
+      if found && File.executable?(found) && !File.directory?(found)
+        return found
+      else
+        return nil
       end
-   else
-      IS_WINDOWS = false
-   end
+    end
 
-   IMAGE_EXT = %w/.bmp .gif .jpg .jpeg .png/
+    # 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
+      file = File.join(dir, program)
 
-   # :startdoc:
+      # 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 += WIN32EXTS if File.extname(program).empty?
+      end
 
-   # Returns whether or not the file is an image. Only JPEG, PNG, BMP and
-   # GIF 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
-   # difficult to build on MS Windows), see the 'filemagic' library, available
-   # on the RAA.
-   #--
-   # Approach used here is based on information found at
-   # 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) # Check data
-      bool
-   end
+      found = Dir[file].first
 
-   # Returns the null device (aka bitbucket) on your platform.  On most
-   # Unix-like systems this is '/dev/null', on Windows it's 'NUL', etc.
-   #--
-   # Based on information from  http://en.wikipedia.org/wiki//dev/null
-   #
-   def self.null
-      case Config::CONFIG['host_os']
-         when /mswin/i
-            'NUL'
-         when /amiga/i
-            'NIL:'
-         when /openvms/i
-            'NL:'
-         else
-            '/dev/null'
+      # Convert all forward slashes to backslashes if supported
+      if found && File.executable?(found) && !File.directory?(found)
+        found.tr!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
+        return found
       end
-   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.
-   #--
-   # Based on code originally provided by Ryan Davis (which, in turn, is
-   # based on Perl's -B switch).
-   #
-   def self.binary?(file)
-      s = (File.read(file, File.stat(file).blksize) || "").split(//)
-      ((s.size - s.grep(" ".."~").size) / s.size.to_f) > 0.30
-   end
-   
-   # Looks for the first occurrence of +program+ within +path+.
-   # 
-   # On Windows, it looks for executables ending with the suffixes defined
-   # in your PATHEXT environment variable, or '.exe', '.bat' and '.com' if
-   # that isn't defined, which you may optionally include in +program+.
-   #
-   # Returns nil if not found. 
-   #
-   def self.which(program, path=ENV['PATH'])
-      programs = [program]
-      
-      # If no file extension is provided on Windows, try the WIN32EXT's in turn
-      if IS_WINDOWS && File.extname(program).empty?
-         unless WIN32EXTS.include?(File.extname(program).downcase)
-            WIN32EXTS.each{ |ext|
-               programs.push(program + ext)
-            }
-         end
+    nil
+  end
+
+  # Returns an array of each +program+ within +path+, or nil if it cannot
+  # be found.
+  #
+  # On Windows, it looks for executables ending with the suffixes defined
+  # in your PATHEXT environment variable, or '.exe', '.bat' and '.com' if
+  # that isn't defined, which you may optionally include in +program+.
+  #
+  # Examples:
+  #
+  #   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
+
+    paths = []
+
+    # Bail out early if an absolute path is provided.
+    if program =~ /^\/|^[a-z]:[\\\/]/i
+      program += WIN32EXTS if MSWINDOWS && File.extname(program).empty?
+      found = Dir[program]
+      if found[0] && File.executable?(found[0]) && !File.directory?(found[0])
+        return found
+      else
+        return nil
       end
-      
-      # Catch the first path found, or nil
-      location = catch(:done){
-         path.split(File::PATH_SEPARATOR).each{ |dir|
-            programs.each{ |prog|
-               f = File.join(dir, prog)
-               if File.executable?(f) && !File.directory?(f)
-                  location = File.join(dir, prog)
-                  location.tr!('/', File::ALT_SEPARATOR) if File::ALT_SEPARATOR
-                  throw(:done, location)
-               end
-            }
-         }
-         nil # Evaluate to nil if not found
-      }
+    end
 
-      location
-   end
+    # 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
+      file = File.join(dir, program)
 
-   # In block form, yields each +program+ within +path+.  In non-block
-   # form, returns an array of each +program+ within +path+.
-   #
-   # On Windows, it looks for executables ending with the suffixes defined
-   # in your PATHEXT environment variable, or '.exe', '.bat' and '.com' if
-   # that isn't defined, which you may optionally include in +program+.
-   #
-   # Returns nil if not found.
-   #
-   def self.whereis(program, path=ENV['PATH'])
-      dirs = []
-      programs = [program]
-      
-      # If no file extension is provided on Windows, try the WIN32EXT's in turn
-      if IS_WINDOWS && File.extname(program).empty?
-         unless WIN32EXTS.include?(File.extname(program).downcase)
-            WIN32EXTS.each{ |ext|
-               programs.push(program + ext)
-            }
-         end
+      # 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 += WIN32EXTS if File.extname(program).empty?
       end
-      
-      path.split(File::PATH_SEPARATOR).each{ |dir|
-         programs.each{ |prog|
-            file = File.join(dir,prog)
-            file.tr!('/', File::ALT_SEPARATOR) if File::ALT_SEPARATOR
-            if File.executable?(file) && !File.directory?(file)
-               if block_given?
-                  yield file
-               else
-                  dirs << file
-               end
-            end
-         }
-      }
-      dirs.empty? ? nil : dirs.uniq
-   end
+
+      found = Dir[file].first
+
+      # Convert all forward slashes to backslashes if supported
+      if found && File.executable?(found) && !File.directory?(found)
+        found.tr!(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
+        paths << found
+      end
+    }
+
+    paths.empty? ? nil : paths.uniq
+  end
 
    # In block form, yields the first +num_lines+ from +filename+.  In non-block
    # form, returns an Array of +num_lines+
    #
+   # Examples:
+   #
+   #   # Return an array
+   #   File.head('somefile.txt') # => ['This is line1', 'This is line2', ...]
+   #
+   #   # Use a block
+   #   File.head('somefile.txt'){ |line| puts line }
+   #
    def self.head(filename, num_lines=10)
       a = []
       IO.foreach(filename){ |line|
@@ -172,26 +238,29 @@ class File
       end
    end
 
-   # In block form, yields the last +num_lines+ of file +filename+.
-   # In non-block form, it returns the lines as an array.
-   #
-   # Note that this method slurps the entire file, so I don't recommend it
-   # for very large files.  Also note that 'tail -f' functionality is not
-   # present.
-   #
-   def self.tail(filename, num_lines=10)
-      if block_given?
-         IO.readlines(filename).reverse[0..num_lines-1].reverse.each{ |line|
-            yield line
-         }
-      else
-         IO.readlines(filename).reverse[0..num_lines-1].reverse
-      end
-   end
+  # In block form, yields the last +num_lines+ of file +filename+.
+  # In non-block form, it returns the lines as an array.
+  #
+  # Note that this method slurps the entire file, so I don't recommend it
+  # for very large files. Also note that 'tail -f' functionality is not
+  # present. See the 'file-tail' library for that.
+  #
+  # Example:
+  #
+  #   File.tail('somefile.txt') # => ['This is line7', 'This is line8', ...]
+  #
+  def self.tail(filename, num_lines=10)
+    if block_given?
+      IO.readlines(filename).reverse[0..num_lines-1].reverse.each{ |line|
+        yield line
+      }
+    else
+      IO.readlines(filename).reverse[0..num_lines-1].reverse
+    end
+  end
 
    # Converts a text file from one OS platform format to another, ala
-   # 'dos2unix'.  Valid values for 'format', which are case insensitve,
-   # include:
+   # 'dos2unix'. The possible values for +platform+ include:
    #
    # * MS Windows -> dos, windows, win32, mswin
    # * Unix/BSD   -> unix, linux, bsd
@@ -201,12 +270,12 @@ class File
    # TypeError will be raised.  If an invalid format value is received, an
    # ArgumentError is raised.
    #
-   def self.nl_convert(filename, newfilename=filename, platform="dos")
-      unless File.ftype(filename) == "file"
-         raise TypeError, "Only valid for plain text files"
+   def self.nl_convert(old_file, new_file = old_file, platform = 'dos')
+      unless File.file?(old_file)
+         raise ArgumentError, 'Only valid for plain text files'
       end
 
-      if platform =~ /dos|windows|win32|mswin/i
+      if platform =~ /dos|windows|win32|mswin|cygwin|mingw/i
          format = "\cM\cJ"
       elsif platform =~ /unix|linux|bsd/i
          format = "\cJ"
@@ -219,27 +288,28 @@ class File
       orig = $\
       $\ = format
 
-      if filename == newfilename
+      if old_file == new_file
          require 'fileutils'
          require 'tempfile'
 
          begin
-            tf = Tempfile.new('ruby_temp_' + Time.now.to_s)
+            temp_name = Time.new.strftime("%Y%m%d%H%M%S")
+            tf = Tempfile.new('ruby_temp_' + temp_name)
             tf.open
 
-            IO.foreach(filename){ |line|
+            IO.foreach(old_file){ |line|
                line.chomp!
                tf.print line
             }
          ensure
             tf.close if tf && !tf.closed?
          end
-         File.delete(filename)
-         FileUtils.cp(tf.path, filename)
+         File.delete(old_file)
+         FileUtils.cp(tf.path, old_file)
       else
          begin
-            nf = File.new(newfilename, 'w')  
-            IO.foreach(filename){ |line|
+            nf = File.new(new_file, 'w')  
+            IO.foreach(old_file){ |line|
                line.chomp!
                nf.print line
             }
@@ -252,85 +322,85 @@ class File
       self
    end
 
-   # Changes the access and modification time if present, or creates a 0
-   # byte file +filename+ if it doesn't already exist.
-   #
-   def self.touch(filename)
-      if File.exists?(filename)
-         time = Time.now
-         File.utime(time, time, filename)
-      else
-         File.open(filename, 'w'){}
-      end
-      self
-   end
+  # Changes the access and modification time if present, or creates a 0
+  # byte file +filename+ if it doesn't already exist.
+  #
+  def self.touch(filename)
+    if File.exists?(filename)
+      time = Time.now
+      File.utime(time, time, filename)
+    else
+      File.open(filename, 'w'){}
+    end
+    self
+  end
 
-   # With no arguments, returns a four element array consisting of the number
-   # of bytes, characters, words and lines in filename, respectively.
-   #
-   # Valid options are 'bytes', 'characters' (or just 'chars'), 'words' and
-   # 'lines'.
-   #
-   def self.wc(filename, option='all')
-      option.downcase!
-      valid = %w/all bytes characters chars lines words/
+  # With no arguments, returns a four element array consisting of the number
+  # of bytes, characters, words and lines in filename, respectively.
+  #
+  # Valid options are 'bytes', 'characters' (or just 'chars'), 'words' and
+  # 'lines'.
+  #
+  def self.wc(filename, option='all')
+    option.downcase!
+    valid = %w/all bytes characters chars lines words/
 
-      unless valid.include?(option)
-         raise ArgumentError, "Invalid option: '#{option}'"
-      end
+    unless valid.include?(option)
+      raise ArgumentError, "Invalid option: '#{option}'"
+    end
 
-      n = 0
-      if option == 'lines'
-         IO.foreach(filename){ n += 1 }
-         return n
-      elsif option == 'bytes'
-         File.open(filename){ |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
-      elsif option == 'words'
-         IO.foreach(filename){ |line|
-            n += line.split.length
-         }
-         return n
-      else
-         bytes,chars,lines,words = 0,0,0,0
-         IO.foreach(filename){ |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]
-      end
-   end
+    n = 0
+    if option == 'lines'
+      IO.foreach(filename){ n += 1 }
+      return n
+    elsif option == 'bytes'
+      File.open(filename){ |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
+    elsif option == 'words'
+      IO.foreach(filename){ |line|
+        n += line.split.length
+      }
+      return n
+    else
+      bytes,chars,lines,words = 0,0,0,0
+      IO.foreach(filename){ |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]
+    end
+  end
 
-   private
+  private
 
-   def self.bmp?(file)
-      IO.read(file, 3) == "BM6"
-   end
+  def self.bmp?(file)
+    IO.read(file, 3) == "BM6"
+  end
 
-   def self.jpg?(file)
-      IO.read(file, 10) == "\377\330\377\340\000\020JFIF"
-   end
+  def self.jpg?(file)
+    IO.read(file, 10) == "\377\330\377\340\000\020JFIF"
+  end
 
-   def self.png?(file)
-      IO.read(file, 4) == "\211PNG"
-   end
+  def self.png?(file)
+    IO.read(file, 4) == "\211PNG"
+  end
 
-   def self.gif?(file)
-      ['GIF89a', 'GIF97a'].include?(IO.read(file, 6))
-   end
+  def self.gif?(file)
+     ['GIF89a', 'GIF97a'].include?(IO.read(file, 6))
+  end
 end