guard 0.6.1 → 0.6.2

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 0.6.2 - August 17, 2011
+
+### Bugs fixes:
+
+- Re-add the possibility to use the `growl` gem since the `growl_notify` gem this is currently known to not work in conjunction with Spork. ([@netzpirat][])
+- Ensure that scoped groups and group name are symbolized before checking for inclusion. ([@rymai][])
+
+### New features
+
+- Groups are now stored in a @groups variable (will be used for future features). ([@rymai][])
+- Guards will now receive their group in the options hash at initialization (will be used for future features). ([@rymai][])
+
+### Improvement
+
+- Explain the growl/growl_notify differences in the README. ([@netzpirat][])
+
 ## 0.6.1 - August 15, 2011
 
 ### Bugs fixes:

data/README.md

@@ -13,7 +13,7 @@ Features
 * [Directory Change Notification](http://msdn.microsoft.com/en-us/library/aa365261\(VS.85\).aspx) support on Windows ([rb-fchange, >= 0.0.2](https://rubygems.org/gems/rb-fchange) required).
 * Polling on the other operating systems (help us to support more OS).
 * Automatic & Super fast (when polling is not used) files modifications detection (even new files are detected).
-* Growl notifications ([growlnotify](http://growl.info/documentation/growlnotify.php) & [growl gem](https://rubygems.org/gems/growl) required).
+* Growl notifications ([growl_notify gem](https://rubygems.org/gems/growl_notify) or [growlnotify](http://growl.info/documentation/growlnotify.php) & [growl gem](https://rubygems.org/gems/growl) required).
 * Libnotify notifications ([libnotify gem](https://rubygems.org/gems/libnotify) required).
 * Tested against Ruby 1.8.7, 1.9.2 and REE.
 
@@ -55,19 +55,25 @@ Install the rb-fsevent gem for [FSEvent](http://en.wikipedia.org/wiki/FSEvents)
 $ gem install rb-fsevent
 ```
 
-Install the growl_notify gem if you want notification support:
+Install either the growl_notify or the growl gem if you want notification support:
 
 ``` bash
 $ gem install growl_notify
+$ # or
+$ gem install growl
 ```
 
-And add it to your Gemfile:
+And add them to your Gemfile:
 
 ``` ruby
 gem 'rb-fsevent'
-gem 'growl_notify'
+gem 'growl'
 ```
 
+The difference between growl and growl_notify is that growl_notify uses AppleScript to 
+display a message, whereas growl uses the `growlnotify` command. In general the AppleScript
+approach is preferred, but this is currently known to not work in conjunction with Spork.
+
 ### On Linux
 
 Install the rb-inotify gem for [inotify](http://en.wikipedia.org/wiki/Inotify) support:

data/lib/guard.rb

@@ -9,12 +9,13 @@ module Guard
   autoload :Notifier,     'guard/notifier'
 
   class << self
-    attr_accessor :options, :guards, :listener
+    attr_accessor :options, :guards, :groups, :listener
 
     # initialize this singleton
     def setup(options = {})
       @options  = options
       @listener = Listener.select_and_init(@options[:watchdir] ? File.expand_path(@options[:watchdir]) : Dir.pwd)
+      @groups   = [:default]
       @guards   = []
 
       @options[:notify] && ENV["GUARD_NOTIFY"] != 'false' ? Notifier.turn_on : Notifier.turn_off
@@ -82,20 +83,25 @@ module Guard
     end
 
     def add_guard(name, watchers = [], options = {})
-      if name.downcase == 'ego'
+      if name.to_sym == :ego
         UI.deprecation("Guard::Ego is now part of Guard. You can remove it from your Guardfile.")
       else
-        guard_class = get_guard_class(name)
-        @guards << guard_class.new(watchers, options)
+        guard = get_guard_class(name).new(watchers, options)
+        @guards << guard
       end
     end
 
+    def add_group(name)
+      @groups << name.to_sym unless name.nil?
+    end
+
     def get_guard_class(name)
+      name        = name.to_s
       try_require = false
-      const_name = name.to_s.downcase.gsub('-', '')
+      const_name  = name.downcase.gsub('-', '')
       begin
-        require "guard/#{name.to_s.downcase}" if try_require
-        self.const_get(self.constants.find {|c| c.to_s.downcase == const_name })
+        require "guard/#{name.downcase}" if try_require
+        self.const_get(self.constants.find { |c| c.to_s.downcase == const_name })
       rescue TypeError
         unless try_require
           try_require = true

data/lib/guard/dsl.rb

@@ -106,13 +106,20 @@ module Guard
 
     def group(name, &guard_definition)
       @groups = @@options[:group] || []
-      guard_definition.call if guard_definition && (@groups.empty? || @groups.include?(name.to_s))
+      name = name.to_sym
+
+      if guard_definition && (@groups.empty? || @groups.map(&:to_sym).include?(name))
+        @current_group = name
+        guard_definition.call
+        @current_group = nil
+      end
     end
 
     def guard(name, options = {}, &watch_definition)
       @watchers = []
       watch_definition.call if watch_definition
-      ::Guard.add_guard(name, @watchers, options)
+      options.update(:group => (@current_group || :default))
+      ::Guard.add_guard(name.to_s.downcase.to_sym, @watchers, options)
     end
 
     def watch(pattern, &action)

data/lib/guard/guard.rb

@@ -1,9 +1,10 @@
 module Guard
   class Guard
 
-    attr_accessor :watchers, :options
+    attr_accessor :watchers, :options, :group
 
     def initialize(watchers = [], options = {})
+      @group = options.delete(:group) || :default
       @watchers, @options = watchers, options
     end
 

data/lib/guard/notifier.rb

@@ -47,10 +47,18 @@ module Guard
     def self.notify_mac(title, message, image, options)
       require_growl # need for guard-rspec formatter that is called out of guard scope
 
-      options = { :description => message, :title => title, :icon => image_path(image), :application_name => APPLICATION_NAME }.merge(options)
-      options.delete(:name)
+      default_options = { :title => title, :icon => image_path(image), :name => APPLICATION_NAME }
+      default_options.merge!(options)
 
-      GrowlNotify.send_notification(options) if enabled?
+      if defined?(GrowlNotify)
+        default_options[:description] = message
+        default_options[:application_name] = APPLICATION_NAME
+        default_options.delete(:name)
+
+        GrowlNotify.send_notification(default_options) if enabled?
+      else
+        Growl.notify message, default_options.merge(options) if enabled?
+      end
     end
 
     def self.notify_linux(title, message, image, options)
@@ -94,17 +102,21 @@ module Guard
     end
 
     def self.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
+      begin
+        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
+        require 'growl'
       end
     rescue LoadError
       turn_off
-      UI.info "Please install growl_notify gem for Mac OS X notification support and add it to your Gemfile"
+      UI.info "Please install growl or growl_notify gem for Mac OS X notification support and add it to your Gemfile"
     end
 
     def self.require_libnotify

data/lib/guard/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70208916582320 !ruby/object:Gem::Requirement
+  requirement: &70138447631700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70208916582320
+  version_requirements: *70138447631700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70208916581740 !ruby/object:Gem::Requirement
+  requirement: &70138447631080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70208916581740
+  version_requirements: *70138447631080
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70208916581220 !ruby/object:Gem::Requirement
+  requirement: &70138447630400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *70208916581220
+  version_requirements: *70138447630400
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70208916580720 !ruby/object:Gem::Requirement
+  requirement: &70138447629860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70208916580720
+  version_requirements: *70138447629860
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me