ptools 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff44afa8e0b25cca28c3cfac9ce34788eb8b69ba
-  data.tar.gz: 2722e012c24b7283b6780a0e9e3b8edd9e038f67
+  metadata.gz: 19b48052d410d086d24c61ef25da0b3e87b32c00
+  data.tar.gz: 49b572916684c747255775890a6e7188f286eced
 SHA512:
-  metadata.gz: 62fcdbcbba8ce694f3207bf1bedb6f6d8e865ca20b7fa5b33209ac154373f69950b3e05f6dafee805a6535d320afe946860c8985079b6b2bc802b70a24eec4c6
-  data.tar.gz: 1e538e79107494c441f8099612330ecd3fef6d403e09ea6a780554c38c64555756fc1923cfddf8044ee7a3ffcd7ba9f1ed9b0b91e28f937d5fad1318f03c462c
+  metadata.gz: 70977a568a82dd6885804f7b47391f096da6b66b965944838c85cb47b6eba501bec70e0bbe69ea65a02621707532a3bf24846dbd4011a9ef66b8dc5a03b63f58
+  data.tar.gz: f81220180763b1fd1157712b16942c0fc5e588d3795b6be1fbaf7945201677333593f45dce298156e947434f18e1cfe7c990bbccd5edc3eac83a30fce56fe491

data/CHANGES

@@ -1,3 +1,11 @@
+== 1.2.7 - 6-Dec-2014
+* File.which now expands ~ for paths. Thanks go to dg-vrnetze for the patch.
+* Use /dev/null for cygwin instead of NUL.
+* Use mv instead of cp in the nl_convert method.
+* Solaris now handled explicitly in nl_convert, and OSX now considered Unix.
+* Modified the binary? method to check 4096 bytes at most.
+* Thanks to Matt Hoyle for many of the changes implemented in this release.
+
 == 1.2.6 - 14-Jul-2014
 * Updated the png? and jpg? methods so they explicitly specify the
   offset argument so that it works with 1.9.2 and earlier. Thanks go to

data/MANIFEST

@@ -15,3 +15,6 @@
 * test/test_wc.rb
 * test/test_which.rb
 * test/test_whereis.rb
+* test/img/test.gif
+* test/img/test.jpg
+* test/img/test.png

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.6'
+  PTOOLS_VERSION = '1.2.7'
 
   # :stopdoc:
 
@@ -40,7 +40,7 @@ class File
   #
   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 = bmp?(file) || jpg?(file) || png?(file) || gif?(file) || tiff?(file) # Check data
     bool
   end
 
@@ -59,7 +59,7 @@ class File
   #
   def self.null
     case RbConfig::CONFIG['host_os']
-      when /mswin|win32|msdos|cygwin|mingw|windows/i
+      when /mswin|win32|msdos|mingw|windows/i
         'NUL'
       when /amiga/i
         'NIL:'
@@ -77,7 +77,7 @@ class File
   # 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.
+  # +File.blksize+ characters, or 4096, whichever is smaller.
   #
   # Example:
   #
@@ -89,7 +89,9 @@ class File
   #
   def self.binary?(file)
     return false if image?(file)
-    s = (File.read(file, File.stat(file).blksize) || "")
+    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
   end
@@ -125,6 +127,8 @@ class File
 
     # Iterate over each path glob the dir + program.
     path.split(File::PATH_SEPARATOR).each{ |dir|
+      dir = File.expand_path(dir)
+
       next unless File.exist?(dir) # In case of bogus second argument
       file = File.join(dir, program)
 
@@ -269,28 +273,22 @@ class File
   # 'dos2unix'. The possible values for +platform+ include:
   #
   # * MS Windows -> dos, windows, win32, mswin
-  # * Unix/BSD   -> unix, linux, bsd
-  # * Mac        -> mac, macintosh, apple, osx
+  # * Unix/BSD   -> unix, linux, bsd, osx, darwin, sunos, solaris
+  # * Mac        -> mac, macintosh, apple
+  #
+  # You may also specify 'local', in which case your CONFIG['host_os'] value
+  # will be used. This is the default.
   #
-  # Note that this method is only valid for an ftype of "file".  Otherwise a
-  # TypeError will be raised.  If an invalid format value is received, an
+  # Note that this method is only valid for an ftype of "file". Otherwise a
+  # TypeError will be raised. If an invalid format value is received, an
   # ArgumentError is raised.
   #
-  def self.nl_convert(old_file, new_file = old_file, platform = 'dos')
+  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
 
-    case platform
-      when /dos|windows|win32|mswin|cygwin|mingw/i
-        format = "\cM\cJ"
-      when /unix|linux|bsd/i
-        format = "\cJ"
-      when /mac|apple|macintosh|osx/i
-        format = "\cM"
-      else
-        raise ArgumentError, "Invalid platform string"
-    end
+    format = nl_for_platform(platform)
 
     orig = $\ # $OUTPUT_RECORD_SEPARATOR
     $\ = format
@@ -313,7 +311,7 @@ class File
       end
 
       File.delete(old_file)
-      FileUtils.cp(tf.path, old_file)
+      FileUtils.mv(tf.path, old_file)
     else
       begin
         nf = File.new(new_file, 'w')
@@ -413,6 +411,21 @@ class File
 
   private
 
+  def self.nl_for_platform(platform)
+    platform = RbConfig::CONFIG["host_os"] if platform == 'local'
+
+    case platform
+      when /dos|windows|win32|mswin|mingw/i
+        return "\cM\cJ"
+      when /unix|linux|bsd|cygwin|osx|darwin|solaris|sunos/i
+        return "\cJ"
+      when /mac|apple|macintosh/i
+        return "\cM"
+      else
+        raise ArgumentError, "Invalid platform string"
+    end
+  end
+
   def self.bmp?(file)
     IO.read(file, 3) == "BM6"
   end
@@ -428,4 +441,25 @@ class File
   def self.gif?(file)
     ['GIF89a', 'GIF97a'].include?(IO.read(file, 6))
   end
+
+  def self.tiff?(file)
+    return false if File.size(file) < 12
+
+    bytes = IO.read(file, 4)
+
+    # II is Intel, MM is Motorola
+    if bytes[0..1] != 'II'&& bytes[0..1] != 'MM'
+      return false
+    end
+
+    if bytes[0..1] == 'II' && bytes[2..3].ord != 42
+      return false
+    end
+
+    if bytes[0..1] == 'MM' && bytes[2..3].reverse.ord != 42
+      return false
+    end
+
+    true
+  end
 end

data/ptools.gemspec

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

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.6', File::PTOOLS_VERSION)
+    assert_equal('1.2.7', File::PTOOLS_VERSION)
   end
 
   test "IMAGE_EXT constant is set to array of values" do

data/test/test_nlconvert.rb

@@ -25,6 +25,17 @@ class TC_Ptools_NLConvert < Test::Unit::TestCase
     @unix_file  = 'nix_test_file.txt'
   end
 
+  test "nl_for_platform basic functionality" do
+    assert_respond_to(File, :nl_for_platform)
+  end
+
+  test "nl_for_platform" do
+    assert_equal( "\cM\cJ", File.nl_for_platform('dos') )
+    assert_equal( "\cJ",    File.nl_for_platform('unix') )
+    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_which.rb

@@ -11,6 +11,7 @@ require 'test-unit'
 require 'rbconfig'
 require 'fileutils'
 require 'ptools'
+require 'tempfile'
 
 class TC_FileWhich < Test::Unit::TestCase
   def self.startup
@@ -95,6 +96,21 @@ class TC_FileWhich < Test::Unit::TestCase
     assert_raises(ArgumentError){ File.which(@ruby, '') }
   end
 
+  test "resolves with with ~" do
+    omit_if(@@windows, "~ tests skipped on MS Windows")
+    begin
+      old_home = ENV['HOME']
+
+      ENV['HOME'] = Dir::Tmpname.tmpdir
+      program = Tempfile.new(['program', '.sh'])
+      File.chmod(755, program.path)
+
+      assert_not_nil(File.which(File.basename(program.path), '~/'))
+    ensure
+      ENV['HOME'] = old_home
+    end
+  end
+
   def teardown
     @exe  = nil
     @ruby = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ptools
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,21 +96,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extra methods for the File class
 test_files:
+- test/test_binary.rb
+- test/test_constants.rb
 - test/test_head.rb
-- test/test_middle.rb
-- test/test_tail.rb
-- test/test_wc.rb
+- test/test_image.rb
 - test/test_is_sparse.rb
+- test/test_middle.rb
+- test/test_nlconvert.rb
 - test/test_null.rb
+- test/test_tail.rb
 - test/test_touch.rb
-- test/test_which.rb
+- test/test_wc.rb
 - test/test_whereis.rb
-- test/test_binary.rb
-- test/test_image.rb
-- test/test_constants.rb
-- test/test_nlconvert.rb
+- test/test_which.rb