From 17a654b1714c13aa124aedf78d6e59b8ac3db0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Thu, 26 May 2011 18:53:58 +0200
Subject: [PATCH] refactor `get_guard_class` to first try the constant and
 fallback to require

This enables defining inline guard handlers to override ones present in gems,
e.g. you could define an inline Guard::RSpec handler and have guard use that
instead of first trying to load 'guard/rspec' from the 'guard-rspec' gem.

Also gets rid of the ill-named method `try_to_load_gem`. Handlers are simply
found in the $LOAD_PATH and don't have to necessarily come from gems.
---
 lib/guard.rb       | 24 ++++++++++++++---------
 spec/guard_spec.rb | 49 +++++++++++++++++++++-------------------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/lib/guard.rb b/lib/guard.rb
index 0118bc3..dd5345c 100644
--- a/lib/guard.rb
+++ b/lib/guard.rb
@@ -81,15 +81,21 @@ module Guard
     end
 
     def get_guard_class(name)
-      try_to_load_gem(name)
-      self.const_get(self.constants.find { |klass_name| klass_name.to_s.downcase == name.to_s.downcase.gsub('-', '') })
-    rescue TypeError
-      UI.error "Could not find load find gem 'guard-#{name}' or find class Guard::#{name}"
-    end
-
-    def try_to_load_gem(name)
-      require "guard/#{name.to_s.downcase}"
-    rescue LoadError
+      try_require = false
+      const_name = name.to_s.downcase.gsub('-', '')
+      begin
+        require "guard/#{name.downcase}" if try_require
+        self.const_get(self.constants.find {|c| c.to_s.downcase == const_name })
+      rescue TypeError
+        unless try_require
+          try_require = true
+          retry
+        else
+          UI.error "Could not find class Guard::#{const_name.capitalize}"
+        end
+      rescue LoadError
+        UI.error "Could not load 'guard/#{name.downcase}' or find class Guard::#{const_name.capitalize}"
+      end
     end
 
     def locate_guard(name)
diff --git a/spec/guard_spec.rb b/spec/guard_spec.rb
index 3671a33..b8c1c43 100644
--- a/spec/guard_spec.rb
+++ b/spec/guard_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'guard/guard'
 
 describe Guard do
 
@@ -41,35 +42,41 @@ describe Guard do
   end
 
   describe ".get_guard_class" do
+    after do
+      [:Classname, :DashedClassName, :Inline].each do |const|
+        Guard.send(:remove_const, const) rescue nil
+      end
+    end
+
     it "reports an error if the class is not found" do
       ::Guard::UI.should_receive(:error)
       Guard.get_guard_class('notAGuardClass')
     end
 
     context 'with a nested Guard class' do
-      it "returns the Guard class when passed a Symbol" do
-        Guard.should_receive(:try_to_load_gem) { |classname|
-          classname.should == :classname
-          class Guard::Classname
-          end
-        }
-        Guard.get_guard_class(:classname).should == Guard::Classname
-      end
-      
-      it "returns the Guard class when passed a String" do
-        Guard.should_receive(:try_to_load_gem) { |classname|
-          classname.should == 'classname'
+      it "resolves the Guard class from string" do
+        Guard.should_receive(:require) { |classname|
+          classname.should == 'guard/classname'
           class Guard::Classname
           end
         }
         Guard.get_guard_class('classname').should == Guard::Classname
       end
+
+      it "resolves the Guard class from symbol" do
+        Guard.should_receive(:require) { |classname|
+          classname.should == 'guard/classname'
+          class Guard::Classname
+          end
+        }
+        Guard.get_guard_class(:classname).should == Guard::Classname
+      end
     end
 
     context 'with a name with dashes' do
       it "returns the Guard class" do
-        Guard.should_receive(:try_to_load_gem) { |classname|
-          classname.should == 'dashed-class-name'
+        Guard.should_receive(:require) { |classname|
+          classname.should == 'guard/dashed-class-name'
           class Guard::DashedClassName
           end
         }
@@ -84,23 +91,11 @@ describe Guard do
           end
         end
 
+        Guard.should_not_receive(:require)
         Guard.get_guard_class('inline').should == Guard::Inline
       end
     end
   end
-  
-  describe ".try_to_load_gem" do
-    class Guard::Classname
-    end
-    
-    it "reports an error if the class is not found" do
-      Guard.get_guard_class('classname').should be_true
-    end
-    
-    it "reports an error if the class is not found" do
-      Guard.get_guard_class(:classname).should be_true
-    end
-  end
 
   describe ".locate_guard" do
     it "returns the path of a Guard gem" do