guard 0.2.0.beta.1 → 0.2.0

data/README.rdoc

@@ -4,14 +4,14 @@ Guard is a command line tool to easly handle events on files modifications.
 
 == Features
 
-- FSEvent support on Mac OS X 10.5+ (without RubyCocoa!, please install {rb-fsevent, >= 0.3.2}[https://rubygems.org/gems/rb-fsevent])
-- Inotify support on Linux (beta, please install {rb-inotify, >= 0.5.1}[https://rubygems.org/gems/rb-inotify])
+- {FSEvent}[http://en.wikipedia.org/wiki/FSEvents] support on Mac OS X 10.5+ (without RubyCocoa!, {rb-fsevent gem, >= 0.3.2}[https://rubygems.org/gems/rb-fsevent] required)
+- {Inotify}[http://en.wikipedia.org/wiki/Inotify] support on Linux ({rb-inotify gem, >= 0.5.1}[https://rubygems.org/gems/rb-inotify] required)
 - Polling for others (help us to support more systems)
 - Super fast change detection (when polling not used)
 - Automatic files modifications detection (even new files are detected)
-- Growl notification (please install {growlnotify}[http://growl.info/documentation/growlnotify.php])
-- Libnotify notification
-- Tested on Ruby 1.8.7 & 1.9.2.
+- Growl notification ({growlnotify}[http://growl.info/documentation/growlnotify.php] & {growl gem}[https://rubygems.org/gems/growl] required)
+- Libnotify notification ({libnotify gem}[https://rubygems.org/gems/libnotify] required)
+- Tested on Ruby 1.8.6, 1.8.7 & 1.9.2
 
 == Install
 
@@ -29,6 +29,26 @@ Generate an empty Guardfile with:
 
 Add guard(s) you need (see available guards below)
 
+=== On Mac OS X
+
+Install rb-fsevent for {FSEvent}[http://en.wikipedia.org/wiki/FSEvents] support
+
+    gem install rb-fsevent
+
+Install growl for Growl notification support
+
+    gem install growl
+
+=== On Linux
+
+Install rb-inotify for {inotify}[http://en.wikipedia.org/wiki/Inotify] support
+
+    gem install rb-inotify
+
+Install libnotify for libonity notification support
+
+    gem install libnotify
+
 == Usage
 
 Just launch Guard inside your ruby/rails project with:
@@ -52,14 +72,16 @@ Signal handlers are used to interact with Guard:
 == Available Guards
 
 - {guard-rspec}[http://github.com/guard/guard-rspec]
+- {guard-test}[http://github.com/guard/guard-test]
+- {guard-minitest}[http://github.com/guard/guard-minitest]
 - {guard-livereload}[http://github.com/guard/guard-livereload]
+- {guard-sass}[http://github.com/guard/guard-sass]
+- {guard-shell}[http://github.com/guard/guard-shell]
 
 guard ideas:
 
 - guard-spork
 - guard-cucumber
-- guard-test
-- guard-sass
 - guard-bundler
 - others ideas?
 

data/lib/guard.rb

@@ -33,7 +33,7 @@ module Guard
         end
         
         UI.info "Guard is now watching at '#{Dir.pwd}'"
-        guards.each(&:start)
+        guards.each { |g| g.start }
         listener.start
       end
     end
@@ -45,22 +45,28 @@ module Guard
     
     def get_guard_class(name)
       require "guard/#{name.downcase}"
-      guard_class = ObjectSpace.each_object(Class).detect { |c| c.to_s.downcase.match "^guard::#{name.downcase}" }
+      klasses = []
+      ObjectSpace.each_object(Class) do |klass|
+        klasses << klass if klass.to_s.downcase.match "^guard::#{name.downcase}"
+      end
+      klasses.first
     rescue LoadError
       UI.error "Could not find gem 'guard-#{name}' in the current Gemfile."
     end
     
     def locate_guard(name)
-      spec = Bundler.load.specs.find{|s| s.name == "guard-#{name}" }
-      spec.full_gem_path
+      `gem open guard-#{name} --latest --command echo`
     rescue
-      UI.error "Could not find gem 'guard-#{name}' in the current Gemfile."
+      UI.error "Could not find 'guard-#{name}' gem path."
     end
     
     def run
       listener.stop
-      UI. clear if options[:clear]
-      yield
+      UI.clear if options[:clear]
+      begin
+        yield
+      rescue Interrupt
+      end
       listener.start
     end
     

data/lib/guard/interactor.rb

@@ -5,14 +5,14 @@ module Guard
       # Run all (Ctrl-\)
       Signal.trap('QUIT') do
         ::Guard.run do
-          ::Guard.guards.each(&:run_all)
+          ::Guard.guards.each { |g| g.run_all }
         end
       end
       
       # Stop (Ctrl-C)
       Signal.trap('INT') do
         ::Guard.listener.stop
-        if ::Guard.guards.all?(&:stop)
+        if ::Guard.guards.all? { |g| g.stop }
           UI.info "Bye bye...", :reset => true
           abort("\n")
         else
@@ -23,7 +23,7 @@ module Guard
       # Reload (Ctrl-Z)
       Signal.trap('TSTP') do
         ::Guard.run do
-          ::Guard.guards.each(&:reload)
+          ::Guard.guards.each { |g| g.reload }
         end
       end
     end

data/lib/guard/listeners/linux.rb

@@ -1,13 +1,13 @@
 module Guard
   class Linux < Listener
     attr_reader :inotify, :files, :latency, :callback
-    
+
     def initialize
       @inotify = INotify::Notifier.new
       @files   = []
       @latency = 0.5
     end
-    
+
     def on_change(&callback)
       @callback = callback
       inotify.watch(Dir.pwd, :recursive, :attrib, :modify, :create) do |event|
@@ -15,21 +15,22 @@ module Guard
           @files << event.absolute_name
         end
       end
+    rescue Interrupt
     end
-    
+
     def start
       @stop = false
       watch_change
     end
-    
+
     def stop
       @stop = true
       inotify.stop
     end
-    
+
     def self.usable?
       require 'rb-inotify'
-      if !defined?(INotify::VERSION) || Gem::Version.new(INotify::VERSION) < Gem::Version.new('0.5.1')
+      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
@@ -39,20 +40,23 @@ module Guard
       UI.info "Please install rb-inotify gem for Linux inotify support"
       false
     end
-    
+
   private
-    
+
     def watch_change
       while !@stop
-        inotify.process
-        unless files.empty?
-          files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
-          callback.call(files)
-          files.clear
+        if Config::CONFIG['build'] =~ /java/ || IO.select([inotify.to_io], [], [], latency)
+          inotify.process
+
+          unless files.empty?
+            files.map! { |file| file.gsub("#{Dir.pwd}/", '') }
+            callback.call(files)
+            files.clear
+          end
+          sleep latency
         end
-        sleep latency
       end
     end
-    
+
   end
 end

data/lib/guard/notifier.rb

@@ -1,13 +1,6 @@
 require 'rbconfig'
 require 'pathname'
 
-case Config::CONFIG['target_os']
-when /darwin/i
-  require 'growl'
-when /linux/i
-  require 'libnotify'
-end
-
 module Guard
   module Notifier
     
@@ -17,9 +10,13 @@ module Guard
         title = options[:title] || "Guard"
         case Config::CONFIG['target_os']
         when /darwin/i
-          Growl.notify message, :title => title, :icon => image_path(image), :name => "Guard"
+          if growl_installed?
+            Growl.notify message, :title => title, :icon => image_path(image), :name => "Guard"
+          end
         when /linux/i
-          Libnotify.show :body => message, :summary => title, :icon_path => image_path(image)
+          if libnotify_installed?
+            Libnotify.show :body => message, :summary => title, :icon_path => image_path(image)
+          end
         end
       end
     end
@@ -41,5 +38,25 @@ module Guard
       end
     end
     
+    def self.growl_installed?
+      @installed ||= begin
+        require 'growl'
+        true
+      rescue LoadError
+        UI.info "Please install growl gem for Mac OS X notification support"
+        false
+      end
+    end
+    
+    def self.libnotify_installed?
+      @installed ||= begin
+        require 'libnotify'
+        true
+      rescue LoadError
+        UI.info "Please install libnotify gem for Linux notification support"
+        false
+      end
+    end
+    
   end
 end

data/lib/guard/version.rb

@@ -1,3 +1,3 @@
 module Guard
-  VERSION = "0.2.0.beta.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: guard
 version: !ruby/object:Gem::Version 
-  hash: 62196353
-  prerelease: true
+  hash: 23
+  prerelease: false
   segments: 
   - 0
   - 2
   - 0
-  - beta
-  - 1
-  version: 0.2.0.beta.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Thibaud Guillaume-Gentil
@@ -17,43 +15,43 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 17
         segments: 
-        - 2
-        - 0
+        - 1
         - 0
-        version: 2.0.0
+        - 3
+        version: 1.0.3
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 13
         segments: 
+        - 2
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        version: 2.0.1
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: guard-rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,11 +60,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         hash: 19
         segments: 
-        - 1
         - 0
-        - 2
-        version: 1.0.2
-  type: :runtime
+        - 1
+        - 4
+        version: 0.1.4
+  type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: thor
@@ -85,37 +83,21 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: growl
+  name: open_gem
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 3
         segments: 
         - 1
-        - 0
-        - 3
-        version: 1.0.3
+        - 4
+        - 2
+        version: 1.4.2
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: libnotify
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 1
-        - 3
-        version: 0.1.3
-  type: :runtime
-  version_requirements: *id006
 description: Guard is a command line tool to easily handle events on files modifications.
 email: 
 - thibaud@thibaud.me