guard 0.7.0.rc1 → 0.7.0

data/lib/guard/listeners/darwin.rb

@@ -1,47 +1,47 @@
-module Guard
-  class Darwin < Listener
-
-    def initialize(*)
-      super
-      @fsevent = FSEvent.new
-    end
-
-    def worker
-      @fsevent
-    end
-
-    def start
-      super
-      worker.run
-    end
-
-    def stop
-      super
-      worker.stop
-    end
-
-    def self.usable?
-      require 'rb-fsevent'
-      if !defined?(FSEvent::VERSION) || (defined?(Gem::Version) &&
-          Gem::Version.new(FSEvent::VERSION) < Gem::Version.new('0.4.0'))
-        UI.info "Please update rb-fsevent (>= 0.4.0)"
-        false
-      else
-        true
-      end
-    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)
-        @callback.call(files) unless files.empty?
-      end
-    end
-
-  end
-end
+module Guard
+  class Darwin < Listener
+
+    def initialize(*)
+      super
+      @fsevent = FSEvent.new
+    end
+
+    def worker
+      @fsevent
+    end
+
+    def start
+      super
+      worker.run
+    end
+
+    def stop
+      super
+      worker.stop
+    end
+
+    def self.usable?
+      require 'rb-fsevent'
+      if !defined?(FSEvent::VERSION) || (defined?(Gem::Version) &&
+          Gem::Version.new(FSEvent::VERSION) < Gem::Version.new('0.4.0'))
+        UI.info "Please update rb-fsevent (>= 0.4.0)"
+        false
+      else
+        true
+      end
+    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)
+        @callback.call(files) unless files.empty?
+      end
+    end
+
+  end
+end

data/lib/guard/listeners/linux.rb

@@ -1,74 +1,74 @@
-module Guard
-  class Linux < Listener
-
-    def initialize(*)
-      super
-      @inotify = INotify::Notifier.new
-      @files   = []
-      @latency = 0.5
-    end
-
-    def start
-      @stop = false
-      super
-      watch_change unless watch_change?
-    end
-
-    def stop
-      super
-      @stop = true
-      sleep(@latency)
-    end
-
-    def self.usable?
-      require 'rb-inotify'
-      if !defined?(INotify::VERSION) || (defined?(Gem::Version) &&
-          Gem::Version.new(INotify::VERSION.join('.')) < Gem::Version.new('0.8.5'))
-        UI.info "Please update rb-inotify (>= 0.8.5)"
-        false
-      else
-        true
-      end
-    rescue LoadError
-      UI.info "Please install rb-inotify gem for Linux inotify support"
-      false
-    end
-
-    def watch_change?
-      !!@watch_change
-    end
-
-  private
-
-    def worker
-      @inotify
-    end
-
-    def watch(directory)
-      # The event selection is based on https://github.com/guard/guard/wiki/Analysis-of-inotify-events-for-different-editors
-      worker.watch(directory, :recursive, :attrib, :create, :move_self, :close_write) do |event|
-        unless event.name == "" # Event on root directory
-          @files << event.absolute_name
-        end
-      end
-    rescue Interrupt
-    end
-
-    def watch_change
-      @watch_change = true
-      until @stop
-        if RbConfig::CONFIG['build'] =~ /java/ || IO.select([worker.to_io], [], [], @latency)
-          break if @stop
-
-          sleep(@latency)
-          worker.process
-
-          files = modified_files(@files.shift(@files.size).map { |f| File.dirname(f) }.uniq)
-          @callback.call(files) unless files.empty?
-        end
-      end
-      @watch_change = false
-    end
-
-  end
-end
+module Guard
+  class Linux < Listener
+
+    def initialize(*)
+      super
+      @inotify = INotify::Notifier.new
+      @files   = []
+      @latency = 0.5
+    end
+
+    def start
+      @stop = false
+      super
+      watch_change unless watch_change?
+    end
+
+    def stop
+      super
+      @stop = true
+      sleep(@latency)
+    end
+
+    def self.usable?
+      require 'rb-inotify'
+      if !defined?(INotify::VERSION) || (defined?(Gem::Version) &&
+          Gem::Version.new(INotify::VERSION.join('.')) < Gem::Version.new('0.8.5'))
+        UI.info "Please update rb-inotify (>= 0.8.5)"
+        false
+      else
+        true
+      end
+    rescue LoadError
+      UI.info "Please install rb-inotify gem for Linux inotify support"
+      false
+    end
+
+    def watch_change?
+      !!@watch_change
+    end
+
+  private
+
+    def worker
+      @inotify
+    end
+
+    def watch(directory)
+      # The event selection is based on https://github.com/guard/guard/wiki/Analysis-of-inotify-events-for-different-editors
+      worker.watch(directory, :recursive, :attrib, :create, :move_self, :close_write) do |event|
+        unless event.name == "" # Event on root directory
+          @files << event.absolute_name
+        end
+      end
+    rescue Interrupt
+    end
+
+    def watch_change
+      @watch_change = true
+      until @stop
+        if RbConfig::CONFIG['build'] =~ /java/ || IO.select([worker.to_io], [], [], @latency)
+          break if @stop
+
+          sleep(@latency)
+          worker.process
+
+          files = modified_files(@files.shift(@files.size).map { |f| File.dirname(f) }.uniq)
+          @callback.call(files) unless files.empty?
+        end
+      end
+      @watch_change = false
+    end
+
+  end
+end

data/lib/guard/listeners/polling.rb

@@ -1,37 +1,37 @@
-module Guard
-  class Polling < Listener
-
-    def initialize(*)
-      super
-      @latency = 1.5
-    end
-
-    def start
-      @stop = false
-      super
-      watch_change
-    end
-
-    def stop
-      super
-      @stop = true
-    end
-
-  private
-
-    def watch_change
-      until @stop
-        start = Time.now.to_f
-        files = modified_files([@directory], :all => true)
-        @callback.call(files) unless files.empty?
-        nap_time = @latency - (Time.now.to_f - start)
-        sleep(nap_time) if nap_time > 0
-      end
-    end
-
-    def watch(directory)
-      @existing = all_files
-    end
-
-  end
-end
+module Guard
+  class Polling < Listener
+
+    def initialize(*)
+      super
+      @latency = 1.5
+    end
+
+    def start
+      @stop = false
+      super
+      watch_change
+    end
+
+    def stop
+      super
+      @stop = true
+    end
+
+  private
+
+    def watch_change
+      until @stop
+        start = Time.now.to_f
+        files = modified_files([@directory], :all => true)
+        @callback.call(files) unless files.empty?
+        nap_time = @latency - (Time.now.to_f - start)
+        sleep(nap_time) if nap_time > 0
+      end
+    end
+
+    def watch(directory)
+      @existing = all_files
+    end
+
+  end
+end

data/lib/guard/listeners/windows.rb

@@ -1,42 +1,42 @@
-module Guard
-  class Windows < Listener
-
-    def initialize(*)
-      super
-      @fchange = FChange::Notifier.new
-    end
-
-    def start
-      super
-      worker.run
-    end
-
-    def stop
-      super
-      worker.stop
-    end
-
-    def self.usable?
-      require 'rb-fchange'
-      true
-    rescue LoadError
-      UI.info "Please install rb-fchange gem for Windows file events support"
-      false
-    end
-
-  private
-
-    def worker
-      @fchange
-    end
-
-    def watch(directory)
-      worker.watch(directory, :all_events, :recursive) do |event|
-        paths = [File.expand_path(event.watcher.path)]
-        files = modified_files(paths, :all => true)
-        @callback.call(files) unless files.empty?
-      end
-    end
-
-  end
-end
+module Guard
+  class Windows < Listener
+
+    def initialize(*)
+      super
+      @fchange = FChange::Notifier.new
+    end
+
+    def start
+      super
+      worker.run
+    end
+
+    def stop
+      super
+      worker.stop
+    end
+
+    def self.usable?
+      require 'rb-fchange'
+      true
+    rescue LoadError
+      UI.info "Please install rb-fchange gem for Windows file events support"
+      false
+    end
+
+  private
+
+    def worker
+      @fchange
+    end
+
+    def watch(directory)
+      worker.watch(directory, :all_events, :recursive) do |event|
+        paths = [File.expand_path(event.watcher.path)]
+        files = modified_files(paths, :all => true)
+        @callback.call(files) unless files.empty?
+      end
+    end
+
+  end
+end

data/lib/guard/notifier.rb

@@ -1,136 +1,136 @@
-require 'rbconfig'
-require 'pathname'
-require 'guard/ui'
-
-module Guard
-  module Notifier
-    APPLICATION_NAME = "Guard"
-
-    def self.turn_off
-      ENV["GUARD_NOTIFY"] = 'false'
-    end
-
-    def self.turn_on
-      ENV["GUARD_NOTIFY"] = 'true'
-      case RbConfig::CONFIG['target_os']
-      when /darwin/i
-        require_growl
-      when /linux/i
-        require_libnotify
-      when /mswin|mingw/i
-        require_rbnotifu
-      end
-    end
-
-    def self.notify(message, options = {})
-      if enabled?
-        image = options.delete(:image) || :success
-        title = options.delete(:title) || "Guard"
-
-        case RbConfig::CONFIG['target_os']
-        when /darwin/i
-          notify_mac(title, message, image, options)
-        when /linux/i
-          notify_linux(title, message, image, options)
-        when /mswin|mingw/i
-          notify_windows(title, message, image, options)
-        end
-      end
-    end
-
-    def self.enabled?
-      ENV["GUARD_NOTIFY"] == 'true'
-    end
-
-  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 => APPLICATION_NAME }
-      default_options.merge!(options)
-
-      if defined?(GrowlNotify)
-        default_options[:description] = message
-        default_options[:application_name] = APPLICATION_NAME
-        default_options.delete(:name)
-
-        GrowlNotify.send_notification(default_options) if enabled?
-      else
-        Growl.notify message, default_options.merge(options) if enabled?
-      end
-    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), :transient => true }
-      Libnotify.show default_options.merge(options) if enabled?
-    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) if enabled?
-    end
-
-    def self.image_path(image)
-      images_path = Pathname.new(File.dirname(__FILE__)).join('../../images')
-      case image
-      when :failed
-        images_path.join("failed.png").to_s
-      when :pending
-        images_path.join("pending.png").to_s
-      when :success
-        images_path.join("success.png").to_s
-      else
-        # path given
-        image
-      end
-    end
-
-    def self.image_level(image)
-      case image
-      when :failed
-        :error
-      when :pending
-        :warn
-      when :success
-        :info
-      else
-        :info
-      end
-    end
-
-    def self.require_growl
-      begin
-        require 'growl_notify'
-
-        if GrowlNotify.application_name != APPLICATION_NAME
-          GrowlNotify.config do |c|
-            c.notifications = c.default_notifications = [ APPLICATION_NAME ]
-            c.application_name = c.notifications.first
-          end
-        end
-      rescue LoadError
-        require 'growl'
-      end
-    rescue LoadError
-      turn_off
-      UI.info "Please install growl_notify or growl gem for Mac OS X notification support and add it to your Gemfile"
-    end
-
-    def self.require_libnotify
-      require 'libnotify'
-    rescue LoadError
-      turn_off
-      UI.info "Please install libnotify gem for Linux notification support and add it to your Gemfile"
-    end
-
-    def self.require_rbnotifu
-      require 'rb-notifu'
-    rescue LoadError
-      turn_off
-      UI.info "Please install rb-notifu gem for Windows notification support and add it to your Gemfile"
-    end
-  end
-end
+require 'rbconfig'
+require 'pathname'
+require 'guard/ui'
+
+module Guard
+  module Notifier
+    APPLICATION_NAME = "Guard"
+
+    def self.turn_off
+      ENV["GUARD_NOTIFY"] = 'false'
+    end
+
+    def self.turn_on
+      ENV["GUARD_NOTIFY"] = 'true'
+      case RbConfig::CONFIG['target_os']
+      when /darwin/i
+        require_growl
+      when /linux/i
+        require_libnotify
+      when /mswin|mingw/i
+        require_rbnotifu
+      end
+    end
+
+    def self.notify(message, options = {})
+      if enabled?
+        image = options.delete(:image) || :success
+        title = options.delete(:title) || "Guard"
+
+        case RbConfig::CONFIG['target_os']
+        when /darwin/i
+          notify_mac(title, message, image, options)
+        when /linux/i
+          notify_linux(title, message, image, options)
+        when /mswin|mingw/i
+          notify_windows(title, message, image, options)
+        end
+      end
+    end
+
+    def self.enabled?
+      ENV["GUARD_NOTIFY"] == 'true'
+    end
+
+  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 => APPLICATION_NAME }
+      default_options.merge!(options)
+
+      if defined?(GrowlNotify)
+        default_options[:description] = message
+        default_options[:application_name] = APPLICATION_NAME
+        default_options.delete(:name)
+
+        GrowlNotify.send_notification(default_options) if enabled?
+      else
+        Growl.notify message, default_options.merge(options) if enabled?
+      end
+    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), :transient => true }
+      Libnotify.show default_options.merge(options) if enabled?
+    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) if enabled?
+    end
+
+    def self.image_path(image)
+      images_path = Pathname.new(File.dirname(__FILE__)).join('../../images')
+      case image
+      when :failed
+        images_path.join("failed.png").to_s
+      when :pending
+        images_path.join("pending.png").to_s
+      when :success
+        images_path.join("success.png").to_s
+      else
+        # path given
+        image
+      end
+    end
+
+    def self.image_level(image)
+      case image
+      when :failed
+        :error
+      when :pending
+        :warn
+      when :success
+        :info
+      else
+        :info
+      end
+    end
+
+    def self.require_growl
+      begin
+        require 'growl_notify'
+
+        if GrowlNotify.application_name != APPLICATION_NAME
+          GrowlNotify.config do |c|
+            c.notifications = c.default_notifications = [ APPLICATION_NAME ]
+            c.application_name = c.notifications.first
+          end
+        end
+      rescue LoadError
+        require 'growl'
+      end
+    rescue LoadError
+      turn_off
+      UI.info "Please install growl_notify or growl gem for Mac OS X notification support and add it to your Gemfile"
+    end
+
+    def self.require_libnotify
+      require 'libnotify'
+    rescue LoadError
+      turn_off
+      UI.info "Please install libnotify gem for Linux notification support and add it to your Gemfile"
+    end
+
+    def self.require_rbnotifu
+      require 'rb-notifu'
+    rescue LoadError
+      turn_off
+      UI.info "Please install rb-notifu gem for Windows notification support and add it to your Gemfile"
+    end
+  end
+end