guard 1.3.0 → 1.3.1

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-## Master
+## 1.3.1 - 14 August, 2012
+
+### Improvements
+
+- [#317][] Switch to Terminal-Notifier-Guard gem. ([@foxycoder][])
+- [#315][] Improve Emacs detection. ([@maio][])
+
+## 1.3.0 - 3 August, 2012
 
 ### Bug fix
 
@@ -573,6 +580,8 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [#283]: https://github.com/guard/guard/issues/283
 [#298]: https://github.com/guard/guard/issues/298
 [#299]: https://github.com/guard/guard/issues/299
+[#315]: https://github.com/guard/guard/issues/315
+[#317]: https://github.com/guard/guard/issues/317
 [@Gazer]: https://github.com/Gazer
 [@Maher4Ever]: https://github.com/Maher4Ever
 [@alandipert]: https://github.com/alandipert
@@ -644,4 +653,4 @@ The Listen integration has been supervised by [@thibaudgg][] and executed by [@M
 [@waldo]: https://github.com/waldo
 [@wereHamster]: https://github.com/wereHamster
 [@yannlugrin]: https://github.com/yannlugrin
-[@zonque]: https://github.com/zonque
+[@zonque]: https://github.com/zonque

data/README.md

@@ -7,7 +7,7 @@ This document contains a lot of information, please take your time and read thes
 any questions, ask them in our [Google group](http://groups.google.com/group/guard-dev) or on `#guard`
 (irc.freenode.net).
 
-Information on advanced topics like create your own Guard plugin, programatic use of Guard, hooks and callbacks and
+Information on advanced topics like creating your own Guard plugin, programatic use of Guard, hooks and callbacks and
 more can be found in the [Guard wiki](https://github.com/guard/guard/wiki).
 
 Before you file an issue, make sure you have read the _[file an issue](#file-an-issue)_ section that contains some
@@ -179,15 +179,14 @@ end
 
 * Runs on Mac OS X 10.8 only
 
-The [terminal notifier](https://github.com/alloy/terminal-notifier) sends notifications to the OS X Notification Center.
-The notification center doesn't support different icons for different message types, and it even shows only the icon
-from Terminal.app.
+The [terminal-notifier-guard](https://github.com/Springest/terminal-notifier-guard) sends notifications to the OS X
+Notification Center.
 
-To use `terminal_notifier` you have to add it to your `Gemfile` and run bundler:
+To use `terminal-notifier-guard` you have to add it to your `Gemfile` and run bundler:
 
 ```ruby
 group :development do
-  gem 'terminal_notifier'
+  gem 'terminal-notifier-guard'
 end
 ```
 
@@ -779,7 +778,7 @@ When you file a bug, please try to follow these simple rules if applicable:
 
 **It's most likely that your bug gets resolved faster if you provide as much information as possible!**
 
-Development [![Dependency Status](https://gemnasium.com/guard/guard.png?branch=master)](https://gemnasium.com/guard/guard)
+Development [![Dependency Status](https://gemnasium.com/guard/guard.png?branch=master)](https://gemnasium.com/guard/guard) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/guard/guard)
 -----------
 
 * Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/guard/master/frames).

data/lib/guard.rb

@@ -179,7 +179,7 @@ module Guard
     #
     # @param [Hash] scopes hash with a Guard plugin or a group scope
     #
-    def reload(scopes)
+    def reload(scopes = {})
       within_preserved_state do
         ::Guard::UI.clear
         ::Guard::UI.action_with_scopes('Reload', scopes)
@@ -192,7 +192,7 @@ module Guard
     #
     # @param [Hash] scopes hash with a Guard plugin or a group scope
     #
-    def run_all(scopes)
+    def run_all(scopes = {})
       within_preserved_state do
         ::Guard::UI.clear
         ::Guard::UI.action_with_scopes('Run', scopes)

data/lib/guard/interactors/helpers/terminal.rb

@@ -39,8 +39,8 @@ module Guard
     # Restore terminal settings
     #
     def restore_terminal_settings
-      system('stty', @stty_save, '2>/dev/null') if @stty_save
+      system("stty #{ @stty_save } 2>/dev/null") if @stty_save
     end
-    
+
   end
-end
+end

data/lib/guard/notifiers/emacs.rb

@@ -25,12 +25,12 @@ module Guard
       # @return [Boolean] the availability status
       #
       def available?(silent = false)
-        result = `#{DEFAULTS[:client]} --eval '1' 2> /dev/null || echo 0`
+        result = `#{DEFAULTS[:client]} --eval '1' 2> /dev/null || echo 'N/A'`
 
-        if result.chomp! == "1"
-          true
-        else
+        if result.chomp! == "N/A"
           false
+        else
+          true
         end
       end
 

data/lib/guard/notifiers/terminal_notifier.rb

@@ -3,14 +3,14 @@ require 'guard/ui'
 module Guard
   module Notifier
 
-    # System notifications using the [terminal_notifier](https://github.com/alloy/terminal-notifier gem.
+    # System notifications using the [terminal-notifier-guard](https://github.com/Springest/terminal-notifier-guard gem.
     #
     # This gem is available for OS X 10.8 Mountain Lion and sends notifications to the OS X
     # notification center.
     #
-    # @example Add the `terminal_notifier` gem to your `Gemfile`
+    # @example Add the `terminal-notifier-guard` gem to your `Gemfile`
     #   group :development
-    #     gem 'terminal-notifier'
+    #     gem 'terminal-notifier-guard'
     #   end
     #
     # @example Add the `:terminal_notifier` notifier to your `Guardfile`
@@ -21,16 +21,16 @@ module Guard
     #
     module TerminalNotifier
       extend self
-      
+
       # Test if the notification library is available.
       #
       # @param [Boolean] silent true if no error messages should be shown
       # @return [Boolean] the availability status
       #
       def available?(silent=false)
-        require 'terminal-notifier'
-        
-        if ::TerminalNotifier.available?
+        require 'terminal-notifier-guard'
+
+        if ::TerminalNotifier::Guard.available?
           true
         else
           ::Guard::UI.error 'The :terminal_notifier only runs on Mac OS X 10.8 and later.' unless silent
@@ -38,10 +38,10 @@ module Guard
         end
 
       rescue LoadError, NameError
-        ::Guard::UI.error "Please add \"gem 'terminal-notifier'\" to your Gemfile and run Guard with \"bundle exec\"." unless silent
+        ::Guard::UI.error "Please add \"gem 'terminal-notifier-guard'\" to your Gemfile and run Guard with \"bundle exec\"." unless silent
         false
       end
-    
+
       # Show a system notification.
       #
       # @param [String] type the notification type. Either 'success', 'pending', 'failed' or 'notify'
@@ -55,10 +55,11 @@ module Guard
       # @option options [String] open some url or file
       #
       def notify(type, title, message, image, options = { })
-        require 'terminal-notifier'
+        require 'terminal-notifier-guard'
         options[:title] = [options[:app_name] || 'Guard', type.downcase.capitalize, title].join ' '
+        options.merge!(:type => type.to_sym, :message => message)
         options.delete :app_name if options[:app_name]
-        ::TerminalNotifier.notify(message, options)
+        ::TerminalNotifier::Guard.execute(false, options)
       end
     end
   end

data/lib/guard/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1136247660184135072
+      hash: 2920801038653850427
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: