rerun 0.2.1 → 0.4

data/LICENSE

@@ -1,4 +1,4 @@
-rerun
+Rerun
 Copyright (c) 2009 Alex Chaffee <alex@stinky.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -21,9 +21,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ---
 
 rerun partially based on code from Rspactor
-[insert license]
+Copyright (c) 2009 Mislav Marohnić
+License as above (MIT open source).
 
 rerun partially based on code from FileSystemWatcher
 http://paulhorman.com/filesystemwatcher/
-[insert license]
+No license provided; assumed public domain.
+
+rerun partially based on code from Shotgun
+Copyright (c) 2009 Ryan Tomayko <tomayko.com/about>
+License as above (MIT open source).
 

data/README.md

@@ -5,25 +5,34 @@
 Launches your app, then watches the filesystem. If a relevant file
 changes, then it restarts your app.
 
-Currently only *.rb files are watched, anywhere under the current
-directory (.). This is pretty lame so it will change soon.
+Currently only *.rb files are watched. This is pretty lame so it will
+change soon.
 
 If you're on Mac OS X, it uses the built-in facilities for monitoring
-the filesystem, so CPU use is very light.
+the filesystem, so CPU use is very light. And if you have "growlnotify"
+available on the PATH, it sends notifications to growl in addition to
+the console. Here's how to install
+[growlnotify](http://growl.info/documentation/growlnotify.php):
 
-If you have "growlcmd" available on the PATH, it sends notifications
-to growl in addition to the console.
+>    In your shell, cd to the directory on the Growl disk image
+>    containing growlnotify, and type ./install.sh. That script
+>    will install growlnotify to /usr/local/bin and the manpage
+>    to /usr/local/man.
+
+Rerun does not work on Windows. Sorry, but you can't do much relaunching
+without "fork".
 
 # Installation:
 
         sudo gem install rerun
 
-or...
+If you want to use the latest version, grab it off Github:
 
         gem sources -a http://gems.github.com/
         sudo gem install alexch-rerun
 
-(The github way isn't working yet for some reason. Maybe I have to wait for cron to run or something.)
+I'll bump the version on Github for release candidates, and deploy to
+Rubyforge only when it's had some time to bake.
 
 # Usage: 
 
@@ -35,20 +44,24 @@ app.rb:
         rerun app.rb
         
 Or if you're running a Rack app that's configured in config.ru
-but you want to override its port:
+but you want it on port 4000 and in debug mode:
 
-        rerun "thin start --port=4000 -R config.ru"
-        
+        rerun "thin start --debug --port=4000 -R config.ru"        
 
 # Options:
 
-Only --version and --help so far.
+--dir directory to watch (default = ".")
+
+Also --version and --help.
 
 # To Do:
 
+* If the cmd is, or starts with, a ".rb" file, then run it with ruby
+* Watch arbitrary file types via globbing
 * Allow arbitrary sets of directories and file types, possibly with "include" and "exclude" sets
 * ".rerun" file to specify options per project or in $HOME.
-* Test on Windows and Linux.
+* Test on Linux.
+* Test on Mac without Growlnotify.
 
 # Other projects that do similar things
 
@@ -56,6 +69,10 @@ Restartomatic: <http://github.com/adammck/restartomatic>
 
 Shotgun: <http://github.com/rtomayko/shotgun>
 
+Rack::Reloader middleware: <http://github.com/rack/rack/blob/5ca8f82fb59f0bf0e8fd438e8e91c5acf3d98e44/lib/rack/reloader.rb>
+
+and the Sinatra FAQ has a discussion at <http://www.sinatrarb.com/faq.html#reloading>
+
 # Why would I use this instead of Shotgun?
 
 Shotgun does a "fork" after the web framework has loaded but before
@@ -78,14 +95,30 @@ server so this doesn't affect them too much.
 
 YMMV!
 
+# Why would I use this instead of Rack::Reloader?
+
+Rack::Reloader is certifiably beautiful code, and is a very elegant use
+of Rack's middleware architecture. But because it relies on the
+LOADED_FEATURES variable, it only reloads .rb files that were 'require'd,
+not 'load'ed. That leaves out (non-Erector) template files, and also,
+the way I was doing it, sub-actions (see
+[this thread](http://groups.google.com/group/sinatrarb/browse_thread/thread/7329727a9296e96a#
+)).
+
+Rack::Reloader also doesn't reload configuration changes or redo other
+things that happen during app startup. Rerun takes the attitude that if
+you want to restart an app, you should just restart the whole app. You know?
+
 # Why did you write this?
 
-I've been using [Sinatra](http://sinatrarb.com) and loving it. In
-order to simplify their system, the Rat Pack just took out
-auto-reloading. I approve of this: a web application framework should
-be focused on serving requests, not on munging Ruby ObjectSpace. But
-I still wanted automatic reloading during development. Shotgun wasn't
-working for me (see above) so I spliced Rerun together out of .
+I've been using [Sinatra](http://sinatrarb.com) and loving it. In order
+to simplify their system, the Rat Pack just removed auto-reloading from
+Sinatra proper. I approve of this: a web application framework should be
+focused on serving requests, not on munging Ruby ObjectSpace for
+dev-time convenience. But I still wanted automatic reloading during
+development. Shotgun wasn't working for me (see above) so I spliced
+Rerun together out of code from Rspactor, FileSystemWatcher, and Shotgun
+-- with a heavy amount of refactoring and rewriting.
 
 # Credits
 
@@ -96,9 +129,14 @@ 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/>
 
+Patches by:
+
+David Billskog <billskog@gmail.com>
+
 # License
 
 Open Source MIT License. See "LICENSE" file.

data/bin/rerun

@@ -20,6 +20,10 @@ opts = OptionParser.new("", 24, '  ') { |opts|
   opts.separator ""
   opts.separator "Options:"
 
+  opts.on("-d dir", "--dir dir", "directory to watch") do |dir|
+    options[:dir] = dir
+  end
+
   opts.on_tail("-h", "--help", "--usage", "show this message") do
     puts opts
     exit

data/lib/osxwatcher.rb

@@ -1,17 +1,8 @@
 require "system"
 require "watcher"
 
-begin
-  require 'osx/foundation'
-  OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
-rescue MissingSourceFile
-  # this is to not fail when running on a non-Mac
-end
-
-# stolen from RSpactor, http://github.com/mislav/rspactor
-# based on http://rails.aizatto.com/2007/11/28/taming-the-autotest-beast-with-fsevents/
-
-#TODO: make it notice deleted files
+#TODO: make it notice deleted files natively, rather than passing to 'examine'
+#TODO: use http://github.com/spicycode/fsevent
 require "watcher"
 module Rerun
   class OSXWatcher < Rerun::Watcher

data/lib/rerun.rb

@@ -3,7 +3,7 @@ require "watcher"
 require "osxwatcher"
 require "fswatcher"
 
-# todo: make this work in non-Mac and non-Unix environments (also Macs without growlnotify) 
+# todo: make sure this works in non-Mac environments (also Macs without growlnotify)
 module Rerun
   class Runner
 
@@ -20,7 +20,15 @@ module Rerun
       @restarting = false
     end
 
+    def dir
+      @options[:dir] || "."
+    end
+
     def start
+      if windows?
+        raise "Sorry, Rerun does not work on Windows."
+      end
+
       if (!@already_running)
         taglines = [
           "To infinity... and beyond!",
@@ -37,13 +45,20 @@ module Rerun
       end
 
       @pid = Kernel.fork do
-        # Signal.trap("INT") { exit }
-        exec(@run_command)
+        begin
+          # Signal.trap("INT") { exit }
+          exec(@run_command)
+        rescue => e
+          puts e
+          exit
+        end
       end
+      Process.detach(@pid) # so if the child exits, it dies
 
-      Signal.trap("INT") { stop; exit }
-
-      # Process.detach(@pid)
+      Signal.trap("INT") do  # INT = control-C
+         stop # first stop the child
+         exit
+       end
 
       begin
         sleep 2
@@ -59,16 +74,16 @@ module Rerun
       end
 
       unless @watcher
-        watcher_class = osx? ? OSXWatcher : FSWatcher
+        watcher_class = mac? ? OSXWatcher : FSWatcher
         # watcher_class = FSWatcher
       
         watcher = watcher_class.new do
           restart unless @restarting
         end
-        watcher.add_directory(".", "**/*.rb")
+        puts "Watching #{dir}"
+        watcher.add_directory(dir, "**/*.rb")
         watcher.sleep_time = 1
         watcher.start
-        
         @watcher = watcher
       end
 
@@ -110,7 +125,7 @@ module Rerun
     end
 
     def notify(title, body)
-      growl title, body if has_growl?
+      growl title, body
       puts
       puts "#{Time.now.strftime("%T")} - #{app_name} #{title}"
     end

data/lib/system.rb

@@ -1,22 +1,30 @@
+def mac?
+  RUBY_PLATFORM =~ /darwin/i && !$osx_foundation_failed_to_load
+end
+
+def windows?
+   RUBY_PLATFORM =~ /mswin/i
+end
 
-# are we on OSX or not?
-begin
-  require 'osx/foundation'
-  OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
-  $osx = true
-rescue MissingSourceFile
-  # this is to not fail when running on a non-Mac
+def linux?
+   RUBY_PLATFORM =~ /linux/i
+end
+
+if mac?
+  begin
+    require 'osx/foundation'
+    OSX.require_framework '/System/Library/Frameworks/CoreServices.framework/Frameworks/CarbonCore.framework'
+  rescue LoadError
+    $osx_foundation_failed_to_load = true
+  end
 end
 
 module Rerun
   module System
-    def osx?
-      $osx
-    end
-    
+
     # do we have growl or not?
-    def has_growl?
-      growlcmd != ""
+    def growl?
+      mac? && (growlcmd != "")
     end
 
     def growlcmd
@@ -29,9 +37,11 @@ module Rerun
     end
 
     def growl(title, body, background = true)
-      s = "#{growlcmd} -n \"#{app_name}\" -m \"#{body}\" \"#{app_name} #{title}\""
-      s += " &" if background
-      `#{s}`
+      if growl?
+        s = "#{growlcmd} -n \"#{app_name}\" -m \"#{body}\" \"#{app_name} #{title}\""
+        s += " &" if background
+        `#{s}`
+      end
     end
     
   end

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.2.1'
+  s.version = '0.4'
   s.date = '2009-06-16'
 
   s.description = "Restarts your app when a file changes"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rerun
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: "0.4"
 platform: ruby
 authors: 
 - Alex Chaffee
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pivotalrb
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Launches an app, and restarts it whenever the filesystem changes.