guard 0.5.1 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.6.0 - August 13, 2011
+
+### Bugs fixes:
+
+- Pull request [#107](https://github.com/guard/guard/pull/107): Small spelling fix. ([@dnagir][])
+- Dir.glob now ignores files that don't need to be watched. ([@rymai][])
+
+### New features
+
+- Pull request [#112](https://github.com/guard/guard/pull/112): Add `list` command to CLI. ([@docwhat][])
+
+### Improvements
+
+- Pull request [#99](https://github.com/guard/guard/pull/99): [OS X] Switch from growl gem to growl_notify gem. ([@johnbintz][])
+- Pull request [#115](https://github.com/guard/guard/pull/115): [Linux] Add ':transient => true' to default libnotify options. ([@zonque][])
+- Pull request [#95](https://github.com/guard/guard/pull/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][])
+  - `watchdir`/`-w` to specify the directory in which Guard should watch for changes,
+  - `guardfile`/`-G` to specify an alternate location for the Guardfile to use.
+- Pull request [#90](https://github.com/guard/guard/pull/90): Refactoring of color handling in the `Guard::UI`. ([@stereobooster][])
+
 ## 0.5.1 - July 2, 2011
 
 ### Bugs fixes:
@@ -6,12 +28,12 @@
 
 ## 0.5.0 - July 2, 2011
 
-## New features
+### New features
 
 - Guard::Ego is now part of Guard, so Guardfile is automagically re-evaluated when modified. ([@thibaudgg][])
 - Pull request [#91](https://github.com/guard/guard/pull/91): Show Guards in Guardfile with the `guard -T`. ([@johnbintz][])
 
-## Improvements
+### Improvements
 
 - Issue [#98](https://github.com/guard/guard/issues/98): Multiple calls per watch event on linux with rb-inotify. ([@jeffutter][] & [@netzpirat][])
 - Pull request [#94](https://github.com/guard/guard/pull/94): Show backtrace in terminal when a problem with a watch action occurs. ([@capotej][])
@@ -170,8 +192,10 @@
 
 [@anithri]: https://github.com/anithri
 [@brainopia]: https://github.com/brainopia
+[@bronson]: https://github.com/bronson
 [@capotej]: https://github.com/capotej
 [@chrisberkhout]: https://github.com/chrisberkhout
+[@dnagir]: https://github.com/dnagir
 [@etehtsea]: https://github.com/etehtsea
 [@fnichol]: https://github.com/fnichol
 [@Gazer]: https://github.com/Gazer
@@ -184,6 +208,7 @@
 [@koshigoe]: https://github.com/koshigoe
 [@mcmire]: https://github.com/mcmire
 [@mislav]: https://github.com/mislav
+[@nestegg]: https://github.com/nestegg
 [@netzpirat]: https://github.com/netzpirat
 [@nicksieger]: https://github.com/nicksieger
 [@niklas]: https://github.com/niklas
@@ -196,6 +221,8 @@
 [@thierryhenrio]: https://github.com/thierryhenrio
 [@tinogomes]: https://github.com/tinogomes
 [@tpope]: https://github.com/tpope
+[@uk-ar]: https://github.com/uk-ar
 [@veged]: https://github.com/veged
 [@wereHamster]: https://github.com/wereHamster
 [@yannlugrin]: https://github.com/yannlugrin
+[@zonque]: https://github.com/zonque

data/README.md

@@ -1,4 +1,4 @@
-Guard [![Build Status](http://travis-ci.org/guard/guard.png)](http://travis-ci.org/guard/guard)
+Guard [![Build Status](https://secure.travis-ci.org/guard/guard.png)](http://travis-ci.org/guard/guard)
 =====
 
 Guard is a command line tool that easily handle events on files modifications.
@@ -50,17 +50,17 @@ Install the rb-fsevent gem for [FSEvent](http://en.wikipedia.org/wiki/FSEvents)
 $ gem install rb-fsevent
 ```
 
-Install the Growl gem if you want notification support:
+Install the growl_notify gem if you want notification support:
 
 ``` bash
-$ gem install growl
+$ gem install growl_notify
 ```
 
-And add them to your Gemfile:
+And add it to your Gemfile:
 
 ``` ruby
 gem 'rb-fsevent'
-gem 'growl'
+gem 'growl_notify'
 ```
 
 ### On Linux
@@ -92,6 +92,12 @@ Install the rb-fchange gem for [Directory Change Notification](http://msdn.micro
 $ gem install rb-fchange
 ```
 
+Install the win32console gem if you want colors in your terminal:
+
+``` bash
+$ gem install win32console
+```
+
 Install the Notifu gem if you want notification support:
 
 ``` bash
@@ -125,7 +131,7 @@ Guard will look for a Guardfile in your current directory. If it does not find o
 Command line options
 --------------------
 
-### `--clear` option
+### `-c`/`--clear` option
 
 Shell can be cleared after each change:
 
@@ -134,7 +140,7 @@ $ guard --clear
 $ guard -c # shortcut
 ```
 
-### `--notify` option
+### `-n`/`--notify` option
 
 Notifications (growl/libnotify) can be disabled:
 
@@ -145,7 +151,7 @@ $ guard -n f # shortcut
 
 Notifications can also be disabled globally by setting a `GUARD_NOTIFY` environment variable to `false`
 
-### `--group` option
+### `-g`/`--group` option
 
 Only certain guards groups can be run (see the Guardfile DSL below for creating groups):
 
@@ -154,7 +160,7 @@ $ guard --group group_name another_group_name
 $ guard -g group_name another_group_name # shortcut
 ```
 
-### `--debug` option
+### `-d`/`--debug` option
 
 Guard can be run in debug mode:
 
@@ -163,6 +169,24 @@ $ guard --debug
 $ guard -d # shortcut
 ```
 
+### `-w`/`--watchdir` option
+
+Guard can watch in any directory (instead of the current directory):
+
+``` bash
+$ guard --watchdir ~/your/fancy/project
+$ guard -w ~/your/fancy/project # shortcut
+```
+
+### `-G`/`--guardfile` option
+
+Guard can use a Guardfile not located in the current directory:
+
+``` bash
+$ guard --guardfile ~/.your_global_guardfile
+$ guard -G ~/.your_global_guardfile # shortcut
+```
+
 An exhaustive list of options is available with:
 
 ``` bash
@@ -193,6 +217,12 @@ Add it to your Gemfile (inside the `development` group):
 gem '<guard-name>'
 ```
 
+You can list all guards installed on your system with:
+
+``` bash
+$ guard list
+```
+
 Insert default guard's definition to your Guardfile by running this command:
 
 ``` bash
@@ -284,7 +314,7 @@ You can list the defined groups and guards for the current Guardfile from the co
   shell
 Group backend:
   bundler
-  rspec: cli => "--color --format doc'
+  rspec: cli => "--color --format doc"
 Group frontend:
   coffeescript: output => "public/javascripts/compiled"
   livereload

data/lib/guard.rb

@@ -14,28 +14,31 @@ module Guard
     # initialize this singleton
     def setup(options = {})
       @options  = options
-      @listener = Listener.select_and_init
+      @listener = Listener.select_and_init(@options[:watchdir] ? File.expand_path(@options[:watchdir]) : Dir.pwd)
       @guards   = []
 
       @options[:notify] && ENV["GUARD_NOTIFY"] != 'false' ? Notifier.turn_on : Notifier.turn_off
 
+      UI.clear if @options[:clear]
+      debug_command_execution if @options[:debug]
+
       self
     end
 
     def start(options = {})
-      UI.clear if options[:clear]
+      Interactor.init_signal_traps
+
       setup(options)
 
-      Interactor.init_signal_traps
       Dsl.evaluate_guardfile(options)
 
       listener.on_change do |files|
-        Dsl.revaluate_guardfile if Watcher.match_guardfile?(files)
+        Dsl.reevaluate_guardfile if Watcher.match_guardfile?(files)
 
         run { run_on_change_for_all_guards(files) } if Watcher.match_files?(guards, files)
       end
 
-      UI.info "Guard is now watching at '#{Dir.pwd}'"
+      UI.info "Guard is now watching at '#{listener.directory}'"
       guards.each { |guard| supervised_task(guard, :start) }
       listener.start
     end
@@ -43,12 +46,14 @@ module Guard
     def run_on_change_for_all_guards(files)
       guards.each do |guard|
         paths = Watcher.match_files(guard, files)
-        supervised_task(guard, :run_on_change, paths) unless paths.empty?
+        unless paths.empty?
+          UI.debug "#{guard.class.name}#run_on_change with #{paths.inspect}"
+          supervised_task(guard, :run_on_change, paths)
+        end
       end
 
       # Reparse the whole directory to catch new files modified during the guards run
-      new_modified_files = listener.modified_files([Dir.pwd + '/'], :all => true)
-      listener.update_last_event
+      new_modified_files = listener.modified_files([listener.directory], :all => true)
       if !new_modified_files.empty? && Watcher.match_files?(guards, new_modified_files)
         run { run_on_change_for_all_guards(new_modified_files) }
       end
@@ -98,8 +103,9 @@ module Guard
         else
           UI.error "Could not find class Guard::#{const_name.capitalize}"
         end
-      rescue LoadError
+      rescue LoadError => loadError
         UI.error "Could not load 'guard/#{name.downcase}' or find class Guard::#{const_name.capitalize}"
+        UI.error loadError.to_s
       end
     end
 
@@ -113,5 +119,29 @@ module Guard
       UI.error "Could not find 'guard-#{name}' gem path."
     end
 
+    ##
+    # Returns a list of guard Gem names installed locally.
+    def guard_gem_names
+      if Gem::Version.create(Gem::VERSION) >= Gem::Version.create('1.8.0')
+        Gem::Specification.find_all.select { |x| x.name =~ /^guard-/ }
+      else
+        Gem.source_index.find_name(/^guard-/)
+      end.map { |x| x.name.sub /^guard-/, '' }
+    end
+
+    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
+
+      Kernel.send(:alias_method, :original_backtick, :"`")
+      Kernel.send(:define_method, :"`") do |command|
+        ::Guard::UI.debug "Command execution: #{command}"
+        original_backtick command
+      end
+    end
+
   end
 end

data/lib/guard/cli.rb

@@ -5,16 +5,39 @@ module Guard
   class CLI < Thor
     default_task :start
 
-    method_option :clear,  :type => :boolean, :default => false, :aliases => '-c', :banner => "Auto clear shell before each change/run_all/reload"
-    method_option :notify, :type => :boolean, :default => true,  :aliases => '-n', :banner => "Notifications feature (growl/libnotify)"
-    method_option :debug,  :type => :boolean, :default => false, :aliases => '-d', :banner => "Print debug messages"
-    method_option :group,  :type => :array,   :default => [],    :aliases => '-g', :banner => "Run only the passed groups"
+    method_option :clear,     :type => :boolean, :default => false, :aliases => '-c', :banner => "Auto clear shell before each change/run_all/reload"
+    method_option :notify,    :type => :boolean, :default => true,  :aliases => '-n', :banner => "Notifications feature (growl/libnotify)"
+    method_option :debug,     :type => :boolean, :default => false, :aliases => '-d', :banner => "Print debug messages"
+    method_option :group,     :type => :array,   :default => [],    :aliases => '-g', :banner => "Run only the passed groups"
+    method_option :watchdir,  :type => :string,                     :aliases => '-w', :banner => "Specify the directory to watch"
+    method_option :guardfile, :type => :string,                     :aliases => '-G', :banner => "Specify a Guardfile"
 
     desc "start", "Starts Guard"
     def start
       ::Guard.start(options)
     end
 
+    desc "list", "Lists guards that can be used with init"
+    def list
+      ::Guard::DslDescriber.evaluate_guardfile(options)
+      installed = []
+      ::Guard::DslDescriber.guardfile_structure.each do |group|
+        group[:guards].each {|x| installed << x[:name]} if group[:guards]
+      end
+
+      ::Guard::UI.info "Available guards:"
+      ::Guard::guard_gem_names.sort.each do |name|
+        if installed.include? name
+          ::Guard::UI.info "   #{name} *"
+        else
+          ::Guard::UI.info "   #{name}"
+        end
+      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"
+    end
+
     desc "version", "Prints Guard's version"
     def version
       ::Guard::UI.info "Guard version #{Guard::VERSION}"

data/lib/guard/dsl.rb

@@ -12,7 +12,7 @@ module Guard
         UI.error "No guards found in Guardfile, please add at least one." if !::Guard.guards.nil? && ::Guard.guards.empty?
       end
 
-      def revaluate_guardfile
+      def reevaluate_guardfile
         ::Guard.guards.clear
         Dsl.evaluate_guardfile(@@options)
         msg = "Guardfile has been re-evaluated."
@@ -45,11 +45,11 @@ module Guard
 
       def fetch_guardfile_contents
         # TODO: do we need .rc file interaction?
-        if @@options.has_key?(:guardfile_contents)
+        if @@options[:guardfile_contents]
           UI.info "Using inline Guardfile."
           @@options[:guardfile_path] = 'Inline Guardfile'
 
-        elsif @@options.has_key?(:guardfile)
+        elsif @@options[:guardfile]
           if File.exist?(@@options[:guardfile])
             read_guardfile(@@options[:guardfile])
             UI.info "Using Guardfile at #{@@options[:guardfile]}."

data/lib/guard/guard.rb

@@ -10,7 +10,7 @@ module Guard
     # Guardfile template needed inside guard gem
     def self.init(name)
       if ::Guard::Dsl.guardfile_include?(name)
-        ::Guard::UI.info "Guardfile already include #{name} guard"
+        ::Guard::UI.info "Guardfile already includes #{name} guard"
       else
         content = File.read('Guardfile')
         guard   = File.read("#{::Guard.locate_guard(name)}/lib/guard/#{name}/templates/Guardfile")

data/lib/guard/interactor.rb

@@ -37,7 +37,7 @@ module Guard
           stop
         end
       else
-        UI.info "Your system doesn't support INT signal, so Ctrl-C (stop) won't work"
+        UI.info "Your system doesn't support INT signal, so Ctrl-C (Stop) won't work"
       end
 
       # Reload (Ctrl-Z)

data/lib/guard/listener.rb

@@ -9,7 +9,8 @@ module Guard
   autoload :Polling, 'guard/listeners/polling'
 
   class Listener
-    attr_reader :last_event, :sha1_checksums_hash, :directory, :callback
+    
+    attr_reader :directory
 
     def self.select_and_init(*a)
       if mac? && Darwin.usable?
@@ -25,14 +26,14 @@ module Guard
     end
 
     def initialize(directory=Dir.pwd, options={})
-      @directory = directory.to_s
+      @directory           = directory.to_s
       @sha1_checksums_hash = {}
-      @relativate_paths = options.fetch(:relativate_paths, true)
+      @relativize_paths    = options.fetch(:relativize_paths, true)
       update_last_event
     end
 
     def start
-      watch directory
+      watch(@directory)
     end
 
     def stop
@@ -46,9 +47,10 @@ module Guard
       @last_event = Time.now
     end
 
-    def modified_files(dirs, options = {})
+    def modified_files(dirs, options={})
       files = potentially_modified_files(dirs, options).select { |path| file_modified?(path) }
-      relativate_paths files
+      update_last_event
+      relativize_paths(files)
     end
 
     def worker
@@ -61,35 +63,48 @@ module Guard
     end
 
     def all_files
-      potentially_modified_files [directory + '/'], :all => true
+      potentially_modified_files([@directory], :all => true)
     end
 
     # scopes all given paths to the current #directory
-    def relativate_paths(paths)
-      return paths unless relativate_paths?
+    def relativize_paths(paths)
+      return paths unless relativize_paths?
       paths.map do |path|
-        path.gsub(%r~^#{directory}/~, '')
+        path.gsub(%r{^#{@directory}/}, '')
       end
     end
 
-    attr_writer :relativate_paths
-    def relativate_paths?
-      !!@relativate_paths
+    def relativize_paths?
+      !!@relativize_paths
     end
 
   private
 
-    def potentially_modified_files(dirs, options = {})
-      match = options[:all] ? "**/*" : "*"
-      Dir.glob(dirs.map { |dir| "#{dir}#{match}" }, File::FNM_DOTMATCH).select { |file| File.file?(file) }
+    def potentially_modified_files(dirs, options={})
+      paths = Dir.glob(dirs.map { |d| "#{d.sub(%r{/+$}, '')}/*" }, File::FNM_DOTMATCH).reject do |path|
+        %w[. .. .bundle .git log tmp vendor].include?(File.basename(path))
+      end
+
+      if options[:all]
+        paths.inject([]) do |array, path|
+          if File.file?(path)
+            array << path
+          else
+            array += Dir.glob("#{path}/**/*", File::FNM_DOTMATCH).select { |p| File.file?(p) }
+          end
+          array
+        end
+      else
+        paths.select { |path| File.file?(path) }
+      end
     end
 
     # Depending on the filesystem, mtime is probably only precise to the second, so round
     # both values down to the second for the comparison.
     def file_modified?(path)
-      if File.mtime(path).to_i == last_event.to_i
+      if File.mtime(path).to_i == @last_event.to_i
         file_content_modified?(path, sha1_checksum(path))
-      elsif File.mtime(path).to_i > last_event.to_i
+      elsif File.mtime(path).to_i > @last_event.to_i
         set_sha1_checksums_hash(path, sha1_checksum(path))
         true
       end
@@ -98,7 +113,7 @@ module Guard
     end
 
     def file_content_modified?(path, sha1_checksum)
-      if sha1_checksums_hash[path] != sha1_checksum
+      if @sha1_checksums_hash[path] != sha1_checksum
         set_sha1_checksums_hash(path, sha1_checksum)
         true
       else

data/lib/guard/listeners/darwin.rb

@@ -1,6 +1,5 @@
 module Guard
   class Darwin < Listener
-    attr_reader :fsevent
 
     def initialize(*)
       super
@@ -13,12 +12,12 @@ module Guard
 
     def start
       super
-      fsevent.run
+      worker.run
     end
 
     def stop
       super
-      fsevent.stop
+      worker.stop
     end
 
     def self.usable?
@@ -38,10 +37,9 @@ module Guard
   private
 
     def watch(directory)
-      worker.watch directory do |modified_dirs|
+      worker.watch(directory) do |modified_dirs|
         files = modified_files(modified_dirs)
-        update_last_event
-        callback.call(files)
+        @callback.call(files) unless files.empty?
       end
     end
 

data/lib/guard/listeners/linux.rb

@@ -1,6 +1,5 @@
 module Guard
   class Linux < Listener
-    attr_reader :inotify, :files, :latency
 
     def initialize(*)
       super
@@ -19,7 +18,7 @@ module Guard
     def stop
       super
       @stop = true
-      sleep latency
+      sleep(@latency)
     end
 
     def self.usable?
@@ -59,15 +58,14 @@ module Guard
     def watch_change
       @watch_change = true
       until @stop
-        if RbConfig::CONFIG['build'] =~ /java/ || IO.select([inotify.to_io], [], [], latency)
+        if RbConfig::CONFIG['build'] =~ /java/ || IO.select([worker.to_io], [], [], @latency)
           break if @stop
 
-          sleep latency
-          inotify.process
+          sleep(@latency)
+          worker.process
 
-          modified_files = modified_files(files.shift(files.size).map{|f| File.dirname(f) + '/' }.uniq)
-          update_last_event
-          callback.call(modified_files) unless modified_files.empty?
+          files = modified_files(@files.shift(@files.size).map { |f| File.dirname(f) }.uniq)
+          @callback.call(files) unless files.empty?
         end
       end
       @watch_change = false

data/lib/guard/listeners/polling.rb

@@ -1,6 +1,5 @@
 module Guard
   class Polling < Listener
-    attr_reader :latency
 
     def initialize(*)
       super
@@ -23,10 +22,9 @@ module Guard
     def watch_change
       until @stop
         start = Time.now.to_f
-        files = modified_files([Dir.pwd + '/'], :all => true)
-        update_last_event
-        callback.call(relativate_paths(files)) unless files.empty?
-        nap_time = latency - (Time.now.to_f - start)
+        files = modified_files([@directory], :all => true)
+        @callback.call(files) unless files.empty?
+        nap_time = @latency - (Time.now.to_f - start)
         sleep(nap_time) if nap_time > 0
       end
     end

data/lib/guard/listeners/windows.rb

@@ -1,6 +1,5 @@
 module Guard
   class Windows < Listener
-    attr_reader :fchange
 
     def initialize(*)
       super
@@ -10,12 +9,12 @@ module Guard
 
     def start
       super
-      @fchange.run
+      worker.run
     end
 
     def stop
       super
-      @fchange.stop
+      worker.stop
     end
 
     def self.usable?
@@ -34,10 +33,9 @@ module Guard
 
     def watch(directory)
       worker.watch(directory, :all_events, :recursive) do |event|
-        paths = [File.expand_path(event.watcher.path) + '/']
-        files = modified_files(paths, {:all => true})
-        update_last_event
-        callback.call(files)
+        paths = [File.expand_path(event.watcher.path)]
+        files = modified_files(paths, :all => true)
+        @callback.call(files) unless files.empty?
       end
     end
 

data/lib/guard/notifier.rb

@@ -4,6 +4,7 @@ require 'guard/ui'
 
 module Guard
   module Notifier
+    APPLICATION_NAME = "Guard"
 
     def self.turn_off
       ENV["GUARD_NOTIFY"] = 'false'
@@ -45,13 +46,16 @@ module Guard
 
     def self.notify_mac(title, message, image, options)
       require_growl # need for guard-rspec formatter that is called out of guard scope
-      default_options = { :title => title, :icon => image_path(image), :name => "Guard" }
-      Growl.notify message, default_options.merge(options) if enabled?
+
+      options = { :description => message, :title => title, :icon => image_path(image), :application_name => APPLICATION_NAME }.merge(options)
+      options.delete(:name)
+
+      GrowlNotify.send_notification(options) if enabled?
     end
 
     def self.notify_linux(title, message, image, options)
       require_libnotify # need for guard-rspec formatter that is called out of guard scope
-      default_options = { :body => message, :summary => title, :icon_path => image_path(image) }
+      default_options = { :body => message, :summary => title, :icon_path => image_path(image), :transient => true }
       Libnotify.show default_options.merge(options) if enabled?
     end
 
@@ -90,10 +94,17 @@ module Guard
     end
 
     def self.require_growl
-      require 'growl'
+      require 'growl_notify'
+
+      if GrowlNotify.application_name != APPLICATION_NAME
+        GrowlNotify.config do |c|
+          c.notifications = c.default_notifications = [ APPLICATION_NAME ]
+          c.application_name = c.notifications.first
+        end
+      end
     rescue LoadError
       turn_off
-      UI.info "Please install growl gem for Mac OS X notification support and add it to your Gemfile"
+      UI.info "Please install growl_notify gem for Mac OS X notification support and add it to your Gemfile"
     end
 
     def self.require_libnotify

data/lib/guard/ui.rb

@@ -1,32 +1,55 @@
 module Guard
   module UI
+
+    ANSI_ESCAPE_BRIGHT = "1"
+
+    ANSI_ESCAPE_BLACK = "30"
+    ANSI_ESCAPE_RED = "31"
+    ANSI_ESCAPE_GREEN = "32"
+    ANSI_ESCAPE_YELLOW = "33"
+    ANSI_ESCAPE_BLUE = "34"
+    ANSI_ESCAPE_MAGENTA = "35"
+    ANSI_ESCAPE_CYAN = "36"
+    ANSI_ESCAPE_WHITE = "37"
+
+    ANSI_ESCAPE_BGBLACK = "40"
+    ANSI_ESCAPE_BGRED = "41"
+    ANSI_ESCAPE_BGGREEN = "42"
+    ANSI_ESCAPE_BGYELLOW = "43"
+    ANSI_ESCAPE_BGBLUE = "44"
+    ANSI_ESCAPE_BGMAGENTA = "45"
+    ANSI_ESCAPE_BGCYAN = "46"
+    ANSI_ESCAPE_BGWHITE = "47"
+
     class << self
 
+      color_enabled = nil
+
       def info(message, options = {})
         unless ENV["GUARD_ENV"] == "test"
           reset_line if options[:reset]
-          puts reset_color(message) if message != ''
+          puts color(message) if message != ''
         end
       end
 
       def error(message, options = {})
         unless ENV["GUARD_ENV"] == "test"
           reset_line if options[:reset]
-          puts "#{color('ERROR:', ';31')} #{message}"
+          puts color('ERROR: ', :red) + message
         end
       end
 
       def deprecation(message, options = {})
         unless ENV["GUARD_ENV"] == "test"
           reset_line if options[:reset]
-          puts "#{color('DEPRECATION:', ';31')} #{message}"
+          puts color('DEPRECATION: ', :red) + message
         end
       end
 
       def debug(message, options = {})
         unless ENV["GUARD_ENV"] == "test"
           reset_line if options[:reset]
-          puts "DEBUG: #{message}" if ::Guard.options && ::Guard.options[:debug]
+          puts color("DEBUG (#{Time.now.strftime('%T')}): ", :yellow) + message if ::Guard.options && ::Guard.options[:debug]
         end
       end
 
@@ -40,29 +63,46 @@ module Guard
 
     private
 
+      # @deprecated
       def reset_color(text)
+        deprecation('UI.reset_color(text) is deprecated, please use color(text, "") instead.')
         color(text, "")
       end
 
-      def color(text, color_code)
+      def color(text, *color_options)
+        color_code = ""
+        color_options.each do |color_option|
+          color_option = color_option.to_s
+          if color_option != ""
+            if !(color_option =~ /\d+/)
+              color_option = const_get("ANSI_ESCAPE_#{color_option.upcase}")
+            end
+            color_code += ";" + color_option
+          end
+        end
         color_enabled? ? "\e[0#{color_code}m#{text}\e[0m" : text
       end
 
       def color_enabled?
-        @color_enabled ||= if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
-          unless ENV['ANSICON']
-            begin
-              require 'rubygems' unless ENV['NO_RUBYGEMS']
-              require 'Win32/Console/ANSI'
-            rescue LoadError
-              @color_enabled = false
-              info "You must 'gem install win32console' to use color on Windows"
-              false
+        if @color_enabled.nil?
+          if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+            if ENV['ANSICON']
+              @color_enabled = true
+            else
+              begin
+                require 'rubygems' unless ENV['NO_RUBYGEMS']
+                require 'Win32/Console/ANSI'
+                @color_enabled = true
+              rescue LoadError
+                @color_enabled = false
+                info "You must 'gem install win32console' to use color on Windows"
+              end
             end
+          else
+            @color_enabled = true
           end
-        else
-          true
         end
+        @color_enabled
       end
 
     end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "0.5.1" unless defined? Guard::VERSION
+  VERSION = "0.6.0" unless defined? Guard::VERSION
 end

data/man/guard.1

@@ -1,64 +1,130 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GUARD" "1" "June 2011" "" ""
+.TH "GUARD" "1" "August 2011" "" ""
 .
 .SH "NAME"
 \fBguard\fR \- Guard keeps an eye on your file modifications\.
 .
+.SH "DESCRIPTION"
+Guard is a command line tool that easily handle events on files modifications\.
+.
 .SH "SYNOPSIS"
 guard \fIcommand\fR \fIoptions\fR
 .
-.SH "DESCRIPTION"
-Guard is a command line tool that easily handle events on files modifications\.
+.SH "COMMANDS"
 .
-.SH "HOMEPAGE"
-https://github\.com/guard/guard
+.SS "start"
+Starts Guard\. This is the default command if none is provided\.
 .
-.SH "OPTIONS"
+.P
+The following options are available:
 .
-.TP
-\fB\-c\fR, \fB\-\-clear\fR
-Clears the Shell after each change\.
+.P
+\fB\-c\fR/\fB\-\-clear\fR
 .
-.TP
-\fB\-n\fR \fIflag\fR, \fB\-\-notify\fR \fIflag\fR
-Disable notifications (Growl or Libnotify depending on your system)\. Note that notifications can also be disabled globally by setting a GUARD_NOTIFY environment variable to false\. The \fIflag\fR part can be passed to guard using true/false or t/f\.
+.IP "" 4
 .
-.TP
-\fB\-g\fR \fIgroup\fR \.\.\., \fB\-\-group\fR \fIgroup\fR \.\.\.
-Runs only the groups specified\.
+.nf
+
+    Clears the Shell after each change\.
 .
-.TP
-\fB\-d\fR, \fB\-\-debug\fR
-Runs Guard in debug mode\.
+.fi
 .
-.TP
-\fB\-h\fR
-List all of Guard\'s available commands\.
+.IP "" 0
 .
-.SH "COMMANDS"
+.P
+\fB\-n\fR/\fB\-\-notify\fR \fIflag\fR
 .
-.TP
-\fBstart\fR
-Starts Guard\. This is the default command if none is provided\.
+.IP "" 4
 .
-.TP
-\fBinit\fR [guard]
+.nf
+
+    Disable notifications (Growl or Libnotify depending on your system)\.
+    Note that notifications can also be disabled globally by setting a GUARD_NOTIFY environment variable to false\.
+    The <flag> part can be passed to guard using true/false or t/f\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fB\-d\fR/\fB\-\-debug\fR
+.
+.IP "" 4
+.
+.nf
+
+    Runs Guard in debug mode\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fB\-g\fR/\fB\-\-group\fR \fIgroup\fR \.\.\.
+.
+.IP "" 4
+.
+.nf
+
+    Runs only the groups specified\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fB\-w\fR/\fB\-\-watchdir\fR \fIfolder\fR
+.
+.IP "" 4
+.
+.nf
+
+    Specify the directory to watch\.
+.
+.fi
+.
+.IP "" 0
+.
+.P
+\fB\-G\fR/\fB\-\-guardfile\fR \fIfile\fR
+.
+.IP "" 4
+.
+.nf
+
+    Specify a Guardfile by giving its path\.
+.
+.fi
+.
+.IP "" 0
+.
+.SS "init [guard]"
 Add the requested guard\'s default Guardfile configuration to the current Guardfile\.
 .
-.TP
-\fBshow\fR, \fB\-T\fR
+.SS "list"
+Lists guards that can be used with the \fBinit\fR command\.
+.
+.SS "\-T/show"
 List defined groups and guards for the current Guardfile\.
 .
+.SH "OPTIONS"
+.
+.TP
+\fB\-h\fR
+List all of Guard\'s available commands\.
+.
+.SS "start"
+.
 .SH "EXAMPLES"
-\fB[bundle exec] guard \-\-clear \-\-group backend frontend \-\-notify false \-\-debug\fR
+\fB[bundle exec] guard [start] \-\-watchdir ~/dev \-\-guardfile ~/env/Guardfile \-\-clear \-\-group backend frontend \-\-notify false \-\-debug\fR
 .
 .P
 or in a more concise way:
 .
 .P
-\fB[bundle exec] guard \-c \-g backend frontend \-n f \-d\fR
+\fB[bundle exec] guard [start] \-w ~/dev \-G ~/env/Guardfile \-c \-g backend frontend \-n f \-d\fR
 .
 .SH "AUTHORS / CONTRIBUTORS"
 Thibaud Guillaume\-Gentil is the main author\.
@@ -68,3 +134,9 @@ A list of contributors based on all commits can be found here: https://github\.c
 .
 .P
 For an exhaustive list of all the contributors, please see the CHANGELOG: https://github\.com/guard/guard/blob/master/CHANGELOG\.md
+.
+.P
+This manual has been written by Remy Coutable\.
+.
+.SH "WWW"
+https://github\.com/guard/guard

data/man/guard.1.html

@@ -54,13 +54,13 @@
 
   <div class='man-navigation' style='display:none'>
     <a href="#NAME">NAME</a>
-    <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#DESCRIPTION">DESCRIPTION</a>
-    <a href="#HOMEPAGE">HOMEPAGE</a>
-    <a href="#OPTIONS">OPTIONS</a>
+    <a href="#SYNOPSIS">SYNOPSIS</a>
     <a href="#COMMANDS">COMMANDS</a>
+    <a href="#OPTIONS">OPTIONS</a>
     <a href="#EXAMPLES">EXAMPLES</a>
     <a href="#AUTHORS-CONTRIBUTORS">AUTHORS / CONTRIBUTORS</a>
+    <a href="#WWW">WWW</a>
   </div>
 
   <ol class='man-decor man-head man head'>
@@ -74,47 +74,82 @@
   <code>guard</code> - <span class="man-whatis">Guard keeps an eye on your file modifications.</span>
 </p>
 
+<h2 id="DESCRIPTION">DESCRIPTION</h2>
+
+<p>Guard is a command line tool that easily handle events on files modifications.</p>
+
 <h2 id="SYNOPSIS">SYNOPSIS</h2>
 
 <p>guard <var>command</var> <var>options</var></p>
 
-<h2 id="DESCRIPTION">DESCRIPTION</h2>
+<h2 id="COMMANDS">COMMANDS</h2>
 
-<p>Guard is a command line tool that easily handle events on files modifications.</p>
+<h3 id="start">start</h3>
 
-<h2 id="HOMEPAGE">HOMEPAGE</h2>
+<p>  Starts Guard. This is the default command if none is provided.</p>
 
-<p>https://github.com/guard/guard</p>
+<p>The following options are available:</p>
 
-<h2 id="OPTIONS">OPTIONS</h2>
+<p>  <code>-c</code>/<code>--clear</code></p>
 
-<dl>
-<dt><code>-c</code>, <code>--clear</code></dt><dd><p>Clears the Shell after each change.</p></dd>
-<dt><code>-n</code> <var>flag</var>, <code>--notify</code> <var>flag</var></dt><dd><p>Disable notifications (Growl or Libnotify depending on your system).
-Note that notifications can also be disabled globally by setting a GUARD_NOTIFY environment variable to false.
-The <var>flag</var> part can be passed to guard using true/false or t/f.</p></dd>
-<dt><code>-g</code> <var>group</var> ..., <code>--group</code> <var>group</var> ...</dt><dd><p>Runs only the groups specified.</p></dd>
-<dt><code>-d</code>, <code>--debug</code></dt><dd><p>Runs Guard in debug mode.</p></dd>
-<dt class="flush"><code>-h</code></dt><dd><p>List all of Guard's available commands.</p></dd>
-</dl>
+<pre><code>    Clears the Shell after each change.
+</code></pre>
 
+<p>  <code>-n</code>/<code>--notify</code> <var>flag</var></p>
 
-<h2 id="COMMANDS">COMMANDS</h2>
+<pre><code>    Disable notifications (Growl or Libnotify depending on your system).
+    Note that notifications can also be disabled globally by setting a GUARD_NOTIFY environment variable to false.
+    The &lt;flag> part can be passed to guard using true/false or t/f.
+</code></pre>
+
+<p>  <code>-d</code>/<code>--debug</code></p>
+
+<pre><code>    Runs Guard in debug mode.
+</code></pre>
+
+<p>  <code>-g</code>/<code>--group</code> <var>group</var> ...</p>
+
+<pre><code>    Runs only the groups specified.
+</code></pre>
+
+<p>  <code>-w</code>/<code>--watchdir</code> <var>folder</var></p>
+
+<pre><code>    Specify the directory to watch.
+</code></pre>
+
+<p>  <code>-G</code>/<code>--guardfile</code> <var>file</var></p>
+
+<pre><code>    Specify a Guardfile by giving its path.
+</code></pre>
+
+<h3 id="init-guard-">init [guard]</h3>
+
+<p>  Add the requested guard's default Guardfile configuration to the current Guardfile.</p>
+
+<h3 id="list">list</h3>
+
+<p>  Lists guards that can be used with the <code>init</code> command.</p>
+
+<h3 id="-T-show">-T/show</h3>
+
+<p>  List defined groups and guards for the current Guardfile.</p>
+
+<h2 id="OPTIONS">OPTIONS</h2>
 
 <dl>
-<dt class="flush"><code>start</code></dt><dd><p>Starts Guard. This is the default command if none is provided.</p></dd>
-<dt><code>init</code> [guard]</dt><dd><p>Add the requested guard's default Guardfile configuration to the current Guardfile.</p></dd>
-<dt><code>show</code>, <code>-T</code></dt><dd><p>List defined groups and guards for the current Guardfile.</p></dd>
+<dt class="flush"><code>-h</code></dt><dd>List all of Guard's available commands.</dd>
 </dl>
 
 
+<h3 id="start">start</h3>
+
 <h2 id="EXAMPLES">EXAMPLES</h2>
 
-<p><code>[bundle exec] guard --clear --group backend frontend --notify false --debug</code></p>
+<p><code>[bundle exec] guard [start] --watchdir ~/dev --guardfile ~/env/Guardfile --clear --group backend frontend --notify false --debug</code></p>
 
 <p>or in a more concise way:</p>
 
-<p><code>[bundle exec] guard -c -g backend frontend -n f -d</code></p>
+<p><code>[bundle exec] guard [start] -w ~/dev -G ~/env/Guardfile -c -g backend frontend -n f -d</code></p>
 
 <h2 id="AUTHORS-CONTRIBUTORS">AUTHORS / CONTRIBUTORS</h2>
 
@@ -126,10 +161,16 @@ https://github.com/guard/guard/contributors</p>
 <p>For an exhaustive list of all the contributors, please see the CHANGELOG:
 https://github.com/guard/guard/blob/master/CHANGELOG.md</p>
 
+<p>This manual has been written by Remy Coutable.</p>
+
+<h2 id="WWW">WWW</h2>
+
+<p>https://github.com/guard/guard</p>
+
 
   <ol class='man-decor man-foot man foot'>
     <li class='tl'></li>
-    <li class='tc'>June 2011</li>
+    <li class='tc'>August 2011</li>
     <li class='tr'>guard(1)</li>
   </ol>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000 +02:00
+date: 2011-08-13 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152963700 !ruby/object:Gem::Requirement
+  requirement: &2151817180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152963700
+  version_requirements: *2151817180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152962700 !ruby/object:Gem::Requirement
+  requirement: &2151815560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2152962700
+  version_requirements: *2151815560
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152961760 !ruby/object:Gem::Requirement
+  requirement: &2151813940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *2152961760
+  version_requirements: *2151813940
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152961140 !ruby/object:Gem::Requirement
+  requirement: &2151811280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152961140
+  version_requirements: *2151811280
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me