New CLI options: watchdir and guardfile thanks to @nestegg!

CHANGELOG.md

@@ -6,6 +6,9 @@
 
 ## Improvements
 
+- New CLI options: ([@nestegg][])
+  - `watchdir`/`-w` to specify the directory in which Guard should watch for changes,
+  - `guardfile`/`-G` to specify an alternate location for the Guardfile to use.
 - Pull request [#90](https://github.com/guard/guard/pull/90): Refactoring of color handling in the `Guard::UI`. ([@stereobooster][])
 
 ## 0.5.1 - July 2, 2011
@@ -195,6 +198,7 @@
 [@koshigoe]: https://github.com/koshigoe
 [@mcmire]: https://github.com/mcmire
 [@mislav]: https://github.com/mislav
+[@nestegg]: https://github.com/nestegg
 [@netzpirat]: https://github.com/netzpirat
 [@nicksieger]: https://github.com/nicksieger
 [@niklas]: https://github.com/niklas

lib/core_ext/hash_with_indifferent_access.rb

@@ -1,9 +0,0 @@
-class Thor
-  module CoreExt #:nodoc:
-    class HashWithIndifferentAccess < ::Hash #:nodoc:
-      def has_key?(key)
-        super(convert_key(key))
-      end
-    end
-  end
-end

lib/guard.rb

@@ -1,6 +1,3 @@
-require 'core_ext/hash_with_indifferent_access'
-#require 'pry'
-
 module Guard
 
   autoload :UI,           'guard/ui'
@@ -17,7 +14,7 @@ module Guard
     # initialize this singleton
     def setup(options = {})
       @options  = options
-      @listener = Listener.select_and_init((options[:watchdir]) ? File.expand_path(options[:watchdir]) : Dir.pwd)
+      @listener = Listener.select_and_init(@options[:watchdir] ? File.expand_path(@options[:watchdir]) : Dir.pwd)
       @guards   = []
 
       @options[:notify] && ENV["GUARD_NOTIFY"] != 'false' ? Notifier.turn_on : Notifier.turn_off

lib/guard/cli.rb

@@ -9,9 +9,8 @@ module Guard
     method_option :notify,    :type => :boolean, :default => true,  :aliases => '-n', :banner => "Notifications feature (growl/libnotify)"
     method_option :debug,     :type => :boolean, :default => false, :aliases => '-d', :banner => "Print debug messages"
     method_option :group,     :type => :array,   :default => [],    :aliases => '-g', :banner => "Run only the passed groups"
-
-    method_option :guardfile, :type => :string,                  :aliases => '-C', :banner => "Specify a Guardfile"
-    method_option :watchdir,  :type => :string, :default => '.', :aliases => '-w', :banner => "Specify the directory to watch"
+    method_option :watchdir,  :type => :string,                     :aliases => '-w', :banner => "Specify the directory to watch"
+    method_option :guardfile, :type => :string,                     :aliases => '-G', :banner => "Specify a Guardfile"
 
     desc "start", "Starts Guard"
     def start