jruby · Jun 27, 2018 · Jun 27, 2018 · Jun 27, 2018 · Jun 27, 2018
diff --git a/spec/mspec/.travis.yml b/spec/mspec/.travis.yml
@@ -1,8 +1,5 @@
 sudo: false
 language: ruby
-before_script:
-  # https://github.com/travis-ci/travis-ci/issues/8408
-  - unset _JAVA_OPTIONS
 script:
   - bundle exec rspec
 matrix:
@@ -23,8 +20,10 @@ matrix:
       # https://github.com/travis-ci/travis-ci/issues/8978
       - gem update --system
       - gem install bundler
-  - jdk: oraclejdk8
+  - rvm: system
     install:
-      - curl -L https://github.com/oracle/truffleruby/releases/download/vm-enterprise-0.28/truffleruby-testing-0.28.tar.gz | tar xz
-      - source truffleruby/setup_env
+      - curl -L https://github.com/oracle/truffleruby/releases/download/vm-1.0.0-rc2/truffleruby-1.0.0-rc2-linux-amd64.tar.gz | tar xz
+      - export PATH="$PWD/truffleruby-1.0.0-rc2-linux-amd64/bin:$PATH"
+      - $PWD/truffleruby-1.0.0-rc2-linux-amd64/lib/truffle/post_install_hook.sh
+      - gem install bundler
       - bundle install
diff --git a/spec/mspec/lib/mspec/guards/feature.rb b/spec/mspec/lib/mspec/guards/feature.rb
@@ -39,3 +39,7 @@ def match?
 def with_feature(*features, &block)
   FeatureGuard.new(*features).run_if(:with_feature, &block)
 end
+
+def without_feature(*features, &block)
+  FeatureGuard.new(*features).run_unless(:without_feature, &block)
+end
diff --git a/spec/mspec/lib/mspec/matchers/be_close.rb b/spec/mspec/lib/mspec/matchers/be_close.rb
@@ -8,7 +8,7 @@ def initialize(expected, tolerance)
 
   def matches?(actual)
     @actual = actual
-    (@actual - @expected).abs < @tolerance
+    (@actual - @expected).abs <= @tolerance
   end
 
   def failure_message

diff --git a/spec/mspec/spec/guards/feature_spec.rb b/spec/mspec/spec/guards/feature_spec.rb
@@ -78,3 +78,43 @@
     ScratchPad.recorded.should be_nil
   end
 end
+
+describe Object, "#without_feature" do
+  before :each do
+    ScratchPad.clear
+
+    @guard = FeatureGuard.new :encoding
+    FeatureGuard.stub(:new).and_return(@guard)
+  end
+
+  it "sets the name of the guard to :without_feature" do
+    without_feature(:encoding) { }
+    @guard.name.should == :without_feature
+  end
+
+  it "calls #unregister even when an exception is raised in the guard block" do
+    @guard.should_receive(:match?).and_return(false)
+    @guard.should_receive(:unregister)
+    lambda do
+      without_feature { raise Exception }
+    end.should raise_error(Exception)
+  end
+end
+
+describe Object, "#without_feature" do
+  before :each do
+    ScratchPad.clear
+  end
+
+  it "does not yield if the feature is enabled" do
+    MSpec.should_receive(:feature_enabled?).with(:encoding).and_return(true)
+    without_feature(:encoding) { ScratchPad.record :yield }
+    ScratchPad.recorded.should be_nil
+  end
+
+  it "yields if the feature is disabled" do
+    MSpec.should_receive(:feature_enabled?).with(:encoding).and_return(false)
+    without_feature(:encoding) { ScratchPad.record :yield }
+    ScratchPad.recorded.should == :yield
+  end
+end
diff --git a/spec/mspec/spec/matchers/be_close_spec.rb b/spec/mspec/spec/matchers/be_close_spec.rb
@@ -16,12 +16,14 @@
     BeCloseMatcher.new(5.0, 0.5).matches?(4.51).should == true
   end
 
-  it "does not match when actual == (expected + tolerance)" do
-    BeCloseMatcher.new(5.0, 0.5).matches?(5.5).should == false
+  it "matches when actual == (expected + tolerance)" do
+    BeCloseMatcher.new(5.0, 0.5).matches?(5.5).should == true
+    BeCloseMatcher.new(3, 2).matches?(5).should == true
   end
 
-  it "does not match when actual == (expected - tolerance)" do
-    BeCloseMatcher.new(5.0, 0.5).matches?(4.5).should == false
+  it "matches when actual == (expected - tolerance)" do
+    BeCloseMatcher.new(5.0, 0.5).matches?(4.5).should == true
+    BeCloseMatcher.new(3, 2).matches?(1).should == true
   end
 
   it "does not match when actual < (expected - tolerance)" do

diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -159,22 +159,22 @@ def rebase_commits(impl)
 def test_new_specs
   require "yaml"
   Dir.chdir(SOURCE_REPO) do
-    if MSPEC
-      sh "bundle", "exec", "rspec"
-    else
-      versions = YAML.load_file(".travis.yml")
-      versions = versions["matrix"]["include"].map { |job| job["rvm"] }
-      versions.delete "ruby-head"
-      min_version, max_version = versions.minmax
-
-      run_rubyspec = -> version {
-        command = "chruby #{version} && ../mspec/bin/mspec -j"
-        sh ENV["SHELL"], "-c", command
-      }
-      run_rubyspec[min_version]
-      run_rubyspec[max_version]
-      run_rubyspec["trunk"]
-    end
+    versions = YAML.load_file(".travis.yml")
+    versions = versions["matrix"]["include"].map { |job| job["rvm"] }
+    versions.delete "ruby-head"
+    versions.delete "system"
+    min_version, max_version = versions.minmax
+
+    test_command = MSPEC ? "bundle exec rspec" : "../mspec/bin/mspec -j"
+
+    run_test = -> version {
+      command = "chruby #{version} && #{test_command}"
+      sh ENV["SHELL"], "-c", command
+    }
+
+    run_test[min_version]
+    run_test[max_version]
+    run_test["trunk"]
   end
 end
 

diff --git a/spec/ruby/.rubocop.yml b/spec/ruby/.rubocop.yml
@@ -10,6 +10,11 @@ AllCops:
 Layout/TrailingWhitespace:
   Enabled: true
 
+Layout/TrailingBlankLines:
+  Enabled: true
+  Exclude:
+    - library/coverage/fixtures/some_class.rb
+
 Lint:
   Enabled: true
 

diff --git a/spec/ruby/.rubocop_todo.yml b/spec/ruby/.rubocop_todo.yml
@@ -87,12 +87,10 @@ Lint/MultipleCompare:
 # Offense count: 12
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
-    - 'command_line/rubyopt_spec.rb'
     - 'core/string/fixtures/freeze_magic_comment.rb'
     - 'language/block_spec.rb'
     - 'language/fixtures/send.rb'
     - 'language/method_spec.rb'
-    - 'library/socket/socket/getaddrinfo_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.

diff --git a/spec/ruby/command_line/dash_e_spec.rb b/spec/ruby/command_line/dash_e_spec.rb
@@ -25,7 +25,7 @@
 
   describe "with -n and a Fixnum range" do
     before :each do
-      @script = "-ne 'print if %s' #{fixture(__FILE__, "conditional_range.txt")}"
+      @script = "-W0 -ne 'print if %s' #{fixture(__FILE__, "conditional_range.txt")}"
     end
 
     it "mimics an awk conditional by comparing an inclusive-end range with $." do

diff --git a/spec/ruby/command_line/rubylib_spec.rb b/spec/ruby/command_line/rubylib_spec.rb
@@ -0,0 +1,67 @@
+require_relative '../spec_helper'
+
+describe "The RUBYLIB environment variable" do
+  before :each do
+    @rubylib, ENV["RUBYLIB"] = ENV["RUBYLIB"], nil
+  end
+
+  after :each do
+    ENV["RUBYLIB"] = @rubylib
+  end
+
+  it "adds a directory to $LOAD_PATH" do
+    dir = tmp("rubylib/incl")
+    ENV["RUBYLIB"] = dir
+    paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
+    paths.should include(dir)
+  end
+
+  it "adds a File::PATH_SEPARATOR-separated list of directories to $LOAD_PATH" do
+    dir1, dir2 = tmp("rubylib/incl1"), tmp("rubylib/incl2")
+    ENV["RUBYLIB"] = "#{dir1}#{File::PATH_SEPARATOR}#{dir2}"
+    paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
+    paths.should include(dir1)
+    paths.should include(dir2)
+    paths.index(dir1).should < paths.index(dir2)
+  end
+
+  it "adds the directory at the front of $LOAD_PATH" do
+    dir = tmp("rubylib/incl_front")
+    ENV["RUBYLIB"] = dir
+    paths = ruby_exe("puts $LOAD_PATH").lines.map(&:chomp)
+    if PlatformGuard.implementation? :ruby
+      # In a MRI checkout, $PWD and some extra -I entries end up as
+      # the first entries in $LOAD_PATH. So just assert that it's not last.
+      idx = paths.index(dir)
+      idx.should < paths.size-1
+    else
+      paths[0].should == dir
+    end
+  end
+
+  it "adds the directory after directories added by -I" do
+    dash_i_dir = tmp("dash_I_include")
+    rubylib_dir = tmp("rubylib_include")
+    ENV["RUBYLIB"] = rubylib_dir
+    paths = ruby_exe("puts $LOAD_PATH", options: "-I #{dash_i_dir}").lines.map(&:chomp)
+    paths.should include(dash_i_dir)
+    paths.should include(rubylib_dir)
+    paths.index(dash_i_dir).should < paths.index(rubylib_dir)
+  end
+
+  it "adds the directory after directories added by -I within RUBYOPT" do
+    rubyopt_dir = tmp("rubyopt_include")
+    rubylib_dir = tmp("rubylib_include")
+    ENV["RUBYLIB"] = rubylib_dir
+    paths = ruby_exe("puts $LOAD_PATH", env: { "RUBYOPT" => "-I#{rubyopt_dir}" }).lines.map(&:chomp)
+    paths.should include(rubyopt_dir)
+    paths.should include(rubylib_dir)
+    paths.index(rubyopt_dir).should < paths.index(rubylib_dir)
+  end
+
+  it "keeps spaces in the value" do
+    ENV["RUBYLIB"] = " rubylib/incl "
+    out = ruby_exe("puts $LOAD_PATH")
+    out.should include(" rubylib/incl ")
+  end
+end
diff --git a/spec/ruby/command_line/rubyopt_spec.rb b/spec/ruby/command_line/rubyopt_spec.rb
@@ -1,11 +1,11 @@
 require_relative '../spec_helper'
 
 describe "Processing RUBYOPT" do
-  before (:each) do
+  before :each do
     @rubyopt, ENV["RUBYOPT"] = ENV["RUBYOPT"], nil
   end
 
-  after (:each) do
+  after :each do
     ENV["RUBYOPT"] = @rubyopt
   end
 

diff --git a/spec/ruby/core/class/inherited_spec.rb b/spec/ruby/core/class/inherited_spec.rb
@@ -99,4 +99,3 @@ class << top; protected :inherited; end
   end
 
 end
-
diff --git a/spec/ruby/core/enumerable/zip_spec.rb b/spec/ruby/core/enumerable/zip_spec.rb
@@ -39,4 +39,3 @@
   end
 
 end
-
diff --git a/spec/ruby/core/env/shared/key.rb b/spec/ruby/core/env/shared/key.rb
@@ -11,5 +11,3 @@
     ENV.send(@method, "should_never_be_set").should be_nil
   end
 end
-
-
diff --git a/spec/ruby/core/exception/uncaught_throw_error_spec.rb b/spec/ruby/core/exception/uncaught_throw_error_spec.rb
@@ -16,4 +16,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/float/shared/arithmetic_exception_in_coerce.rb b/spec/ruby/core/float/shared/arithmetic_exception_in_coerce.rb
@@ -31,4 +31,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/float/shared/comparison_exception_in_coerce.rb b/spec/ruby/core/float/shared/comparison_exception_in_coerce.rb
@@ -33,4 +33,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/hash/clone_spec.rb b/spec/ruby/core/hash/clone_spec.rb
@@ -10,4 +10,3 @@
     clone.should_not equal hash
   end
 end
-
diff --git a/spec/ruby/core/hash/has_key_spec.rb b/spec/ruby/core/hash/has_key_spec.rb
@@ -5,4 +5,3 @@
 describe "Hash#has_key?" do
   it_behaves_like :hash_key_p, :has_key?
 end
-
diff --git a/spec/ruby/core/hash/has_value_spec.rb b/spec/ruby/core/hash/has_value_spec.rb
@@ -5,4 +5,3 @@
 describe "Hash#has_value?" do
   it_behaves_like :hash_value_p, :has_value?
 end
-
diff --git a/spec/ruby/core/hash/value_spec.rb b/spec/ruby/core/hash/value_spec.rb
@@ -5,4 +5,3 @@
 describe "Hash#value?" do
   it_behaves_like :hash_value_p, :value?
 end
-
diff --git a/spec/ruby/core/integer/abs_spec.rb b/spec/ruby/core/integer/abs_spec.rb
@@ -4,4 +4,3 @@
 describe "Integer#abs" do
   it_behaves_like :integer_abs, :abs
 end
-
diff --git a/spec/ruby/core/integer/divide_spec.rb b/spec/ruby/core/integer/divide_spec.rb
@@ -93,4 +93,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/integer/equal_value_spec.rb b/spec/ruby/core/integer/equal_value_spec.rb
@@ -4,4 +4,3 @@
 describe "Integer#==" do
   it_behaves_like :integer_equal, :==
 end
-
diff --git a/spec/ruby/core/integer/gt_spec.rb b/spec/ruby/core/integer/gt_spec.rb
@@ -47,4 +47,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/integer/gte_spec.rb b/spec/ruby/core/integer/gte_spec.rb
@@ -47,4 +47,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/integer/lt_spec.rb b/spec/ruby/core/integer/lt_spec.rb
@@ -49,4 +49,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/integer/lte_spec.rb b/spec/ruby/core/integer/lte_spec.rb
@@ -52,4 +52,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/integer/magnitude_spec.rb b/spec/ruby/core/integer/magnitude_spec.rb
@@ -4,4 +4,3 @@
 describe "Integer#magnitude" do
   it_behaves_like :integer_abs, :magnitude
 end
-
diff --git a/spec/ruby/core/integer/minus_spec.rb b/spec/ruby/core/integer/minus_spec.rb
@@ -47,4 +47,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/integer/multiply_spec.rb b/spec/ruby/core/integer/multiply_spec.rb
@@ -49,4 +49,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/integer/plus_spec.rb b/spec/ruby/core/integer/plus_spec.rb
@@ -47,4 +47,3 @@
     end
   end
 end
-
diff --git a/spec/ruby/core/io/pos_spec.rb b/spec/ruby/core/io/pos_spec.rb
@@ -9,4 +9,3 @@
 describe "IO#pos=" do
   it_behaves_like :io_set_pos, :pos=
 end
-
diff --git a/spec/ruby/core/io/print_spec.rb b/spec/ruby/core/io/print_spec.rb
@@ -51,4 +51,3 @@ def o2.to_s(); 'o2'; end
     lambda { IOSpecs.closed_io.print("stuff") }.should raise_error(IOError)
   end
 end
-
diff --git a/spec/ruby/core/io/shared/write.rb b/spec/ruby/core/io/shared/write.rb
@@ -69,4 +69,25 @@
     lambda { IOSpecs.closed_io.send(@method, "hello") }.should raise_error(IOError)
   end
 
+  describe "on a pipe" do
+    before :each do
+      @r, @w = IO.pipe
+    end
+
+    after :each do
+      @r.close
+      @w.close
+    end
+
+    it "writes the given String to the pipe" do
+      @w.send(@method, "foo")
+      @w.close
+      @r.read.should == "foo"
+    end
+
+    it "raises Errno::EPIPE if the read end is closed" do
+      @r.close
+      -> { @w.send(@method, "foo") }.should raise_error(Errno::EPIPE, /Broken pipe/)
+    end
+  end
 end
Original file line number	Diff line number	Diff line change
		@@ -99,4 +99,3 @@ class << top; protected :inherited; end
		end

		end
Original file line number	Diff line number	Diff line change
		@@ -11,5 +11,3 @@
		ENV.send(@method, "should_never_be_set").should be_nil
		end
		end
Original file line number	Diff line number	Diff line change
		@@ -5,4 +5,3 @@
		describe "Hash#has_key?" do
		it_behaves_like :hash_key_p, :has_key?
		end
Original file line number	Diff line number	Diff line change
		@@ -5,4 +5,3 @@
		describe "Hash#has_value?" do
		it_behaves_like :hash_value_p, :has_value?
		end
Original file line number	Diff line number	Diff line change
		@@ -5,4 +5,3 @@
		describe "Hash#value?" do
		it_behaves_like :hash_value_p, :value?
		end
Original file line number	Diff line number	Diff line change
		@@ -4,4 +4,3 @@
		describe "Integer#abs" do
		it_behaves_like :integer_abs, :abs
		end
Original file line number	Diff line number	Diff line change
		@@ -4,4 +4,3 @@
		describe "Integer#==" do
		it_behaves_like :integer_equal, :==
		end
Original file line number	Diff line number	Diff line change
		@@ -4,4 +4,3 @@
		describe "Integer#magnitude" do
		it_behaves_like :integer_abs, :magnitude
		end
Original file line number	Diff line number	Diff line change
		@@ -9,4 +9,3 @@
		describe "IO#pos=" do
		it_behaves_like :io_set_pos, :pos=
		end
Original file line number	Diff line number	Diff line change
		@@ -51,4 +51,3 @@ def o2.to_s(); 'o2'; end
		lambda { IOSpecs.closed_io.print("stuff") }.should raise_error(IOError)
		end
		end