From c0e548ba44280b5e8e3cee20b0fc6dc7fcb1c2a9 Mon Sep 17 00:00:00 2001 From: Fabian Maas Date: Wed, 1 Jun 2022 14:41:49 +0200 Subject: [PATCH] return registered bundles by name also when not specified via full (relative) path --- bin/rock-bundle-find | 11 +++++++---- lib/rock/bundles.rb | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/rock-bundle-find b/bin/rock-bundle-find index 1419f28..0f4ce43 100755 --- a/bin/rock-bundle-find +++ b/bin/rock-bundle-find @@ -24,12 +24,15 @@ end Bundles.each_bundle do |bdl| if bdl.name == name - if !quiet - puts bdl.path - end - exit 0 + if bdl.registered? + puts bdl.name + else + puts bdl.path + end + exit 0 end end + if !quiet STDERR.puts "cannot find required bundle" end diff --git a/lib/rock/bundles.rb b/lib/rock/bundles.rb index dab830a..675ec51 100644 --- a/lib/rock/bundles.rb +++ b/lib/rock/bundles.rb @@ -45,7 +45,7 @@ class Bundle def registered? paths = (ENV['ROCK_BUNDLE_PATH'] || '').split(":") paths.any? do |p| - p == path || path =~ /^#{Regexp.quote(p)}/ + p == path || !(path =~ /^#{Regexp.quote(p)}/).nil? end end