jruby · Mar 28, 2016 · Mar 28, 2016
diff --git a/spec/ruby/.travis.yml b/spec/ruby/.travis.yml
@@ -1,9 +1,9 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.0.0-p648
   - 2.1.8
   - 2.2.4
+  - 2.3.0
   - ruby-head
 install:
   - git clone https://github.com/ruby/mspec.git ../mspec
@@ -12,3 +12,4 @@ script:
 branches:
   only:
     - master
+    - /^try/
diff --git a/spec/ruby/appveyor.yml b/spec/ruby/appveyor.yml
@@ -0,0 +1,15 @@
+---
+version: "{build}"
+clone_depth: 5
+install:
+  - SET PATH=C:\Ruby22\bin;%PATH%
+  - ruby --version
+  - git clone https://github.com/ruby/mspec.git ../mspec
+build: off
+test_script:
+  - SET CHECK_LEAKS=true
+  - ../mspec/bin/mspec -ff command_line language core library
+branches:
+  only:
+    - master
+    - /^try/
diff --git a/spec/ruby/core/argf/fixtures/bin_file.txt b/spec/ruby/core/argf/fixtures/bin_file.txt
@@ -1,2 +1,2 @@
-test
-test
+test
+test
diff --git a/spec/ruby/core/argf/read_nonblock_spec.rb b/spec/ruby/core/argf/read_nonblock_spec.rb
@@ -0,0 +1,68 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/read', __FILE__)
+
+platform_is_not :windows do
+  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
+
+    it 'reads up to the given amount of bytes' do
+      argf [@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
+        argf [@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
+        argf [@file1_name, @file2_name] do
+          @argf.read_nonblock(File.size(@file1_name)).should == @file1
+          @argf.read_nonblock(4).should == ''
+        end
+      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 = IO.popen([RUBY_EXE, '-e', input], "r+", &:read)
+
+      stdin.should == 'IO::EAGAINWaitReadable'
+    end
+
+    ruby_version_is "2.3" do
+      it 'returns :wait_readable when the :exception is set to false' do
+        input = 'p ARGF.read_nonblock(4, nil, exception: false)'
+        stdin = IO.popen([RUBY_EXE, '-e', input], "r+", &:read)
+
+        stdin.strip.should == ':wait_readable'
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/argf/read_spec.rb b/spec/ruby/core/argf/read_spec.rb
@@ -1,6 +1,9 @@
 require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/read', __FILE__)
 
 describe "ARGF.read" do
+  it_behaves_like :argf_read, :read
+
   before :each do
     @file1_name = fixture __FILE__, "file1.txt"
     @file2_name = fixture __FILE__, "file2.txt"
@@ -23,34 +26,6 @@
     end
   end
 
-  it "treats second nil argument as no output buffer" do
-    argf [@file1_name] do
-      @argf.read(nil, nil).should == @file1
-    end
-  end
-
-  it "treats second argument as an output buffer" do
-    argf [@file1_name] do
-      buffer = ""
-      @argf.read(nil, buffer)
-      buffer.should == @file1
-    end
-  end
-
-  it "reads a number of bytes from the first file" do
-    argf [@file1_name] do
-      @argf.read(5).should == @file1[0,5]
-    end
-  end
-
-  it "reads from a single file consecutively" do
-    argf [@file1_name] do
-      @argf.read(1).should == @file1[0,1]
-      @argf.read(2).should == @file1[1,2]
-      @argf.read(3).should == @file1[3,3]
-    end
-  end
-
   it "reads the contents of two files" do
     argf [@file1_name, @file2_name] do
       @argf.read.should ==  @file1 + @file2
@@ -76,11 +51,6 @@
     stdin.should == @stdin
   end
 
-  it "reads a number of bytes from stdin" do
-    stdin = ruby_exe("print ARGF.read(10)", args: "< #{@stdin_name}")
-    stdin.should == @stdin[0,10]
-  end
-
   it "reads the contents of one file and stdin" do
     stdin = ruby_exe("print ARGF.read", args: "#{@file1_name} - < #{@stdin_name}")
     stdin.should == @file1 + @stdin
@@ -92,14 +62,6 @@
     end
   end
 
-  platform_is_not :windows do
-    it "reads the contents of a special device file" do
-      argf ['/dev/zero'] do
-        @argf.read(100).should == "\000" * 100
-      end
-    end
-  end
-
   with_feature :encoding do
 
     before :each do

diff --git a/spec/ruby/core/argf/readpartial_spec.rb b/spec/ruby/core/argf/readpartial_spec.rb
@@ -0,0 +1,77 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/read', __FILE__)
+
+describe "ARGF.readpartial" do
+  it_behaves_like :argf_read, :readpartial
+
+  before :each do
+    @file1_name = fixture __FILE__, "file1.txt"
+    @file2_name = fixture __FILE__, "file2.txt"
+    @stdin_name = fixture __FILE__, "stdin.txt"
+
+    @file1 = File.read @file1_name
+    @file2 = File.read @file2_name
+    @stdin = File.read @stdin_name
+  end
+
+  it "raises an ArgumentError if called without a maximum read length" do
+    argf [@file1_name] do
+      lambda { @argf.readpartial }.should raise_error(ArgumentError)
+    end
+  end
+
+  it "reads maximum number of bytes from one file at a time" do
+    argf [@file1_name, @file2_name] do
+      len = @file1.size + @file2.size
+      @argf.readpartial(len).should == @file1
+    end
+  end
+
+  it "clears output buffer even if EOFError is raised because @argf is at end" do
+    begin
+      output = "to be cleared"
+
+      argf [@file1_name] do
+        @argf.read
+        @argf.readpartial(1, output)
+      end
+    rescue EOFError
+      output.should == ""
+    end
+  end
+
+  it "reads maximum number of bytes from one file at a time" do
+    argf [@file1_name, @file2_name] do
+      len = @file1.size + @file2.size
+      @argf.readpartial(len).should == @file1
+    end
+  end
+
+  it "returns an empty string if EOFError is raised while reading any but the last file" do
+    argf [@file1_name, @file2_name] do
+      @argf.readpartial(@file1.size)
+      @argf.readpartial(1).should == ""
+    end
+  end
+
+  ruby_version_is "2.3" do
+    it "raises an EOFError if the exception was raised while reading the last file" do
+      argf [@file1_name, @file2_name] do
+        @argf.readpartial(@file1.size)
+        @argf.readpartial(1)
+        @argf.readpartial(@file2.size)
+        lambda { @argf.readpartial(1) }.should raise_error(EOFError)
+        lambda { @argf.readpartial(1) }.should raise_error(EOFError)
+      end
+    end
+  end
+
+  it "raises an EOFError if the exception was raised while reading STDIN" do
+    ruby_str = <<-STR
+      print ARGF.readpartial(#{@stdin.size})
+      ARGF.readpartial(1) rescue print $!.class
+    STR
+    stdin = ruby_exe(ruby_str, args: "< #{@stdin_name}", escape: true)
+    stdin.should == @stdin + "EOFError"
+  end
+end
diff --git a/spec/ruby/core/argf/shared/read.rb b/spec/ruby/core/argf/shared/read.rb
@@ -0,0 +1,58 @@
+describe :argf_read, shared: true do
+  before :each do
+    @file1_name = fixture __FILE__, "file1.txt"
+    @stdin_name = fixture __FILE__, "stdin.txt"
+
+    @file1 = File.read @file1_name
+    @stdin = File.read @stdin_name
+  end
+
+  it "treats second nil argument as no output buffer" do
+    argf [@file1_name] do
+      @argf.send(@method, @file1.size, nil).should == @file1
+    end
+  end
+
+  it "treats second argument as an output buffer" do
+    argf [@file1_name] do
+      buffer = ""
+      @argf.send(@method, @file1.size, buffer)
+      buffer.should == @file1
+    end
+  end
+
+  it "clears output buffer before appending to it" do
+    argf [@file1_name] do
+      buffer = "to be cleared"
+      @argf.send(@method, @file1.size, buffer)
+      buffer.should == @file1
+    end
+  end
+
+  it "reads a number of bytes from the first file" do
+    argf [@file1_name] do
+      @argf.send(@method, 5).should == @file1[0, 5]
+    end
+  end
+
+  it "reads from a single file consecutively" do
+    argf [@file1_name] do
+      @argf.send(@method, 1).should == @file1[0, 1]
+      @argf.send(@method, 2).should == @file1[1, 2]
+      @argf.send(@method, 3).should == @file1[3, 3]
+    end
+  end
+
+  it "reads a number of bytes from stdin" do
+    stdin = ruby_exe("print ARGF.#{@method}(10)", :args => "< #{@stdin_name}")
+    stdin.should == @stdin[0, 10]
+  end
+
+  platform_is_not :windows do
+    it "reads the contents of a special device file" do
+      argf ['/dev/zero'] do
+        @argf.send(@method, 100).should == "\000" * 100
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/array/dig_spec.rb b/spec/ruby/core/array/dig_spec.rb
@@ -15,18 +15,35 @@
       a.dig(0, -1, 0).should == 2
     end
 
+    it "returns the nested value specified if the sequence includes a key" do
+      a = [42, { foo: :bar }]
+      a.dig(1, :foo).should == :bar
+    end
+
     it "raises a TypeError for a non-numeric index" do
       lambda {
         ['a'].dig(:first)
       }.should raise_error(TypeError)
     end
 
-    it "raises without any args" do
+    it "raises a TypeError if any intermediate step does not respond to #dig" do
+      a = [1, 2]
+      lambda {
+        a.dig(0, 1)
+      }.should raise_error(TypeError)
+    end
+
+    it "raises an ArgumentError if no arguments provided" do
       lambda {
         [10].dig()
       }.should raise_error(ArgumentError)
     end
 
+    it "returns nil if any intermediate step is nil" do
+      a = [[1, [2, 3]]]
+      a.dig(1, 2, 3).should == nil
+    end
+
     it "calls #dig on the result of #at with the remaining arguments" do
       h = [[nil, [nil, nil, 42]]]
       h[0].should_receive(:dig).with(1, 2).and_return(42)

diff --git a/spec/ruby/core/array/pack/p_spec.rb b/spec/ruby/core/array/pack/p_spec.rb
@@ -4,16 +4,8 @@
 
 describe "Array#pack with format 'P'" do
   it_behaves_like :array_pack_basic_non_float, 'P'
-
-  it "returns a String whose size is the number of bytes in a machine word" do
-    [nil].pack("P").size.should == 1.size
-  end
 end
 
 describe "Array#pack with format 'p'" do
   it_behaves_like :array_pack_basic_non_float, 'p'
-
-  it "returns a String whose size is the number of bytes in a machine word" do
-    [nil].pack("p").size.should == 1.size
-  end
 end
diff --git a/spec/ruby/core/array/product_spec.rb b/spec/ruby/core/array/product_spec.rb
@@ -41,6 +41,12 @@
       acc.should be_empty
     end
 
+    it "returns self" do
+      a = [1, 2, 3].freeze
+
+      a.product([1, 2]) { |p| p.first }.should == a
+    end
+
     it "will ignore unreasonable numbers of products and yield anyway" do
       a = (0..100).to_a
       lambda do
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
-    test
-    test
+    test
+    test