guard 1.8.3 → 2.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5058ee4dcf31a41ecc9be8bc4fa80d1e07b78e7a
-  data.tar.gz: 212550736d4d08e333f3e968f60980083f15b393
+  metadata.gz: ec53a40ba0d6bb529aba462d295f5959631fc2de
+  data.tar.gz: 730479188a61cfdafea27ee0ed417ef72ef09fc2
 SHA512:
-  metadata.gz: df4481ed0881fa095882c6f1444dc92a9f1e04c6bd9cecaf7028d06e1ba69bf842acf2453fd6838ee44718b835f99e2ef686bd407cc50d2ea39e635c5d5c1716
-  data.tar.gz: 94c0359e6c917b38d249ece6613ee5d80a3969c7b4424fd7da65d7d9e7dd464eed00927c88b05d10594c78328efbeb5ef5890c567fe5cabd206b0ad2000d8526
+  metadata.gz: b98bfa844663944ed92554b69af8edb2f8cc1f63de2d7d0ef374c828414ceb5ebbd7fb5f07b7ecb904f52c86522ac721c973062e331c5677dfa47da8572faae3
+  data.tar.gz: f9d2785f7edf80c6e81fac7d05f87dfb732442e9bf38b27ba3e8a2decbb2f5f3817f0e1c5d9411c5508bd61f8710ed7bebec31b0b465ef9df8b24c2daef1a4df

data/CHANGELOG.md

@@ -1,6 +1,55 @@
 ## Master
 
-No changes yet.
+No changes.
+
+## 2.0.0.pre - 12 September, 2013
+
+### Removals & deprecations
+
+- Remove `Guard::Guardfile.duplicate_definitions?`. ([@rymai][])
+- Remove the deprecated `watch_all_modifications` start option. ([@rymai][])
+- Remove the deprecated `no_vendor` start option. ([@rymai][])
+- Remove the deprecated `reset_color` UI method. ([@rymai][])
+- Remove the deprecated `match_file?` Watcher method. ([@rymai][])
+- Remove the deprecated `ignore_paths` DSL method. ([@rymai][])
+- Remove the deprecation warning for the `interactor` DSL method. ([@rymai][])
+- Remove the deprecation warning for when a plugin defines the `run_on_change` method. ([@rymai][])
+- Remove the deprecation warning for when a plugin defines the `run_on_deletion` method. ([@rymai][])
+- Deprecate `Guard.guards(filter)` in favor of `Guard.plugins(filter)`. ([@rymai][])
+- Deprecate `Guard.add_guard(name, options = {})` in favor of `Guard.add_plugin(name, options = {})`. ([@rymai][])
+- Deprecate `Guard.get_guard_class(name, fail_gracefully)` in favor of `Guard::PluginUtil.new(name).plugin_class(fail_gracefully: fail_gracefully)`. ([@rymai][])
+- Deprecate `Guard.locate_guard(name)` in favor of `Guard::PluginUtil.new(name).plugin_location`. ([@rymai][])
+- Deprecate `Guard.guard_gem_names` in favor of `Guard::PluginUtil.plugin_names`. ([@rymai][])
+- Deprecate `Guard::Guard` in favor of `Guard::Plugin`. ([@rymai][])
+- Deprecate `Guard::Dsl.evaluate_guardfile(options)` in favor of `Guard::Guardfile::Evaluator.new(options).evaluate_guardfile`. ([@rymai][])
+- Deprecate `Guard::Guardfile.create_guardfile(options)` in favor of `Guard::Guardfile::Generator.new(options).create_guardfile`. ([@rymai][])
+- Deprecate `Guard::Guardfile.initialize_template(plugin_name)` in favor of `Guard::Guardfile::Generator.new.initialize_template(plugin_name)`. ([@rymai][])
+- Deprecate `Guard::Guardfile.initialize_all_templates` in favor of `Guard::Guardfile::Generator.new.initialize_all_templates`. ([@rymai][])
+
+### New features & improvements
+
+- [#469][] List available notifiers. ([@netzpirat][])
+- Refactor `Guard::Notifier` and the whole notifiers system. ([@rymai][])
+- Allow to pass symbols or actual Guard plugins / groups for the `scope` parameter to `Guard::Runner#run`. ([@rymai][])
+- Ensure Guard API calls are not order dependent. ([@rymai][])
+- Ensure Guard has sensible defaults. ([@rymai][])
+- New `#title` method for `Guard::Group` & `Guard::Plugin`. ([@rymai][])
+- New `Guard::Plugin::Base` module common to `Guard::Guard` (deprecated) & `Guard::Plugin`. ([@rymai][])
+- New `Guard::PluginUtil` that contains useful methods to find and instantiate Guard plugins. ([@rymai][])
+- New `Guard.plugin` method to find the first plugin matching a filter. ([@rymai][])
+- New `Guard.group` method to find the first group matching a filter. ([@rymai][])
+- Don't swallow exceptions when evaluating the Guardfile. ([@rymai][])
+- Rename `Guard::Hook` to `Guard::Plugin::Hooker`. ([@rymai][])
+- Move setup stuff into a new `Guard::Setuper` module. ([@rymai][])
+- Move deprecation stuff inside a new `Guard::Deprecator` class. ([@rymai][])
+
+### Bug fixes
+
+- [#472][] Clear terminal title notification on exit. Fixes [#472][]. ([@netzpirat][])
+- [#457][] Raise an exception when a group is called "all". Fixes [#457][]. (reported by [@rweng][], fixed by [@rymai][])
+- [#471][] Only init once per plugin when running `guard init` (reported by [@simon-ohara][], fixed by [@thibaudgg][])
+- [#456][] Fix notifu notifier. ([@netzpirat][])
+- [#435][] Fix pressing `C-c` when interactor thread is not started. ([@netzpirat][])
 
 ## 1.8.2 - 30 July, 2013
 
@@ -25,6 +74,7 @@ No changes yet.
 
 ### Improvements
 
+- Listen 1.0.0 support. ([@thibaudgg][])
 - [#416][] Support .guardrc file on the folder from which Guard is executed as well. ([@Nerian][])
 - Display an info message when a plugin throws `:task_has_failed`. ([@rymai][])
 - Ensure compatibility with new Listen's API. ([@rymai][])
@@ -79,10 +129,10 @@ No changes yet.
 
 ### New features
 
-- Allow the Guard scope to be defined from the `Guardfile` with the `scope` DSL method. ([@netzpirat][])
+- Allow the Guard scope to be defined from the `Guardfile` with the `scope` Dsl method. ([@netzpirat][])
 - [#378][] Scope plugins and groups from CLI and interactor. ([@netzpirat][])
 - [#369][] Allow Guard plugins to specify their template location. ([@schmurfy][])
-- [#364][] Add `ignore!` and `filter!` DSL methods. ([@tarsolya][])
+- [#364][] Add `ignore!` and `filter!` Dsl methods. ([@tarsolya][])
 - [#362][] Add interactor options `:history_file` and `:guard_rc`. ([@netzpirat][])
 
 ### Improvements
@@ -310,7 +360,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 
 ### Improvements
 
-- Add `interactor` to DSL to allow switching Guard interaction implementation. ([@netzpirat][])
+- Add `interactor` to Dsl to allow switching Guard interaction implementation. ([@netzpirat][])
 - Add quit action to the interactor. ([@Maher4Ever][])
 
 ## 0.9.1 - December 19, 2011
@@ -410,7 +460,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 ### New feature
 
 - [#136][] New CLI `:watch_all_modifications`/`-A` option to watch for deleted and moved files too. ([@limeyd][] and [@netzpirat][])
-- [#97][] Guard dependencies. Task execution can now be halted if a Guard throws `:task_has_failed` and `Guard::Dsl#group` options include `:halt_on_fail => true`. ([@rymai][])
+- [#97][] Guard dependencies. Task execution can now be halted if a Guard throws `:task_has_failed` and `Guard::Dsl#group` options include `halt_on_fail: true`. ([@rymai][])
 - [#121][] `Guard.guards` and `Guard.groups` are now smart accessors. Filters can be passed to find a specific Guard/group or several Guard plugins/groups that match (see YARDoc). ([@rymai][] and [@ches][])
 - New `Guard::Group` class to store groups defined in Guardfile (with `Guard::Dsl#group`). ([@rymai][])
 
@@ -441,7 +491,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 
 ### New features
 
-- [#130][] Add `ignore_paths` method to DSL. ([@ianwhite][])
+- [#130][] Add `ignore_paths` method to Dsl. ([@ianwhite][])
 - [#128][] Users can add additional settings to `~/.guard.rb` that augment the existing Guardfile. ([@tpope][])
 
 ## 0.6.2 - August 17, 2011
@@ -481,7 +531,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 ### Improvements
 
 - [#99][] [OS X] Switch from growl gem to growl_notify gem. ([@johnbintz][])
-- [#115][] [Linux] Add `:transient => true` to default libnotify options. ([@zonque][])
+- [#115][] [Linux] Add `transient: true` to default libnotify options. ([@zonque][])
 - [#95][] Output system commands and options to be executed when in debug mode. ([@uk-ar][] and [@netzpirat][])
 - `Guard::Dsl.revaluate_guardfile` has been renamed to `Guard::Dsl.reevaluate_guardfile`. ([@rymai][])
 - New CLI options: ([@nestegg][])
@@ -537,7 +587,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 
 ### New features
 
-- [#73][] Allow DSL's `group` method to accept a Symbol as group name. ([@johnbintz][])
+- [#73][] Allow Dsl's `group` method to accept a Symbol as group name. ([@johnbintz][])
 - [#51][] Allow options (like `:priority`) to be passed through to the Notifier. ([@indirect][] and [@netzpirat][])
 
 ### Improvement
@@ -612,7 +662,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 ### New features
 
 - The whole directory is now watched during `run_on_change` to detect new files modifications. ([@thibaudgg][])
-- [#26][] New DSL method: `group` allows you to group several guards. New CLI option: `--group group_name` to specify certain groups of guards to start. ([@netzpirat][])
+- [#26][] New Dsl method: `group` allows you to group several guards. New CLI option: `--group group_name` to specify certain groups of guards to start. ([@netzpirat][])
 - `watch` patterns are now more strict: strings are matched with `String#==`, `Regexp` are matched with `Regexp#match`. ([@rymai][])
 - A deprecation warning is displayed if your `Guardfile` contains `String` that look like `Regexp` (bad!). ([@rymai][])
 - It's now possible to return an `Enumerable` in the `watch` optional blocks in the `Guardfile`. ([@rymai][])
@@ -620,7 +670,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 ### New specs
 
 - `Guard::Watcher`. ([@rymai][])
-- [#13][] `Guard::Dsl`. ([@oliamb][])
+- [#13][] `Guard::DSL`. ([@oliamb][])
 
 ## 0.2.2 - October 25, 2010
 
@@ -786,11 +836,17 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [#413]: https://github.com/guard/guard/issues/413
 [#414]: https://github.com/guard/guard/issues/414
 [#416]: https://github.com/guard/guard/issues/416
+[#435]: https://github.com/guard/guard/issues/435
 [#443]: https://github.com/guard/guard/issues/443
 [#450]: https://github.com/guard/guard/issues/450
 [#453]: https://github.com/guard/guard/issues/453
+[#456]: https://github.com/guard/guard/issues/456
+[#457]: https://github.com/guard/guard/issues/457
 [#460]: https://github.com/guard/guard/issues/460
 [#463]: https://github.com/guard/guard/issues/463
+[#469]: https://github.com/guard/guard/issues/469
+[#471]: https://github.com/guard/guard/issues/471
+[#472]: https://github.com/guard/guard/issues/472
 [@Gazer]: https://github.com/Gazer
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@Nerian]: https://github.com/Nerian
@@ -861,10 +917,12 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [@royvandewater]: https://github.com/royvandewater
 [@rudicode]: https://github.com/rudicode
 [@rupert654]: https://github.com/rupert654
+[@rweng]: https://github.com/rweng
 [@rymai]: https://github.com/rymai
 [@schmurfy]: https://github.com/schmurfy
 [@scottdavis]: https://github.com/scottdavis
 [@semperos]: https://github.com/semperos
+[@simon-ohara]: https://github.com/simon-ohara
 [@spadin]: https://github.com/spadin
 [@steakknife]: https://github.com/steakknife
 [@stereobooster]: https://github.com/stereobooster

data/README.md

@@ -16,21 +16,21 @@ the following places:
 Information on advanced topics like creating your own Guard plugin, programatic use of Guard, hooks and callbacks and
 more can be found in the [Guard wiki](https://github.com/guard/guard/wiki).
 
-Before you file an issue, make sure you have read the _[known issues](#known-issues)_ and _[file an issue](#file-an-issue)_ sections that contains some important information.
+Before you file an issue, make sure you have read the _[known issues](#issues)_ and _[file an issue](#file-an-issue)_ sections that contains some important information.
 
 #### Features
 
 * File system changes handled by our awesome [Listen](https://github.com/guard/listen) gem.
 * Support for visual system notifications.
-* Huge eco-system with [more than 190](https://rubygems.org/search?query=guard-) guard plugins.
-* Tested against Ruby 1.8.7, 1.9.2, 1.9.3, 2.0.0, REE and the latest versions of JRuby & Rubinius.
+* Huge eco-system with [more than 220](https://rubygems.org/search?query=guard-) Guard plugins.
+* Tested against Ruby 1.9.2, 1.9.3, 2.0.0, JRuby (1.9 mode) & Rubinius (1.9 mode).
 
 #### Screencast
 
-Two nice introduction screen casts to Guard are available that helps you get started:
+Two nice screencasts are available to help you get started:
 
-* [Guard is Your Best Friend](http://net.tutsplus.com/tutorials/tools-and-tips/guard-is-your-best-friend) on Net Tuts+
-* [Guard](http://railscasts.com/episodes/264-guard) on RailsCast
+* [Guard](http://railscasts.com/episodes/264-guard) on RailsCast.
+* [Guard is Your Best Friend](http://net.tutsplus.com/tutorials/tools-and-tips/guard-is-your-best-friend) on Net Tuts+.
 
 Installation
 ------------
@@ -57,6 +57,7 @@ Generate an empty `Guardfile` with:
 $ guard init
 ```
 
+
 Run Guard through Bundler with:
 
 ```bash
@@ -99,7 +100,7 @@ You can always get help on the available tasks with the `help` task:
 $ guard help
 ```
 
-To request more detailed help on a specific task is simple: just appending the task name to the help task.
+Requesting more detailed help on a specific task is simple: just append the task name to the help task.
 For example, to get help for the `start` task, simply run:
 
 ```bash
@@ -172,7 +173,7 @@ $ guard -c # shortcut
 You can add the following snippet to your `~/.guardrc` to have the clear option always be enabled:
 
 ```
-Guard.options[:clear] = true
+Guard.options.clear = true
 ```
 
 #### `-n`/`--notify` option
@@ -312,7 +313,26 @@ $ guard show
 ```
 
 This shows the internal structure of the evaluated `Guardfile` or `.Guardfile`, with the `.guard.rb` file. You can
-read more about these files in the [shared configuration section](https://github.com/guard/guard#shared-configurations).
+read more about these files in the [shared configuration section](https://github.com/guard/guard/wiki/Shared-configurations).
+
+### Notifiers
+
+You can show the notifiers, their availablity and options with the `notifier` task:
+
+```bash
+$ guard notifiers
++-------------------+-----------+------+------------------------+-------------------+
+| Name              | Available | Used | Option                 | Value             |
++-------------------+-----------+------+------------------------+-------------------+
+| gntp              | ✔         | ✘    | sticky                 | false             |
++-------------------+-----------+------+------------------------+-------------------+
+| growl             | ✘         | ✘    | sticky                 | false             |
+|                   |           |      | priority               | 0                 |
++-------------------+-----------+------+------------------------+-------------------+
+```
+
+This shows if a notifier is available on the current system, it it's being used and the
+current options (which reflects your custom options merged into the default options).
 
 Interactions
 ------------
@@ -385,14 +405,14 @@ The `guard` method allows you to add a Guard plugin to your toolchain and config
 options after the name of the plugin:
 
 ```ruby
-guard :coffeescript, :input => 'coffeescripts', :output => 'javascripts'
+guard :coffeescript, input: 'coffeescripts', output: 'javascripts'
 ```
 
 You can define the same plugin more than once:
 
 ```ruby
-guard :coffeescript, :input => 'coffeescripts', :output => 'javascripts'
-guard :coffeescript, :input => 'specs', :output => 'specs'
+guard :coffeescript, input: 'coffeescripts', output: 'javascripts'
+guard :coffeescript, input: 'specs', output: 'specs'
 ```
 
 ### watch
@@ -472,7 +492,7 @@ to make this work, the group needs to have the `halt_on_fail` option enabled and
 needs to throw `:task_has_failed` to indicate that the action was not successful.
 
 ```ruby
-group :specs, :halt_on_fail => true do
+group :specs, halt_on_fail: true do
   guard :rspec do
     watch(/.../)
   end
@@ -492,20 +512,22 @@ the DSL scope configuration.
 You can define either a single plugin or group:
 
 ```ruby
-scope :plugin => :rspec
-scope :group => :docs
+scope plugin: :rspec
+scope group: :docs
 ```
 
 or specify multiple plugins or groups.
 
 ```ruby
-scope :plugins => [:test, :jasmine]
-scope :groups => [:docs, :frontend]
+scope plugins: [:test, :jasmine]
+scope groups: [:docs, :frontend]
 ```
 
 If you define both the plugin and group scope, the plugin scope has precedence. If you use both the
 plural and the singular option, the plural has precedence.
 
+**Please be sure to call the `scope` method after you've declared your Guard plugins!**
+
 ### notification
 
 If you don't specify any notification configuration in your `Guardfile`, Guard goes through the list of available
@@ -519,17 +541,17 @@ notification :growl
 will select the `growl` gem for notifications. You can also set options for a notifier:
 
 ```ruby
-notification :growl, :sticky => true
+notification :growl, sticky: true
 ```
 
 Each notifier has a slightly different set of supported options:
 
 ```ruby
-notification :growl, :sticky => true, :host => '192.168.1.5', :password => 'secret'
-notification :gntp, :sticky => true, :host => '192.168.1.5', :password => 'secret'
-notification :growl_notify, :sticky => true, :priority => 0
-notification :libnotify, :timeout => 5, :transient => true, :append => false, :urgency => :critical
-notification :notifu, :time => 5, :nosound => true, :xp => true
+notification :growl, sticky: true, host: '192.168.1.5', password: 'secret'
+notification :gntp, sticky: true, host: '192.168.1.5', password: 'secret'
+notification :growl_notify, sticky: true, priority: 0
+notification :libnotify, timeout: 5, transient: true, append: false, urgency: :critical
+notification :notifu, time: 5, nosound: true, xp: true
 notification :emacs
 ```
 
@@ -548,7 +570,7 @@ notification :off
 You can customize the Pry interactor history and RC file like:
 
 ```ruby
-interactor :guard_rc => '~/.my_guard-rc', :history_file => '~/.my_guard_history_file'
+interactor guard_rc: '~/.my_guard-rc', history_file: '~/.my_guard_history_file'
 ```
 
 If you do not need the Pry interactions with Guard at all, you can turn it off:
@@ -585,7 +607,7 @@ This comes in handy when you have large amounts of non-source data in you projec
 are ignored.
 
 Please note that method only accept regexps. More on the
-[Listen README](https://github.com/guard/listen#the-patterns-for-filtering-and-ignoring-paths).
+[Listen README](https://github.com/guard/listen#note-on-the-patterns-for-ignoring-and-filtering-paths).
 
 To append to the default ignored files and directories, use the `ignore` method:
 
@@ -606,7 +628,7 @@ The `filter` method allows you to focus by filtering files and directories witho
 the `filter` method.
 
 Please note that method only accept regexps. More on the
-[Listen README](https://github.com/guard/listen#the-patterns-for-filtering-and-ignoring-paths).
+[Listen README](https://github.com/guard/listen#note-on-the-patterns-for-ignoring-and-filtering-paths).
 
 ```ruby
 filter /\.txt$/, /.*\.zip/
@@ -624,12 +646,12 @@ The `logger` method allows you to customize the [Lumberjack](https://github.com/
 needs by specifying one or more options like:
 
 ```ruby
-logger :level       => :warn,
-       :template    => '[:severity - :time - :progname] :message',
-       :time_format => 'at %I:%M%p',
-       :only        => [:rspec, :jasmine, 'coffeescript'],
-       :except      => :jammit,
-       :device      => 'guard.log'
+logger level:       :warn,
+       template:    '[:severity - :time - :progname] :message',
+       time_format: 'at %I:%M%p',
+       only:        [:rspec, :jasmine, 'coffeescript'],
+       except:      :jammit,
+       device:      'guard.log'
 ```
 
 Log `:level` option must be either `:debug`, `:info`, `:warn` or `:error`. If Guard is started in debug mode, the log
@@ -713,7 +735,6 @@ Please try to follow these simple rules:
 
 #### Core Team
 
-* [Maher Sallam](https://github.com/Maher4Ever) ([@mahersalam](http://twitter.com/mahersalam))
 * [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat), [mksoft.ch](https://mksoft.ch))
 * [Rémy Coutable](https://github.com/rymai) ([@rymai](http://twitter.com/rymai), [rymai.me](http://rymai.me))
 * [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg), [thibaud.me](http://thibaud.me/))

data/lib/guard.rb

@@ -1,320 +1,112 @@
 require 'rbconfig'
-require 'thread'
-require 'listen'
+
+require 'guard/commander'
+require 'guard/deprecated_methods'
+require 'guard/deprecator'
+require 'guard/dsl'
+require 'guard/group'
+require 'guard/guardfile'
+require 'guard/interactor'
+require 'guard/notifier'
+require 'guard/plugin_util'
+require 'guard/runner'
+require 'guard/setuper'
+require 'guard/ui'
+require 'guard/watcher'
 
 # Guard is the main module for all Guard related modules and classes.
 # Also Guard plugins should use this namespace.
 #
 module Guard
 
-  require 'guard/dsl'
-  require 'guard/guardfile'
-  require 'guard/group'
-  require 'guard/interactor'
-  require 'guard/notifier'
-  require 'guard/runner'
-  require 'guard/ui'
-  require 'guard/watcher'
-
-  # The Guardfile template for `guard init`
-  GUARDFILE_TEMPLATE = File.expand_path('../guard/templates/Guardfile', __FILE__)
-
-  # The location of user defined templates
-  HOME_TEMPLATES = File.expand_path('~/.guard/templates')
-
-  WINDOWS = RbConfig::CONFIG['host_os'] =~ %r!(msdos|mswin|djgpp|mingw)!
+  WINDOWS  = RbConfig::CONFIG['host_os'] =~ %r!(msdos|mswin|djgpp|mingw)!
   DEV_NULL = WINDOWS ? 'NUL' : '/dev/null'
 
-  class << self
-    attr_accessor :options, :interactor, :runner, :listener, :lock, :scope, :running
-
-    # Initialize the Guard singleton:
-    #
-    # - Initialize the internal Guard state.
-    # - Create the interactor when necessary for user interaction.
-    # - Select and initialize the file change listener.
-    #
-    # @option options [Boolean] clear if auto clear the UI should be done
-    # @option options [Boolean] notify if system notifications should be shown
-    # @option options [Boolean] debug if debug output should be shown
-    # @option options [Array<String>] group the list of groups to start
-    # @option options [Array<String>] watchdir the directories to watch
-    # @option options [String] guardfile the path to the Guardfile
-    # @deprecated @option options [Boolean] watch_all_modifications watches all file modifications if true
-    # @deprecated @option options [Boolean] no_vendor ignore vendored dependencies
-    #
-    def setup(options = {})
-      @running   = true
-      @lock      = Mutex.new
-      @options   = options.dup
-      @runner    = ::Guard::Runner.new
-      @scope     = { :plugins => [], :groups => [] }
-
-      @watchdirs = [Dir.pwd]
-
-      if options[:watchdir]
-        # Ensure we have an array
-        @watchdirs = Array(options[:watchdir]).map { |dir| File.expand_path dir }
-      end
-
-      ::Guard::UI.clear(:force => true)
-      setup_debug
-      deprecated_options_warning
-
-      setup_groups
-      setup_guards
-      setup_listener
-      setup_signal_traps
-      setup_from_guardfile
-      setup_scopes
-
-      runner.deprecation_warning if options[:show_deprecations]
-
-      setup_notifier
-      setup_interactor
-
-      self
-    end
+  extend Commander
+  extend DeprecatedMethods
+  extend Setuper
 
-    def setup_debug
-      if options[:debug]
-        Thread.abort_on_exception = true
-        ::Guard::UI.options[:level] = :debug
-        debug_command_execution
-      end
-    end
+  class << self
+    attr_accessor :evaluator, :interactor, :runner, :listener, :lock, :scope, :running
 
-    # Initialize the groups array with the `:default` group.
+    # Smart accessor for retrieving specific plugins at once.
     #
+    # @see Guard.plugin
+    # @see Guard.group
     # @see Guard.groups
     #
-    def setup_groups
-      @groups = [Group.new(:default)]
-    end
-
-    # Initialize the guards array to an empty array.
-    #
-    # @see Guard.guards
-    #
-    def setup_guards
-      @guards = []
-    end
-
-    # Initializes the listener and registers a callback for changes.
-    #
-    def setup_listener
-      listener_callback = lambda do |modified, added, removed|
-
-        # Convert to relative paths (respective to the watchdir it came from)
-        @watchdirs.each do |watchdir|
-          [modified, added, removed].each do |paths|
-            paths.map! do |path|
-              if path.start_with? watchdir
-                path.sub "#{watchdir}#{File::SEPARATOR}", ''
-              else
-                path
-              end
-            end
-          end
-        end
-        ::Guard::Dsl.reevaluate_guardfile if ::Guard::Watcher.match_guardfile?(modified)
-
-        ::Guard.within_preserved_state do
-          runner.run_on_changes(modified, added, removed)
-        end
-      end
-
-      listener_options = {}
-      %w[latency force_polling].each do |option|
-        listener_options[option.to_sym] = options[option] if options.key?(option)
-      end
-
-      listen_args = @watchdirs + [listener_options]
-      @listener = Listen.to(*listen_args).change(&listener_callback)
-    end
-
-    # Sets up traps to catch signals used to control Guard.
-    #
-    # Currently two signals are caught:
-    # - `USR1` which pauses listening to changes.
-    # - `USR2` which resumes listening to changes.
-    # - 'INT' which is delegated to Pry if active, otherwise stops Guard.
-    #
-    def setup_signal_traps
-      unless defined?(JRUBY_VERSION)
-        if Signal.list.keys.include?('USR1')
-          Signal.trap('USR1') { ::Guard.pause unless listener.paused? }
-        end
-
-        if Signal.list.keys.include?('USR2')
-          Signal.trap('USR2') { ::Guard.pause if listener.paused? }
-        end
-
-        if Signal.list.keys.include?('INT')
-          Signal.trap('INT') do
-            if interactor
-              interactor.thread.raise(Interrupt)
-            else
-              ::Guard.stop
-            end
-          end
-        end
-      end
-    end
-
-    def setup_from_guardfile
-      ::Guard::Dsl.evaluate_guardfile(options)
-      ::Guard::UI.error 'No guards found in Guardfile, please add at least one.' if @guards.empty?
-    end
-
-    def setup_scopes
-      scope[:groups]  = options[:group].map { |g| ::Guard.groups(g) } if options[:group]
-      scope[:plugins] = options[:plugin].map { |p| ::Guard.guards(p) } if options[:plugin]
-    end
-
-    # Enables or disables the notifier based on user's configurations.
-    #
-    def setup_notifier
-      options[:notify] && ENV['GUARD_NOTIFY'] != 'false' ? ::Guard::Notifier.turn_on : ::Guard::Notifier.turn_off
-    end
-
-    # Initializes the interactor unless the user has specified not to.
-    #
-    def setup_interactor
-      unless options[:no_interactions] || !::Guard::Interactor.enabled
-        @interactor = ::Guard::Interactor.new
-      end
-    end
-
-    # Start Guard by evaluating the `Guardfile`, initializing declared Guard plugins
-    # and starting the available file change listener.
-    # Main method for Guard that is called from the CLI when Guard starts.
-    #
-    # - Setup Guard internals
-    # - Evaluate the `Guardfile`
-    # - Configure Notifiers
-    # - Initialize the declared Guard plugins
-    # - Start the available file change listener
-    #
-    # @option options [Boolean] clear if auto clear the UI should be done
-    # @option options [Boolean] notify if system notifications should be shown
-    # @option options [Boolean] debug if debug output should be shown
-    # @option options [Array<String>] group the list of groups to start
-    # @option options [String] watchdir the director to watch
-    # @option options [String] guardfile the path to the Guardfile
-    #
-    def start(options = {})
-      setup(options)
-
-      within_preserved_state do
-        ::Guard::UI.debug 'Guard starts all plugins'
-        runner.run(:start)
-        ::Guard::UI.info "Guard is now watching at '#{ @watchdirs.join "', '" }'"
-        listener.start
-      end
-    end
-
-    # Stop Guard listening to file changes
-    #
-    def stop
-      within_preserved_state(false) do
-        ::Guard::UI.debug 'Guard stops all plugins'
-        runner.run(:stop)
-        ::Guard::Notifier.turn_off
-        ::Guard::UI.info 'Bye bye...', :reset => true
-        listener.stop
-        @running = false
-      end
-    end
-
-    # Reload Guardfile and all Guard plugins currently enabled.
-    # If no scope is given, then the Guardfile will be re-evaluated,
-    # which results in a stop/start, which makes the reload obsolete.
-    #
-    # @param [Hash] scopes hash with a Guard plugin or a group scope
-    #
-    def reload(scopes = {})
-      scopes = convert_scopes(scopes)
-
-      within_preserved_state do
-        ::Guard::UI.clear(:force => true)
-        ::Guard::UI.action_with_scopes('Reload', scopes)
-
-        if scopes.empty?
-          ::Guard::Dsl.reevaluate_guardfile
-        else
-          runner.run(:reload, scopes)
-        end
-      end
-    end
-
-    # Trigger `run_all` on all Guard plugins currently enabled.
-    #
-    # @param [Hash] scopes hash with a Guard plugin or a group scope
-    #
-    def run_all(scopes = {})
-      scopes = convert_scopes(scopes)
-
-      within_preserved_state do
-        ::Guard::UI.clear(:force => true)
-        ::Guard::UI.action_with_scopes('Run', scopes)
-        runner.run(:run_all, scopes)
-      end
-    end
-
-    # Pause Guard listening to file changes.
-    #
-    def pause
-      if listener.paused?
-        ::Guard::UI.info 'Un-paused files modification listening', :reset => true
-        listener.unpause
-      else
-        ::Guard::UI.info 'Paused files modification listening', :reset => true
-        listener.pause
-      end
-    end
-
-    # Smart accessor for retrieving a specific Guard plugin or several Guard plugins at once.
-    #
+    # @example Filter plugins by String or Symbol
+    #   Guard.plugins('rspec')
+    #   Guard.plugins(:rspec)
+    #
+    # @example Filter plugins by Regexp
+    #   Guard.plugins(/rsp.+/)
+    #
+    # @example Filter plugins by Hash
+    #   Guard.plugins(name: 'rspec', group: 'backend')
+    #
+    # @param [String, Symbol, Regexp, Hash] filter the filter to apply to the plugins
+    # @return [Plugin, Array<Plugin>] the filtered plugin(s)
+    #
+    def plugins(filter = nil)
+      @plugins ||= []
+
+      return @plugins if filter.nil?
+
+      filtered_plugins = case filter
+                        when String, Symbol
+                          @plugins.find_all do |plugin|
+                            plugin.name == filter.to_s.downcase.gsub('-', '')
+                          end
+                        when Regexp
+                          @plugins.find_all do |plugin|
+                            plugin.name =~ filter
+                          end
+                        when Hash
+                          @plugins.find_all do |plugin|
+                            filter.all? do |k, v|
+                              case k
+                              when :name
+                                plugin.name == v.to_s.downcase.gsub('-', '')
+                              when :group
+                                plugin.group.name == v.to_sym
+                              end
+                            end
+                          end
+                        end
+
+      filtered_plugins
+    end
+
+    # Smart accessor for retrieving a specific plugin.
+    #
+    # @see Guard.plugins
+    # @see Guard.group
     # @see Guard.groups
     #
-    # @example Filter Guard plugins by String or Symbol
-    #   Guard.guards('rspec')
-    #   Guard.guards(:rspec)
+    # @example Find a plugin by String or Symbol
+    #   Guard.plugin('rspec')
+    #   Guard.plugin(:rspec)
     #
-    # @example Filter Guard plugins by Regexp
-    #   Guard.guards(/rsp.+/)
+    # @example Find a plugin by Regexp
+    #   Guard.plugin(/rsp.+/)
     #
-    # @example Filter Guard plugins by Hash
-    #   Guard.guards({ :name => 'rspec', :group => 'backend' })
+    # @example Find a plugin by Hash
+    #   Guard.plugin(name: 'rspec', group: 'backend')
     #
-    # @param [String, Symbol, Regexp, Hash] filter the filter to apply to the Guard plugins
-    # @return [Array<Guard>] the filtered Guard plugins
+    # @param [String, Symbol, Regexp, Hash] filter the filter for finding the plugin
+    #   the Guard plugin
+    # @return [Plugin, nil] the plugin found, nil otherwise
     #
-    def guards(filter = nil)
-      @guards ||= []
-
-      case filter
-      when String, Symbol
-        @guards.find { |guard| guard.class.to_s.downcase.sub('guard::', '') == filter.to_s.downcase.gsub('-', '') }
-      when Regexp
-        @guards.find_all { |guard| guard.class.to_s.downcase.sub('guard::', '') =~ filter }
-      when Hash
-        filter.inject(@guards) do |matches, (k, v)|
-          if k.to_sym == :name
-            matches.find_all { |guard| guard.class.to_s.downcase.sub('guard::', '') == v.to_s.downcase.gsub('-', '') }
-          else
-            matches.find_all { |guard| guard.send(k).to_sym == v.to_sym }
-          end
-        end
-      else
-        @guards
-      end
+    def plugin(filter)
+      plugins(filter).first
     end
 
-    # Smart accessor for retrieving a specific plugin group or several plugin groups at once.
+    # Smart accessor for retrieving specific groups at once.
     #
-    # @see Guard.guards
+    # @see Guard.plugin
+    # @see Guard.plugins
+    # @see Guard.group
     #
     # @example Filter groups by String or Symbol
     #   Guard.groups('backend')
@@ -324,219 +116,77 @@ module Guard
     #   Guard.groups(/(back|front)end/)
     #
     # @param [String, Symbol, Regexp] filter the filter to apply to the Groups
-    # @return [Array<Group>] the filtered groups
+    # @return [Array<Group>] the filtered group(s)
     #
     def groups(filter = nil)
-      case filter
-      when String, Symbol
-        @groups.find { |group| group.name == filter.to_sym }
-      when Regexp
-        @groups.find_all { |group| group.name.to_s =~ filter }
-      else
-        @groups
-      end
-    end
+      return @groups if filter.nil?
 
-    # Add a Guard plugin to use.
-    #
-    # @param [String] name the Guard name
-    # @param [Array<Watcher>] watchers the list of declared watchers
-    # @param [Array<Hash>] callbacks the list of callbacks
-    # @param [Hash] options the plugin options (see the given Guard documentation)
-    # @return [Guard::Guard] the added Guard plugin
-    #
-    def add_guard(name, watchers = [], callbacks = [], options = {})
-      if name.to_sym == :ego
-        ::Guard::UI.deprecation('Guard::Ego is now part of Guard. You can remove it from your Guardfile.')
-      else
-        guard_class = get_guard_class(name)
-        callbacks.each { |callback| Hook.add_callback(callback[:listener], guard_class, callback[:events]) }
-        guard = guard_class.new(watchers, options)
-        @guards << guard
-        guard
-      end
-    end
+      filtered_groups = case filter
+                        when String, Symbol
+                          @groups.find_all { |group| group.name == filter.to_sym }
+                        when Regexp
+                          @groups.find_all { |group| group.name.to_s =~ filter }
+                        end
 
-    # Add a Guard plugin group.
-    #
-    # @param [String] name the group name
-    # @option options [Boolean] halt_on_fail if a task execution
-    #   should be halted for all Guard plugins in this group if one Guard throws `:task_has_failed`
-    # @return [Guard::Group] the group added (or retrieved from the `@groups` variable if already present)
-    #
-    def add_group(name, options = {})
-      group = groups(name)
-      if group.nil?
-        group = ::Guard::Group.new(name, options)
-        @groups << group
-      end
-      group
+      filtered_groups
     end
 
-    # Runs a block where the interactor is
-    # blocked and execution is synchronized
-    # to avoid state inconsistency.
+    # Smart accessor for retrieving a specific group.
     #
-    # @param [Boolean] restart_interactor whether to restart the interactor or not
-    # @yield the block to run
-    #
-    def within_preserved_state(restart_interactor = true)
-      lock.synchronize do
-        begin
-          interactor.stop if interactor
-          @result = yield
-        rescue Interrupt
-          # Bring back Pry when the block is halted with Ctrl-C
-        end
-
-        interactor.start if interactor && restart_interactor
-      end
-
-      @result
-    end
-
-    # Tries to load the Guard plugin main class. This transforms the supplied Guard plugin
-    # name into a class name:
-    #
-    # * `guardname` will become `Guard::Guardname`
-    # * `dashed-guard-name` will become `Guard::DashedGuardName`
-    # * `underscore_guard_name` will become `Guard::UnderscoreGuardName`
-    #
-    # When no class is found with the strict case sensitive rules, another
-    # try is made to locate the class without matching case:
-    #
-    # * `rspec` will find a class `Guard::RSpec`
+    # @see Guard.plugin
+    # @see Guard.plugins
+    # @see Guard.groups
     #
-    # @param [String] name the name of the Guard
-    # @param [Boolean] fail_gracefully whether error messages should not be printed
-    # @return [Class, nil] the loaded class
+    # @example Find a group by String or Symbol
+    #   Guard.group('backend')
+    #   Guard.group(:backend)
     #
-    def get_guard_class(name, fail_gracefully=false)
-      name        = name.to_s
-      try_require = false
-      const_name  = name.gsub(/\/(.?)/) { "::#{ $1.upcase }" }.gsub(/(?:^|[_-])(.)/) { $1.upcase }
-      begin
-        require "guard/#{ name.downcase }" if try_require
-        self.const_get(self.constants.find { |c| c.to_s == const_name } || self.constants.find { |c| c.to_s.downcase == const_name.downcase })
-      rescue TypeError
-        if try_require
-          ::Guard::UI.error "Could not find class Guard::#{ const_name.capitalize }"
-        else
-          try_require = true
-          retry
-        end
-      rescue LoadError => loadError
-        unless fail_gracefully
-          ::Guard::UI.error "Could not load 'guard/#{ name.downcase }' or find class Guard::#{ const_name.capitalize }"
-          ::Guard::UI.error loadError.to_s
-        end
-      end
-    end
-
-    # Locate a path to a Guard plugin gem.
+    # @example Find a group by Regexp
+    #   Guard.group(/(back|front)end/)
     #
-    # @param [String] name the name of the Guard plugin without the prefix `guard-`
-    # @return [String] the full path to the Guard gem
+    # @param [String, Symbol, Regexp] filter the filter for finding the group
+    # @return [Group] the group found, nil otherwise
     #
-    def locate_guard(name)
-      if Gem::Version.create(Gem::VERSION) >= Gem::Version.create('1.8.0')
-        Gem::Specification.find_by_name("guard-#{ name }").full_gem_path
-      else
-        Gem.source_index.find_name("guard-#{ name }").last.full_gem_path
-      end
-    rescue
-      ::Guard::UI.error "Could not find 'guard-#{ name }' gem path."
+    def group(filter)
+      groups(filter).first
     end
 
-    # Returns a list of Guard plugin Gem names installed locally.
-    #
-    # @return [Array<String>] a list of Guard plugin gem names
+    # Add a Guard plugin to use.
     #
-    def guard_gem_names
-      if Gem::Version.create(Gem::VERSION) >= Gem::Version.create('1.8.0')
-        Gem::Specification.find_all.select do |x|
-          if x.name =~ /^guard-/
-            true
-          elsif x.name != 'guard'
-            guard_plugin_path = File.join(x.full_gem_path, "lib/guard/#{ x.name }.rb")
-            File.exists?( guard_plugin_path )
-          end
-        end
-      else
-        Gem.source_index.find_name(/^guard-/)
-      end.map { |x| x.name.sub(/^guard-/, '') }
-    end
-
-    # Adds a command logger in debug mode. This wraps common command
-    # execution functions and logs the executed command before execution.
+    # @param [String] name the Guard name
+    # @param [Hash] options the plugin options (see the given Guard documentation)
+    # @option options [String] group the group to which the Guard plugin belongs
+    # @option options [Array<Watcher>] watchers the list of declared watchers
+    # @option options [Array<Hash>] callbacks the list of callbacks
+    # @return [Plugin] the added Guard plugin
+    # @see Plugin
     #
-    def debug_command_execution
-      Kernel.send(:alias_method, :original_system, :system)
-      Kernel.send(:define_method, :system) do |command, *args|
-        ::Guard::UI.debug "Command execution: #{ command } #{ args.join(' ') }"
-        original_system command, *args
-      end
+    def add_plugin(name, options = {})
+      plugin_instance = ::Guard::PluginUtil.new(name).initialize_plugin(options)
+      @plugins << plugin_instance
 
-      Kernel.send(:alias_method, :original_backtick, :'`')
-      Kernel.send(:define_method, :'`') do |command|
-        ::Guard::UI.debug "Command execution: #{ command }"
-        original_backtick command
-      end
+      plugin_instance
     end
 
-    # Deprecation message for the `watch_all_modifications` start option
-    WATCH_ALL_MODIFICATIONS_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
-      Starting with Guard v1.1 the 'watch_all_modifications' option is removed and is now always on.
-    EOS
-
-    # Deprecation message for the `no_vendor` start option
-    NO_VENDOR_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
-      Starting with Guard v1.1 the 'no_vendor' option is removed because the monitoring
-      gems are now part of a new gem called Listen. (https://github.com/guard/listen)
-
-      You can specify a custom version of any monitoring gem directly in your Gemfile
-      if you want to overwrite Listen's default monitoring gems.
-    EOS
-
-    # Displays a warning for each deprecated options used.
+    # Add a Guard plugin group.
     #
-    def deprecated_options_warning
-      ::Guard::UI.deprecation(WATCH_ALL_MODIFICATIONS_DEPRECATION) if options[:watch_all_modifications]
-      ::Guard::UI.deprecation(NO_VENDOR_DEPRECATION) if options[:no_vendor]
-    end
-
-    # Convert the old scope format to the new scope format.
+    # @param [String] name the group name
+    # @option options [Boolean] halt_on_fail if a task execution
+    #   should be halted for all Guard plugins in this group if
+    #   one Guard throws `:task_has_failed`
+    # @return [Group] the group added (or retrieved from the `@groups`
+    #   variable if already present)
     #
-    # @example Convert old scopes
-    #   convert_scopes({ :guard => :rspec, :group => :backend })
-    #   => { :plugins => [:rspec], :groups => [:backend] }
+    # @see Group
     #
-    def convert_scopes(scopes)
-      if plugin = scopes.delete(:guard)
-        scopes[:plugins] = [plugin]
-      end
-
-      if group = scopes.delete(:group)
-        scopes[:groups] = [group]
+    def add_group(name, options = {})
+      unless group = group(name)
+        group = ::Guard::Group.new(name, options)
+        @groups << group
       end
 
-      scopes
+      group
     end
 
-    # Determine if Guard needs to quit. This
-    # checks for Ctrl-D pressed.
-    #
-    # @return [Boolean] whether to quit or not
-    #
-    def quit?
-      STDIN.read_nonblock(1)
-      false
-    rescue Errno::EINTR
-      false
-    rescue Errno::EAGAIN
-      false
-    rescue EOFError
-      true
-    end
   end
 end