guard 1.6.1 → 1.6.2

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.6.2 - 27 January, 2013
+
+### Improvements
+
+- Allow the logger device to be set with the `:device` option. ([@netzpirat][])
+- Improve `list` and `show` command output. ([@netzpirat][])
+- [#386][] Replace Pry's reset command. ([@envygeeks][])
+
+### Bug fixes
+
+- [#389][] Fix `list` and `show` commands. ([@netzpirat][])
+- [#387][] Load the users defined guardrc file. ([@envygeeks][])
+
 ## 1.6.1 - 27 December, 2012
 
 ### Improvements
@@ -701,6 +714,9 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [#376]: https://github.com/guard/guard/issues/376
 [#377]: https://github.com/guard/guard/issues/377
 [#378]: https://github.com/guard/guard/issues/378
+[#386]: https://github.com/guard/guard/issues/386
+[#387]: https://github.com/guard/guard/issues/387
+[#389]: https://github.com/guard/guard/issues/389
 [@Gazer]: https://github.com/Gazer
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@alandipert]: https://github.com/alandipert
@@ -720,6 +736,7 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [@docwhat]: https://github.com/docwhat
 [@dyfrgi]: https://github.com/dyfrgi
 [@earlonrails]: https://github.com/earlonrails
+[@envygeeks]: https://github.com/envygeeks
 [@etehtsea]: https://github.com/etehtsea
 [@f1sherman]: https://github.com/f1sherman
 [@fabioyamate]: https://github.com/fabioyamate

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2012 Thibaud Guillaume-Gentil
+Copyright (c) 2009-2013 Thibaud Guillaume-Gentil
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-Guard [![Build Status](https://secure.travis-ci.org/guard/guard.png?branch=master)](http://travis-ci.org/guard/guard) [![Dependency Status](https://gemnasium.com/guard/guard.png)](https://gemnasium.com/guard/guard) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/guard/guard)
+Guard [![Gem Version](https://badge.fury.io/rb/guard.png)](http://badge.fury.io/rb/guard) [![Build Status](https://secure.travis-ci.org/guard/guard.png?branch=master)](http://travis-ci.org/guard/guard) [![Dependency Status](https://gemnasium.com/guard/guard.png)](https://gemnasium.com/guard/guard) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/guard/guard)
 =====
 
 Guard is a command line tool to easily handle events on file system modifications.
@@ -81,12 +81,11 @@ end
 ```
 
 If you're using Windows and at least Ruby 1.9.2, then [Windows Directory Monitor](https://github.com/Maher4Ever/wdm) is
-more efficient than using `rb-fchange`. However WDM cannot be installed on platforms other than Windows, making it
-impossible to add it to the `Gemfile` for projects developed on multiple platforms.
+more efficient than using `rb-fchange`.
 
 ```Ruby
 group :development do
-  gem 'wdm', :require => false
+  gem 'wdm', :platforms => [:mswin, :mingw], :require => false
 end
 ```
 
@@ -361,6 +360,12 @@ $ guard --clear
 $ guard -c # shortcut
 ```
 
+You can add the following snippet to your `~/.guardrc` to have the clear option always be enabled:
+
+```
+Guard.options[:clear] = true
+```
+
 #### `-n`/`--notify` option
 
 System notifications can be disabled:
@@ -389,7 +394,7 @@ Scope Guard to certain plugins on start:
 
 ```bash
 $ guard --plugins plugin_name another_plugin_name
-$ guard -p plugin_name another_plugin_name # shortcut
+$ guard -P plugin_name another_plugin_name # shortcut
 ```
 
 #### `-d`/`--debug` option
@@ -462,18 +467,19 @@ You can list the available plugins with the `list` task:
 
 ```bash
 $ guard list
-
-Available guards:
-   coffeescript
-   compass
-   cucumber
-   jammit
-   ronn
-   rspec *
-   spork
-   yard
-See also https://github.com/guard/guard/wiki/List-of-available-Guards
-* denotes ones already in your Guardfile
++----------+--------------+
+| Available Guard plugins |
++----------+--------------+
+| Plugin   | In Guardfile |
++----------+--------------+
+| Compass  | ✘            |
+| Cucumber | ✘            |
+| Jammit   | ✘            |
+| Ronn     | ✔            |
+| Rspec    | ✔            |
+| Spork    | ✘            |
+| Yard     | ✘            |
++----------+--------------+
 ```
 
 ### Show
@@ -482,19 +488,25 @@ You can show the structure of the groups and their plugins with the `show` task:
 
 ```bash
 $ guard show
-
-(global):
-  shell
-Group backend:
-  bundler
-  rspec: cli => "--color --format doc"
-Group frontend:
-  coffeescript: output => "public/javascripts/compiled"
-  livereload
++---------+--------+-----------------+----------------------------+
+|                       Guardfile structure                       |
++---------+--------+-----------------+----------------------------+
+| Group   | Plugin | Option          | Value                      |
++---------+--------+-----------------+----------------------------+
+| Default |        |                 |                            |
+| Specs   | Rspec  | all_after_pass  | true                       |
+|         |        | all_on_start    | true                       |
+|         |        | cli             | "--fail-fast --format doc" |
+|         |        | focus_on_failed | false                      |
+|         |        | keep_failed     | true                       |
+|         |        | run_all         | {}                         |
+|         |        | spec_paths      | ["spec"]                   |
+| Docs    | Ronn   |                 |                            |
++---------+--------+-----------------+----------------------------+
 ```
 
 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 below.
+read more about these files in the [shared configuration section](https://github.com/guard/guard#shared-configurations).
 
 Interactions
 ------------
@@ -783,14 +795,16 @@ filter /\.js$/
 
 ### logger
 
-The `logger` method allows you to customize the Guard log output to your needs by specifying one or more options like:
+The `logger` method allows you to customize the [Lumberjack](https://github.com/bdurand/lumberjack) log output to your
+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
+       :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
@@ -805,6 +819,9 @@ The `:time_format` option directives are the same as Time#strftime or can be `:m
 The `:only` and `:except` are either a string or a symbol, or an array of strings or symbols that matches the name of
 the Guard plugin name that sends the log message. They cannot be specified at the same time.
 
+By default the logger uses `$stderr` as device, but you can override this by supplying the `:device` option and set
+either an IO stream or a filename.
+
 ### Example
 
 ```ruby

data/lib/guard.rb

@@ -22,8 +22,8 @@ module Guard
   # The location of user defined templates
   HOME_TEMPLATES = File.expand_path('~/.guard/templates')
 
-  WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
-  DEV_NULL = WINDOWS ? "NUL" : "/dev/null"
+  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
@@ -44,12 +44,12 @@ module Guard
     # @deprecated @option options [Boolean] no_vendor ignore vendored dependencies
     #
     def setup(options = {})
-      @running    = true
-      @lock       = Mutex.new
-      @options    = options.dup
-      @watchdir   = (options[:watchdir] && File.expand_path(options[:watchdir])) || Dir.pwd
-      @runner     = ::Guard::Runner.new
-      @scope      = { :plugins => [], :groups => []}
+      @running  = true
+      @lock     = Mutex.new
+      @options  = options.dup
+      @watchdir = (options[:watchdir] && File.expand_path(options[:watchdir])) || Dir.pwd
+      @runner   = ::Guard::Runner.new
+      @scope    = { :plugins => [], :groups => [] }
 
       if options[:debug]
         Thread.abort_on_exception = true
@@ -433,8 +433,8 @@ module Guard
         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")
+          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

data/lib/guard/cli.rb

@@ -124,8 +124,7 @@ module Guard
     # @see Guard::DslDescriber.list
     #
     def list
-      verify_bundler_presence
-      ::Guard::DslDescriber.list(options)
+      puts ::Guard::DslDescriber.list(options)
     end
 
     desc 'version', 'Show the Guard version'
@@ -136,8 +135,7 @@ module Guard
     # @see Guard::VERSION
     #
     def version
-      verify_bundler_presence
-      ::Guard::UI.info "Guard version #{ ::Guard::VERSION }"
+      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 guards or the given GUARDS into it'
@@ -182,8 +180,7 @@ module Guard
     # @see Guard::DslDescriber.show
     #
     def show
-      verify_bundler_presence
-      ::Guard::DslDescriber.show(options)
+      puts ::Guard::DslDescriber.show(options)
     end
 
     private

data/lib/guard/commands/show.rb

@@ -16,7 +16,7 @@ module Guard
         BANNER
 
         def process
-          ::Guard::DslDescriber.show(::Guard.options)
+          output.puts ::Guard::DslDescriber.show(::Guard.options)
         end
       end
     end

data/lib/guard/dsl.rb

@@ -29,58 +29,7 @@ module Guard
   # In addition, if a user configuration `.guard.rb` in your home directory is found, it will
   # be appended to the current project `Guardfile`.
   #
-  # @example A sample of a complex Guardfile
-  #
-  #   notification :growl
-  #
-  #   group 'frontend' do
-  #     guard 'passenger', :ping => true do
-  #       watch('config/application.rb')
-  #       watch('config/environment.rb')
-  #       watch(%r{^config/environments/.+\.rb})
-  #       watch(%r{^config/initializers/.+\.rb})
-  #     end
-  #
-  #     guard 'livereload', :apply_js_live => false do
-  #       watch(%r{^app/.+\.(erb|haml)})
-  #       watch(%r{^app/helpers/.+\.rb})
-  #       watch(%r{^public/javascripts/.+\.js})
-  #       watch(%r{^public/stylesheets/.+\.css})
-  #       watch(%r{^public/.+\.html})
-  #       watch(%r{^config/locales/.+\.yml})
-  #     end
-  #   end
-  #
-  #   group 'backend' do
-  #     # Reload the bundle when the Gemfile is modified
-  #     guard 'bundler' do
-  #       watch('Gemfile')
-  #     end
-  #
-  #     # for big project you can fine tune the "timeout" before Spork's launch is considered failed
-  #     guard 'spork', :wait => 40 do
-  #       watch('Gemfile')
-  #       watch('config/application.rb')
-  #       watch('config/environment.rb')
-  #       watch(%r{^config/environments/.+\.rb})
-  #       watch(%r{^config/initializers/.+\.rb})
-  #       watch('spec/spec_helper.rb')
-  #     end
-  #
-  #     # use RSpec 2, from the system's gem and with some direct RSpec CLI options
-  #     guard 'rspec', :version => 2, :cli => "--color --drb -f doc", :bundler => false do
-  #       watch('spec/spec_helper.rb')                                  { "spec" }
-  #       watch('app/controllers/application_controller.rb')            { "spec/controllers" }
-  #       watch('config/routes.rb')                                     { "spec/routing" }
-  #       watch(%r{^spec/support/(controllers|acceptance)_helpers\.rb}) { |m| "spec/#{m[1]}" }
-  #       watch(%r{^spec/.+_spec\.rb})
-  #
-  #       watch(%r{^app/controllers/(.+)_(controller)\.rb}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  #
-  #       watch(%r{^app/(.+)\.rb}) { |m| "spec/#{m[1]}_spec.rb" }
-  #       watch(%r{^lib/(.+)\.rb}) { |m| "spec/lib/#{m[1]}_spec.rb" }
-  #     end
-  #   end
+  # @see https://github.com/guard/guard/wiki/Guardfile-examples
   #
   class Dsl
 
@@ -107,7 +56,7 @@ module Guard
 
     class << self
 
-      @@options = nil
+      attr_accessor :options
 
       # Evaluate the DSL methods in the `Guardfile`.
       #
@@ -119,7 +68,7 @@ module Guard
       def evaluate_guardfile(options = {})
         raise ArgumentError.new('No option hash passed to evaluate_guardfile!') unless options.is_a?(Hash)
 
-        @@options = options.dup
+        self.options = options.dup
 
         fetch_guardfile_contents
         instance_eval_guardfile(guardfile_contents_with_user_config)
@@ -129,7 +78,7 @@ module Guard
       #
       def reevaluate_guardfile
         before_reevaluate_guardfile
-        ::Guard::Dsl.evaluate_guardfile(@@options)
+        ::Guard::Dsl.evaluate_guardfile(options)
         after_reevaluate_guardfile
       end
 
@@ -142,7 +91,7 @@ module Guard
         ::Guard.setup_groups
         ::Guard::Notifier.clear_notifications
 
-        @@options.delete(:guardfile_contents)
+        options.delete(:guardfile_contents)
       end
 
       # Start Guard and notification and show a message
@@ -167,7 +116,7 @@ module Guard
       # @param [String] contents the content to evaluate.
       #
       def instance_eval_guardfile(contents)
-        new.instance_eval(contents, @@options[:guardfile_path], 1)
+        new.instance_eval(contents, options[:guardfile_path], 1)
       rescue
         ::Guard::UI.error "Invalid Guardfile, original error is:\n#{ $! }"
       end
@@ -186,8 +135,8 @@ module Guard
       # @param [String] guardfile_path the path to the Guardfile
       #
       def read_guardfile(guardfile_path)
-        @@options[:guardfile_path]     = guardfile_path
-        @@options[:guardfile_contents] = File.read(guardfile_path)
+        options[:guardfile_path]     = guardfile_path
+        options[:guardfile_contents] = File.read(guardfile_path)
       rescue
         ::Guard::UI.error("Error reading file #{ guardfile_path }")
         exit 1
@@ -197,16 +146,16 @@ module Guard
       # the options as `:guardfile_contents`.
       #
       def fetch_guardfile_contents
-        if @@options[:guardfile_contents]
+        if options[:guardfile_contents]
           ::Guard::UI.info 'Using inline Guardfile.'
-          @@options[:guardfile_path] = 'Inline Guardfile'
+          options[:guardfile_path] = 'Inline Guardfile'
 
-        elsif @@options[:guardfile]
-          if File.exist?(@@options[:guardfile])
-            read_guardfile(@@options[:guardfile])
-            ::Guard::UI.info "Using Guardfile at #{ @@options[:guardfile] }."
+        elsif options[:guardfile]
+          if File.exist?(options[:guardfile])
+            read_guardfile(options[:guardfile])
+            ::Guard::UI.info "Using Guardfile at #{ options[:guardfile] }."
           else
-            ::Guard::UI.error "No Guardfile exists at #{ @@options[:guardfile] }."
+            ::Guard::UI.error "No Guardfile exists at #{ options[:guardfile] }."
             exit 1
           end
 
@@ -229,7 +178,7 @@ module Guard
       # @return [String] the Guardfile content
       #
       def guardfile_contents
-        @@options ? @@options[:guardfile_contents] : ''
+        options ? options[:guardfile_contents] : ''
       end
 
       # Get the content of the `Guardfile` and the global
@@ -249,7 +198,7 @@ module Guard
       # @return [String] the path to the Guardfile
       #
       def guardfile_path
-        @@options ? @@options[:guardfile_path] : ''
+        options ? options[:guardfile_path] : ''
       end
 
       # Tests if the current `Guardfile` content is usable.
@@ -361,7 +310,7 @@ module Guard
     # @see Guard::DslDescriber
     #
     def group(name, options = {})
-      name    = name.to_sym
+      name = name.to_sym
 
       if block_given?
         ::Guard.add_group(name.to_s.downcase, options)
@@ -536,7 +485,7 @@ module Guard
       end
 
       if options[:only] && options[:except]
-        ::Guard::UI.warning "You cannot specify the logger options :only and :except at the same time."
+        ::Guard::UI.warning 'You cannot specify the logger options :only and :except at the same time.'
 
         options.delete :only
         options.delete :except

data/lib/guard/dsl_describer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Guard
 
   # The DslDescriber overrides methods to create an internal structure
@@ -12,139 +14,68 @@ module Guard
     require 'guard/dsl'
     require 'guard/ui'
 
+    require 'terminal-table'
+
     class << self
 
-      # Evaluate the DSL methods in the `Guardfile`.
+      # Setups groups and plugins state and evaluates the DSL methods in the `Guardfile`.
       #
       # @option options [Array<Symbol,String>] groups the groups to evaluate
       # @option options [String] guardfile the path to a valid Guardfile
       # @option options [String] guardfile_contents a string representing the content of a valid Guardfile
       # @raise [ArgumentError] when options are not a Hash
       #
-      def evaluate_guardfile(options = {})
-        @@guardfile_structure = [{ :guards => [] }]
+      def evaluate_guardfile(options = { })
+        ::Guard.options = { :plugin => [], :group => [] }
+        ::Guard.setup_groups
+        ::Guard.setup_guards
+
         super options
       end
 
       # List the Guard plugins that are available for use in your system and marks
       # those that are currently used in your `Guardfile`.
       #
-      # @example Guard list output
-      #
-      #   Available guards:
-      #     bundler *
-      #     livereload
-      #     ronn
-      #     rspec *
-      #     spork
-      #
-      #   See also https://github.com/guard/guard/wiki/List-of-available-Guards
-      #   * denotes ones already in your Guardfile
-      #
       # @param [Hash] options the Guard options
       #
       def list(options)
         evaluate_guardfile(options)
 
-        installed_guards = guardfile_structure.inject([]) do |installed, group|
-          group[:guards].each { |guard| installed << guard[:name].to_s } if group[:guards]
-          installed
-        end
-
-        ::Guard::UI.info 'Available guards:'
-
-        ::Guard.guard_gem_names.sort.uniq.each do |name|
-          ::Guard::UI.info "   #{ name }#{ installed_guards.include?(name) ? '*' : '' }"
+        rows = ::Guard.guard_gem_names.sort.uniq.inject([]) do |rows, name|
+          rows << [name.capitalize, ::Guard.guards(name) ? '✔' : '✘']
         end
 
-        ::Guard::UI.info ''
-        ::Guard::UI.info 'See also https://github.com/guard/guard/wiki/List-of-available-Guards'
-        ::Guard::UI.info '* denotes ones already in your Guardfile'
+        Terminal::Table.new(:title => 'Available Guard plugins', :headings => ['Plugin', 'In Guardfile'], :rows => rows)
       end
 
       # Shows all Guard plugins and their options that are defined in
       # the `Guardfile`.
       #
-      # @example guard show output
-      #
-      #   (global):
-      #     bundler
-      #     coffeescript: input => "app/assets/javascripts", noop => true
-      #     jasmine
-      #     rspec: cli => "--fail-fast --format Fuubar
-      #
       # @param [Hash] options the Guard options
       #
       def show(options)
         evaluate_guardfile(options)
 
-        guardfile_structure.each do |group|
-          unless group[:guards].empty?
-            if group[:group]
-              ::Guard::UI.info "Group #{ group[:group] }:"
-            else
-              ::Guard::UI.info '(global):'
-            end
-
-            group[:guards].each do |guard|
-              line = "  #{ guard[:name] }"
+        rows = ::Guard.groups.inject([]) do |rows, group|
+          plugins = ''
+          options = ''
+          values  = ''
 
-              unless guard[:options].empty?
-                line += ": #{ guard[:options].inject({}) { |options, (k, v)| options[k.to_s] = v; options }.sort.collect { |k, v| "#{ k } => #{ v.inspect }" }.join(', ') }"
-              end
+          ::Guard.guards({ :group => group.name }).each do |plugin|
+            plugins << plugin.to_s
 
-              ::Guard::UI.info line
+            plugin.options.inject({}) { |o, (k, v)| o[k.to_s] = v; o }.sort.each do |name, value|
+              options << name.to_s << "\n"
+              values  << value.inspect << "\n"
             end
           end
-        end
 
-        ::Guard::UI.info ''
-      end
-
-      private
+          rows << [group.to_s, plugins, options, values]
+        end
 
-      # Get the Guardfile structure.
-      #
-      # @return [Array<Hash>] the structure
-      #
-      def guardfile_structure
-        @@guardfile_structure
+        Terminal::Table.new(:title => 'Guardfile structure', :headings => %w(Group Plugin Option Value), :rows => rows)
       end
 
     end
-
-    private
-
-    # Declares a group of guards.
-    #
-    # @param [String] name the group's name called from the CLI
-    # @yield a block where you can declare several guards
-    #
-    # @see Guard::Dsl#group
-    #
-    def group(name)
-      @@guardfile_structure << { :group => name.to_sym, :guards => [] }
-      @group = true
-
-      yield if block_given?
-
-      @group = false
-    end
-
-    # Declares a Guard.
-    #
-    # @param [String] name the Guard name
-    # @param [Hash] options the options accepted by the Guard
-    # @yield a block where you can declare several watch patterns and actions
-    #
-    # @see Guard::Dsl#guard
-    #
-    def guard(name, options = { })
-      @group ||= false
-      node = (@group ? @@guardfile_structure.last : @@guardfile_structure.first)
-
-      node[:guards] << { :name => name, :options => options }
-    end
-
   end
 end

data/lib/guard/guard.rb

@@ -7,12 +7,12 @@ module Guard
   # depending on user interaction and file modification.
   #
   # `run_on_changes` could be implemented to handle all the changes task case (additions,
-  # modifications, removals) in once, or each task can be implemented separatly with a
+  # modifications, removals) in once, or each task can be implemented separately with a
   # specific behavior.
   #
   # In each of these Guard task methods you have to implement some work when you want to
   # support this kind of task. The return value of each Guard task method is not evaluated
-  # by Guard, but I'll be passed to the "_end" hook for further evaluation. You can
+  # by Guard, but it'll be passed to the "_end" hook for further evaluation. You can
   # throw `:task_has_failed` to indicate that your Guard plugin method was not successful,
   # and successive Guard plugin tasks will be aborted when the group has set the `:halt_on_fail`
   # option.
@@ -47,6 +47,7 @@ module Guard
     attr_accessor :watchers, :options, :group
 
     # Initializes a Guard plugin.
+    # Don't do any work here, especially as Guard plugins get initialized even if they are not in an active group!
     #
     # @param [Array<Guard::Watcher>] watchers the Guard plugin file watchers
     # @param [Hash] options the custom Guard plugin options
@@ -67,7 +68,7 @@ module Guard
       File.read("#{ ::Guard.locate_guard(name) }/lib/guard/#{ name }/templates/Guardfile")
     end
 
-    # Initialize the Guard plugin. This will copy the Guardfile template inside the Guard plugin gem.
+    # Initialize the Guard plugin. This will copy the Guardfile template inside the Guard plugin Gem.
     # The template Guardfile must be located within the Gem at `lib/guard/guard-name/templates/Guardfile`.
     #
     # @param [String] name the name of the Guard plugin
@@ -89,7 +90,7 @@ module Guard
       end
     end
 
-    # Call once when Guard starts. Please override initialize method to init stuff.
+    # Called once when Guard starts. Please override initialize method to init stuff.
     #
     # @raise [:task_has_failed] when start has failed
     # @return [Object] the task result

data/lib/guard/interactor.rb

@@ -91,6 +91,7 @@ module Guard
 
       add_hooks
 
+      replace_reset_command
       create_run_all_command
       create_command_aliases
       create_guard_commands
@@ -106,7 +107,9 @@ module Guard
     #
     def add_hooks
       Pry.config.hooks.add_hook :when_started, :load_guard_rc do
-        load GUARD_RC if File.exist?(File.expand_path(self.class.options[:guard_rc] || GUARD_RC))
+        (self.class.options[:guard_rc] || GUARD_RC).tap do |p|
+          load p if File.exist?(File.expand_path(p))
+        end
       end
 
       if stty_exists?
@@ -116,6 +119,16 @@ module Guard
       end
     end
 
+    # Replaces reset defined inside of Pry with a reset that
+    # instead restarts guard.
+
+    def replace_reset_command
+      Pry.commands.command "reset", "Reset the Guard to a clean state." do
+        output.puts "Guard reset."
+        exec "guard"
+      end
+    end
+
     # Creates a command that triggers the `:run_all` action
     # when the command is empty (just pressing enter on the
     # beginning of a line).

data/lib/guard/ui.rb

@@ -16,7 +16,10 @@ module Guard
       # Get the Guard::UI logger instance
       #
       def logger
-        @logger ||= Lumberjack::Logger.new($stderr, self.options)
+        @logger ||= begin
+          options = self.options.dup
+          Lumberjack::Logger.new(options.delete(:device) || $stderr, options)
+        end
       end
 
       # Get the logger options

data/lib/guard/version.rb

@@ -1,4 +1,4 @@
 module Guard
   # The current gem version of Guard
-  VERSION = '1.6.1'
+  VERSION = '1.6.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me