Update to ruby/spec@a454137

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 69 insertions, 2 deletions

diff --git a/spec/ruby/command_line/rubylib_spec.rb b/spec/ruby/command_line/rubylib_spec.rb
new file mode 100644
index 0000000000..93184f446d
--- /dev/null
+++ 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 colon-separated list of directories to $LOAD_PATH" do
+    dir1, dir2 = tmp("rubylib/incl1"), tmp("rubylib/incl2")
+    ENV["RUBYLIB"] = "#{dir1}:#{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
index 81a57f97c3..50f5d5d0a8 100644
--- 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