rerun 0.7.0.pre2 → 0.7.0.pre3

data/Rakefile

@@ -10,7 +10,7 @@ desc "Run all specs"
 RSpec::Core::RakeTask.new('spec') do |t|
   ENV['ENV'] = "test"
   t.pattern = 'spec/**/*_spec.rb'
-  t.ruby_opts = ['-rubygems'] if defined? Gem
+  t.rspec_opts = ['--color']
 end
 
 $rubyforge_project = 'pivotalrb'

data/lib/rerun/glob.rb

@@ -12,6 +12,9 @@ module Rerun
 
     def to_regexp_string
       chars = @glob_string.split('')
+
+      chars = smoosh(chars)
+
       curlies = 0;
       escaping = false;
       chars.map do |char|
@@ -20,6 +23,8 @@ module Rerun
           char
         else
           case char
+            when '**'
+              "([^/]+/)*"
             when '*'
               ".*"
             when "?"
@@ -58,5 +63,20 @@ module Rerun
     def to_regexp
       Regexp.new(to_regexp_string)
     end
+
+    def smoosh chars
+      out = []
+      until chars.empty?
+        char = chars.shift
+        if char == "*" and chars.first == "*"
+          chars.shift
+          chars.shift if chars.first == "/"
+          out.push("**")
+        else
+          out.push(char)
+        end
+      end
+      out
+    end
   end
 end

data/lib/rerun/runner.rb

@@ -144,14 +144,12 @@ module Rerun
 
       unless @watcher
 
-        watcher = Watcher.new do
+        watcher = Watcher.new(:directory => dir, :pattern => pattern) do
           restart unless @restarting
         end
-        say "Watching #{dir}/#{pattern}"
-        watcher.add_directory(dir, pattern)
-        watcher.sleep_time = 1
         watcher.start
         @watcher = watcher
+        say "Watching #{dir}/#{pattern} using #{watcher.adapter.class.name.split('::').last} adapter"
       end
     end
 
@@ -169,13 +167,14 @@ module Rerun
     end
 
     def signal(signal)
-      say "Sending #{signal} to #{@pid}" unless signal == 0
+      say "Sending signal #{signal} to #{@pid}" unless signal == 0
       Process.kill(signal, @pid)
       true
     rescue
       false
     end
 
+    # todo: test escalation
     def stop
       if @pid && (@pid != 0)
         notify "stopping", "All good things must come to an end." unless @restarting

data/lib/rerun/watcher.rb

@@ -2,7 +2,7 @@ require 'listen'
 
 Thread.abort_on_exception = true
 
-# This class will watch a directory or a set of directories and alert you of
+# This class will watch a directory and alert you of
 # new files, modified files, deleted files.
 #
 # Author: Paul Horman, http://paulhorman.com/filesystemwatcher/
@@ -13,56 +13,40 @@ module Rerun
     MODIFIED = 1
     DELETED = 2
 
-    attr_accessor :sleep_time, :priority
-    attr_reader :directories
+    attr_reader :directory, :pattern, :priority
 
-    def initialize(&client_callback)
+    # Create a file system watcher. Start it by calling #start.
+    #
+    # @param options[:directory] the directory to watch (default ".")
+    # @param options[:pattern] the glob pattern to search under the watched directory (default "**/*")
+    # @param options[:priority] the priority of the watcher thread (default 0)
+    #
+    def initialize(options = {}, &client_callback)
       @client_callback = client_callback
 
-      @sleep_time = 1
-      @priority = 0
+      options = {
+          :directory => ".",
+          :pattern => "**/*",
+          :priority => 0,
+      }.merge(options)
 
-      @directories = []
-      @files = []
+      @pattern = options[:pattern]
+      @directory = options[:directory]
+      if FileTest.exists?(directory) && FileTest.readable?(directory) then
+        @directory = Directory.new(directory, @pattern)
+      else
+        raise InvalidDirectoryError, "Dir '#{directory}' either doesnt exist or isnt readable"
+      end
+      @priority = options[:priority]
 
       @found = nil
       @first_time = true
       @thread = nil
-
-    end
-
-    # add a directory to be watched
-    # @param dir the directory to watch
-    # @param expression the glob pattern to search under the watched directory
-    def add_directory(dir, expression="**/*")
-      if FileTest.exists?(dir) && FileTest.readable?(dir) then
-        @directories << Directory.new(dir, expression)
-      else
-        raise InvalidDirectoryError, "Dir '#{dir}' either doesnt exist or isnt readable"
-      end
-    end
-
-    def remove_directory(dir)
-      @directories.delete(dir)
-    end
-
-    # add a specific file to the watch list
-    # @param file the file to watch
-    def add_file(file)
-      if FileTest.exists?(file) && FileTest.readable?(file) then
-        @files << file
-      else
-        raise InvalidFileError, "File '#{file}' either doesnt exist or isnt readable"
-      end
-    end
-
-    def remove_file(file)
-      @files.delete(file)
     end
 
     def prime
       @first_time = true
-      @found = Hash.new()
+      @found = {}
       examine
       @first_time = false
     end
@@ -76,24 +60,27 @@ module Rerun
 
       @thread = Thread.new do
         # todo: multiple dirs
-        # todo: convert each dir's pattern to a regex and get Listen to do the file scan for us
-        @listener = Listen::Listener.new(@directories.first.dir) do |modified, added, removed|
+
+        regexp = Glob.new(@pattern).to_regexp
+        @listener = Listen::Listener.new(@directory.dir, :filter => regexp) do |modified, added, removed|
           #d { modified }
           #d { added }
           #d { removed }
           examine
-          sleep(@sleep_time)
         end
         @listener.start
       end
 
       @thread.priority = @priority
 
-      at_exit { stop } #?
-
-      sleep 1 until @listener.instance_variable_get(:@adapter)
-      puts "Using adapter #{@listener.instance_variable_get(:@adapter)}"
+      at_exit { stop } # try really hard to clean up after ourselves
+    end
 
+    def adapter
+      timeout(4) do
+        sleep 1 until adapter = @listener.instance_variable_get(:@adapter)
+        adapter
+      end
     end
 
     # kill the filewatcher thread
@@ -123,11 +110,7 @@ module Rerun
 
       already_examined = Hash.new()
 
-      @directories.each do |directory|
-        examine_files(directory.files(), already_examined)
-      end
-
-      examine_files(@files, already_examined) if not @files.empty?
+      examine_files(@directory.files, already_examined)
 
       # now diff the found files and the examined files to see if
       # something has been deleted

data/rerun.gemspec

@@ -3,7 +3,7 @@ $spec = Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
 
   s.name = 'rerun'
-  s.version = '0.7.0.pre2'
+  s.version = '0.7.0.pre3'
 
   s.description = "Restarts your app when a file changes"
   s.summary     = "Launches an app, and restarts it whenever the filesystem changes."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rerun
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre2
+  version: 0.7.0.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -61,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1600005325287533273
+      hash: 3232457078342945302
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: