[DRE-commits] [ruby-rspec-instafail] 07/15: Use conditional search instead of rescuing from exception

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch debian/sid
in repository ruby-rspec-instafail.

commit 6e960119bd44a7146e5f54cfbc3e24972eadc4a2
Author: Oleksandr Slynko <oslynko at pivotal.io>
Date:   Fri May 20 15:50:06 2016 +0100

    Use conditional search instead of rescuing from exception
---
 lib/rspec/instafail.rb | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/rspec/instafail.rb b/lib/rspec/instafail.rb
index 05637d0..ecf5410 100755
--- a/lib/rspec/instafail.rb
+++ b/lib/rspec/instafail.rb
@@ -1,6 +1,9 @@
 module RSpec
-  version = Gem.loaded_specs["rspec-core"].version
-  require "rspec/instafail/rspec_#{[3, version.segments.first].min}"
-rescue
-  require "rspec/instafail/rspec_1"
+  gem_spec = Gem::Specification.find_all_by_name('rspec-core').first
+  if gem_spec
+    version = gem_spec.version
+    require "rspec/instafail/rspec_#{[3, version.segments.first].min}"
+  else
+    require "rspec/instafail/rspec_1"
+  end
 end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec-instafail.git