rerun 0.5.2 → 0.5.4

data/README.md

@@ -5,19 +5,17 @@
 Launches your app, then watches the filesystem. If a relevant file
 changes, then it restarts your app.
 
-Currently only *.rb files are watched. This is pretty lame so it will
-change soon.
+By default only *.{rb,js,css,erb,ru} files are watched. Use the
+`--pattern` option if you want to change this.
 
-If you're on Mac OS X, it uses the built-in facilities for monitoring
+If you're on Mac OS X, and using the built-in ruby,
+it uses the built-in facilities for monitoring
 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):
+[growlnotify](http://growl.info/extras.php#growlnotify):
 
->    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.
+> The Installer package for growlnotify is in the growlnotify folder in the Extras folder on the Growl disk image. Simply open the Installer package and follow the on-screen instructions.
 
 Rerun does not work on Windows. Sorry, but you can't do much relaunching
 without "fork".
@@ -26,57 +24,63 @@ without "fork".
 
         sudo gem install rerun
 
-If you want to use the latest version, grab it off Github:
-
-        gem sources -a http://gems.github.com/
-        sudo gem install alexch-rerun
-
-I'll bump the version on Github for release candidates, and deploy to
-Rubyforge only when it's had some time to bake.
-
 # Usage: 
 
-        rerun [options] cmd
+        rerun [options] [--] cmd
 
 For example, if you're running a Sinatra app whose main file is
 app.rb:
 
-        rerun "ruby app.rb"
+        rerun ruby app.rb
+        
+If the first part of the command is a `.rb` filename, then `ruby` is
+optional, so the above can also be accomplished like this:
+
+        rerun app.rb
+        
+Or if you're using Thin to run a Rack app that's configured in config.ru
+but you want it on port 4000 and in debug mode, and only want to watch
+the `app` subdirectory:
+
+        rerun --dir app -- thin start --debug --port=4000 -R config.ru
         
-Or if you're running a Rack app that's configured in config.ru
-but you want it on port 4000 and in debug mode:
+The `--` is to separate rerun options from cmd options. You can also 
+use a quoted string for the command, e.g.
+
+        rerun --dir app "thin start --debug --port=4000 -R config.ru"
+        
+Rackup can also be used to launch a Rack server, so let's try that:
+
+        rerun -- rackup --port 4000 config.ru
 
-        rerun "thin start --debug --port=4000 -R config.ru"        
 
 # Options:
 
 --dir directory to watch (default = ".")
 
---pattern glob to match inside directory. This uses the Ruby Dir glob style -- see <http://www.ruby-doc.org/core/classes/Dir.html#M002322> for details. By default it watches .rb, .erb, .js, and .css files.
+--pattern glob to match inside directory. This uses the Ruby Dir glob style -- see <http://www.ruby-doc.org/core/classes/Dir.html#M002322> for details. 
+By default it watches .rb, .erb, .js, .css, and .ru files.
 
 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
+* If the last element of the command is a `.ru` file and there's no other command then use `rackup`
 * 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 Linux.
 * Test on Mac without Growlnotify.
-* Merge with Kicker (using it as a library and writing a Rerun recipe)
+* 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/>
 
 # Other projects that do similar things
 
-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>
-
-Kicker: <http://github.com/alloy/kicker/>
+* 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>
+* The Sinatra FAQ has a discussion at <http://www.sinatrarb.com/faq.html#reloading>
+* Kicker: <http://github.com/alloy/kicker/>
+* Watchr: <https://github.com/mynyml/watchr>
 
 # Why would I use this instead of Shotgun?
 
@@ -141,6 +145,7 @@ FileSystemWatcher: <http://paulhorman.com/filesystemwatcher/>
 Patches by:
 
 David Billskog <billskog@gmail.com>
+Jens B <https://github.com/dpree>
 
 # License
 

data/Rakefile

@@ -56,9 +56,5 @@ end
 
 desc 'Publish gem and tarball to rubyforge'
 task 'release' => [package('.gem'), package('.tar.gz')] do |t|
-  sh <<-end
-    rubyforge add_release #{$rubyforge_project} #{$spec.name} #{$spec.version} #{package('.gem')} &&
-    rubyforge add_file    #{$rubyforge_project} #{$spec.name} #{$spec.version} #{package('.tar.gz')}
-  end
+  sh "gem push #{package('.gem')}"
 end
-5

data/bin/rerun

@@ -26,8 +26,8 @@ opts = OptionParser.new("", 24, '  ') { |opts|
     options[:dir] = dir
   end
 
-  opts.on("-p pattern", "--pattern pattern", "file glob, default = \"#{Rerun::DEFAULT_PATTERN}\"") do |dir|
-    options[:dir] = dir
+  opts.on("-p pattern", "--pattern pattern", "file glob, default = \"#{Rerun::DEFAULT_PATTERN}\"") do |pattern|
+    options[:pattern] = pattern
   end
 
   opts.on_tail("-h", "--help", "--usage", "show this message") do

data/lib/rerun.rb

@@ -6,14 +6,15 @@ require "fswatcher"
 # todo: make sure this works in non-Mac environments (also Macs without growlnotify)
 module Rerun
   
-  DEFAULT_PATTERN = "**/*.{rb,js,css,erb}"
-  
+  DEFAULT_PATTERN = "**/*.{rb,js,css,erb,ru}"
+    
   class Runner
 
     include System
 
     def initialize(run_command, options = {})
       @run_command, @options = run_command, options
+      @run_command = "ruby #{@run_command}" if @run_command.split(' ').first =~ /\.rb$/
     end
     
     def restart

data/lib/watcher.rb

@@ -172,7 +172,7 @@ module Rerun
       end
 
       def files()
-        return Dir[@dir + "/" + @expression]
+        return Dir["#{@dir}/#{@expression}"]
       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.5.2'
-  s.date = '2009-12-03'
+  s.version = '0.5.4'
+  s.date = '2010-11-20'
 
   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,12 @@
 --- !ruby/object:Gem::Specification 
 name: rerun
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Alex Chaffee
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -08:00
+date: 2010-11-20 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -42,21 +47,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: pivotalrb
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: Launches an app, and restarts it whenever the filesystem changes.