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

data/spec/touch_spec.rb

@@ -8,40 +8,40 @@ require 'rspec'
 require 'ptools'
 
 RSpec.describe File, :touch do
-  let(:dirname) { File.dirname(__FILE__) }
+  let(:dirname) { described_class.dirname(__FILE__) }
   let(:filename) { 'test_file_touch.txt' }
-  let(:xfile) { File.join(dirname, filename) }
+  let(:xfile) { described_class.join(dirname, filename) }
 
   before do
-    File.open(xfile, 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
-    @test_file = File.join(dirname, 'delete.this')
+    described_class.open(xfile, 'w'){ |fh| 10.times{ |n| fh.puts "line #{n}" } }
+    @test_file = described_class.join(dirname, 'delete.this')
   end
 
-  example "touch basic functionality" do
-    expect(File).to respond_to(:touch)
-    expect{ File.touch(@test_file) }.not_to raise_error
+  after do
+    described_class.delete(@test_file) if described_class.exist?(@test_file)
+    described_class.delete(xfile) if described_class.exist?(xfile)
   end
 
-  example "touch a new file returns expected results" do
-    expect(File.touch(@test_file)).to eq(File)
-    expect(File.exist?(@test_file)).to be true
-    expect(File.size(@test_file)).to eq(0)
+  example 'touch basic functionality' do
+    expect(described_class).to respond_to(:touch)
+    expect{ described_class.touch(@test_file) }.not_to raise_error
   end
 
-  example "touch an existing file returns expected results" do
-    stat = File.stat(xfile)
-    sleep 1
-    expect{ File.touch(xfile) }.not_to raise_error
-    expect(File.size(xfile) == stat.size).to be true
-    expect(File.mtime(xfile) == stat.mtime).to be false
+  example 'touch a new file returns expected results' do
+    expect(described_class.touch(@test_file)).to eq(described_class)
+    expect(described_class.exist?(@test_file)).to be true
+    expect(described_class.size(@test_file)).to eq(0)
   end
 
-  example "touch requires an argument" do
-    expect{ File.touch }.to raise_error(ArgumentError)
+  example 'touch an existing file returns expected results' do
+    stat = described_class.stat(xfile)
+    sleep 1
+    expect{ described_class.touch(xfile) }.not_to raise_error
+    expect(described_class.size(xfile) == stat.size).to be true
+    expect(described_class.mtime(xfile) == stat.mtime).to be false
   end
 
-  after do
-    File.delete(@test_file) if File.exist?(@test_file)
-    File.delete(xfile) if File.exist?(xfile)
+  example 'touch requires an argument' do
+    expect{ described_class.touch }.to raise_error(ArgumentError)
   end
 end

data/spec/wc_spec.rb

@@ -11,55 +11,55 @@ RSpec.describe File, :wc do
   let(:test_file) { 'test_file_wc.txt' }
 
   before do
-    File.open(test_file, 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
+    described_class.open(test_file, 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
   end
 
-  example "wc method basic functionality" do
-    expect(File).to respond_to(:wc)
-    expect{ File.wc(test_file) }.not_to raise_error
+  after do
+    described_class.delete(test_file) if described_class.exist?(test_file)
   end
 
-  example "wc accepts specific optional arguments" do
-    expect{ File.wc(test_file, 'bytes') }.not_to raise_error
-    expect{ File.wc(test_file, 'chars') }.not_to raise_error
-    expect{ File.wc(test_file, 'words') }.not_to raise_error
-    expect{ File.wc(test_file, 'lines') }.not_to raise_error
+  example 'wc method basic functionality' do
+    expect(described_class).to respond_to(:wc)
+    expect{ described_class.wc(test_file) }.not_to raise_error
   end
 
-  example "argument to wc ignores the case of the option argument" do
-    expect{ File.wc(test_file, 'LINES') }.not_to raise_error
+  example 'wc accepts specific optional arguments' do
+    expect{ described_class.wc(test_file, 'bytes') }.not_to raise_error
+    expect{ described_class.wc(test_file, 'chars') }.not_to raise_error
+    expect{ described_class.wc(test_file, 'words') }.not_to raise_error
+    expect{ described_class.wc(test_file, 'lines') }.not_to raise_error
   end
 
-  example "wc with no option returns expected results" do
-    expect(File.wc(test_file)).to be_kind_of(Array)
-    expect(File.wc(test_file)).to eq([166, 166, 25, 25])
+  example 'argument to wc ignores the case of the option argument' do
+    expect{ described_class.wc(test_file, 'LINES') }.not_to raise_error
   end
 
-  example "wc with bytes option returns the expected result" do
-    expect(File.wc(test_file, 'bytes')).to eq(166)
+  example 'wc with no option returns expected results' do
+    expect(described_class.wc(test_file)).to be_kind_of(Array)
+    expect(described_class.wc(test_file)).to eq([166, 166, 25, 25])
   end
 
-  example "wc with chars option returns the expected result" do
-    expect(File.wc(test_file, 'chars')).to eq(166)
+  example 'wc with bytes option returns the expected result' do
+    expect(described_class.wc(test_file, 'bytes')).to eq(166)
   end
 
-  example "wc with words option returns the expected result" do
-    expect(File.wc(test_file, 'words')).to eq(25)
+  example 'wc with chars option returns the expected result' do
+    expect(described_class.wc(test_file, 'chars')).to eq(166)
   end
 
-  example "wc with lines option returns the expected result" do
-    expect(File.wc(test_file, 'lines')).to eq(25)
+  example 'wc with words option returns the expected result' do
+    expect(described_class.wc(test_file, 'words')).to eq(25)
   end
 
-  example "wc requires at least on argument" do
-    expect{ File.wc }.to raise_error(ArgumentError)
+  example 'wc with lines option returns the expected result' do
+    expect(described_class.wc(test_file, 'lines')).to eq(25)
   end
 
-  example "an invalid option raises an error" do
-    expect{ File.wc(test_file, 'bogus') }.to raise_error(ArgumentError)
+  example 'wc requires at least on argument' do
+    expect{ described_class.wc }.to raise_error(ArgumentError)
   end
 
-  after do
-    File.delete(test_file) if File.exists?(test_file)
+  example 'an invalid option raises an error' do
+    expect{ described_class.wc(test_file, 'bogus') }.to raise_error(ArgumentError)
   end
 end

data/spec/whereis_spec.rb

@@ -14,11 +14,11 @@ RSpec.describe File, :whereis do
   let(:bin_dir) { RbConfig::CONFIG['bindir'] }
 
   before do
-    @expected_locs = [File.join(bin_dir, ruby)]
+    @expected_locs = [described_class.join(bin_dir, ruby)]
 
     if windows
       @expected_locs[0] << '.exe'
-      @expected_locs[0].tr!("/", "\\")
+      @expected_locs[0].tr!('/', '\\')
     end
 
     unless windows
@@ -31,57 +31,56 @@ RSpec.describe File, :whereis do
     @actual_locs = nil
   end
 
-  example "whereis basic functionality" do
-    expect(File).to respond_to(:whereis)
-    expect{ File.whereis('ruby') }.not_to raise_error
-    expect(File.whereis('ruby')).to be_kind_of(Array).or be_nil
+  example 'whereis basic functionality' do
+    expect(described_class).to respond_to(:whereis)
+    expect{ described_class.whereis('ruby') }.not_to raise_error
+    expect(described_class.whereis('ruby')).to be_kind_of(Array).or be_nil
   end
 
-  example "whereis accepts an optional second argument" do
-    expect{ File.whereis('ruby', '/usr/bin:/usr/local/bin') }.not_to raise_error
+  example 'whereis accepts an optional second argument' do
+    expect{ described_class.whereis('ruby', '/usr/bin:/usr/local/bin') }.not_to raise_error
   end
 
-  example "whereis returns expected values" do
-    expect{ @actual_locs = File.whereis(ruby) }.not_to raise_error
+  example 'whereis returns expected values' do
+    expect{ @actual_locs = described_class.whereis(ruby) }.not_to raise_error
     expect(@actual_locs).to be_kind_of(Array)
     expect((@expected_locs & @actual_locs).size > 0).to be true
   end
 
-  example "whereis returns nil if program not found" do
-    expect(File.whereis('xxxyyy')).to be_nil
+  example 'whereis returns nil if program not found' do
+    expect(described_class.whereis('xxxyyy')).to be_nil
   end
 
-  example "whereis returns nil if program cannot be found in provided path" do
-    expect(File.whereis(ruby, '/foo/bar')).to be_nil
+  example 'whereis returns nil if program cannot be found in provided path' do
+    expect(described_class.whereis(ruby, '/foo/bar')).to be_nil
   end
 
-  example "whereis returns single element array or nil if absolute path is provided" do
-    absolute = File.join(bin_dir, ruby)
+  example 'whereis returns single element array or nil if absolute path is provided' do
+    absolute = described_class.join(bin_dir, ruby)
     absolute << '.exe' if windows
 
-    expect(File.whereis(absolute)).to eq([absolute])
-    expect(File.whereis("/foo/bar/baz/#{ruby}")).to be_nil
+    expect(described_class.whereis(absolute)).to eq([absolute])
+    expect(described_class.whereis("/foo/bar/baz/#{ruby}")).to be_nil
   end
 
-  example "whereis works with an explicit extension on ms windows" do
-    skip "skipped unless MS Windows" unless windows
-    expect(File.whereis(ruby + '.exe')).not_to be_nil
+  example 'whereis works with an explicit extension on ms windows', :windows_only => true do
+    expect(described_class.whereis("#{ruby}.exe")).not_to be_nil
   end
 
-  example "whereis requires at least one argument" do
-    expect{ File.whereis }.to raise_error(ArgumentError)
+  example 'whereis requires at least one argument' do
+    expect{ described_class.whereis }.to raise_error(ArgumentError)
   end
 
-  example "whereis returns unique paths only" do
-    expect(File.whereis(ruby) == File.whereis(ruby).uniq).to be true
+  example 'whereis returns unique paths only' do
+    expect(described_class.whereis(ruby) == described_class.whereis(ruby).uniq).to be true
   end
 
-  example "whereis accepts a maximum of two arguments" do
-    expect{ File.whereis(ruby, 'foo', 'bar') }.to raise_error(ArgumentError)
+  example 'whereis accepts a maximum of two arguments' do
+    expect{ described_class.whereis(ruby, 'foo', 'bar') }.to raise_error(ArgumentError)
   end
 
-  example "the second argument to whereis cannot be nil or empty" do
-    expect{ File.whereis(ruby, nil) }.to raise_error(ArgumentError)
-    expect{ File.whereis(ruby, '') }.to raise_error(ArgumentError)
+  example 'the second argument to whereis cannot be nil or empty' do
+    expect{ described_class.whereis(ruby, nil) }.to raise_error(ArgumentError)
+    expect{ described_class.whereis(ruby, '') }.to raise_error(ArgumentError)
   end
 end

data/spec/which_spec.rb

@@ -12,101 +12,93 @@ require 'tempfile'
 
 describe File, :which do
   before(:context) do
-    @windows = File::ALT_SEPARATOR
-    @dir = File.join(Dir.pwd, 'tempdir')
-    @non_exe = File.join(Dir.pwd, 'tempfile')
-    @ruby = RUBY_PLATFORM.match('java') ? 'jruby' : 'ruby'
-    @ruby = 'rbx' if defined?(Rubinius)
+    @dir = described_class.join(Dir.pwd, 'tempdir')
+    @non_exe = described_class.join(Dir.pwd, 'tempfile')
+    @ruby = RbConfig::CONFIG['RUBY_INSTALL_NAME']
 
-    Dir.mkdir(@dir) unless File.exist?(@dir)
+    Dir.mkdir(@dir) unless described_class.exist?(@dir)
     FileUtils.touch(@non_exe)
-    File.chmod(775, @dir)
-    File.chmod(644, @non_exe)
+    described_class.chmod(775, @dir)
+    described_class.chmod(644, @non_exe)
 
-    @exe = File.join(
+    @exe = described_class.join(
       RbConfig::CONFIG['bindir'],
       RbConfig::CONFIG['ruby_install_name']
     )
 
-    if @windows
-      @exe.tr!('/','\\')
-      @exe << ".exe"
+    if File::ALT_SEPARATOR
+      @exe.tr!('/', '\\')
+      @exe << '.exe'
     end
   end
 
-  example "which method basic functionality" do
-    expect(File).to respond_to(:which)
-    expect{ File.which(@ruby) }.not_to raise_error
-    expect(File.which(@ruby)).to be_kind_of(String)
+  after(:context) do
+    FileUtils.rm(@non_exe)
+    FileUtils.rm_rf(@dir)
   end
 
-  example "which accepts an optional path to search" do
-    expect{ File.which(@ruby, "/usr/bin:/usr/local/bin") }.not_to raise_error
+  example 'which method basic functionality' do
+    expect(described_class).to respond_to(:which)
+    expect{ described_class.which(@ruby) }.not_to raise_error
+    expect(described_class.which(@ruby)).to be_kind_of(String)
   end
 
-  example "which returns nil if not found" do
-    expect(File.which(@ruby, '/bogus/path')).to be_nil
-    expect(File.which('blahblahblah')).to be_nil
+  example 'which accepts an optional path to search' do
+    expect{ described_class.which(@ruby, '/usr/bin:/usr/local/bin') }.not_to raise_error
   end
 
-  example "which handles executables without extensions on windows" do
-    skip "skipped unless MS Windows" unless @windows
-    expect(File.which('ruby')).not_to be_nil
-    expect(File.which('notepad')).not_to be_nil
+  example 'which returns nil if not found' do
+    expect(described_class.which(@ruby, '/bogus/path')).to be_nil
+    expect(described_class.which('blahblahblah')).to be_nil
   end
 
-  example "which handles executables that already contain extensions on windows" do
-    skip "skipped unless MS Windows" unless @windows
-    expect(File.which('ruby.exe')).not_to be_nil
-    expect(File.which('notepad.exe')).not_to be_nil
+  example 'which handles executables without extensions on windows', :windows_only => true do
+    expect(described_class.which('ruby')).not_to be_nil
+    expect(described_class.which('notepad')).not_to be_nil
   end
 
-  example "which returns argument if an existent absolute path is provided" do
-    expect(File.which(@ruby)).to eq(@exe), "May fail on a symlink"
+  example 'which handles executables that already contain extensions on windows', :windows_only => true do
+    expect(described_class.which('ruby.exe')).not_to be_nil
+    expect(described_class.which('notepad.exe')).not_to be_nil
   end
 
-  example "which returns nil if a non-existent absolute path is provided" do
-    expect(File.which('/foo/bar/baz/ruby')).to be_nil
+  example 'which returns argument if an existent absolute path is provided' do
+    expect(described_class.which(@ruby)).to eq(@exe), 'May fail on a symlink'
   end
 
-  example "which does not pickup files that are not executable" do
-    expect(File.which(@non_exe)).to be_nil
+  example 'which returns nil if a non-existent absolute path is provided' do
+    expect(described_class.which('/foo/bar/baz/ruby')).to be_nil
   end
 
-  example "which does not pickup executable directories" do
-    expect(File.which(@dir)).to be_nil
+  example 'which does not pickup files that are not executable' do
+    expect(described_class.which(@non_exe)).to be_nil
   end
 
-  example "which accepts a minimum of one argument" do
-    expect{ File.which }.to raise_error(ArgumentError)
+  example 'which does not pickup executable directories' do
+    expect(described_class.which(@dir)).to be_nil
   end
 
-  example "which accepts a maximum of two arguments" do
-    expect{ File.which(@ruby, "foo", "bar") }.to raise_error(ArgumentError)
+  example 'which accepts a minimum of one argument' do
+    expect{ described_class.which }.to raise_error(ArgumentError)
   end
 
-  example "the second argument cannot be nil or empty" do
-    expect{ File.which(@ruby, nil) }.to raise_error(ArgumentError)
-    expect{ File.which(@ruby, '') }.to raise_error(ArgumentError)
+  example 'which accepts a maximum of two arguments' do
+    expect{ described_class.which(@ruby, 'foo', 'bar') }.to raise_error(ArgumentError)
   end
 
-  example "resolves with with ~" do
-    skip "skipped on MS Windows" if @windows
-    begin
-      old_home = ENV['HOME']
-
-      ENV['HOME'] = Dir::Tmpname.tmpdir
-      program = Tempfile.new(['program', '.sh'])
-      File.chmod(755, program.path)
-
-      expect(File.which(File.basename(program.path), '~/')).not_to be_nil
-    ensure
-      ENV['HOME'] = old_home
-    end
+  example 'the second argument cannot be nil or empty' do
+    expect{ described_class.which(@ruby, nil) }.to raise_error(ArgumentError)
+    expect{ described_class.which(@ruby, '') }.to raise_error(ArgumentError)
   end
 
-  after(:context) do
-    FileUtils.rm(@non_exe)
-    FileUtils.rm_rf(@dir)
+  example 'resolves with with ~', :unix_only => true do
+    old_home = ENV['HOME']
+    ENV['HOME'] = Dir::Tmpname.tmpdir
+    program = Tempfile.new(['program', '.sh'])
+    described_class.chmod(755, program.path)
+
+    expect(described_class.which(described_class.basename(program.path), '~/')).not_to be_nil
+  ensure
+    ENV['HOME'] = old_home
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ptools
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: universal-mingw32
 authors:
 - Daniel J. Berger
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,6 +65,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: win32-file
   requirement: !ruby/object:Gem::Requirement
@@ -90,6 +118,7 @@ extra_rdoc_files: []
 files:
 - CHANGES.md
 - Gemfile
+- LICENSE
 - MANIFEST.md
 - README.md
 - Rakefile
@@ -100,12 +129,16 @@ files:
 - spec/constants_spec.rb
 - spec/head_spec.rb
 - spec/image_spec.rb
+- spec/img/jpg_no_ext
+- spec/img/test.bmp
 - spec/img/test.gif
 - spec/img/test.ico
 - spec/img/test.jpg
 - spec/img/test.png
+- spec/img/test.tiff
 - spec/nlconvert_spec.rb
 - spec/sparse_spec.rb
+- spec/spec_helper.rb
 - spec/tail_spec.rb
 - spec/touch_spec.rb
 - spec/txt/empty.txt
@@ -117,14 +150,15 @@ files:
 - spec/which_spec.rb
 homepage: https://github.com/djberg96/ptools
 licenses:
-- Artistic-2.0
+- Apache-2.0
 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
+  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'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -140,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.19
 signing_key:
 specification_version: 4
 summary: Extra methods for the File class