ptools 1.4.2-universal-mingw32 → 1.4.3-universal-mingw32

data/spec/tail_spec.rb

@@ -8,100 +8,100 @@ require 'rspec'
 require 'ptools'
 
 RSpec.describe File, :tail do
-  let(:dirname)            { File.dirname(__FILE__) }
-  let(:test_file1)         { File.join(dirname, 'test_file1.txt') }
-  let(:test_file64)        { File.join(dirname, 'test_file64.txt') }
-  let(:test_file128)       { File.join(dirname, 'test_file128.txt') }
-  let(:test_file_trail)    { File.join(dirname, 'test_file_trail.txt') }
-  let(:test_file_trail_nl) { File.join(dirname, 'test_file_trail_nl.txt') }
+  let(:dirname)            { described_class.dirname(__FILE__) }
+  let(:test_file1)         { described_class.join(dirname, 'test_file1.txt') }
+  let(:test_file64)        { described_class.join(dirname, 'test_file64.txt') }
+  let(:test_file128)       { described_class.join(dirname, 'test_file128.txt') }
+  let(:test_file_trail)    { described_class.join(dirname, 'test_file_trail.txt') }
+  let(:test_file_trail_nl) { described_class.join(dirname, 'test_file_trail_nl.txt') }
 
   before do
-    File.open(test_file1, 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
+    described_class.open(test_file1, 'w'){ |fh| 25.times{ |n| fh.puts "line#{n+1}" } }
 
     # Trailing newline test
-    File.open(test_file_trail, 'w'){ |fh|
+    described_class.open(test_file_trail, 'w') do |fh|
       2.times{ |n| fh.puts "trail#{n+1}" }
-      fh.write "trail3"
-    }
+      fh.write 'trail3'
+    end
 
-    File.open(test_file_trail_nl, 'w'){ |fh|
+    described_class.open(test_file_trail_nl, 'w') do |fh|
       3.times{ |n| fh.puts "trail#{n+1}" }
-    }
+    end
 
     # Larger files
-    test_tail_fmt_str = "line data data data data data data data %5s"
+    test_tail_fmt_str = 'line data data data data data data data %5s'
 
-    File.open(test_file64, 'w'){ |fh|
-      2000.times{ |n|
+    described_class.open(test_file64, 'w') do |fh|
+      2000.times do |n|
         fh.puts test_tail_fmt_str % (n+1).to_s
-      }
-    }
+      end
+    end
 
-    File.open(test_file128, 'w'){ |fh|
-      4500.times{ |n|
+    described_class.open(test_file128, 'w') do |fh|
+      4500.times do |n|
         fh.puts test_tail_fmt_str % (n+1).to_s
-      }
-    }
+      end
+    end
 
-    @expected_tail1 = %w{
+    @expected_tail1 = %w[
       line16 line17 line18 line19 line20
       line21 line22 line23 line24 line25
-    }
+    ]
 
-    @expected_tail2 = ["line21","line22","line23","line24","line25"]
+    @expected_tail2 = %w[line21 line22 line23 line24 line25]
 
     @expected_tail_more = []
     25.times{ |n| @expected_tail_more.push "line#{n+1}" }
 
-    @expected_tail_trail = %w{ trail2 trail3 }
+    @expected_tail_trail = %w[trail2 trail3]
 
-    @test_tail_fmt_str = "line data data data data data data data %5s"
+    @test_tail_fmt_str = 'line data data data data data data data %5s'
   end
 
-  example "tail basic functionality" do
-    expect(File).to respond_to(:tail)
-    expect{ File.tail(test_file1) }.not_to raise_error
-    expect{ File.tail(test_file1, 5) }.not_to raise_error
-    expect{ File.tail(test_file1){}.not_to raise_error }
+  after do
+    described_class.delete(test_file1) if described_class.exist?(test_file1)
+    described_class.delete(test_file64) if described_class.exist?(test_file64)
+    described_class.delete(test_file128) if described_class.exist?(test_file128)
+    described_class.delete(test_file_trail_nl) if described_class.exist?(test_file_trail_nl)
+    described_class.delete(test_file_trail) if described_class.exist?(test_file_trail)
+  end
+
+  example 'tail basic functionality' do
+    expect(described_class).to respond_to(:tail)
+    expect{ described_class.tail(test_file1) }.not_to raise_error
+    expect{ described_class.tail(test_file1, 5) }.not_to raise_error
+    expect{ described_class.tail(test_file1){} }.not_to raise_error
   end
 
-  example "tail returns the expected values" do
-    expect(File.tail(test_file1)).to be_kind_of(Array)
-    expect(File.tail(test_file1)).to eq(@expected_tail1)
-    expect(File.tail(test_file1, 5)).to eq(@expected_tail2)
+  example 'tail returns the expected values' do
+    expect(described_class.tail(test_file1)).to be_kind_of(Array)
+    expect(described_class.tail(test_file1)).to eq(@expected_tail1)
+    expect(described_class.tail(test_file1, 5)).to eq(@expected_tail2)
   end
 
-  example "specifying a number greater than the actual number of lines works as expected" do
-    expect(File.tail(test_file1, 30)).to eq(@expected_tail_more)
+  example 'specifying a number greater than the actual number of lines works as expected' do
+    expect(described_class.tail(test_file1, 30)).to eq(@expected_tail_more)
   end
 
-  example "tail requires two arguments" do
-    expect{ File.tail }.to raise_error(ArgumentError)
-    expect{ File.tail(test_file1, 5, 5) }.to raise_error(ArgumentError)
+  example 'tail requires two arguments' do
+    expect{ described_class.tail }.to raise_error(ArgumentError)
+    expect{ described_class.tail(test_file1, 5, 5) }.to raise_error(ArgumentError)
   end
 
-  example "tail works as expected when there is no trailing newline" do
-    expect(File.tail(test_file_trail, 2)).to eq(@expected_tail_trail)
-    expect(File.tail(test_file_trail_nl, 2)).to eq(@expected_tail_trail)
+  example 'tail works as expected when there is no trailing newline' do
+    expect(described_class.tail(test_file_trail, 2)).to eq(@expected_tail_trail)
+    expect(described_class.tail(test_file_trail_nl, 2)).to eq(@expected_tail_trail)
   end
 
-  example "tail works as expected on a file larger than 64k" do
+  example 'tail works as expected on a file larger than 64k' do
     expected_tail_64k = []
     2000.times{ |n| expected_tail_64k.push(@test_tail_fmt_str % (n+1).to_s) }
-    expect(File.tail(test_file64, 2000)).to eq(expected_tail_64k)
+    expect(described_class.tail(test_file64, 2000)).to eq(expected_tail_64k)
   end
 
-  example "tail works as expected on a file larger than 128k" do
+  example 'tail works as expected on a file larger than 128k' do
     expected_tail_128k = []
     4500.times{ |n| expected_tail_128k.push(@test_tail_fmt_str % (n+1).to_s) }
-    expect(File.tail(test_file128, 4500)).to eq(expected_tail_128k)
-  end
-
-  after do
-    File.delete(test_file1) if File.exist?(test_file1)
-    File.delete(test_file64) if File.exist?(test_file64)
-    File.delete(test_file128) if File.exist?(test_file128)
-    File.delete(test_file_trail_nl) if File.exist?(test_file_trail_nl)
-    File.delete(test_file_trail) if File.exist?(test_file_trail)
+    expect(described_class.tail(test_file128, 4500)).to eq(expected_tail_128k)
   end
 end

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