guard 2.11.1 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c08c0020f1277d3e88398066112cb1b4798d0f1
-  data.tar.gz: ffcd381f2cd3cea854d6b88d321041a514cfffa5
+  metadata.gz: 5b69ff7c38770b8a29924a38a705223f786200d6
+  data.tar.gz: 4e2ee36f5c3d9a7cab2694159a42db76c9b90cbe
 SHA512:
-  metadata.gz: 934c5636ffd82320f8d47d0b62773a43e69c57146f9d891d866967b1ce80be0e90284f1bb2c858cb18f13bc39ce804cff932498b36a93bb8e0a37715c11f533f
-  data.tar.gz: 3fff026d2a99b080c45a45312dc66341e6b8e4b17ac1d150b9aa32e9add2429bbe7509ca1effe0490bfd2587df61132ed9a9470bb9efd35c5b92641edcf75a49
+  metadata.gz: f41277e89d009cadea030fef8d1f30940f092e64250b6e093b1f843082ce3bf23e10c764bac7eeb3ed6c6d800af309ce03c461ff6d9fea682b4be82695c35fb8
+  data.tar.gz: 1914c80a762e4988c07b05b4e4f53811647cfb046355cbed428be143aef11db75bc97e05572b51ead74f1a9b31ce441ef04ede888781e98a1db58c733747030b

data/README.md

@@ -3,7 +3,7 @@
 Guard
 =====
 
-[![Gem Version](https://badge.fury.io/rb/guard.png)](http://badge.fury.io/rb/guard) [![Build Status](https://travis-ci.org/guard/guard.png?branch=master)](https://travis-ci.org/guard/guard) [![Dependency Status](https://gemnasium.com/guard/guard.png)](https://gemnasium.com/guard/guard) [![Code Climate](https://codeclimate.com/github/guard/guard.png)](https://codeclimate.com/github/guard/guard) [![Coverage Status](https://coveralls.io/repos/guard/guard/badge.png?branch=master)](https://coveralls.io/r/guard/guard) [![Inline docs](http://inch-ci.org/github/guard/guard.png)](http://inch-ci.org/github/guard/guard)
+[![Gem Version](https://img.shields.io/gem/v/guard.svg?style=flat)](https://rubygems.org/gems/guard) [![Build Status](https://travis-ci.org/guard/guard.svg)](https://travis-ci.org/guard/guard) [![Dependency Status](https://gemnasium.com/guard/guard.png)](https://gemnasium.com/guard/guard) [![Code Climate](https://codeclimate.com/github/guard/guard/badges/gpa.svg)](https://codeclimate.com/github/guard/guard) [![Test Coverage](https://codeclimate.com/github/guard/guard/badges/coverage.svg)](https://codeclimate.com/github/guard/guard) [![Inline docs](http://inch-ci.org/github/guard/guard.svg)](http://inch-ci.org/github/guard/guard)
 
 <img src="http://cl.ly/image/1k3o1r2Z3a0J/guard-Icon.png" alt="Guard Icon" align="right" />
 Guard is a command line tool to easily handle events on file system modifications.

data/bin/_guard-core

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require "guard"
+
+begin
+  require "guard/aruba_adapter"
+rescue LoadError => e
+  abort "#{e.inspect} - perhaps you need to run using `bundle exec`?"
+end
+
+Guard::ArubaAdapter.new(ARGV.dup).execute!

data/bin/guard

@@ -1,11 +1,12 @@
 #!/usr/bin/env ruby
 
-require "guard"
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= (Pathname(__FILE__).realpath + "../../Gemfile").to_s
 
-begin
-  require "guard/aruba_adapter"
-rescue LoadError => e
-  abort "#{e.inspect} - perhaps you need to run using `bundle exec`?"
-end
+require "rubygems"
+require "bundler/setup"
 
-Guard::ArubaAdapter.new(ARGV.dup).execute!
+while !system(Gem.bin_path("guard", "_guard-core"), *ARGV) && $?.exitstatus == 2
+  puts("Restarting guard...")
+end
+exit($?.exitstatus)

data/lib/guard.rb

@@ -155,11 +155,7 @@ module Guard
       return if guardfiles.empty?
 
       if guardfiles.any? { |path| /^Guardfile$/.match(path) }
-        UI.warning <<EOS
-Guardfile changed - Guard will exit so you can restart it manually.
-
-More info here: https://github.com/guard/guard/wiki/Guard-2.10.3-exits-when-Guardfile-is-changed
-EOS
+        UI.warning "Guardfile changed -- _guard-core will exit.\n"
         exit 2 # nonzero to break any while loop
       else
         msg = "Config changed: %s - Guard will exit so it can be restarted."

data/lib/guard/guardfile/generator.rb

@@ -76,13 +76,14 @@ module Guard
 
         _ui(:info, format(INFO_TEMPLATE_ADDED, plugin_name))
 
-      rescue Errno::ENOENT
+      rescue Errno::ENOENT => error
 
         name = plugin_name.downcase
         class_name = name.gsub("-", "").capitalize
         _ui(:error, "Could not load 'guard/#{name}'"\
             " or '~/.guard/templates/#{name}'"\
             " or find class Guard::#{class_name}")
+        _ui(:error, "Error is: #{error}")
       end
 
       # Adds the templates of all installed Guard implementations to an

data/lib/guard/internals/scope.rb

@@ -55,8 +55,10 @@ module Guard
 
       def titles(scope = nil)
         hash = scope || to_hash
-        return hash[:plugins].map(&:title) unless hash[:plugins].empty?
-        return hash[:groups].map(&:title) unless hash[:groups].empty?
+        plugins = hash[:plugins]
+        groups = hash[:groups]
+        return plugins.map(&:title) unless plugins.nil? || plugins.empty?
+        return hash[:groups].map(&:title) unless groups.nil? || groups.empty?
         ["all"]
       end
 

data/lib/guard/notifier.rb

@@ -23,7 +23,7 @@ module Guard
     DEPRECATED_IMPLICIT_CONNECT = "Calling Notiffany::Notifier.notify()" +
       " without a prior Notifier.connect() is deprecated"
 
-    def self.notify(message, options)
+    def self.notify(message, options = {})
       unless @notifier
         # TODO: reenable again?
         # UI.deprecation(DEPRECTED_IMPLICIT_CONNECT)

data/lib/guard/plugin_util.rb

@@ -9,8 +9,8 @@ module Guard
   # * Add its template to the Guardfile.
   #
   class PluginUtil
-    ERROR_NO_GUARD_OR_CLASS = "Could not load 'guard/%s' or'\
-    ' find class Guard::%s"
+    ERROR_NO_GUARD_OR_CLASS = "Could not load 'guard/%s' or" \
+      " find class Guard::%s"
 
     INFO_ADDED_GUARD_TO_GUARDFILE = "%s guard added to Guardfile,"\
       " feel free to edit it"

data/lib/guard/templates/Guardfile

@@ -2,7 +2,7 @@
 # More info at https://github.com/guard/guard#readme
 
 ## Uncomment and set this to only include directories you want to watch
-# directories %w(app lib config test spec feature)
+# directories %w(app lib config test spec features)
 
 ## Uncomment to clear the screen before every task
 # clearing :on
@@ -14,8 +14,8 @@
 ##  $ while bundle exec guard; do echo "Restarting Guard..."; done
 ##
 ## Note: if you are using the `directories` clause above and you are not
-## watching the project directory ('.'), the you will want to move the Guardfile
-## to a watched dir and symlink it back, e.g.
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
 #
 #  $ mkdir config
 #  $ mv Guardfile config/

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.11.1"
+  VERSION = "2.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.12.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -127,12 +127,14 @@ email:
 - thibaud@thibaud.gg
 executables:
 - guard
+- _guard-core
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE
 - README.md
+- bin/_guard-core
 - bin/guard
 - images/failed.png
 - images/guard.png
@@ -212,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications