rerun 0.6.0 → 0.6.2

data/README.md

@@ -53,6 +53,17 @@ Rackup can also be used to launch a Rack server, so let's try that:
 
         rerun -- rackup --port 4000 config.ru
 
+Want to mimic [autotest](https://github.com/grosser/autotest)? Try
+
+        rerun -x rake
+
+or
+
+        rerun -cx rspec
+
+How about regenerating your HTML files after every change to your [Erector](http://erector.rubyforge.org) widgets?
+
+        rerun -x erector --to-html my_site.rb
 
 # Options:
 
@@ -63,7 +74,7 @@ By default it watches these files: `rb,js,css,scss,sass,erb,html,haml,ru`.
 
 --clear (or -c) clear the screen before each run
 
---exit (or -x) expect the program to exit. With this option, rerun checks the return value; without it, rerun checks that the process is running.
+--exit (or -x) expect the program to exit. With this option, rerun checks the return value; without it, rerun checks that the launched process is still running.
 
 Also --version and --help.
 
@@ -76,6 +87,9 @@ Also --version and --help.
 * Test on Linux.
 * Merge with Kicker (using it as a library and writing a Rerun recipe) or Watchr
 * On OS X, use a C library using growl's developer API <http://growl.info/developer/>
+* "Failed" icon
+* Get Rails icon working
+* Figure out an algorithm so "-x" is not needed (if possible)
 
 # Other projects that do similar things
 
@@ -139,17 +153,17 @@ Rerun: Alex Chaffee, <mailto:alex@stinky.com>, <http://github.com/alexch/>
 
 Based upon and/or inspired by:
 
-Shotgun: <http://github.com/rtomayko/shotgun>
-
-Rspactor: <http://github.com/mislav/rspactor>
-(In turn based on http://rails.aizatto.com/2007/11/28/taming-the-autotest-beast-with-fsevents/ )
-
-FileSystemWatcher: <http://paulhorman.com/filesystemwatcher/>
+* Shotgun: <http://github.com/rtomayko/shotgun>
+* Rspactor: <http://github.com/mislav/rspactor>
+  * (In turn based on http://rails.aizatto.com/2007/11/28/taming-the-autotest-beast-with-fsevents/ )
+* FileSystemWatcher: <http://paulhorman.com/filesystemwatcher/>
 
-Patches by:
+## Patches by:
 
-David Billskog <billskog@gmail.com>
-Jens B <https://github.com/dpree>
+* David Billskog <billskog@gmail.com>
+* Jens B <https://github.com/dpree>
+* Andrés Botero <https://github.com/anbotero>
+* Dreamcat4
 
 # License
 

data/lib/rerun/osxwatcher.rb

@@ -7,13 +7,13 @@ module Rerun
   class OSXWatcher < Rerun::Watcher
     attr_reader :last_check, :valid_extensions
     attr_reader :stream
-    
+
     def start
       prime
       timestamp_checked
 
       dirs = Array(directories.map{|d| d.dir})
-      
+
       mac_callback = lambda do |stream, ctx, num_events, paths, marks, event_ids|
         examine
         # changed_files = extract_changed_files_from_paths(split_paths(paths, num_events))

data/lib/rerun/runner.rb

@@ -22,7 +22,7 @@ module Rerun
     def pattern
       @options[:pattern] || DEFAULT_PATTERN
     end
-    
+
     def clear?
       @options[:clear]
     end
@@ -70,7 +70,7 @@ module Rerun
         stop # first stop the child
         exit
       end
- 
+
       begin
         sleep 2
       rescue Interrupt => e
@@ -84,7 +84,7 @@ module Rerun
         if status.success?
           notify "succeeded", ""
         else
-          notify "failed", "Exit status #{status.exitstatus}" 
+          notify "failed", "Exit status #{status.exitstatus}"
         end
       else
         if !running?
@@ -100,7 +100,7 @@ module Rerun
         watcher = watcher_class.new do
           restart unless @restarting
         end
-        puts "Watching #{dir}/#{pattern}"
+        say "Watching #{dir}/#{pattern}"
         watcher.add_directory(dir, pattern)
         watcher.sleep_time = 1
         watcher.start
@@ -126,7 +126,7 @@ module Rerun
 
     def stop
       if @pid && (@pid != 0)
-        notify "Stopped", "All good things must come to an end." unless @restarting
+        notify "stopped", "All good things must come to an end." unless @restarting
         signal("KILL") && Process.wait(@pid)
       end
     rescue => e
@@ -147,7 +147,11 @@ module Rerun
     def notify(title, body)
       growl title, body
       puts
-      puts "#{Time.now.strftime("%T")} - #{app_name} #{title}"
+      say "#{app_name} #{title}"
+    end
+
+    def say msg
+      puts "#{Time.now.strftime("%T")} - #{msg}"
     end
 
   end

data/lib/rerun/system.rb

@@ -6,7 +6,7 @@ module Rerun
       RUBY_PLATFORM =~ /darwin/i
     end
 
-    def osx_foundation?      
+    def osx_foundation?
       mac? and begin
         if $osx_foundation.nil?
           require 'osx/foundation'
@@ -16,7 +16,7 @@ module Rerun
         $osx_foundation
       rescue LoadError
         $osx_foundation = false
-      end        
+      end
     end
 
     def windows?
@@ -35,7 +35,7 @@ module Rerun
     def growlcmd
       `which growlnotify`.chomp
     end
-    
+
     def app_name
       # todo: make sure this works in non-Mac and non-Unix environments
       File.expand_path(".").gsub(/^.*\//, '').capitalize
@@ -45,7 +45,7 @@ module Rerun
       libdir = "#{File.expand_path(File.dirname(File.dirname(__FILE__)))}/lib"
       $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
 
-      rails_sig_file = File.expand_path(".")+"/config/boot.rb" 
+      rails_sig_file = File.expand_path(".")+"/config/boot.rb"
       return "#{libdir}/../icons/rails_red_sml.png" if File.exists? rails_sig_file
       return nil
     end
@@ -58,6 +58,6 @@ module Rerun
         `#{s}`
       end
     end
-    
+
   end
 end

data/lib/rerun/watcher.rb

@@ -1,203 +1,203 @@
-
-Thread.abort_on_exception = true
-
-# This class will watch a directory or a set of directories and alert you of
-# new files, modified files, deleted files.
-#
-# Author: Paul Horman, http://paulhorman.com/filesystemwatcher/
-# Author: Alex Chaffee
-module Rerun
-  class Watcher
-    CREATED = 0
-    MODIFIED = 1
-    DELETED = 2
-
-    attr_accessor :sleep_time, :priority
-    attr_reader :directories
-
-    def initialize(&client_callback)
-      @client_callback = client_callback
-
-      @sleep_time = 1
-      @priority = 0
-
-      @directories = []
-      @files = []
-
-      @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()
-      examine
-      @first_time = false
-    end
-
-    def start
-      if @thread then
-        raise RuntimeError, "already started"
-      end
-
-      prime
-      
-      @thread = Thread.new do
-        while true do
-          examine
-          sleep(@sleep_time)
-        end
-      end
-
-      @thread.priority = @priority
-      
-      at_exit { stop } #?
-
-    end
-
-    # kill the filewatcher thread
-    def stop
-      begin
-        @thread.wakeup
-      rescue ThreadError => e
-        # ignore
-      end
-      begin
-        @thread.kill
-      rescue ThreadError => e
-        # ignore
-      end
-    end
-
-    # wait for the filewatcher to finish
-    def join
-      @thread.join() if @thread
-    rescue Interrupt => e
-      # don't care
-    end
-
-    private
-
-    def examine
-      already_examined = Hash.new()
-
-      @directories.each do |directory|
-        examine_files(directory.files(), already_examined)
-      end
-
-      examine_files(@files, already_examined) if not @files.empty?
-
-      # now diff the found files and the examined files to see if
-      # something has been deleted
-      all_found_files = @found.keys()
-      all_examined_files = already_examined.keys()
-      intersection = all_found_files - all_examined_files
-      intersection.each do |file_name|
-        @client_callback.call(DELETED, file_name)
-        @found.delete(file_name)
-      end
-
-    end
-
-    # loops over the file list check for new or modified files
-    def examine_files(files, already_examined)
-      files.each do |file_name|
-        # expand the file name to the fully qual path
-        full_file_name = File.expand_path(file_name)
-
-        # we cant do much if the file isnt readable anyway
-        if File.readable?(full_file_name) then
-          already_examined[full_file_name] = true
-          stat = File.stat(full_file_name)
-          mod_time = stat.mtime
-          size = stat.size
-
-          # on the first iteration just load all of the files into the foundList
-          if @first_time then
-            @found[full_file_name] = FoundFile.new(full_file_name, mod_time, size)
-          else
-            # see if we have found this file already
-            found_file = @found[full_file_name]
-            @found[full_file_name] = FoundFile.new(full_file_name, mod_time, size)
-
-            if found_file
-              if mod_time > found_file.mod_time || size != found_file.size then
-                @client_callback.call(MODIFIED, full_file_name)
-              end
-            else
-              @client_callback.call(CREATED, full_file_name)
-            end
-          end
-        end
-      end
-    end
-
-    class Directory
-      attr_reader :dir, :expression
-
-      def initialize(dir, expression)
-        @dir, @expression = dir, expression
-        @dir.chop! if @dir =~ %r{/$}
-      end
-
-      def files()
-        return Dir["#{@dir}/#{@expression}"]
-      end
-    end
-
-    class FoundFile
-      attr_reader :status, :file_name, :mod_time, :size
-
-      def initialize(file_name, mod_time, size)
-        @file_name, @mod_time, @size = file_name, mod_time, size
-      end
-
-      def modified(mod_time)
-        @mod_time = mod_time
-      end
-
-      def to_s
-        "FoundFile[file_name=#{file_name}, mod_time=#{mod_time.to_i}, size=#{size}]"
-      end
-    end
-
-    # if the directory you want to watch doesnt exist or isn't readable this is thrown
-    class InvalidDirectoryError < StandardError;
-    end
-
-    # if the file you want to watch doesnt exist or isn't readable this is thrown
-    class InvalidFileError < StandardError;
-    end
-  end
-end
+
+Thread.abort_on_exception = true
+
+# This class will watch a directory or a set of directories and alert you of
+# new files, modified files, deleted files.
+#
+# Author: Paul Horman, http://paulhorman.com/filesystemwatcher/
+# Author: Alex Chaffee
+module Rerun
+  class Watcher
+    CREATED = 0
+    MODIFIED = 1
+    DELETED = 2
+
+    attr_accessor :sleep_time, :priority
+    attr_reader :directories
+
+    def initialize(&client_callback)
+      @client_callback = client_callback
+
+      @sleep_time = 1
+      @priority = 0
+
+      @directories = []
+      @files = []
+
+      @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()
+      examine
+      @first_time = false
+    end
+
+    def start
+      if @thread then
+        raise RuntimeError, "already started"
+      end
+
+      prime
+
+      @thread = Thread.new do
+        while true do
+          examine
+          sleep(@sleep_time)
+        end
+      end
+
+      @thread.priority = @priority
+
+      at_exit { stop } #?
+
+    end
+
+    # kill the filewatcher thread
+    def stop
+      begin
+        @thread.wakeup
+      rescue ThreadError => e
+        # ignore
+      end
+      begin
+        @thread.kill
+      rescue ThreadError => e
+        # ignore
+      end
+    end
+
+    # wait for the filewatcher to finish
+    def join
+      @thread.join() if @thread
+    rescue Interrupt => e
+      # don't care
+    end
+
+    private
+
+    def examine
+      already_examined = Hash.new()
+
+      @directories.each do |directory|
+        examine_files(directory.files(), already_examined)
+      end
+
+      examine_files(@files, already_examined) if not @files.empty?
+
+      # now diff the found files and the examined files to see if
+      # something has been deleted
+      all_found_files = @found.keys()
+      all_examined_files = already_examined.keys()
+      intersection = all_found_files - all_examined_files
+      intersection.each do |file_name|
+        @client_callback.call(DELETED, file_name)
+        @found.delete(file_name)
+      end
+
+    end
+
+    # loops over the file list check for new or modified files
+    def examine_files(files, already_examined)
+      files.each do |file_name|
+        # expand the file name to the fully qual path
+        full_file_name = File.expand_path(file_name)
+
+        # we cant do much if the file isnt readable anyway
+        if File.readable?(full_file_name) then
+          already_examined[full_file_name] = true
+          stat = File.stat(full_file_name)
+          mod_time = stat.mtime
+          size = stat.size
+
+          # on the first iteration just load all of the files into the foundList
+          if @first_time then
+            @found[full_file_name] = FoundFile.new(full_file_name, mod_time, size)
+          else
+            # see if we have found this file already
+            found_file = @found[full_file_name]
+            @found[full_file_name] = FoundFile.new(full_file_name, mod_time, size)
+
+            if found_file
+              if mod_time > found_file.mod_time || size != found_file.size then
+                @client_callback.call(MODIFIED, full_file_name)
+              end
+            else
+              @client_callback.call(CREATED, full_file_name)
+            end
+          end
+        end
+      end
+    end
+
+    class Directory
+      attr_reader :dir, :expression
+
+      def initialize(dir, expression)
+        @dir, @expression = dir, expression
+        @dir.chop! if @dir =~ %r{/$}
+      end
+
+      def files()
+        return Dir["#{@dir}/#{@expression}"]
+      end
+    end
+
+    class FoundFile
+      attr_reader :status, :file_name, :mod_time, :size
+
+      def initialize(file_name, mod_time, size)
+        @file_name, @mod_time, @size = file_name, mod_time, size
+      end
+
+      def modified(mod_time)
+        @mod_time = mod_time
+      end
+
+      def to_s
+        "FoundFile[file_name=#{file_name}, mod_time=#{mod_time.to_i}, size=#{size}]"
+      end
+    end
+
+    # if the directory you want to watch doesnt exist or isn't readable this is thrown
+    class InvalidDirectoryError < StandardError;
+    end
+
+    # if the file you want to watch doesnt exist or isn't readable this is thrown
+    class InvalidFileError < StandardError;
+    end
+  end
+end

data/rerun.gemspec

@@ -3,8 +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.6.0'
-  s.date = '2011-05-15'
+  s.version = '0.6.2'
 
   s.description = "Restarts your app when a file changes"
   s.summary     = "Launches an app, and restarts it whenever the filesystem changes."

metadata

@@ -1,24 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rerun
-version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 3
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 2
+  version: 0.6.2
 platform: ruby
-authors:
+authors: 
 - Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-15 00:00:00.000000000Z
+
+date: 2011-05-18 00:00:00 -07:00
+default_executable: 
 dependencies: []
+
 description: Restarts your app when a file changes
 email: alex@stinky.com
-executables:
+executables: 
 - rerun
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - README.md
 - LICENSE
 - Rakefile
@@ -32,28 +41,39 @@ files:
 - lib/rerun/runner.rb
 - lib/rerun/system.rb
 - lib/rerun/watcher.rb
+has_rdoc: true
 homepage: http://github.com/alexch/rerun/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: pivotalrb
-rubygems_version: 1.8.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Launches an app, and restarts it whenever the filesystem changes.
 test_files: []
+