rerun 0.2 → 0.2.1

data/README.md

@@ -9,15 +9,37 @@ Currently only *.rb files are watched, anywhere under the current
 directory (.). 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.
 
-If you have "growlcmd" available on the PATH, it sends notifications to
-growl in addition to the console.
+If you have "growlcmd" available on the PATH, it sends notifications
+to growl in addition to the console.
+
+# Installation:
+
+        sudo gem install rerun
+
+or...
+
+        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.)
 
 # Usage: 
 
         rerun [options] cmd
 
+For example, if you're running a Sinatra app whose main file is
+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:
+
+        rerun "thin start --port=4000 -R config.ru"
+        
+
 # Options:
 
 Only --version and --help so far.
@@ -36,26 +58,46 @@ Shotgun: <http://github.com/rtomayko/shotgun>
 
 # Why would I use this instead of Shotgun?
 
-Shotgun does a "fork" after the web framework has loaded but before your application is
-loaded. It then loads your app, processes a single request in the child process, then exits the child process.
+Shotgun does a "fork" after the web framework has loaded but before
+your application is loaded. It then loads your app, processes a
+single request in the child process, then exits the child process.
 
-Rerun launches the whole app, then when it's time to restart, uses "kill" to shut it
-down and starts the whole thing up again from scratch. 
+Rerun launches the whole app, then when it's time to restart, uses
+"kill" to shut it down and starts the whole thing up again from
+scratch.
 
-So rerun takes somewhat longer than Shotgun to restart the app, but does it much less
-frequently. And once it's running it behaves more normally and consistently with your
-production app.
+So rerun takes somewhat longer than Shotgun to restart the app, but
+does it much less frequently. And once it's running it behaves more
+normally and consistently with your production app.
 
-Also, Shotgun reloads the app on every request, even if it doesn't need to. This is
-fine if you're loading a single file, but my web pages all load other files (CSS, JS,
-media) and that adds up quickly. The developers of shotgun are probably using caching
-or a front web server so this doesn't affect them too much.
+Also, Shotgun reloads the app on every request, even if it doesn't
+need to. This is fine if you're loading a single file, but my web
+pages all load other files (CSS, JS, media) and that adds up quickly.
+The developers of shotgun are probably using caching or a front web
+server so this doesn't affect them too much.
 
 YMMV!
 
-# Contact
+# 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 .
+
+# Credits
+
+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>
 
-Alex Chaffee, <mailto:alex@stinky.com>, <http://github.com/alexch/>
+FileSystemWatcher: <http://paulhorman.com/filesystemwatcher/>
 
 # License
 

data/bin/rerun

@@ -5,7 +5,7 @@ require 'rubygems'
 libdir = "#{File.expand_path(File.dirname(File.dirname(__FILE__)))}/lib"
 $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
 
-load 'rerun.gemspec' # defines "$spec" variable
+load "#{libdir}/../rerun.gemspec" # defines "$spec" variable, which we read the version from
 
 require 'optparse'
 
@@ -47,4 +47,6 @@ end
 
 require 'rerun'
 cmd = ARGV.join(" ")
-Rerun::Runner.new(cmd, options).start
+runner = Rerun::Runner.new(cmd, options)
+runner.start
+runner.join

data/lib/rerun.rb

@@ -14,8 +14,10 @@ module Rerun
     end
     
     def restart
+      @restarting = true
       stop
       start
+      @restarting = false
     end
 
     def start
@@ -24,22 +26,24 @@ module Rerun
           "To infinity... and beyond!",
           "Charge!",
           ]
-        notify "Launching", taglines[rand(taglines.size)]
+        notify "Launched", taglines[rand(taglines.size)]
         @already_running = true
       else
         taglines = [
           "Here we go again!",
           "Once more unto the breach, dear friends, once more!", 
         ]
-        notify "Restarting", taglines[rand(taglines.size)]
+        notify "Restarted", taglines[rand(taglines.size)]
       end
 
       @pid = Kernel.fork do
-        Signal.trap("HUP") { stop; exit }
+        # Signal.trap("INT") { exit }
         exec(@run_command)
       end
 
-      Process.detach(@pid)
+      Signal.trap("INT") { stop; exit }
+
+      # Process.detach(@pid)
 
       begin
         sleep 2
@@ -54,18 +58,25 @@ module Rerun
         @already_running = false
       end
 
-      watcher_class = osx? ? OSXWatcher : FSWatcher
-      # watcher_class = FSWatcher
+      unless @watcher
+        watcher_class = osx? ? OSXWatcher : FSWatcher
+        # watcher_class = FSWatcher
       
-      watcher = watcher_class.new do
-        restart
+        watcher = watcher_class.new do
+          restart unless @restarting
+        end
+        watcher.add_directory(".", "**/*.rb")
+        watcher.sleep_time = 1
+        watcher.start
+        
+        @watcher = watcher
       end
-      watcher.add_directory(".", "**/*.rb")
-      watcher.sleep_time = 1
-      watcher.start
-      watcher.join
 
     end
+    
+    def join
+      @watcher.join
+    end
 
     def running?
       signal(0)
@@ -79,11 +90,11 @@ module Rerun
     end
 
     def stop
-      if @pid && @pid != 0
-        notify "Stopping"
+      if @pid && (@pid != 0)
+        notify "Stopped", "All good things must come to an end." unless @restarting
         signal("KILL") && Process.wait(@pid)
       end
-    rescue
+    rescue => e
       false
     end
 
@@ -101,8 +112,7 @@ module Rerun
     def notify(title, body)
       growl title, body if has_growl?
       puts
-      puts "#{Time.now.strftime("%T")} - #{app_name} #{title}: #{body}"
-      puts
+      puts "#{Time.now.strftime("%T")} - #{app_name} #{title}"
     end
     
   end

data/lib/system.rb

@@ -28,8 +28,10 @@ module Rerun
       File.expand_path(".").gsub(/^.*\//, '').capitalize
     end
 
-    def growl(title, body)
-      `#{growlcmd} -n \"#{app_name}\" -m \"#{body}\" \"#{app_name} #{title}\" &`
+    def growl(title, body, background = true)
+      s = "#{growlcmd} -n \"#{app_name}\" -m \"#{body}\" \"#{app_name} #{title}\""
+      s += " &" if background
+      `#{s}`
     end
     
   end

data/lib/watcher.rb

@@ -149,6 +149,7 @@ module Rerun
           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
@@ -157,7 +158,6 @@ module Rerun
             else
               @client_callback.call(CREATED, full_file_name)
             end
-            @found[full_file_name] = FoundFile.new(full_file_name, mod_time, size)
           end
         end
       end

data/rerun.gemspec

@@ -3,8 +3,8 @@ $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'
-  s.date = '2009-06-15'
+  s.version = '0.2.1'
+  s.date = '2009-06-16'
 
   s.description = "Restarts your app when a file changes"
   s.summary     = "Launches an app, and restarts it whenever the filesystem changes."
@@ -33,6 +33,6 @@ $spec = Gem::Specification.new do |s|
 
   s.homepage = "http://github.com/alexch/rerun/"
   s.require_paths = %w[lib]
-  #s.rubyforge_project = ''
+  s.rubyforge_project = 'pivotalrb'
   s.rubygems_version = '1.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rerun
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Alex Chaffee
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 -07:00
+date: 2009-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: pivotalrb
 rubygems_version: 1.3.3
 signing_key: 
 specification_version: 2