From 5a384e2c08704dc7af9d8d3bdfc475eb8c0723aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Tue, 20 Aug 2019 02:46:31 +0200
Subject: [PATCH] Fix some bundler specs (#2380)

* These seem to consistenly pass already

* Show actual command when running `make test-bundler`

Current the setup command that installs the necessary gems for testing
bundler was printed, but not the actual command that runs the tests.
That was a bit confusing.

* Borrow trick from setproctitle specs

* A title that long doesn't get set sometimes

No idea why, but the test doesn't need that the title is that long.

* Fix most gem helper spec ruby-core failures

* Fix the rest of the gem helper failures

* Fix version spec by improving the assertion

* Remove unnecessary `BUNDLE_RUBY` environment var

We can use `RUBY` when necessary, and `BUNDLE_RUBY` is not a good name
because bundler considers `BUNDLE_*` variables as settings.

* Rename `BUNDLE_GEM` to `GEM_COMMAND`

This is more descriptive I think, and also friendlier for bundler
because `BUNDLE_` env variables are interpreted by bundler as settings,
and this is not a bundler setting.

This fixes one bundler spec failure in config specs against ruby-core.

* Fix quality spec when run in core

Use the proper path helper.

* Fix dummy lib builder to never load default gems

If a dummy library is named as a default gem, when requiring the library
from its executable, the default gem would be loaded when running from
core, because in core all default gems share path with bundler, and thus
they are always in the $LOAD_PATH. We fix the issue by loading lib
relatively inside dummy lib executables.

* More exact assertions

Sometimes I have the problem that I do some "print debugging" inside
specs, and suddently the spec passes. This happens when the assertion is
too relaxed, and the things I print make it match, specially when they
are simple strings like "1.0" than can be easily be part of gem paths
that I print for debugging.

I fix this by making a more exact assertion.

* Detect the correct shebang when ENV["RUBY"] is set

* Relax assertion

So that the spec passes even if another paths containing "ext" are in
the load path. This works to fix a ruby-core issue, but it's a better
assertion in general. We just want to know that the extension path was
added.

* Use folder structure independent path helper

It should fix this spec for ruby-core.

* Fix the last failing spec on ruby-core

* Skip `bundle open <default_gem>` spec when no default gems
---
 common.mk                                      |  1 -
 lib/bundler/bundler.gemspec                    |  9 +++------
 lib/bundler/gem_helper.rb                      | 12 ++++++------
 lib/bundler/shared_helpers.rb                  |  2 +-
 spec/bundler/bundler/cli_spec.rb               |  2 +-
 spec/bundler/bundler/env_spec.rb               |  4 ++--
 spec/bundler/bundler/gem_helper_spec.rb        |  2 +-
 spec/bundler/bundler/mirror_spec.rb            |  2 +-
 spec/bundler/commands/config_spec.rb           |  2 +-
 spec/bundler/commands/exec_spec.rb             | 18 +++++++++---------
 spec/bundler/commands/info_spec.rb             |  2 +-
 spec/bundler/commands/newgem_spec.rb           |  2 +-
 spec/bundler/commands/open_spec.rb             | 12 +++++++++++-
 spec/bundler/commands/show_spec.rb             |  2 +-
 spec/bundler/install/gemfile/git_spec.rb       | 10 +++++-----
 spec/bundler/install/gems/resolving_spec.rb    |  6 +++---
 spec/bundler/quality_es_spec.rb                |  4 ++--
 spec/bundler/quality_spec.rb                   |  5 ++---
 spec/bundler/runtime/setup_spec.rb             |  4 ++--
 .../bundler/runtime/with_unbundled_env_spec.rb |  2 +-
 spec/bundler/spec_helper.rb                    | 12 ++++++------
 spec/bundler/support/builders.rb               |  2 +-
 spec/bundler/support/hax.rb                    |  8 ++++++++
 spec/bundler/support/path.rb                   | 10 +++++++---
 tool/runruby.rb                                |  3 +--
 25 files changed, 77 insertions(+), 61 deletions(-)

diff --git a/tool/runruby.rb b/tool/runruby.rb
index d9fc1ac09db7..4715ff4d5cdf 100755
--- a/tool/runruby.rb
+++ b/tool/runruby.rb
@@ -107,6 +107,7 @@
 env["GEM_PATH"] = env["GEM_HOME"] = File.expand_path(".bundle", srcdir)
 env["BUNDLE_RUBY"] = abs_ruby
 env["BUNDLE_GEM"] = "#{abs_ruby} -rrubygems #{srcdir}/bin/gem --backtrace"
+env["GEM_COMMAND"] = "#{abs_ruby} -rrubygems #{srcdir}/bin/gem --backtrace"
 env["PATH"] = [File.dirname(abs_ruby), abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
 
 if e = ENV["RUBYLIB"]