guard 2.0.0.pre.3 → 2.0.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97231e4fc0839c1025501eaf13e0577f9f53c002
-  data.tar.gz: 07f0d463dd0a08e1aa4480ecbada67db32035e37
+  metadata.gz: 8025e7f0ec625bbce9aca160a9ffd51d71f26c56
+  data.tar.gz: fdcd36acb0a257c89429d602a01a73114afb243c
 SHA512:
-  metadata.gz: 6647423b6451e4dd2ccb864240a4a881bf86a20bd1673d547c4f0fdd1285a25004e2604390c8480c60fa60a1fa0a4b436629755665a0f1ef25365c1a9d368d65
-  data.tar.gz: 969be72dd8aeb2eca0f55255fa24e886a7b4cfd4cd31059ec1e26cca2075233c6e9d35f886fea10eae68f88e61cd6b03f0413ff736cb1071f5cf71d0102e91fc
+  metadata.gz: 4d050af1881b99fccfb8d8e9195dddd2c8c189feeb4f7008141414db6789fcfa8c712161981fcfa8f9d2b4ddef183e36faf63cf4f415eac67a67860c4f5c2277
+  data.tar.gz: 60ab1d3b0b0469cf29dad122a7c4be3f1d94549f8be86e475b9d43d44ef77ab98c6d18834c1a96172b26c52119bbf396abba0dc2ffbfea7ee29b8d99deb0915a

data/README.md

@@ -54,10 +54,9 @@ $ bundle
 Generate an empty `Guardfile` with:
 
 ```bash
-$ guard init
+$ bundle exec guard init
 ```
 
-
 Run Guard through Bundler with:
 
 ```bash
@@ -97,14 +96,14 @@ Guard is run from the command line. Please open your terminal and go to your pro
 You can always get help on the available tasks with the `help` task:
 
 ```bash
-$ guard help
+$ bundle exec guard help
 ```
 
 Requesting more detailed help on a specific task is simple: just append the task name to the help task.
 For example, to get help for the `start` task, simply run:
 
 ```bash
-$ guard help start
+$ bundle exec guard help start
 ```
 
 ### Init
@@ -113,28 +112,28 @@ You can generate a Guardfile and have all installed plugins be automatically add
 it by running the `init` task without any option:
 
 ```bash
-$ guard init
+$ bundle exec guard init
 ```
 
 You can also specify the name of an installed plugin to only get that plugin template
 in the generated Guardfile:
 
 ```bash
-$ guard init <guard-name>
+$ bundle exec guard init <guard-name>
 ```
 
 You can also specify the names of multiple plugins to only get those plugin templates
 in the generated Guardfile:
 
 ```bash
-$ guard init <guard1-name> <guard2-name>
+$ bundle exec guard init <guard1-name> <guard2-name>
 ```
 
 You can also define your own templates in `~/.guard/templates/` which can be appended in the same way to your existing
 `Guardfile`:
 
 ```bash
-$ guard init <template-name>
+$ bundle exec guard init <template-name>
 ```
 
 **Note**: If you already have a `Guardfile` in the current directory, the `init` task can be used
@@ -146,8 +145,8 @@ You can generate an empty `Guardfile` by running the `init` task with the bare
 option:
 
 ```bash
-$ guard init --bare
-$ guard init -b # shortcut
+$ bundle exec guard init --bare
+$ bundle exec guard init -b # shortcut
 ```
 
 ### Start
@@ -155,7 +154,7 @@ $ guard init -b # shortcut
 Just launch Guard inside your Ruby or Rails project with:
 
 ```bash
-$ guard
+$ bundle exec guard
 ```
 
 Guard will look for a `Guardfile` in your current directory. If it does not find one, it will look in your `$HOME`
@@ -166,8 +165,8 @@ directory for a `.Guardfile`.
 The shell can be cleared after each change:
 
 ```bash
-$ guard --clear
-$ guard -c # shortcut
+$ bundle exec guard --clear
+$ bundle exec guard -c # shortcut
 ```
 
 You can add the following snippet to your `~/.guardrc` to have the clear option always be enabled:
@@ -181,8 +180,8 @@ Guard.options.clear = true
 System notifications can be disabled:
 
 ```bash
-$ guard --notify false
-$ guard -n f # shortcut
+$ bundle exec guard --notify false
+$ bundle exec guard -n f # shortcut
 ```
 
 Notifications can also be disabled globally by setting a `GUARD_NOTIFY` environment variable to `false`.
@@ -192,8 +191,8 @@ Notifications can also be disabled globally by setting a `GUARD_NOTIFY` environm
 Scope Guard to certain plugin groups on start:
 
 ```bash
-$ guard --group group_name another_group_name
-$ guard -g group_name another_group_name # shortcut
+$ bundle exec guard --group group_name another_group_name
+$ bundle exec guard -g group_name another_group_name # shortcut
 ```
 
 See the Guardfile DSL below for creating groups.
@@ -203,8 +202,8 @@ See the Guardfile DSL below for creating groups.
 Scope Guard to certain plugins on start:
 
 ```bash
-$ guard --plugins plugin_name another_plugin_name
-$ guard -P plugin_name another_plugin_name # shortcut
+$ bundle exec guard --plugins plugin_name another_plugin_name
+$ bundle exec guard -P plugin_name another_plugin_name # shortcut
 ```
 
 #### `-d`/`--debug` option
@@ -213,8 +212,8 @@ Guard can display debug information which can be very usefull for plugins
 developers with:
 
 ```bash
-$ guard --debug
-$ guard -d # shortcut
+$ bundle exec guard --debug
+$ bundle exec guard -d # shortcut
 ```
 
 #### `-w`/`--watchdir` option
@@ -222,9 +221,9 @@ $ guard -d # shortcut
 Guard can watch any number of directories instead of only the current directory:
 
 ```bash
-$ guard --watchdir ~/your/fancy/project
-$ guard -w ~/your/fancy/project ~/your/fancier/project2 #multiple directories
-$ guard -w ~/your/fancy/project # shortcut
+$ bundle exec guard --watchdir ~/your/fancy/project
+$ bundle exec guard -w ~/your/fancy/project ~/your/fancier/project2 #multiple directories
+$ bundle exec guard -w ~/your/fancy/project # shortcut
 ```
 
 #### `-G`/`--guardfile` option
@@ -232,8 +231,8 @@ $ guard -w ~/your/fancy/project # shortcut
 Guard can use a `Guardfile` not located in the current directory:
 
 ```bash
-$ guard --guardfile ~/.your_global_guardfile
-$ guard -G ~/.your_global_guardfile # shortcut
+$ bundle exec guard --guardfile ~/.your_global_guardfile
+$ bundle exec guard -G ~/.your_global_guardfile # shortcut
 ```
 
 #### `-i`/`--no-interactions` option
@@ -241,8 +240,8 @@ $ guard -G ~/.your_global_guardfile # shortcut
 Turn off completely any Guard terminal interactions with:
 
 ```bash
-$ guard start -i
-$ guard start --no-interactions
+$ bundle exec guard start -i
+$ bundle exec guard start --no-interactions
 ```
 
 #### `-B`/`--no-bundler-warning` option
@@ -250,8 +249,8 @@ $ guard start --no-interactions
 Skip Bundler warning when a Gemfile exists in the project directory but Guard is not run with Bundler.
 
 ```bash
-$ guard start -B
-$ guard start --no-bundler-warning
+$ bundle exec guard start -B
+$ bundle exec guard start --no-bundler-warning
 ```
 
 #### `-l`/`--latency` option
@@ -259,8 +258,8 @@ $ guard start --no-bundler-warning
 Overwrite Listen's default latency, useful when your hard-drive / system is slow.
 
 ```bash
-$ guard start -l 1.5
-$ guard start --latency 1.5
+$ bundle exec guard start -l 1.5
+$ bundle exec guard start --latency 1.5
 ```
 
 #### `-p`/`--force-polling` option
@@ -268,8 +267,8 @@ $ guard start --latency 1.5
 Force Listen polling listener usage.
 
 ```bash
-$ guard start -p
-$ guard start --force-polling
+$ bundle exec guard start -p
+$ bundle exec guard start --force-polling
 ```
 
 ### List
@@ -277,7 +276,7 @@ $ guard start --force-polling
 You can list the available plugins with the `list` task:
 
 ```bash
-$ guard list
+$ bundle exec guard list
 +----------+--------------+
 | Plugin   | In Guardfile |
 +----------+--------------+
@@ -296,7 +295,7 @@ $ guard list
 You can show the structure of the groups and their plugins with the `show` task:
 
 ```bash
-$ guard show
+$ bundle exec guard show
 +---------+--------+-----------------+----------------------------+
 | Group   | Plugin | Option          | Value                      |
 +---------+--------+-----------------+----------------------------+
@@ -320,7 +319,7 @@ read more about these files in the [shared configuration section](https://github
 You can show the notifiers, their availablity and options with the `notifier` task:
 
 ```bash
-$ guard notifiers
+$ bundle exec guard notifiers
 +-------------------+-----------+------+------------------------+-------------------+
 | Name              | Available | Used | Option                 | Value             |
 +-------------------+-----------+------+------------------------+-------------------+
@@ -444,7 +443,7 @@ detected before sending it to the plugin for processing:
 
 ```ruby
 guard :rspec do
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
 end
 ```
 
@@ -482,7 +481,7 @@ end
 Groups to be run can be specified with the Guard DSL option `--group` (or `-g`):
 
 ```bash
-$ guard -g specs
+$ bundle exec guard -g specs
 ```
 
 Guard plugins that don't belong to a group are considered global and are always run.
@@ -697,7 +696,6 @@ Pull requests are very welcome! Please try to follow these simple rules if appli
 * Make sure your patches are well tested. All specs must pass on [Travis CI](https://travis-ci.org/guard/guard).
 * Update the [Yard](http://yardoc.org/) documentation.
 * Update the [README](https://github.com/guard/guard/blob/master/README.md).
-* Update the [CHANGELOG](https://github.com/guard/guard/blob/master/CHANGELOG.md) for noteworthy changes (don't forget to run `bundle exec pimpmychangelog` and watch the magic happen)!
 * Please **do not change** the version number.
 
 For questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
@@ -720,9 +718,9 @@ Please try to follow these simple rules:
 #### Core Team
 
 * [Michael Kessler](https://github.com/netzpirat) ([@netzpirat](http://twitter.com/netzpirat), [mksoft.ch](https://mksoft.ch))
-* [Rémy Coutable](https://github.com/rymai) ([@rymai](http://twitter.com/rymai), [rymai.me](http://rymai.me))
+* [Rémy Coutable](https://github.com/rymai) ([@rymai](http://twitter.com/rymai), [rym.ai](http://rym.ai))
 * [Thibaud Guillaume-Gentil](https://github.com/thibaudgg) ([@thibaudgg](http://twitter.com/thibaudgg), [thibaud.me](http://thibaud.me/))
 
 #### Contributors
 
-[https://github.com/guard/guard/contributors](https://github.com/guard/guard/contributors)
+[https://github.com/guard/guard/graphs/contributors](https://github.com/guard/guard/graphs/contributors)

data/lib/guard.rb

@@ -27,7 +27,7 @@ module Guard
   extend Setuper
 
   class << self
-    attr_accessor :interactor, :runner, :listener, :lock, :scope, :running
+    attr_accessor :runner, :listener, :lock, :scope, :running
 
     # Smart accessor for retrieving specific plugins at once.
     #

data/lib/guard/interactor.rb

@@ -126,7 +126,7 @@ module Guard
 
       _store_terminal_settings if _stty_exists?
 
-      if !@thread || !['sleep', 'run'].include?(@thread.status)
+      unless @thread
         ::Guard::UI.debug 'Start interactor'
 
         @thread = Thread.new do
@@ -145,6 +145,7 @@ module Guard
         ::Guard::UI.reset_line
         ::Guard::UI.debug 'Stop interactor'
         @thread.kill
+        @thread = nil
       end
 
       _restore_terminal_settings if _stty_exists?

data/lib/guard/setuper.rb

@@ -64,21 +64,28 @@ module Guard
       setup_scope(groups: options.group, plugins: options.plugin)
 
       _setup_notifier
-      _setup_interactor
 
       self
     end
 
+    # Lazy initializer for Guard's options hash
+    #
+    def options
+      @options ||= ::Guard::Options.new(@opts || {}, DEFAULT_OPTIONS)
+    end
+
     # Lazy initializer for Guardfile evaluator
     #
     def evaluator
       @evaluator ||= ::Guard::Guardfile::Evaluator.new(@opts || {})
     end
 
-    # Lazy initializer for Guard's options hash
+    # Lazy initializer the interactor unless the user has specified not to.
     #
-    def options
-      @options ||= ::Guard::Options.new(@opts || {}, DEFAULT_OPTIONS)
+    def interactor
+      return if options.no_interactions || !::Guard::Interactor.enabled
+
+      @interactor ||= ::Guard::Interactor.new
     end
 
     # Clear Guard's options hash
@@ -141,8 +148,9 @@ module Guard
     private
 
     def _reset_lazy_accessors
-      @options   = nil
-      @evaluator = nil
+      @options    = nil
+      @evaluator  = nil
+      @interactor = nil
     end
 
     # Sets up various debug behaviors:
@@ -230,14 +238,6 @@ module Guard
       end
     end
 
-    # Initializes the interactor unless the user has specified not to.
-    #
-    def _setup_interactor
-      unless options.no_interactions || !::Guard::Interactor.enabled
-        @interactor = ::Guard::Interactor.new
-      end
-    end
-
     # Adds a command logger in debug mode. This wraps common command
     # execution functions and logs the executed command before execution.
     #

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = '2.0.0.pre.3'
+  VERSION = '2.0.0.pre.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.3
+  version: 2.0.0.pre.4
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.2
+        version: 2.0.0.pre.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.2
+        version: 2.0.0.pre.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.12
 - !ruby/object:Gem::Dependency
   name: lumberjack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me