ptools 1.3.7-universal-mingw32 → 1.4.0-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69b0c5a7f01036c4e8b29773fcda191482ec37cef11ed835d77e84d6d1113e09
-  data.tar.gz: 6acb8b4b8b4a0bc479d912bbf9f8eae991725f6a766f6c1c85c2149b771a1dfc
+  metadata.gz: 2511ed84e4a1ce0ebc834b5827455ec5d635c371a322d796605ded4415986dc0
+  data.tar.gz: 4a1cd91f42be4f4c8f8800aa47c15d0b60eb47b60f86a861edecec6f428d1f34
 SHA512:
-  metadata.gz: 8bed3889606d6351aa7c2a636be91c3a17a05470516355db715a9fa2f88f5d3cf7442771938cd70c2a796e26eb1f5c04a87e03d007793fffcfbed09175178bd1
-  data.tar.gz: 793779b97fdd26452c6066ba7416d770a6d02e4c862e0637c40531c374955c54507616b466916f4d1130022f7f2f363e5c377c0cd673bfd9f63cd9c7e2cee5ce
+  metadata.gz: 307c82262a8d4319b8dfb4b8fe40ffc3d19d922ff49b119d3b59b2e511c19be4c0e8e38ff23809e12462be64ad6f74c611f94d6c675251ebb5458bc3acd01b1a
+  data.tar.gz: f9cfc533c43421df79e433b8076784ce94dc90d1b0211da54dbb8817e699cfc362a6d065ab106938b9a6ce39d57f38610f30803c541621eadc501cb2d1613fb5

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.4.0 - 20-Aug-2020
+* Switched from test-unit to rspec, and reworked the tests bit in general.
+* Removed the File.null method since Ruby has IO::NULL.
+
 == 1.3.7 - 24-Jun-2020
 * Fixed a bug where the File.binary? method would bomb on a zero byte file.
   Thanks go to Alexandru Emil Lupu for the spot and patch.
@@ -28,8 +32,7 @@
 * The Rakefile tasks now assume Rubygems 2.x.
 
 == 1.3.2 - 11-Dec-2014
-* Update to the File.tail method that deals prevents potential line ending
-  issues in JRuby.
+* Update to the File.tail method that prevents potential line ending issues in JRuby.
 * Added known issues with JRuby to the README.
 
 == 1.3.1 - 9-Dec-2014

data/Gemfile

@@ -8,5 +8,5 @@ end
 
 group :test do
   gem 'rake'
-  gem 'test-unit'
+  gem 'rspec'
 end

data/MANIFEST

@@ -6,17 +6,22 @@
 * ptools.gemspec
 * certs/djberg96_pub.pem
 * lib/ptools.rb
-* test/test_constants.rb
-* test/test_head.rb
-* test/test_image.rb
-* test/test_nlconvert.rb
-* test/test_null.rb
-* test/test_tail.rb
-* test/test_touch.rb
-* test/test_wc.rb
-* test/test_which.rb
-* test/test_whereis.rb
-* test/img/test.gif
-* test/img/test.jpg
-* test/img/test.png
-* test/img/test.ico
+* spec/binary_spec.rb
+* spec/constants_spec.rb
+* spec/head_spec.rb
+* spec/image_spec.rb
+* spec/nlconvert_spec.rb
+* spec/sparse_spec.rb
+* spec/tail_spec.rb
+* spec/touch_spec.rb
+* spec/wc_spec.rb
+* spec/whereis_spec.rb
+* spec/which_spec.rb
+* spec/img/test.gif
+* spec/img/test.ico
+* spec/img/test.jpg
+* spec/img/test.png
+* spec/txt/empty.txt
+* spec/txt/english.txt
+* spec/txt/english.utf16
+* spec/txt/korean.txt

data/README

@@ -53,7 +53,7 @@
   Add whatever other tools people think might be useful.
    
 == License
-  Artistic 2.0
+  Artistic-2.0
     
 == Copyright
   (C) 2003-2020 Daniel J. Berger

data/Rakefile

@@ -2,9 +2,10 @@ require 'rake'
 require 'rake/clean'
 require 'rake/testtask'
 require 'rbconfig'
+require 'rspec/core/rake_task'
 include RbConfig
 
-CLEAN.include("**/*.gem", "**/*.rbc", "**/*coverage*")
+CLEAN.include("**/*.gem", "**/*.rbc", "**/*coverage*", "**/*.lock")
 
 desc 'Install the ptools package (non-gem)'
 task :install do
@@ -19,7 +20,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, true)
+    Gem::Package.build(spec)
   end
 
   desc 'Install the ptools gem'
@@ -33,103 +34,54 @@ namespace 'gem' do
   end
 end
 
-Rake::TestTask.new do |t|
-  task :test => :clean
-  t.verbose = true
-  t.warning = true
-end
-
-namespace 'test' do
-  desc "Check test coverage using rcov"
-  task :coverage => [:clean] do
-    require 'rcov'
-    rm_rf 'coverage'
-    sh "rcov -Ilib test/test*.rb" 
+namespace 'spec' do
+  RSpec::Core::RakeTask.new(:binary) do |t|
+    t.pattern = 'spec/binary_spec.rb'
   end
 
-  Rake::TestTask.new('binary') do |t|
-    t.libs << 'test'
-    t.verbose = true
-    t.warning = true
-    t.test_files = FileList['test/test_binary.rb']
+  RSpec::Core::RakeTask.new(:constants) do |t|
+    t.pattern = 'spec/constants_spec.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']
+  RSpec::Core::RakeTask.new(:head) do |t|
+    t.pattern = 'spec/head_spec.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']
+  RSpec::Core::RakeTask.new(:image) do |t|
+    t.pattern = 'spec/image_spec.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']
+  RSpec::Core::RakeTask.new(:nlconvert) do |t|
+    t.pattern = 'spec/nlconvert_spec.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']
+  RSpec::Core::RakeTask.new(:sparse) do |t|
+    t.pattern = 'spec/sparse_spec.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']
+  RSpec::Core::RakeTask.new(:tail) do |t|
+    t.pattern = 'spec/tail_spec.rb'
   end
 
-  Rake::TestTask.new('sparse') do |t|
-    t.libs << 'test'
-    t.verbose = true
-    t.warning = true
-    t.test_files = FileList['test/test_is_sparse.rb']
+  RSpec::Core::RakeTask.new(:touch) do |t|
+    t.pattern = 'spec/touch_spec.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']
+  RSpec::Core::RakeTask.new(:wc) do |t|
+    t.pattern = 'spec/wc_spec.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']
+ 
+  RSpec::Core::RakeTask.new(:whereis) do |t|
+    t.pattern = 'spec/whereis_spec.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']
+  RSpec::Core::RakeTask.new(:which) do |t|
+    t.pattern = 'spec/which_spec.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']
+  RSpec::Core::RakeTask.new(:all) do |t|
+    t.pattern = 'spec/*_spec.rb'
   end
 end
 
-task :default => :test
+task :default => 'spec:all'

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.7'.freeze
+  PTOOLS_VERSION = '1.4.0'.freeze
 
   # :stopdoc:
 
@@ -44,36 +44,6 @@ class File
     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 RbConfig::CONFIG['host_os']
-      when /mswin|win32|msdos|mingw|windows/i
-        'NUL'
-      when /amiga/i
-        'NIL:'
-      when /openvms/i
-        'NL:'
-      else
-        '/dev/null'
-    end
-  end
-
-  class << self
-    alias null_device null
-  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

data/ptools.gemspec

@@ -2,13 +2,13 @@ require 'rbconfig'
 
 Gem::Specification.new do |spec|
   spec.name       = 'ptools'
-  spec.version    = '1.3.7'
+  spec.version    = '1.4.0'
   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.test_files = Dir['spec/_spec*']
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
   spec.cert_chain = ['certs/djberg96_pub.pem']
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   EOF
 
   spec.add_development_dependency('rake')
-  spec.add_development_dependency('test-unit')
+  spec.add_development_dependency('rspec', '~> 3.9')
 
   if File::ALT_SEPARATOR
     spec.platform = Gem::Platform.new(['universal', 'mingw32'])

data/spec/binary_spec.rb

@@ -0,0 +1,59 @@
+#####################################################################
+# test_binary.rb
+#
+# Test case for the File.binary? method. You should run this test
+# via the 'rake test_binary' task.
+#####################################################################
+require 'rubygems'
+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' }
+
+  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')
+  end
+
+  example "File.binary? basic functionality" do
+    expect(File).to respond_to(:binary?)
+    expect{ File.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
+  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
+  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
+  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
+  end
+
+  example "File.binary? raises an error if the file cannot be found" do
+    expect{ File.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)
+  end
+end

data/spec/constants_spec.rb

@@ -0,0 +1,33 @@
+##############################################################################
+# constants_spec.rb
+#
+# Specs for the constants that have been defined in the ptools library.
+# This test case should be run via the 'rake spec:constants' task.
+##############################################################################
+require 'rubygems'
+require 'rspec'
+require 'rbconfig'
+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.0')
+    expect(File::PTOOLS_VERSION.frozen?).to be true
+  end
+
+  example "IMAGE_EXT constant is set to array of values" do
+    expect(File::IMAGE_EXT.sort).to eq(%w[.bmp .gif .jpeg .jpg .png])
+  end
+
+  example "WINDOWS constant is defined on MS Windows" do
+    skip "skipped unless MS Windows" unless windows
+    expect(File::MSWINDOWS).not_to be_nil
+  end
+
+  example "WIN32EXTS constant is defined on MS Windows" do
+    skip "skipped unless MS Windows" unless windows
+    expect(File::WIN32EXTS).not_to be_nil
+  end
+end

data/spec/head_spec.rb

@@ -0,0 +1,41 @@
+######################################################################
+# head_spec.rb
+#
+# Specs for the File.head method. These specs should be run via
+# the 'rake spec:head' task.
+######################################################################
+require 'rspec'
+require 'ptools'
+
+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"]
+  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
+  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)
+  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)
+  end
+
+  after do
+    File.delete(test_file) if File.exists?(test_file)
+  end
+end