guard 0.9.3 → 0.9.4

data/CHANGELOG.md

@@ -1,6 +1,16 @@
+## 0.9.4 - December 25, 2011
+
+### Improvement
+
+- Add the ability to load user defined templates. ([@hawx][])
+
+### Bug fix
+
+- Fix guard-rspec notifications by using ENV variable to store Notifier.notifications. ([@thibaudgg][])
+
 ## 0.9.3 - December 23, 2011
 
-### Improvements
+### Improvement
 
 - Fix terminal status after interrupting the Readline interactor. ([@Maher4Ever][])
 
@@ -13,14 +23,14 @@
 
 ## 0.9.1 - December 19, 2011
 
-### Bug fix
+### Bug fixes
 
 - Fix wrong `--no-vendor` option. ([@netzpirat][])
 - [#195](https://github.com/guard/guard/issues/195): Empty watch directory prohibit Guard from running. (reported by [@madtrick][], fixed by [@netzpirat][])
 
 ## 0.9.0 - December 19, 2011
 
-### Bug fix
+### Bug fixes
 
 - [#173](https://github.com/guard/guard/issues/173): Cannot set the watch_all_modifications option. (reported by [@sutherland][], fixed by [@netzpirat][])
 - Fix `guard init` when a guard name is given. ([@rymai][])
@@ -366,6 +376,7 @@
 [@fnichol]: https://github.com/fnichol
 [@Gazer]: https://github.com/Gazer
 [@gix]: https://github.com/gix
+[@hawx]: https://github.com/hawx
 [@hron]: https://github.com/hron
 [@hardipe]: https://github.com/hardipe
 [@hashrocketeer]: https://github.com/hashrocketeer

data/README.md

@@ -218,6 +218,13 @@ In addition, the `init` task can be used to append a supplied Guard template fro
 $ guard init <guard-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>
+```
+
 ### Start
 
 Just launch Guard inside your Ruby or Rails project with:
@@ -839,6 +846,7 @@ Pull requests are very welcome! Please try to follow these simple rules if appli
 
 * Please create a topic branch for every separate change you make.
 * Make sure your patches are well tested. All specs run with `rake spec:portability` must pass.
+  * On OS X you need to compile once rb-fsevent executable with `rake build_mac_exec`.
 * Update the [Yard](http://yardoc.org/) documentation.
 * Update the README.
 * Update the CHANGELOG for noteworthy changes.

data/lib/guard.rb

@@ -17,6 +17,8 @@ module Guard
 
   # The Guardfile template for `guard init`
   GUARDFILE_TEMPLATE = File.expand_path('../guard/templates/Guardfile', __FILE__)
+  # The location of user defined templates
+  HOME_TEMPLATES = File.expand_path('~/.guard/templates')
 
   class << self
     attr_accessor :options, :interactor, :listener, :lock
@@ -26,7 +28,7 @@ module Guard
     #
     # @see Guard::Guard.init
     #
-    # @param [String] guard_name the name of the Guard to initialize
+    # @param [String] guard_name the name of the Guard or template to initialize
     #
     def initialize_template(guard_name = nil)
       if !File.exist?('Guardfile')
@@ -38,8 +40,24 @@ module Guard
       end
 
       if guard_name
-        guard_class = ::Guard.get_guard_class(guard_name)
-        guard_class.init(guard_name)
+        guard_class = ::Guard.get_guard_class(guard_name, true)
+        if guard_class
+          guard_class.init(guard_name)
+        elsif File.exist?(File.join(HOME_TEMPLATES, guard_name))
+          content  = File.read('Guardfile')
+          template = File.read(File.join(HOME_TEMPLATES, guard_name))
+          
+          File.open('Guardfile', 'wb') do |f|
+            f.puts(content)
+            f.puts("")
+            f.puts(template)
+          end
+          
+          ::Guard::UI.info "#{ guard_name } template added to Guardfile, feel free to edit it"
+        else
+          const_name  = guard_name.downcase.gsub('-', '')
+          UI.error "Could not load 'guard/#{ guard_name.downcase }' or '~/.guard/templates/#{ guard_name.downcase }' or find class Guard::#{ const_name.capitalize }"
+        end
       end
     end
 
@@ -432,9 +450,10 @@ module Guard
     # * `rspec` will find a class `Guard::RSpec`
     #
     # @param [String] name the name of the Guard
+    # @param [Boolean] fail_gracefully whether error messages should not be printed
     # @return [Class, nil] the loaded class
     #
-    def get_guard_class(name)
+    def get_guard_class(name, fail_gracefully=false)
       name        = name.to_s
       try_require = false
       const_name  = name.gsub(/\/(.?)/) { "::#{ $1.upcase }" }.gsub(/(?:^|[_-])(.)/) { $1.upcase }
@@ -449,8 +468,10 @@ module Guard
           UI.error "Could not find class Guard::#{ const_name.capitalize }"
         end
       rescue LoadError => loadError
-        UI.error "Could not load 'guard/#{ name.downcase }' or find class Guard::#{ const_name.capitalize }"
-        UI.error loadError.to_s
+        unless fail_gracefully
+          UI.error "Could not load 'guard/#{ name.downcase }' or find class Guard::#{ const_name.capitalize }"
+          UI.error loadError.to_s
+        end
       end
     end
 

data/lib/guard/dsl.rb

@@ -109,7 +109,7 @@ module Guard
       def reevaluate_guardfile
         ::Guard.guards.clear
         ::Guard.reset_groups
-        ::Guard::Notifier.notifications.clear
+        ::Guard::Notifier.clear_notifications
         @@options.delete(:guardfile_contents)
         Dsl.evaluate_guardfile(@@options)
         msg = 'Guardfile has been re-evaluated.'

data/lib/guard/notifier.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 require 'rbconfig'
 require 'pathname'
 require 'guard/ui'
@@ -53,7 +55,7 @@ module Guard
     # @return [Hash] the notifications
     #
     def notifications
-      @notifications ||= []
+      ENV['GUARD_NOTIFICATIONS'] ? YAML::load(ENV['GUARD_NOTIFICATIONS']) : []
     end
 
     # Set the available notifications.
@@ -61,7 +63,13 @@ module Guard
     # @param [Array<Hash>] notifications the notifications
     #
     def notifications=(notifications)
-      @notifications = notifications
+      ENV['GUARD_NOTIFICATIONS'] = YAML::dump(notifications)
+    end
+
+    # Clear available notifications.
+    #
+    def clear_notifications
+      ENV['GUARD_NOTIFICATIONS'] = nil
     end
 
     # Turn notifications on. If no notifications are defined
@@ -107,7 +115,7 @@ module Guard
       return turn_off if name == :off
 
       if NOTIFIERS.has_key?(name) && NOTIFIERS[name].available?(silent)
-        notifications << { :name => name, :options => options }
+        self.notifications = notifications << { :name => name, :options => options }
         true
       else
         false

data/lib/guard/version.rb

@@ -1,6 +1,6 @@
 module Guard
   unless defined? Guard::VERSION
     # The current gem version of Guard
-    VERSION = '0.9.3'
+    VERSION = '0.9.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000Z
+date: 2011-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70333332552280 !ruby/object:Gem::Requirement
+  requirement: &70180932216960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70333332552280
+  version_requirements: *70180932216960
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70333332551660 !ruby/object:Gem::Requirement
+  requirement: &70180932216500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70333332551660
+  version_requirements: *70180932216500
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70333332550980 !ruby/object:Gem::Requirement
+  requirement: &70180932209560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70333332550980
+  version_requirements: *70180932209560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70333332550060 !ruby/object:Gem::Requirement
+  requirement: &70180932208780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *70333332550060
+  version_requirements: *70180932208780
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70333332549420 !ruby/object:Gem::Requirement
+  requirement: &70180932207640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *70333332549420
+  version_requirements: *70180932207640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70333332548120 !ruby/object:Gem::Requirement
+  requirement: &70180932206640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70333332548120
+  version_requirements: *70180932206640
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70333332546500 !ruby/object:Gem::Requirement
+  requirement: &70180932206180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.17.2
   type: :development
   prerelease: false
-  version_requirements: *70333332546500
+  version_requirements: *70180932206180
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70333332545160 !ruby/object:Gem::Requirement
+  requirement: &70180932205720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +98,7 @@ dependencies:
         version: 0.9.6.2
   type: :development
   prerelease: false
-  version_requirements: *70333332545160
+  version_requirements: *70180932205720
 description: Guard is a command line tool to easily handle events on file system modifications.
 email:
 - thibaud@thibaud.me
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: guard
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Guard keeps an eye on your file modifications