guard 0.4.0.rc → 0.4.0

data/{README.markdown → README.md}

@@ -3,6 +3,8 @@ Guard [![Build Status](http://travis-ci.org/guard/guard.png)](http://travis-ci.o
 
 Guard is a command line tool that easily handle events on files modifications.
 
+If you have any questions/issues please join us on our [Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
+
 Features
 --------
 
@@ -103,7 +105,7 @@ or if you use Bundler, to run the Guard executable specific to your bundle:
 $ 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 directory for one.
+Guard will look for a Guardfile in your current directory. If it does not find one, it will look in your `$HOME` directory for one.
 
 Command line options
 --------------------
@@ -122,7 +124,7 @@ $ guard --notify false
 $ guard -n f # shortcut
 ```
 
-Notifications can also be disabled by setting a `GUARD_NOTIFY` environment variable to `false`
+Notifications can also be disabled globally by setting a `GUARD_NOTIFY` environment variable to `false`
 
 The guards to start can be specified by group (see the Guardfile DSL below) specifying the `--group` (or `-g`) option:
 
@@ -146,6 +148,8 @@ Signal handlers are used to interact with Guard:
 * `Ctrl-\` - Calls each guard's `run_all` method, in the same order they are declared in the Guardfile.
 * `Ctrl-Z` - Calls each guard's `reload` method, in the same order they are declared in the Guardfile.
 
+You can read more about [configure the signal keyboard shortcuts](https://github.com/guard/guard/wiki/Configure-keyboard-shortcuts) on the wiki.
+
 Available Guards
 ----------------
 
@@ -212,6 +216,31 @@ group 'frontend' do
 end
 ```
 
+The Guardfile DSL can also be used in a programmatic fashion by calling directly `Guard::Dsl.evaluate_guardfile`.
+Available options are as follow:
+
+* `:guardfile`          - The path to a valid Guardfile.
+* `:guardfile_contents` - A string representing the content of a valid Guardfile
+
+Without any options given, Guard will look for a Guardfile in your current directory and if it does not find one, it will look in your `$HOME` directory for one.
+
+For instance, you could use it as follow:
+
+``` ruby
+gem 'guard'
+require 'guard'
+
+Guard.setup
+
+Guard::Dsl.evaluate_guardfile(:guardfile => '/Your/Custom/Path/To/A/Valid/Guardfile')
+# or
+Guard::Dsl.evaluate_guardfile(:guardfile_contents => "
+  guard 'rspec' do
+    watch(%r{^spec/.+_spec\.rb})
+  end
+")
+```
+
 Create a new guard
 ------------------
 
@@ -301,10 +330,10 @@ Development
 -----------
 
 * Source hosted at [GitHub](https://github.com/guard/guard).
-* Report Issues/Questions/Feature requests on [GitHub Issues](https://github.com/guard/guard/issues).
+* Report Issues/Feature requests on [GitHub Issues](https://github.com/guard/guard/issues).
 
 Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change
-you make.
+you make. Please do not change the version in your pull-request.
 
 Author
 ------

data/lib/guard.rb

@@ -81,14 +81,14 @@ module Guard
     end
 
     def get_guard_class(name)
-      try_to_load_gem name
-      self.const_get(self.constants.find{ |klass_name| klass_name.to_s.downcase == name.to_s.downcase.gsub('-', '') })
+      try_to_load_gem(name)
+      self.const_get(self.constants.find { |klass_name| klass_name.to_s.downcase == name.to_s.downcase.gsub('-', '') })
     rescue TypeError
       UI.error "Could not find load find gem 'guard-#{name}' or find class Guard::#{name}"
     end
 
     def try_to_load_gem(name)
-      require "guard/#{name.downcase}"
+      require "guard/#{name.to_s.downcase}"
     rescue LoadError
     end
 

data/lib/guard/dsl.rb

@@ -90,7 +90,7 @@ module Guard
     end
 
     def group(name, &guard_definition)
-      guard_definition.call if guard_definition && (@@options[:group].empty? || @@options[:group].include?(name))
+      guard_definition.call if guard_definition && (@@options[:group].empty? || @@options[:group].include?(name.to_s))
     end
 
     def guard(name, options = {}, &watch_definition)

data/lib/guard/listener.rb

@@ -47,10 +47,6 @@ module Guard
     end
 
     def modified_files(dirs, options = {})
-# <<<<<<< HEAD
-#       files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && file_modified?(path) }
-#       files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
-# =======
       files = potentially_modified_files(dirs, options).select { |path| File.file?(path) && file_modified?(path) }
       relativate_paths files
     end
@@ -66,7 +62,6 @@ module Guard
 
     def all_files
       potentially_modified_files [directory + '/'], :all => true
-# >>>>>>> b12769d2bf385b3c69973721144cae3d5d8fbed9
     end
 
     # scopes all given paths to the current #directory

data/lib/guard/listeners/darwin.rb

@@ -23,19 +23,17 @@ module Guard
 
     def self.usable?
       require 'rb-fsevent'
-      if !defined?(FSEvent::VERSION) || Gem::Version.new(FSEvent::VERSION) < Gem::Version.new('0.3.9')
-        UI.info "Please update rb-fsevent (>= 0.3.9)"
-        false
-      else
-        true
+      if !defined?(FSEvent::VERSION) || Gem::Version.new(FSEvent::VERSION) < Gem::Version.new('0.4.0')
+        UI.info "Please update rb-fsevent (>= 0.4.0)"
       end
+      true
     rescue LoadError
       UI.info "Please install rb-fsevent gem for Mac OSX FSEvents support"
       false
     end
 
   private
-  
+
     def watch(directory)
       worker.watch directory do |modified_dirs|
         files = modified_files(modified_dirs)

data/lib/guard/listeners/linux.rb

@@ -24,12 +24,10 @@ module Guard
 
     def self.usable?
       require 'rb-inotify'
-      if !defined?(INotify::VERSION) || Gem::Version.new(INotify::VERSION.join('.')) < Gem::Version.new('0.5.1')
-        UI.info "Please update rb-inotify (>= 0.5.1)"
-        false
-      else
-        true
+      if !defined?(INotify::VERSION) || Gem::Version.new(INotify::VERSION.join('.')) < Gem::Version.new('0.8.5')
+        UI.info "Please update rb-inotify (>= 0.8.5)"
       end
+      true
     rescue LoadError
       UI.info "Please install rb-inotify gem for Linux inotify support"
       false

data/lib/guard/notifier.rb

@@ -23,18 +23,16 @@ module Guard
 
     def self.notify(message, options = {})
       if enabled?
-        image = options[:image] || :success
-        title = options[:title] || "Guard"
+        image = options.delete(:image) || :success
+        title = options.delete(:title) || "Guard"
+
         case Config::CONFIG['target_os']
         when /darwin/i
-          require_growl # need for guard-rspec formatter that is called out of guard scope
-          Growl.notify message, :title => title, :icon => image_path(image), :name => "Guard"
+          notify_mac(title, message, image, options)
         when /linux/i
-          require_libnotify # need for guard-rspec formatter that is called out of guard scope
-          Libnotify.show :body => message, :summary => title, :icon_path => image_path(image)
+          notify_linux(title, message, image, options)
         when /mswin|mingw/i
-          require_rbnotifu
-          Notifu.show :message => message, :title => title, :type => image_level(image), :time => 3
+          notify_windows(title, message, image, options)
         end
       end
     end
@@ -45,6 +43,24 @@ module Guard
 
   private
 
+    def self.notify_mac(title, message, image, options)
+      require_growl # need for guard-rspec formatter that is called out of guard scope
+      default_options = { :title => title, :icon => image_path(image), :name => "Guard" }
+      Growl.notify message, default_options.merge(options)
+    end
+
+    def self.notify_linux(title, message, image, options)
+      require_libnotify # need for guard-rspec formatter that is called out of guard scope
+      default_options = { :body => message, :summary => title, :icon_path => image_path(image) }
+      Libnotify.show default_options.merge(options)
+    end
+
+    def self.notify_windows(title, message, image, options)
+      require_rbnotifu # need for guard-rspec formatter that is called out of guard scope
+      default_options = { :message => message, :title => title, :type => image_level(image), :time => 3 }
+      Notifu.show default_options.merge(options)
+    end
+
     def self.image_path(image)
       images_path = Pathname.new(File.dirname(__FILE__)).join('../../images')
       case image
@@ -72,7 +88,7 @@ module Guard
         :info
       end
     end
-    
+
     def self.require_growl
       require 'growl'
     rescue LoadError

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "0.4.0.rc"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: guard
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.4.0.rc
+  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-28 00:00:00 Z
+date: 2011-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -86,7 +86,7 @@ files:
 - lib/guard/watcher.rb
 - lib/guard.rb
 - LICENSE
-- README.markdown
+- README.md
 homepage: http://rubygems.org/gems/guard
 licenses: []
 
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: guard
-rubygems_version: 1.8.4
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Guard keep an eye on your files modifications.