guard 2.10.0 → 2.10.1

data/lib/guard/internals/session.rb

@@ -69,6 +69,8 @@ module Guard
 
         @guardfile_plugin_scope = []
         @guardfile_group_scope = []
+        @guardfile_ignore = []
+        @guardfile_ignore_bang = []
       end
 
       def guardfile_scope(scope)
@@ -78,8 +80,11 @@ module Guard
         fail "Unknown options: #{opts.inspect}" unless opts.empty?
       end
 
+      # TODO: create a EvaluatorResult class?
       attr_reader :guardfile_group_scope
       attr_reader :guardfile_plugin_scope
+      attr_accessor :guardfile_ignore
+      attr_accessor :guardfile_ignore_bang
 
       def clearing(on)
         @clear = on

data/lib/guard/internals/session.rb.orig

@@ -81,11 +81,24 @@ module Guard
       attr_reader :guardfile_group_scope
       attr_reader :guardfile_plugin_scope
 
-      # TODO: not tested
-      def clear?
+      def guardfile_ignore
+        fail NotImplementedError
+      end
+
+      def guardfile_ignore_bang
+        fail NotImplementedError
+      end
+
+      def clearing(on)
+        @clear = on
+      end
+
+      def clearing?
         @clear
       end
 
+      alias :clear? :clearing?
+
       def debug?
         @debug
       end

data/lib/guard/notifier.rb

@@ -9,8 +9,7 @@ require_relative "ui"
 
 module Guard
   # The notifier handles sending messages to different notifiers. Currently the
-  # following
-  # libraries are supported:
+  # following libraries are supported:
   #
   # * Ruby GNTP
   # * Growl
@@ -109,13 +108,13 @@ module Guard
     # @param [Hash] options the turn_on options
     # @option options [Boolean] silent disable any logging
     #
-    def turn_on(opts = {})
+    def turn_on(options = {})
       _check_server!
       return unless enabled?
 
       fail "Already active!" if active?
 
-      silent = opts[:silent]
+      silent = options[:silent]
 
       @detected.available.each do |klass, _|
         ::Guard::UI.info(format(USING_NOTIFIER, klass.title)) unless silent
@@ -171,7 +170,7 @@ module Guard
     # @option options [String] silent disable any error message
     # @return [Boolean] if the notification could be added
     #
-    def add(name, opts = {})
+    def add(name, options = {})
       _check_server!
 
       return false unless enabled?
@@ -182,7 +181,7 @@ module Guard
       end
 
       # ok to pass new instance when called without connect (e.g. evaluator)
-      (@detected || Detected.new(SUPPORTED)).add(name, opts)
+      (@detected || Detected.new(SUPPORTED)).add(name, options)
     end
 
     # TODO: deprecate/remove

data/lib/guard/notifiers/tmux.rb

@@ -173,41 +173,41 @@ module Guard
       # to true, and may further disable the colorization by setting
       # `change_color` to false.
       #
-      # @param [String] title the notification title
-      # @param [Hash] opts additional notification library options
-      # @option opts [String] type the notification type. Either 'success',
+      # @param [String] message the notification message
+      # @param [Hash] options additional notification library options
+      # @option options [String] type the notification type. Either 'success',
       #   'pending', 'failed' or 'notify'
-      # @option opts [String] message the notification message body
-      # @option opts [String] image the path to the notification image
-      # @option opts [Boolean] change_color whether to show a color
+      # @option options [String] message the notification message body
+      # @option options [String] image the path to the notification image
+      # @option options [Boolean] change_color whether to show a color
       #   notification
-      # @option opts [String,Array] color_location the location where to draw
+      # @option options [String,Array] color_location the location where to draw
       #   the color notification
-      # @option opts [Boolean] display_message whether to display a message
+      # @option options [Boolean] display_message whether to display a message
       #   or not
-      # @option opts [Boolean] display_on_all_clients whether to display a
+      # @option options [Boolean] display_on_all_clients whether to display a
       #   message on all tmux clients or not
       #
-      def notify(message, opts = {})
+      def notify(message, options = {})
         super
-        opts.delete(:image)
+        options.delete(:image)
 
-        change_color = Defaults.option(opts, :change_color)
-        options = Array(Defaults.option(opts, :color_location))
-        display_the_title = Defaults.option(opts, :display_title)
-        display_message = Defaults.option(opts, :display_message)
-        type  = opts.delete(:type).to_s
-        title = opts.delete(:title)
+        change_color = Defaults.option(options, :change_color)
+        locations = Array(Defaults.option(options, :color_location))
+        display_the_title = Defaults.option(options, :display_title)
+        display_message = Defaults.option(options, :display_message)
+        type  = options.delete(:type).to_s
+        title = options.delete(:title)
 
         if change_color
-          color = tmux_color(type, opts)
-          options.each { |location| Client.set(_all?, location, color) }
+          color = tmux_color(type, options)
+          locations.each { |location| Client.set(_all?, location, color) }
         end
 
-        display_title(type, title, message, opts) if display_the_title
+        display_title(type, title, message, options) if display_the_title
 
         return unless display_message
-        display_message(type, title, message, opts)
+        display_message(type, title, message, options)
       end
 
       # Displays a message in the title bar of the terminal.
@@ -224,10 +224,10 @@ module Guard
       # @option options [String] default_message_format a string to use as
       #   formatter when no format per type is defined.
       #
-      def display_title(type, title, message, opts = {})
+      def display_title(type, title, message, options = {})
         format = "#{type}_title_format".to_sym
-        options = Defaults.option(opts, :default_title_format)
-        title_format   = opts.fetch(format, options)
+        default_title_format = Defaults.option(options, :default_title_format)
+        title_format   = options.fetch(format, default_title_format)
         teaser_message = message.split("\n").first
         display_title  = title_format % [title, teaser_message]
 

data/lib/guard/plugin.rb

@@ -91,7 +91,7 @@ module Guard
     #     hook :foo
     #   end
     #
-    # Here, when {Guard::Plugin::Base#run_all} is called, {#hook} will notify
+    # Here, when {Guard::Plugin#run_all} is called, {#hook} will notify
     # callbacks registered for the "run_all_foo" event.
     #
     # When event is a String, {#hook} will directly turn the String
@@ -103,7 +103,7 @@ module Guard
     #     hook "foo_bar"
     #   end
     #
-    # When {Guard::Plugin::Base#run_all} is called, {#hook} will notify
+    # When {Guard::Plugin::run_all} is called, {#hook} will notify
     # callbacks registered for the "foo_bar" event.
     #
     # @param [Symbol, String] event the name of the Guard event

data/lib/guard/ui.rb

@@ -185,13 +185,7 @@ module Guard
         yield plugin
       end
 
-      # Display a message of the type `method` and with the color `color_name`
-      # (no color by default) conditionnaly given a `plugin_name`.
-      #
-      # @param [String] plugin_name the calling plugin name
-      # @option options [Boolean] reset whether to clean the output before
-      # @option options [String] plugin manually define the calling plugin
-      #
+      # @private
       def _filtered_logger_message(message, method, color_name, options = {})
         message = color(message, color_name) if color_name
 

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.10.0"
+  VERSION = "2.10.1"
 end

data/lib/guard/version.rb.orig

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.8.2"
+  VERSION = "2.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-29 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -100,7 +100,6 @@ files:
 - lib/guard.rb.orig
 - lib/guard/aruba_adapter.rb
 - lib/guard/cli.rb
-- lib/guard/cli.rb.orig
 - lib/guard/commander.rb
 - lib/guard/commands/all.rb
 - lib/guard/commands/change.rb
@@ -113,13 +112,11 @@ files:
 - lib/guard/deprecated/dsl.rb
 - lib/guard/deprecated/evaluator.rb
 - lib/guard/deprecated/guard.rb
-- lib/guard/deprecated/guard.rb.orig
 - lib/guard/deprecated/guardfile.rb
 - lib/guard/deprecated/watcher.rb
 - lib/guard/dsl.rb
 - lib/guard/dsl.rb.orig
 - lib/guard/dsl_describer.rb
-- lib/guard/dsl_describer.rb.orig
 - lib/guard/group.rb
 - lib/guard/guardfile.rb
 - lib/guard/guardfile/evaluator.rb
@@ -141,9 +138,7 @@ files:
 - lib/guard/jobs/pry_wrapper.rb
 - lib/guard/jobs/sleep.rb
 - lib/guard/notifier.rb
-- lib/guard/notifier.rb.orig
 - lib/guard/notifier/detected.rb
-- lib/guard/notifier/detected.rb.orig
 - lib/guard/notifiers/base.rb
 - lib/guard/notifiers/emacs.rb
 - lib/guard/notifiers/file_notifier.rb
@@ -157,23 +152,18 @@ files:
 - lib/guard/notifiers/tmux.rb
 - lib/guard/options.rb
 - lib/guard/plugin.rb
-- lib/guard/plugin.rb.orig
 - lib/guard/plugin_util.rb
 - lib/guard/rake_task.rb
 - lib/guard/reevaluator.rb
-- lib/guard/reevaluator.rb.orig
 - lib/guard/runner.rb
 - lib/guard/sheller.rb
 - lib/guard/templates/Guardfile
-- lib/guard/templates/Guardfile.orig
 - lib/guard/terminal.rb
 - lib/guard/ui.rb
-- lib/guard/ui.rb.orig
 - lib/guard/ui/colors.rb
 - lib/guard/version.rb
 - lib/guard/version.rb.orig
 - lib/guard/watcher.rb
-- lib/guard/watcher.rb.orig
 - man/guard.1
 - man/guard.1.html
 homepage: http://guardgem.org

data/lib/guard/cli.rb.orig

@@ -1,220 +0,0 @@
-require "thor"
-
-require "guard"
-require "guard/version"
-require "guard/dsl_describer"
-require "guard/guardfile/evaluator"
-require "guard/guardfile/generator"
-
-module Guard
-  # Facade for the Guard command line interface managed by
-  # [Thor](https://github.com/wycats/thor).
-  #
-  # This is the main interface to Guard that is called by the Guard binary
-  # `bin/guard`. Do not put any logic in here, create a class and delegate
-  # instead.
-  #
-  class CLI < Thor
-    default_task :start
-
-    desc "start", "Starts Guard"
-
-    method_option :clear,
-                  type:    :boolean,
-                  default: false,
-                  aliases: "-c",
-                  banner:  "Auto clear shell before each action"
-
-    method_option :notify,
-                  type:    :boolean,
-                  default: true,
-                  aliases: "-n",
-                  banner:  "Notifications feature"
-
-    method_option :debug,
-                  type:    :boolean,
-                  default: false,
-                  aliases: "-d",
-                  banner:  "Show debug information"
-
-    method_option :group,
-                  type:    :array,
-                  default: [],
-                  aliases: "-g",
-                  banner:  "Run only the passed groups"
-
-    method_option :plugin,
-                  type:    :array,
-                  default: [],
-                  aliases: "-P",
-                  banner:  "Run only the passed plugins"
-
-    method_option :watchdir,
-                  type:    :array,
-                  aliases: "-w",
-                  banner:  "Specify the directories to watch"
-
-    method_option :guardfile,
-                  type:    :string,
-                  aliases: "-G",
-                  banner:  "Specify a Guardfile"
-
-    method_option :no_interactions,
-                  type: :boolean,
-                  default: false,
-                  aliases: "-i",
-                  banner: "Turn off completely any Guard terminal interactions"
-
-    method_option :no_bundler_warning,
-                  type: :boolean,
-                  default: false,
-                  aliases: "-B",
-                  banner: "Turn off warning when Bundler is not present"
-
-    # Listen options
-    method_option :latency,
-                  type:    :numeric,
-                  aliases: "-l",
-                  banner:  'Overwrite Listen\'s default latency'
-
-    method_option :force_polling,
-                  type:    :boolean,
-                  default: false,
-                  aliases: "-p",
-                  banner:  "Force usage of the Listen polling listener"
-
-    method_option :wait_for_delay,
-                  type:    :numeric,
-                  aliases: "-y",
-                  banner:  'Overwrite Listen\'s default wait_for_delay'
-
-    method_option :listen_on,
-                  type:    :string,
-                  aliases: "-o",
-                  default: false,
-                  banner:  "Specify a network address to Listen on for "\
-                  "file change events (e.g. for use in VMs)"
-
-    # Start Guard by initializing the defined Guard plugins and watch the file
-    # system.
-    #
-    # This is the default task, so calling `guard` is the same as calling
-    # `guard start`.
-    #
-    # @see Guard.start
-    #
-    def start
-      _verify_bundler_presence unless options[:no_bundler_warning]
-      ::Guard.start(options)
-    end
-
-    desc "list", "Lists Guard plugins that can be used with init"
-
-    # List the Guard plugins that are available for use in your system and
-    # marks those that are currently used in your `Guardfile`.
-    #
-    # @see Guard::DslDescriber.list
-    #
-    def list
-      ::Guard::DslDescriber.new(options).list
-    end
-
-    desc "notifiers", "Lists notifiers and its options"
-
-    # List the Notifiers for use in your system.
-    #
-    # @see Guard::DslDescriber.notifiers
-    #
-    def notifiers
-      ::Guard::DslDescriber.new(options).notifiers
-    end
-
-    desc "version", "Show the Guard version"
-    map %w(-v --version) => :version
-
-    # Shows the current version of Guard.
-    #
-    # @see Guard::VERSION
-    #
-    def version
-      $stdout.puts "Guard version #{ ::Guard::VERSION }"
-    end
-
-    desc "init [GUARDS]", "Generates a Guardfile at the current directory"\
-      " (if it is not already there) and adds all installed Guard plugins"\
-      " or the given GUARDS into it"
-
-    method_option :bare,
-                  type: :boolean,
-                  default: false,
-                  aliases: "-b",
-                  banner: "Generate a bare Guardfile without adding any"\
-                  " installed plugin into it"
-
-    # Initializes the templates of all installed Guard plugins and adds them
-    # to the `Guardfile` when no Guard name is passed. When passing
-    # Guard plugin names it does the same but only for those Guard plugins.
-    #
-    # @see Guard::Guardfile.initialize_template
-    # @see Guard::Guardfile.initialize_all_templates
-    #
-    # @param [Array<String>] plugin_names the name of the Guard plugins to
-    # initialize
-    #
-    def init(*plugin_names)
-      _verify_bundler_presence unless options[:no_bundler_warning]
-
-      ::Guard.reset_options(options) # Since UI.deprecated uses config
-
-      generator = Guardfile::Generator.new(abort_on_existence: options[:bare])
-      generator.create_guardfile
-
-      # Note: this reset "hack" will be fixed after refactoring
-      ::Guard.reset_plugins
-
-      # Evaluate because it might have existed and creating was skipped
-      ::Guard::Guardfile::Evaluator.new(Guard.options).evaluate_guardfile
-
-      return if options[:bare]
-
-      if plugin_names.empty?
-        generator.initialize_all_templates
-      else
-        plugin_names.each do |plugin_name|
-          generator.initialize_template(plugin_name)
-        end
-      end
-    end
-
-    desc "show", "Show all defined Guard plugins and their options"
-    map %w(-T) => :show
-
-    # Shows all Guard plugins and their options that are defined in
-    # the `Guardfile`
-    #
-    # @see Guard::DslDescriber.show
-    #
-    def show
-      ::Guard::DslDescriber.new(options).show
-    end
-
-    private
-
-    # Verifies if Guard is run with `bundle exec` and
-    # shows a hint to do so if not.
-    #
-    def _verify_bundler_presence
-      return unless File.exist?("Gemfile")
-      return if ENV["BUNDLE_GEMFILE"] || ENV["RUBYGEMS_GEMDEPS"]
-
-      ::Guard::UI.info <<EOF
-
-Guard here! It looks like your project has a Gemfile, yet you are running
-`guard` outside of Bundler. If this is your intent, feel free to ignore this
-message. Otherwise, consider using `bundle exec guard` to ensure your
-dependencies are loaded correctly.
-(You can run `guard` with --no-bundler-warning to get rid of this message.)
-EOF
-    end
-  end
-end