Permalink
Browse files

Merge with current guard (commit '5352528530f29d3db523261560ee6920063…

…c85b5')
  • Loading branch information...
2 parents 5c93116 + 5352528 commit 92f81d383a9d26472700a8a4f6392d9cf96100b9 @stereobooster committed May 7, 2011
View
@@ -0,0 +1,4 @@
+rvm:
+ - 1.8.7
+ - 1.9.2
+ - ree
View
@@ -0,0 +1,90 @@
+### Bugs fixes:
+
+- Issue [#41](https://github.com/guard/guard/issues/41): Removed useless Bundler requirement. ([@thibaudgg](https://github.com/thibaudgg))
+
+### New features:
+
+- Changed CHANGELOG from RDOC to Markdown and cleaned it! Let's celebrate! ([@rymai](https://github.com/rymai))
+- Changed README from RDOC to Markdown! Let's celebrate! ([@thibaudgg](https://github.com/thibaudgg))
+- Issue [#48](https://github.com/guard/guard/issues/48): Adding support for inline Guard classes rather than requiring a gem. ([@jrsacks](https://github.com/jrsacks))
+
+
+## 0.3.3 - April 18, 2011
+
+### Bugs fixes:
+
+- Fixed `new_modified_files` rerun conditions on `Guard.run_on_change_for_all_guards`. ([@thibaudgg](https://github.com/thibaudgg))
+
+
+## 0.3.2 - April 17, 2011
+
+### Bugs fixes:
+
+- Pull request [#43](https://github.com/guard/guard/issues/43): Fixed `guard init` command. ([@brainopia](https://github.com/brainopia))
+
+
+## 0.3.1 - April 14, 2011
+
+### Bugs fixes:
+
+- Return unique filenames from Linux listener. (Marian Schubert)
+- `Guard.get_guard_class` return wrong class when loaded nested class. ([@koshigoe](https://github.com/koshigoe))
+- Issue [#35](https://github.com/guard/guard/issues/35): Fixed open-gem/gem_open dependency problem by using `gem which` to locate guards gem path. (reported by [@thierryhenrio](https://github.com/thierryhenrio), fixed by [@thibaudgg](https://github.com/thibaudgg))
+- Issue [#38](https://github.com/guard/guard/issues/38) & Pull request [#39](https://github.com/guard/guard/issues/39): Fixed an invalid ANSI escape code in `Guard::UI.reset_line`. ([@gix](https://github.com/gix))
+
+### New features:
+
+- Issue [#28](https://github.com/guard/guard/issues/28): New `-n` command line option to disable notifications (Growl / Libnotify). ([@thibaudgg](https://github.com/thibaudgg))
+
+
+## 0.3.0 - January 19, 2011
+
+### Bugs fixes:
+
+- Avoid launching run_on_change guards method when no files matched. --clear guard argument is now usable. ([@thibaudgg](https://github.com/thibaudgg))
+
+### New features:
+
+- The whole directory is now watched during `run_on_change` to detect new files modifications. ([@thibaudgg](https://github.com/thibaudgg))
+- Pull request [#26](https://github.com/guard/guard/issues/26): New DSL method: `group` allows you to group several guards. ([@netzpirat](https://github.com/netzpirat))
+- Pull request [#26](https://github.com/guard/guard/issues/26): New CLI option: `--group group_name` to specify certain groups of guards to start. ([@netzpirat](https://github.com/netzpirat))
+- `watch` patterns are now more strict: strings are matched with `String#==`, `Regexp` are matched with `Regexp#match`. ([@rymai](https://github.com/rymai))
+- A deprecation warning is displayed if your `Guardfile` contains `String` that look like `Regexp` (bad!). ([@rymai](https://github.com/rymai))
+- It's now possible to return an `Enumerable` in the `watch` optional blocks in the `Guardfile`. ([@rymai](https://github.com/rymai))
+
+### New specs:
+
+- Guard::Watcher. ([@rymai](https://github.com/rymai))
+- Pull request [#13](https://github.com/guard/guard/issues/13): Guard::Dsl. ([@oliamb](https://github.com/oliamb))
+
+
+## 0.2.2 - October 25, 2010
+
+### Bugs fixes:
+
+- Issue [#5](https://github.com/guard/guard/issues/5): avoid creating new copy of `fsevent_watch` every time a file is changed. (reported by [@stouset](https://github.com/stouset), fixed by [@thibaudgg](https://github.com/thibaudgg))
+
+
+## 0.2.1 - October 24, 2010
+
+### Bugs fixes:
+
+- Pull request [#7](https://github.com/guard/guard/issues/7): Fixes for Linux support. ([@yannlugrin](https://github.com/yannlugrin)))
+- Pull request [#6](https://github.com/guard/guard/issues/6): Locate guard now chomp newline in result path. ([@yannlugrin](https://github.com/yannlugrin)))
+
+
+## 0.2.0 - October 21, 2010
+
+### Bugs fixes:
+
+- Issue [#3](https://github.com/guard/guard/issues/3): `guard init <guard-name>` no more need `Gemfile` but `open_gem` is required now. (reported by [@wereHamster](https://github.com/wereHamster), fixed by [@thibaudgg](https://github.com/thibaudgg))
+- Issue [#2](https://github.com/guard/guard/issues/2): 1.8.6 compatibility. (reported by [@veged](https://github.com/veged), fixed by [@thibaudgg](https://github.com/thibaudgg))
+- Removes Growl & Libnotify dependencies. ([@thibaudgg](https://github.com/thibaudgg))
+
+
+## 0.2.0.beta.1 - October 17, 2010
+
+### New features:
+
+- Improved listeners support (`rb-fsevent` & `rb-inotify`). ([@thibaudgg](https://github.com/thibaudgg))
+- Added polling listening fallback. ([@thibaudgg](https://github.com/thibaudgg))
View
@@ -1,77 +0,0 @@
-== 0.3.3 (Avril 18, 2011)
-
-Bugs fixes:
-- Fixed new_modified_files rerun conditions on Guard.run_on_change_for_all_guards
-
-== 0.3.2 (Avril 17, 2011)
-
-Bugs fixes:
-- Fixed "guard init" command (@brainopia)
-
-== 0.3.1 (Avril 14, 2011)
-
-Features:
-- Added a command line option (-n false) to disable notifications (growl/libnotify)
-
-Bugs fixes:
-- Return unique filenames from Linux listener (Marian Schubert)
-- Guard.get_guard_class return wrong class when loaded nested class. (@koshigoe)
-- Fixed open-gem/gem_open dependency problem by using `gem which` to locate guards gem path
-- Fixed an invalid ANSI escape code in UI.reset_line (@gix)
-
-== 0.3.0 (Jan 19, 2011)
-
-== Jan 19, 2011 [by thibaudgg]
-
-Features:
-- The whole directory are now watched after that run_on_change was launched on all guards to detect new files modifications.
-
-== Dec 17, 2010 [by netzpirat]
-
-Features:
-- New DSL method: `group` allows you to group several guards.
-- New CLI option: `--group group_name` to specify certain groups of guards to start.
-
-== Dec 16, 2010 [by rymai]
-
-Features:
-- 'watch' patterns are now more strict: Strings are matched with '==', Regexp are matched with Regexp#match.
-- A deprecation warning is displayed if your Guardfile contains String that look like Regexp (bad!).
-
-== Nov 26, 2010 [by rymai]
-
-Features:
-- It's now possible to return an enumerable in the 'watch' optional blocks in the Guardfile.
-
-Specs:
-- Guard::Watcher
-
-Bugs fixes:
-- Avoid launching run_on_change guards method when no files matched. --clear guard argument is now usable.
-
-== 0.2.2 (Oct 25, 2010)
-
-Bugs fixes:
-
-- Avoid creating new copy of fsevent_watch every time a file is changed. (issue #5)
-
-== 0.2.1 (Oct 24, 2010)
-
-Bugs fixes:
-
-- Fixes for Linux support
-
-== 0.2.0 (Oct 21, 2010)
-
-Bugs fixes:
-
-- Fixes for 1.8.6 compatibility (issue #2)
-- guard init <guard-name> no more need Gemfile presence but open_gem is required now (issue #3)
-- Removes growl & libnotify dependencies
-
-== 0.2.0.beta.1 (Oct 17, 2010)
-
-Features:
-
-- Improved listeners support (rb-fsevent & rb-inotify)
-- Added polling listening fallback
View
@@ -5,12 +5,12 @@ gemspec
require 'rbconfig'
if Config::CONFIG['target_os'] =~ /darwin/i
- gem 'rb-fsevent', '>= 0.3.9'
- gem 'growl', '~> 1.0.3'
+ gem 'rb-fsevent', '>= 0.3.9', :require => false
+ gem 'growl', '~> 1.0.3', :require => false
end
if Config::CONFIG['target_os'] =~ /linux/i
- gem 'rb-inotify', '>= 0.5.1'
- gem 'libnotify', '~> 0.1.3'
+ gem 'rb-inotify', '>= 0.5.1', :require => false
+ gem 'libnotify', '~> 0.1.3', :require => false
end
if Config::CONFIG['target_os'] =~ /mswin|mingw/i
gem 'win32console'
View
@@ -1,4 +1,4 @@
-guard('rspec', :cli => '-f doc', :version => 2) do
+guard('rspec', :version => 2) do
watch(%r{^spec/(.*)_spec\.rb})
watch(%r{^lib/(.*)\.rb}) { |m| "spec/#{m[1]}_spec.rb" }
watch('spec/spec_helper.rb') { "spec" }
Oops, something went wrong.

0 comments on commit 92f81d3

Please sign in to comment.