rubinius · Feb 5, 2016 · Feb 5, 2016 · Feb 5, 2016 · Feb 5, 2016
Showing with 121 additions and 24 deletions.

+23 −0 core/argf.rb

+74 −0 spec/ruby/core/argf/read_nonblock_spec.rb

+1 −24 spec/ruby/core/argf/read_spec.rb

+23 −0 spec/ruby/core/argf/shared/read.rb
diff --git a/core/argf.rb b/core/argf.rb
@@ -363,6 +363,29 @@ def read(bytes=nil, output=nil)
       output
     end
 
+    def read_nonblock(maxlen, output = nil, exception: true)
+      output ||= default_value
+
+      unless advance!
+        output.clear
+        raise EOFError, "ARGF at end"
+      end
+
+      begin
+        out = @stream.read_nonblock(maxlen, output, exception: exception)
+
+        return out if out == :wait_readable
+      rescue EOFError => e
+        raise e if @use_stdin_only
+
+        @stream.close
+        @advance = true
+        advance! or raise e
+      end
+
+      return output
+    end
+
     #
     # Read next line of text.
     #

diff --git a/spec/ruby/core/argf/read_nonblock_spec.rb b/spec/ruby/core/argf/read_nonblock_spec.rb
@@ -0,0 +1,74 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/read', __FILE__)
+
+describe 'ARGF.read_nonblock' do
+  it_behaves_like :argf_read, :read_nonblock
+
+  before do
+    @file1_name = fixture(__FILE__, 'file1.txt')
+    @file2_name = fixture(__FILE__, 'file2.txt')
+
+    @file1 = File.read(@file1_name)
+    @file2 = File.read(@file2_name)
+
+    @chunk1 = File.read(@file1_name, 4)
+    @chunk2 = File.read(@file2_name, 4)
+  end
+
+  after do
+    ARGF.close unless ARGF.closed?
+  end
+
+  it 'reads up to the given amount of bytes' do
+    argv [@file1_name] do
+      ARGF.read_nonblock(4).should == @chunk1
+    end
+  end
+
+  describe 'when using multiple files' do
+    it 'reads up to the given amount of bytes from the first file' do
+      argv [@file1_name, @file2_name] do
+        ARGF.read_nonblock(4).should == @chunk1
+      end
+    end
+
+    it 'returns an empty String when reading after having read the first file in its entirety' do
+      argv [@file1_name, @file2_name] do
+        ARGF.read_nonblock(File.size(@file1_name)).should == @file1
+        ARGF.read_nonblock(4).should == ''
+      end
+    end
+  end
+
+  describe 'when ARGV is empty' do
+    it 'raises EOFError' do
+      proc { argv [] { ARGF.read_nonblock(4) } }.should raise_error(EOFError)
+    end
+  end
+
+  it 'reads up to the given bytes from STDIN' do
+    stdin = ruby_exe('print ARGF.read_nonblock(4)', :args => "< #{@file1_name}")
+
+    stdin.should == @chunk1
+  end
+
+  it 'reads up to the given bytes from a file when a file and STDIN are present' do
+    stdin = ruby_exe("print ARGF.read_nonblock(4)", :args => "#{@file1_name} - < #{@file2_name}")
+
+    stdin.should == @chunk1
+  end
+
+  it 'raises IO::EAGAINWaitReadable when STDIN is empty' do
+    input = 'ARGF.read_nonblock(4) rescue print $!.class'
+    stdin = ruby_exe(input, escape: true)
+
+    stdin.should == 'IO::EAGAINWaitReadable'
+  end
+
+  it 'returns :wait_readable when the :exception is set to false' do
+    input = 'p ARGF.read_nonblock(4, nil, exception: false)'
+    stdin = ruby_exe(input, escape: true)
+
+    stdin.strip.should == ':wait_readable'
+  end
+end
diff --git a/spec/ruby/core/argf/read_spec.rb b/spec/ruby/core/argf/read_spec.rb
@@ -5,7 +5,7 @@
   it_behaves_like :argf_read, :read
 
   before :each do
-   
+
     @file1_name = fixture __FILE__, "file1.txt"
     @file2_name = fixture __FILE__, "file2.txt"
     @stdin_name = fixture __FILE__, "stdin.txt"
@@ -66,27 +66,4 @@
       ARGF.read.should == @file1 + @file1
     end
   end
-
-  with_feature :encoding do
-
-    before :each do
-      @external = Encoding.default_external
-      @internal = Encoding.default_internal
-
-      Encoding.default_external = Encoding::UTF_8
-      Encoding.default_internal = nil
-    end
-
-    after :each do
-      Encoding.default_external = @external
-      Encoding.default_internal = @internal
-    end
-
-    it "reads the contents of the file with default encoding" do
-      Encoding.default_external = Encoding::US_ASCII
-      argv [@file1_name, @file2_name] do
-        ARGF.read.encoding.should == Encoding::US_ASCII
-      end
-    end
-  end
 end
diff --git a/spec/ruby/core/argf/shared/read.rb b/spec/ruby/core/argf/shared/read.rb
@@ -59,4 +59,27 @@
       end
     end
   end
+
+  with_feature :encoding do
+    before :each do
+      @external = Encoding.default_external
+      @internal = Encoding.default_internal
+
+      Encoding.default_external = Encoding::UTF_8
+      Encoding.default_internal = nil
+    end
+
+    after :each do
+      Encoding.default_external = @external
+      Encoding.default_internal = @internal
+    end
+
+    it "reads the contents of the file with default encoding" do
+      Encoding.default_external = Encoding::ASCII_8BIT
+
+      argv [@file1_name, @file2_name] do
+        ARGF.send(@method, 4).encoding.should == Encoding::ASCII_8BIT
+      end
+    end
+  end
 end