guard 2.6.1 → 2.7.0

data/lib/guard/commands/notification.rb

@@ -1,27 +1,26 @@
-require 'guard/notifier'
+require "pry"
 
-module Guard
-  class Interactor
-
-     NOTIFICATION = Pry::CommandSet.new do
-      create_command 'notification' do
-
-        group 'Guard'
-        description 'Toggles the notifications.'
+require "guard/notifier"
 
-        banner <<-BANNER
+module Guard
+  module Commands
+    class Notification
+      def self.import
+        Pry::Commands.create_command "notification" do
+          group "Guard"
+          description "Toggles the notifications."
+
+          banner <<-BANNER
           Usage: notification
 
           Toggles the notifications on and off.
-        BANNER
+          BANNER
 
-        def process
-          ::Guard::Notifier.toggle
+          def process
+            ::Guard::Notifier.toggle
+          end
         end
       end
     end
-
   end
 end
-
-Pry.commands.import ::Guard::Interactor::NOTIFICATION

data/lib/guard/commands/pause.rb

@@ -1,28 +1,27 @@
-module Guard
-  class Interactor
-
-    PAUSE = Pry::CommandSet.new do
-      create_command 'pause' do
-
-        group 'Guard'
-        description 'Toggles the file listener.'
+require "pry"
 
-        banner <<-BANNER
+module Guard
+  module Commands
+    class Pause
+      def self.import
+        Pry::Commands.create_command "pause" do
+          group "Guard"
+          description "Toggles the file listener."
+
+          banner <<-BANNER
           Usage: pause
 
           Toggles the file listener on and off.
 
           When the file listener is paused, the default Guard Pry
           prompt will show the pause sign `[p]`.
-        BANNER
+          BANNER
 
-        def process
-          ::Guard.pause
+          def process
+            ::Guard.async_queue_add([:guard_pause])
+          end
         end
       end
     end
-
   end
 end
-
-Pry.commands.import ::Guard::Interactor::PAUSE

data/lib/guard/commands/reload.rb

@@ -1,35 +1,34 @@
-module Guard
-  class Interactor
-
-    RELOAD = Pry::CommandSet.new do
-      create_command 'reload' do
+require "pry"
 
-        group 'Guard'
-        description 'Reload all plugins.'
-
-        banner <<-BANNER
+module Guard
+  module Commands
+    class Reload
+      def self.import
+        Pry::Commands.create_command "reload" do
+          group "Guard"
+          description "Reload all plugins."
+
+          banner <<-BANNER
           Usage: reload <scope>
 
           Run the Guard plugin `reload` action.
 
           You may want to specify an optional scope to the action,
           either the name of a Guard plugin or a plugin group.
-        BANNER
+          BANNER
 
-        def process(*entries)
-          scopes, rest = ::Guard::Interactor.convert_scope(entries)
+          def process(*entries)
+            scopes, unknown = ::Guard::Interactor.convert_scope(entries)
 
-          if rest.empty?
-            ::Guard.reload scopes
-          else
-            output.puts "Unknown scope #{ rest.join(', ') }"
+            unless unknown.empty?
+              output.puts "Unknown scopes: #{ unknown.join(", ") }"
+              return
+            end
+
+            ::Guard.async_queue_add([:guard_reload, scopes])
           end
         end
-
       end
     end
-
   end
 end
-
-Pry.commands.import ::Guard::Interactor::RELOAD

data/lib/guard/commands/scope.rb

@@ -1,32 +1,36 @@
-module Guard
-  class Interactor
-
-    SCOPE = Pry::CommandSet.new do
-      create_command 'scope' do
-
-        group 'Guard'
-        description 'Scope Guard actions to groups and plugins.'
+require "pry"
 
-        banner <<-BANNER
+module Guard
+  module Commands
+    class Scope
+      def self.import
+        Pry::Commands.create_command "scope" do
+          group "Guard"
+          description "Scope Guard actions to groups and plugins."
+
+          banner <<-BANNER
           Usage: scope <scope>
 
           Set the global Guard scope.
-        BANNER
+          BANNER
+
+          def process(*entries)
+            scope, unknown = ::Guard::Interactor.convert_scope(entries)
 
-        def process(*entries)
-          scope, rest = ::Guard::Interactor.convert_scope(entries)
+            unless unknown.empty?
+              output.puts "Unknown scopes: #{unknown.join(",") }"
+              return
+            end
+
+            if scope[:plugins].empty? && scope[:groups].empty?
+              output.puts "Usage: scope <scope>"
+              return
+            end
 
-          if scope[:plugins].empty? && scope[:groups].empty?
-            output.puts 'Usage: scope <scope>'
-          else
             ::Guard.scope = scope
           end
         end
-
       end
     end
-
   end
 end
-
-Pry.commands.import ::Guard::Interactor::SCOPE

data/lib/guard/commands/show.rb

@@ -1,27 +1,24 @@
-require 'guard/dsl_describer'
+require "pry"
 
 module Guard
-  class Interactor
-
-    SHOW = Pry::CommandSet.new do
-      create_command 'show' do
-
-        group 'Guard'
-        description 'Show all Guard plugins.'
-
-        banner <<-BANNER
+  module Commands
+    class Show
+      def self.import
+        Pry::Commands.create_command "show" do
+          group "Guard"
+          description "Show all Guard plugins."
+
+          banner <<-BANNER
           Usage: show
 
           Show all defined Guard plugins and their options.
-        BANNER
+          BANNER
 
-        def process
-          ::Guard::DslDescriber.new(::Guard.options).show
+          def process
+            ::Guard.async_queue_add([:guard_show])
+          end
         end
       end
     end
-
   end
 end
-
-Pry.commands.import ::Guard::Interactor::SHOW

data/lib/guard/deprecated_methods.rb

@@ -1,7 +1,5 @@
 module Guard
-
   module DeprecatedMethods
-
     # @deprecated Use `Guard.plugins(filter)` instead.
     #
     # @see https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0 How to
@@ -30,8 +28,8 @@ module Guard
     #   upgrade for Guard 2.0
     #
     def get_guard_class(name, fail_gracefully = false)
-      ::Guard::UI.deprecation(::Guard::Deprecator::GET_GUARD_CLASS_DEPRECATION)
-      ::Guard::PluginUtil.new(name).plugin_class(fail_gracefully: fail_gracefully)
+      UI.deprecation(Deprecator::GET_GUARD_CLASS_DEPRECATION)
+      PluginUtil.new(name).plugin_class(fail_gracefully: fail_gracefully)
     end
 
     # @deprecated Use `Guard::PluginUtil.new(name).plugin_location` instead.
@@ -40,8 +38,8 @@ module Guard
     #   upgrade for Guard 2.0
     #
     def locate_guard(name)
-      ::Guard::UI.deprecation(::Guard::Deprecator::LOCATE_GUARD_DEPRECATION)
-      ::Guard::PluginUtil.new(name).plugin_location
+      UI.deprecation(Deprecator::LOCATE_GUARD_DEPRECATION)
+      PluginUtil.new(name).plugin_location
     end
 
     # @deprecated Use `Guard::PluginUtil.plugin_names` instead.
@@ -50,10 +48,8 @@ module Guard
     #   upgrade for Guard 2.0
     #
     def guard_gem_names
-      ::Guard::UI.deprecation(::Guard::Deprecator::GUARD_GEM_NAMES_DEPRECATION)
-      ::Guard::PluginUtil.plugin_names
+      UI.deprecation(Deprecator::GUARD_GEM_NAMES_DEPRECATION)
+      PluginUtil.plugin_names
     end
-
   end
-
 end

data/lib/guard/deprecator.rb

@@ -1,107 +1,122 @@
-require 'guard/ui'
+require "guard/ui"
 
 module Guard
   class Deprecator
+    UPGRADE_WIKI = "https://github.com/guard/guard/wiki"\
+      "/Upgrade-guide-for-existing-guards-to-Guard-v1.1"
 
-    MORE_INFO_ON_UPGRADING_TO_GUARD_1_1 = <<-EOS.gsub(/^\s*/, '')
-      For more information on how to update existing Guard plugins, please head over
-      to: https://github.com/guard/guard/wiki/Upgrade-guide-for-existing-guards-to-Guard-v1.1
+    MORE_INFO_ON_UPGRADING_TO_GUARD_1_1 = <<-EOS.gsub(/^\s*/, "")
+      For more information on how to update existing Guard plugins, please head
+      over to:
+      #{UPGRADE_WIKI}
     EOS
 
-    MORE_INFO_ON_UPGRADING_TO_GUARD_2 = <<-EOS.gsub(/^\s*/, '')
+    MORE_INFO_ON_UPGRADING_TO_GUARD_2 = <<-EOS.gsub(/^\s*/, "")
       For more information on how to upgrade for Guard 2.0, please head over
       to: https://github.com/guard/guard/wiki/Upgrading-to-Guard-2.0%s
     EOS
 
-    ADD_GUARD_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
-      Starting with Guard 2.0 'Guard.add_guard(name, options = {})' is deprecated.
+    ADD_GUARD_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
+      Starting with Guard 2.0 'Guard.add_guard(name, options = {})' is
+      deprecated.
 
       Please use 'Guard.add_plugin(name, options = {})' instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
     EOS
 
-    GUARDS_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
+    GUARDS_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
       Starting with Guard 2.0 'Guard.guards(filter)' is deprecated.
 
       Please use 'Guard.plugins(filter)' instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
     EOS
 
     # Deprecator message for the `Guard.get_guard_class` method
-    GET_GUARD_CLASS_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
+    GET_GUARD_CLASS_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
       Starting with Guard 2.0 'Guard.get_guard_class(name, fail_gracefully =
       false)' is deprecated and is now always on.
 
       Please use 'Guard::PluginUtil.new(name).plugin_class(fail_gracefully:
       fail_gracefully)' instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
     EOS
 
     # Deprecator message for the `Guard.locate_guard` method
-    LOCATE_GUARD_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
+    LOCATE_GUARD_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
       Starting with Guard 2.0 'Guard.locate_guard(name)' is deprecated.
 
       Please use 'Guard::PluginUtil.new(name).plugin_location' instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
     EOS
 
     # Deprecator message for the `Guard.guard_gem_names` method
-    GUARD_GEM_NAMES_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
+    GUARD_GEM_NAMES_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
       Starting with Guard 2.0 'Guard.guard_gem_names' is deprecated.
 
       Please use 'Guard::PluginUtil.plugin_names' instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods"}
     EOS
 
     # Deprecator message for the `Guard::Dsl.evaluate_guardfile` method
-    EVALUATE_GUARDFILE_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
-      Starting with Guard 2.0 'Guard::Dsl.evaluate_guardfile(options)' is deprecated.
+    EVALUATE_GUARDFILE_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
+      Starting with Guard 2.0 'Guard::Dsl.evaluate_guardfile(options)' is
+      deprecated.
 
-      Please use 'Guard::Guardfile::Evaluator.new(options).evaluate_guardfile' instead.
+      Please use 'Guard::Guardfile::Evaluator.new(options).evaluate_guardfile'
+      instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods-1'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods-1"}
     EOS
 
     # Deprecator message for the `Guardfile.create_guardfile` method
-    CREATE_GUARDFILE_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
-      Starting with Guard 2.0 'Guard::Guardfile.create_guardfile(options)' is deprecated.
+    CREATE_GUARDFILE_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
+      Starting with Guard 2.0 'Guard::Guardfile.create_guardfile(options)' is
+      deprecated.
 
-      Please use 'Guard::Guardfile::Generator.new(options).create_guardfile' instead.
+      Please use 'Guard::Guardfile::Generator.new(options).create_guardfile'
+      instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods-2'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods-2"}
     EOS
 
     # Deprecator message for the `Guardfile.initialize_template` method
-    INITIALIZE_TEMPLATE_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
-      Starting with Guard 2.0 'Guard::Guardfile.initialize_template(plugin_name)' is deprecated.
+    INITIALIZE_TEMPLATE_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
+      Starting with Guard 2.0
+      'Guard::Guardfile.initialize_template(plugin_name)' is deprecated.
 
-      Please use 'Guard::Guardfile::Generator.new.initialize_template(plugin_name)' instead.
+      Please use
+      'Guard::Guardfile::Generator.new.initialize_template(plugin_name)'
+      instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods-2'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods-2"}
     EOS
 
     # Deprecator message for the `Guardfile.initialize_all_templates` method
-    INITIALIZE_ALL_TEMPLATES_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
-      Starting with Guard 2.0 'Guard::Guardfile.initialize_all_templates' is deprecated.
+    INITIALIZE_ALL_TEMPLATES_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
+      Starting with Guard 2.0 'Guard::Guardfile.initialize_all_templates' is
+      deprecated.
 
-      Please use 'Guard::Guardfile::Generator.new.initialize_all_templates' instead.
+      Please use 'Guard::Guardfile::Generator.new.initialize_all_templates'
+      instead.
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#deprecated-methods-2'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#deprecated-methods-2"}
     EOS
 
     # Deprecator message for when a Guard plugin inherits from Guard::Guard
-    GUARD_GUARD_DEPRECATION = <<-EOS.gsub(/^\s*/, '')
-      Starting with Guard 2.0, Guard::%s should inherit from Guard::Plugin instead of Guard::Guard.
+    GUARD_GUARD_DEPRECATION = <<-EOS.gsub(/^\s*/, "")
+      Starting with Guard 2.0, Guard::%s should inherit from Guard::Plugin
+      instead of Guard::Guard.
 
-      Please note that the constructor signature has changed from Guard::Guard#initialize(watchers = [], options = {}) to Guard::Plugin#initialize(options = {}).
+      Please note that the constructor signature has changed from
+      Guard::Guard#initialize(watchers = [], options = {}) to
+      Guard::Plugin#initialize(options = {}).
 
-      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % '#changes-in-guardguard'}
+      #{MORE_INFO_ON_UPGRADING_TO_GUARD_2 % "#changes-in-guardguard"}
     EOS
-
   end
 end

data/lib/guard/dsl.rb

@@ -1,11 +1,10 @@
-require 'guard/guardfile'
-require 'guard/interactor'
-require 'guard/notifier'
-require 'guard/ui'
-require 'guard/watcher'
+require "guard/guardfile"
+require "guard/interactor"
+require "guard/notifier"
+require "guard/ui"
+require "guard/watcher"
 
 module Guard
-
   # The Dsl class provides the methods that are used in each `Guardfile` to
   # describe the behaviour of Guard.
   #
@@ -44,6 +43,11 @@ module Guard
   # @see https://github.com/guard/guard/wiki/Guardfile-examples
   #
   class Dsl
+    WARN_INVALID_LOG_LEVEL = "Invalid log level `%s` ignored. "\
+      "Please use either :debug, :info, :warn or :error."
+
+    WARN_INVALID_LOG_OPTIONS = "You cannot specify the logger options"\
+      " :only and :except at the same time."
 
     # @deprecated Use
     #   `Guard::Guardfile::Evaluator.new(options).evaluate_guardfile` instead.
@@ -52,8 +56,8 @@ module Guard
     #   upgrade for Guard 2.0
     #
     def self.evaluate_guardfile(options = {})
-      ::Guard::UI.deprecation(::Guard::Deprecator::EVALUATE_GUARDFILE_DEPRECATION)
-      ::Guard::Guardfile::Evaluator.new(options).evaluate_guardfile
+      UI.deprecation(Deprecator::EVALUATE_GUARDFILE_DEPRECATION)
+      Guardfile::Evaluator.new(options).evaluate_guardfile
     end
 
     # Set notification options for the system notifications.
@@ -62,7 +66,7 @@ module Guard
     # You can also pass `:off` as library to turn off notifications.
     #
     # @example Define multiple notifications
-    #   notification :growl_notify
+    #   notification :ruby_gntp
     #   notification :ruby_gntp, host: '192.168.1.5'
     #
     # @param [Symbol, String] notifier the name of the notifier to use
@@ -71,7 +75,7 @@ module Guard
     # @see Guard::Notifier for available notifier and its options.
     #
     def notification(notifier, options = {})
-      ::Guard::Notifier.add_notifier(notifier.to_sym, options.merge(silent: false))
+      Notifier.add_notifier(notifier.to_sym, options.merge(silent: false))
     end
 
     # Sets the interactor options or disable the interactor.
@@ -108,7 +112,8 @@ module Guard
     #     guard :livereload
     #   end
     #
-    # @param [Symbol, String, Array<Symbol, String>] name the group name called from the CLI
+    # @param [Symbol, String, Array<Symbol, String>] name the group name called
+    #   from the CLI
     # @param [Hash] options the options accepted by the group
     # @yield a block where you can declare several Guard plugins
     #
@@ -121,7 +126,8 @@ module Guard
       groups = args
 
       groups.each do |group|
-        raise ArgumentError, "'all' is not an allowed group name!" if group.to_sym == :all
+        next unless group.to_sym == :all
+        fail ArgumentError, "'all' is not an allowed group name!"
       end
 
       if block_given?
@@ -136,7 +142,9 @@ module Guard
 
         @current_groups.pop
       else
-        ::Guard::UI.error "No Guard plugins found in the group '#{ groups.join(', ') }', please add at least one."
+        ::Guard::UI.error \
+          "No Guard plugins found in the group '#{ groups.join(", ") }',"\
+          " please add at least one."
       end
     end
 
@@ -169,6 +177,7 @@ module Guard
 
       yield if block_given?
 
+      @current_groups ||= []
       groups = @current_groups && @current_groups.last || [:default]
       groups.each do |group|
         ::Guard.add_plugin(name, @plugin_options.merge(group: group))
@@ -177,22 +186,28 @@ module Guard
       @plugin_options = nil
     end
 
-    # Defines a pattern to be watched in order to run actions on file modification.
+    # Defines a pattern to be watched in order to run actions on file
+    # modification.
     #
     # @example Declare watchers for a Guard
     #   guard :rspec do
     #     watch('spec/spec_helper.rb')
     #     watch(%r{^.+_spec.rb})
-    #     watch(%r{^app/controllers/(.+).rb}) { |m| 'spec/acceptance/#{m[1]}s_spec.rb' }
+    #     watch(%r{^app/controllers/(.+).rb}) do |m|
+    #       'spec/acceptance/#{m[1]}s_spec.rb'
+    #     end
     #   end
     #
     # @example Declare global watchers outside of a Guard
     #   watch(%r{^(.+)$}) { |m| puts "#{m[1]} changed." }
     #
-    # @param [String, Regexp] pattern the pattern that Guard must watch for modification
+    # @param [String, Regexp] pattern the pattern that Guard must watch for
+    # modification
+    #
     # @yield a block to be run when the pattern is matched
     # @yieldparam [MatchData] m matches of the pattern
-    # @yieldreturn a directory, a filename, an array of directories / filenames, or nothing (can be an arbitrary command)
+    # @yieldreturn a directory, a filename, an array of
+    #   directories / filenames, or nothing (can be an arbitrary command)
     #
     # @see Guard::Watcher
     # @see #guard
@@ -200,6 +215,7 @@ module Guard
     def watch(pattern, &action)
       # Allow watches in the global scope (to execute arbitrary commands) by
       # building a generic Guard::Plugin.
+      @plugin_options ||= nil
       return guard(:plugin) { watch(pattern, &action) } unless @plugin_options
 
       @plugin_options[:watchers] << ::Guard::Watcher.new(pattern, action)
@@ -213,8 +229,13 @@ module Guard
     # @example Define a callback that'll be called before the `reload` action.
     #   callback(:reload_begin) { puts "Let's reload!" }
     #
-    # @example Define a callback that'll be called before the `start` and `stop` actions.
-    #   my_lambda = lambda { |plugin, event, *args| puts "Let's #{event} #{plugin} with #{args}!" }
+    # @example Define a callback that'll be called before the `start` and
+    # `stop` actions.
+    #
+    #   my_lambda = lambda do |plugin, event, *args|
+    #     puts "Let's #{event} #{plugin} with #{args}!"
+    #   end
+    #
     #   callback(my_lambda, [:start_begin, :start_end])
     #
     # @param [Array] args the callback arguments
@@ -223,15 +244,16 @@ module Guard
     # @see Guard::Hooker
     #
     def callback(*args, &block)
+      @plugin_options ||= nil
       fail "callback must be called within a guard block" unless @plugin_options
 
       block, events = if args.size > 1
-        # block must be the first argument in that case, the yielded block is
-        # ignored
-        args
-      else
-        [block, args[0]]
-      end
+                        # block must be the first argument in that case, the
+                        # yielded block is ignored
+                        args
+                      else
+                        [block, args[0]]
+                      end
       @plugin_options[:callbacks] << { events: events, listener: block }
     end
 
@@ -299,13 +321,13 @@ module Guard
         options[:level] = options[:level].to_sym
 
         unless [:debug, :info, :warn, :error].include? options[:level]
-          ::Guard::UI.warning "Invalid log level `#{ options[:level] }` ignored. Please use either :debug, :info, :warn or :error."
+          UI.warning WARN_INVALID_LOG_LEVEL % [options[:level]]
           options.delete :level
         end
       end
 
       if options[:only] && options[:except]
-        ::Guard::UI.warning 'You cannot specify the logger options :only and :except at the same time.'
+        UI.warning WARN_INVALID_LOG_OPTIONS
 
         options.delete :only
         options.delete :except
@@ -313,10 +335,13 @@ module Guard
 
       # Convert the :only and :except options to a regular expression
       [:only, :except].each do |name|
-        if options[name]
-          list = [].push(options[name]).flatten.map { |plugin| Regexp.escape(plugin.to_s) }.join('|')
-          options[name] = Regexp.new(list, Regexp::IGNORECASE)
+        next unless options[name]
+
+        list = [].push(options[name]).flatten.map do |plugin|
+          Regexp.escape(plugin.to_s)
         end
+
+        options[name] = Regexp.new(list.join("|"), Regexp::IGNORECASE)
       end
 
       ::Guard::UI.options.merge!(options)
@@ -339,10 +364,7 @@ module Guard
     # @param [Hash] scopes the scope for the groups and plugins
     #
     def scope(scope = {})
-      scope[:plugins] = Array(scope[:plugins] || scope[:plugin] || [])
-      scope[:groups] = Array(scope[:groups] || scope[:group] || [])
       ::Guard.setup_scope(scope)
     end
-
   end
 end