diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-11-13 07:57:02 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-11-13 10:19:51 +0900 |
| commit | bb9ecd026a6cadd5d0f85ac061649216806ed935 (patch) | |
| tree | 237975b9702a837fd0a8d24575f1edadb4d773d0 /spec/bundler/support/matchers.rb | |
| parent | 00d56bdf66a3aeaadbc84196aacbd8d4e698cf79 (diff) | |
| download | ruby-bb9ecd026a6cadd5d0f85ac061649216806ed935.tar.gz | |
Merge Bundler 2.1.0.pre3 released version
Diffstat (limited to 'spec/bundler/support/matchers.rb')
| -rw-r--r-- | spec/bundler/support/matchers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/bundler/support/matchers.rb b/spec/bundler/support/matchers.rb index 69d3be4a3d..e1a08a30cc 100644 --- a/spec/bundler/support/matchers.rb +++ b/spec/bundler/support/matchers.rb @@ -128,9 +128,10 @@ module Spec groups << opts @errors = names.map do |name| name, version, platform = name.split(/\s+/) + require_path = name == "bundler" ? "#{lib_dir}/bundler" : name version_const = name == "bundler" ? "Bundler::VERSION" : Spec::Builders.constantize(name) begin - run! "require '#{name}.rb'; puts #{version_const}", *groups + run! "require '#{require_path}.rb'; puts #{version_const}", *groups rescue StandardError => e next "#{name} is not installed:\n#{indent(e)}" end |