Use newer RubyGems API to look for bundler

Closes #448
cucumber · Jun 30, 2013 · 2b72335 · 2b72335
1 parent deff34a
commit 2b72335
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/lib/cucumber/rake/task.rb b/lib/cucumber/rake/task.rb
@@ -75,19 +75,13 @@ def quoted_binary(cucumber_bin)
         end
 
         def use_bundler
-          @bundler.nil? ? File.exist?("./Gemfile") && gem_available?("bundler") : @bundler
+          @bundler.nil? ? File.exist?("./Gemfile") && bundler_gem_available? : @bundler
         end
 
-        def gem_available?(gemname)
-          gem_available_new_rubygems?(gemname) || gem_available_old_rubygems?(gemname)
-        end
-
-        def gem_available_old_rubygems?(gemname)
-          Gem.available?(gemname)
-        end
-
-        def gem_available_new_rubygems?(gemname)
-          Gem::Specification.respond_to?(:find_all_by_name) && Gem::Specification.find_all_by_name(gemname).any?
+        def bundler_gem_available?
+          Gem::Specification.find_by_name('bundler')
+        rescue Gem::LoadError
+          false
         end
 
         def cmd