ptools 1.3.3-universal-mingw32 → 1.3.5-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 825f3067d1acabd589eb633c4307140008626138
-  data.tar.gz: 2924015a89255311cb29ce3f26de584a81935288
+  metadata.gz: ee238a6835d5ed4a5dec58ed5eb35e88d8c6af6b
+  data.tar.gz: 96b5a663c8a6ef5c0dbedfbedaadbb399e735ca1
 SHA512:
-  metadata.gz: 204eff0e8d7e2251793f0acf20ec16b113d35595a57012525700a343f917492d6ce2a5dee7504e6792f37f84f563bef421f232ea2e41776eafef49bc183a942a
-  data.tar.gz: 6ea1e00173da43e41da1400af67369d68e68fa56582c480cc4b51be43f9f28553bcac286ee0a0d6b4945de6163582dc09bbe82bc4321c647a6800ec9de9beab3
+  metadata.gz: 9e5ef4db7f09c58cd4ee9e2b3343f1bcceb647abe07651a7ac2e308769c183b903d3729f9e444a64b85503b68a30b09601eb8bc1e3986868cbc3544f5c6f1f05
+  data.tar.gz: faa94b24f47fb46c74a723030eeebba3cf49fbfb34bfcb9a25064ad19cb10e82d638746bea0519f7e2209328dae4fb17b63e466e6f4a51edf9b4cf399244117d

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-7,����o���f!�x(p��Q�e6M@y#�g>�"ξ��&�@Z�Q�"�|֋T2��-5�m���C��k��|b�^
�z�Mʔ�F�&%u1��ʲK���jeh�g���IGc��/�U�E����ͱ��B5.}�K0�Ρ�o~2�ٍ��Pĉ��(g�ә�$z+�0����2�g2�#-��MvF����n�������`�H)��hw��a"cgB�*�j9�'KWc۝Zu�;�4+���=O"�A �?^���]ˢ
+nWȴ�(���潂���2��_B�!��	[�EI�m=���sy��麜��c�H.���Bl�RS ��vx�$��v�����ʌ%?Ty���� (x�O
+�����) ��Dؒq0�Z։k˽���x�����R���ݕ%����Hֵk����_���!aWE�{�
+��/�2�+B4+jk���Z�T���lb��k���IVT�L�������^�~R�Bn�H's�o3

data/CHANGES

@@ -1,3 +1,15 @@
+== 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.

data/MANIFEST

@@ -18,3 +18,4 @@
 * test/img/test.gif
 * test/img/test.jpg
 * test/img/test.png
+* test/img/test.ico

data/Rakefile

@@ -8,9 +8,9 @@ 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
@@ -19,7 +19,7 @@ namespace 'gem' do
     require 'rubygems/package'
     spec = eval(IO.read('ptools.gemspec'))
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
-    Gem::Package.build(spec)
+    Gem::Package.build(spec, true)
   end
 
   desc 'Install the ptools gem'

data/certs/djberg96_pub.pem

@@ -1,21 +1,21 @@
 -----BEGIN CERTIFICATE-----
 MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
 cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+MB4XDTE3MDkwMzE1MjMxM1oXDTE4MDkwMzE1MjMxM1owPzERMA8GA1UEAwwIZGpi
 ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8y4kEssxNpAdPhNNw2
+p4zkERFndPAnmOKDdErczFYYUA9uYpA7/iTjkLlNyRwvsNHpnMXdSF7vy++YIU+F
+Ux3AGTmspupbdSzqBNUhSEJ9TmpjMer1dMYMR9fRw3r3qQreiO2u/O/tV4VpzrDj
+28JC0b1PcKtfobxbnk+hporZqTH6ClOxDsRx+trlkr7q7FLZwTZn0ywjAV8WMVTO
+SMmkzXQ37s2Nnrq6r+dDZI0voBxyQkAUzmdBOQTrvOFAo3tuWcnJNR/RRdFhJ9nK
+mYMPmEd1z0s+cU0SUEeTvhGv/9LCmbSyZqKezDLYNR4Gb0FOA9D50+4OOi2+3G1o
+1U0CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJCx
+ukSSioTiLtwQCdML0IyEZAJ/MB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
 bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-tGSHgAmcLlkdGgan182qsE/4kKM=
+ggEBAJh/dmRaTpJAUeJ2x9CEyy9gSP6SZjMeAwWgPNdowPDyw0JzlpBIrYiTnCYK
+2OqxvIi8L38+rHw3KYL0fEyNqP3RbMl6+SljRwiU0JwEqj9e1pqIx99RTLKeI9PM
+F8LxxmDHreGOaY4R8JBOMxys1wBkF/Iilx4qoT4LBn+DzraAlmYjr6O6itIxGten
+NFJFS/tFBTTeNW6SJLdDnGd2b7vBBEd/ZpIhuZNxriU6FKWC5FJeBdAiuw6lqHun
+QLLepVJthIvwmfc8AU5TJGMawtVAUHIWiuQPoBBVVKOkeEhioO0cV8UabKsKMbE8
+VpiARrgH+4lYiRFJ+gKpIbSEJvk=
 -----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.3'
+  PTOOLS_VERSION = '1.3.5'.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,13 @@ 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)
     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+.
@@ -479,4 +483,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

@@ -3,14 +3,14 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name       = 'ptools'
-  spec.version    = '1.3.3'
-  spec.license    = 'Artistic 2.0'
+  spec.version    = '1.3.5'
+  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['**/*'] << '.gemtest'
+  spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
   spec.cert_chain = ['certs/djberg96_pub.pem']
 
   spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']

data/test/test_binary.rb

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ptools
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.5
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -12,25 +12,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
   cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+  MB4XDTE3MDkwMzE1MjMxM1oXDTE4MDkwMzE1MjMxM1owPzERMA8GA1UEAwwIZGpi
   ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-  Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-  S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-  gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-  FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-  zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-  DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-  nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+  bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8y4kEssxNpAdPhNNw2
+  p4zkERFndPAnmOKDdErczFYYUA9uYpA7/iTjkLlNyRwvsNHpnMXdSF7vy++YIU+F
+  Ux3AGTmspupbdSzqBNUhSEJ9TmpjMer1dMYMR9fRw3r3qQreiO2u/O/tV4VpzrDj
+  28JC0b1PcKtfobxbnk+hporZqTH6ClOxDsRx+trlkr7q7FLZwTZn0ywjAV8WMVTO
+  SMmkzXQ37s2Nnrq6r+dDZI0voBxyQkAUzmdBOQTrvOFAo3tuWcnJNR/RRdFhJ9nK
+  mYMPmEd1z0s+cU0SUEeTvhGv/9LCmbSyZqKezDLYNR4Gb0FOA9D50+4OOi2+3G1o
+  1U0CAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJCx
+  ukSSioTiLtwQCdML0IyEZAJ/MB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
   bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-  ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-  tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-  /sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-  wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-  EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-  tGSHgAmcLlkdGgan182qsE/4kKM=
+  ggEBAJh/dmRaTpJAUeJ2x9CEyy9gSP6SZjMeAwWgPNdowPDyw0JzlpBIrYiTnCYK
+  2OqxvIi8L38+rHw3KYL0fEyNqP3RbMl6+SljRwiU0JwEqj9e1pqIx99RTLKeI9PM
+  F8LxxmDHreGOaY4R8JBOMxys1wBkF/Iilx4qoT4LBn+DzraAlmYjr6O6itIxGten
+  NFJFS/tFBTTeNW6SJLdDnGd2b7vBBEd/ZpIhuZNxriU6FKWC5FJeBdAiuw6lqHun
+  QLLepVJthIvwmfc8AU5TJGMawtVAUHIWiuQPoBBVVKOkeEhioO0cV8UabKsKMbE8
+  VpiARrgH+4lYiRFJ+gKpIbSEJvk=
   -----END CERTIFICATE-----
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2017-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,16 +86,20 @@ extra_rdoc_files:
 - CHANGES
 - MANIFEST
 files:
-- ".gemtest"
+- certs
+- certs/djberg96_pub.pem
 - CHANGES
 - Gemfile
-- MANIFEST
-- README
-- Rakefile
-- certs/djberg96_pub.pem
+- 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
@@ -110,11 +114,12 @@ files:
 - test/test_wc.rb
 - test/test_whereis.rb
 - test/test_which.rb
+- test/txt
 - test/txt/english.txt
 - test/txt/korean.txt
 homepage: https://github.com/djberg96/ptools
 licenses:
-- Artistic 2.0
+- Artistic-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -132,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Extra methods for the File class