guard 2.12.5 → 2.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6cb2b065313fadd1e7938935252c4ba5ff98631
-  data.tar.gz: fbe543cde3dac216174ef74dbc7ef8a7d97c307c
+  metadata.gz: 8e15b3952cdcf0c7bc0630dc7ea778b232a41a4d
+  data.tar.gz: 0815439ec78d643499d434c892a1813f5b00d8e4
 SHA512:
-  metadata.gz: 53c56440d62730e2f4b7c31006dc88854042fee6ef6abcd0f9840a7efbc01b7393176383e630078465c356da681c3d864f5747f4f1e0d62f43cb1eaabb5b11b0
-  data.tar.gz: 43d9c9262a46f4a0d7129be5db869db6daecf3994057e89b5f2138e74a66b934a649045ae9c58d70756f53ebec3d768ad323a49042afc997c6f87b7f6cb933f4
+  metadata.gz: 7e7d66058a18aa51dcb60fe7a293ea38c7e6f8bc6e5e50521f5148af70674afcffceb50d3c61450d56a5a6bb067c40356388528e714771c83542dd074f999a25
+  data.tar.gz: 88a5e72ec2292dd3c53ac95a443dbfaca092900ca3ac68cbde0396a7a79de9978e84f03e3c94009cede1bbd18bfac454b4921db5b786a3f85f5fe1f5ea715bcb

data/README.md

@@ -17,12 +17,12 @@ If you have
 any questions about the Guard usage or want to share some information with the Guard community, please go to one of
 the following places:
 
-* [Google+ community](https://plus.google.com/u/1/communities/110022199336250745477)
-* [Google group](http://groups.google.com/group/guard-dev)
-* [StackOverflow](http://stackoverflow.com/questions/tagged/guard)
-* IRC channel `#guard` (irc.freenode.net) for chatting
+* [Google+ community](https://plus.google.com/u/1/communities/110022199336250745477).
+* [Google group](http://groups.google.com/group/guard-dev).
+* [StackOverflow](http://stackoverflow.com/questions/tagged/guard).
+* IRC channel `#guard` (irc.freenode.net) for chatting.
 
-Information on advanced topics like creating your own Guard plugin, programatic use of Guard, hooks and callbacks and
+Information on advanced topics like creating your own Guard plugin, programmatic 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 _[known issues](#issues)_ and _[file an issue](#file-an-issue)_ sections that contains some important information.
@@ -86,7 +86,7 @@ If you're getting sick of typing `bundle exec` all the time, try one of the foll
 
 * (Recommended) Running `bundle binstub guard` will create `bin/guard` in your
   project, which means running `bin/guard` (tab completion will save you a key
-  stroke or two) will have the exact same result as `bundle exec guard`
+  stroke or two) will have the exact same result as `bundle exec guard`.
 
 * Or, for RubyGems >= 2.2.0 (at least, though the more recent the better),
   simply set the `RUBYGEMS_GEMDEPS` environment variable to `-` (for autodetecting
@@ -171,9 +171,9 @@ Please try to follow these simple rules:
 
 #### Core Team
 
-* R.I.P. :broken_heart: [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat), [flinkfinger.com](http://www.flinkfinger.com))
-* [Rémy Coutable](https://github.com/rymai)
-* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg), [thibaud.gg](http://thibaud.gg/))
+* R.I.P. :broken_heart: [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat), [flinkfinger.com](http://www.flinkfinger.com)).
+* [Rémy Coutable](https://github.com/rymai).
+* [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg), [thibaud.gg](http://thibaud.gg/)).
 
 #### Contributors
 

data/lib/guard.rb

@@ -154,10 +154,15 @@ module Guard
       guardfiles = modified.select { |path| /^(?:.+\/)?Guardfile$/.match(path) }
       return if guardfiles.empty?
 
-      if guardfiles.any? { |path| /^Guardfile$/.match(path) }
+      guardfile = Pathname("Guardfile").realpath
+      real_guardfiles = guardfiles.detect do |path|
+        /^Guardfile$/.match(path) || Pathname(path).expand_path == guardfile
+      end
+
+      if real_guardfiles
         UI.warning "Guardfile changed -- _guard-core will exit.\n"
         exit 2 # nonzero to break any while loop
-      else
+      else # e.g. templates/Guardfile
         msg = "Config changed: %s - Guard will exit so it can be restarted."
         UI.info format(msg, guardfiles.inspect)
         exit 0 # 0 so any shell while loop can continue

data/lib/guard/cli.rb

@@ -110,6 +110,15 @@ module Guard
     # @see Guard.start
     #
     def start
+      if defined?(JRUBY_VERSION)
+        unless options[:no_interactions]
+          abort "\nSorry, JRuby and interactive mode are incompatible.\n"\
+            "As a workaround, use the '-i' option instead.\n\n"\
+            "More info: \n"\
+            " * https://github.com/guard/guard/issues/754\n"\
+            " * https://github.com/jruby/jruby/issues/2383\n\n"
+        end
+      end
       exit(Cli::Environments::Valid.new(options).start_guard)
     end
 

data/lib/guard/cli/environments/valid.rb

@@ -34,13 +34,17 @@ module Guard
             Guardfile::Evaluator.new(session.evaluator_options).evaluate
           rescue Guardfile::Evaluator::NoGuardfileError
             generator.create_guardfile
+          rescue Guard::Guardfile::Evaluator::NoPluginsError
+            # Do nothing - just the error
           end
 
           return 0 if bare # 0 - exit code
 
           # Evaluate because it might have existed and creating was skipped
-          # FIXME: still, I don't know why this is needed
-          Guardfile::Evaluator.new(session.evaluator_options).evaluate
+          begin
+            Guardfile::Evaluator.new(session.evaluator_options).evaluate
+          rescue Guard::Guardfile::Evaluator::NoPluginsError
+          end
 
           if plugin_names.empty?
             generator.initialize_all_templates

data/lib/guard/dsl_reader.rb

@@ -15,7 +15,7 @@ module Guard
     end
 
     # Stub everything else
-    def notification
+    def notification(_notifier, _opts = {})
     end
 
     def interactor(_options)

data/lib/guard/plugin_util.rb

@@ -129,7 +129,11 @@ module Guard
       # TODO: move this to Generator?
       options = Guard.state.session.evaluator_options
       evaluator = Guardfile::Evaluator.new(options)
-      evaluator.evaluate
+      begin
+        evaluator.evaluate
+      rescue Guard::Guardfile::Evaluator::NoPluginsError
+      end
+
       if evaluator.guardfile_include?(name)
         UI.info "Guardfile already includes #{ name } guard"
       else

data/lib/guard/templates/Guardfile

@@ -2,17 +2,9 @@
 # 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 features)
+# directories %w(app lib config test spec features) \
+#  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
 
-## Uncomment to clear the screen before every task
-# clearing :on
-
-## Guard internally checks for changes in the Guardfile and exits.
-## If you want Guard to automatically start up again, run guard in a
-## shell loop, e.g.:
-##
-##  $ 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 ('.'), then you will want to move
 ## the Guardfile to a watched dir and symlink it back, e.g.

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "2.12.5"
+  VERSION = "2.12.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.12.5
+  version: 2.12.6
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Guard keeps an eye on your file modifications