rerun 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfeb631293e3c084bb49fe63e960edd9ec01a7bc
-  data.tar.gz: dfacf8cd2c638cc518b3021d3267f09b0f9df91a
+  metadata.gz: b5186659055558e298a987ddc358c03fb2ca23dc
+  data.tar.gz: 93afa739db65f198c20d09520efcfa6e08800e06
 SHA512:
-  metadata.gz: 15d53a73449cc4755ca91ebf2c59c5f21b64d9ac97c43c3af3f47c9404e0fea33ba02f6e2b3ab9fe021043fbc60bb9fa0b4f81d2af1363a8bc151136462c53df
-  data.tar.gz: 74e2275e507e39b77ca9f01358178639f2f65154b4255518e550371f5c78fb95a84d90b34e11236bc0db9ea3ba579d21fc38c68edb1368803ac44beb4c4a2574
+  metadata.gz: 60e098c424e134c5456c0ed871f62224bb2fe33f93aed659e554a55729b56f2cdd06a4c910a5f6a498c8d1a131d67e82861a0acfdcca874cb0799031eacd289a
+  data.tar.gz: 5f0fbd5006a6bae73e8ac6104ec6d4c7648ee79baf9c3ba01b14e6ed544386922b6472e3d3fec9e852dea6f4857449673b3b7a93ac7ce4798ef697748b8ac5fa

data/README.md

@@ -14,7 +14,7 @@ Rerun's advantage is its simple design. Since it uses `exec` and the standard
 Unix `SIGINT` and `SIGKILL` signals, you're sure the restarted app is really
 acting just like it was when you ran it from the command line the first time.
 
-By default only `*.{rb,js,css,scss,sass,erb,html,haml,ru}` files are watched.
+By default only `*.{rb,js,css,coffee,scss,sass,erb,html,haml,ru,slim,md}` files are watched.
 Use the `--pattern` option if you want to change this.
 
 As of version 0.7.0, we use the Listen gem, which tries to use your OS's
@@ -116,8 +116,14 @@ Procfile processes locally and restart them all when necessary.
 `--dir` directory (or directories) to watch (default = "."). Separate multiple paths with ',' and/or use multiple `-d` options.
 
 `--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 files ending in: `rb,js,css,scss,sass,erb,html,haml,ru`.
-On top of this, it also ignores dotfiles, `.tmp` files, and some other files and directories (like `.git .hg .rbx .svn bundle log tmp`) -- run `rerun --help` for the full list.
+By default it watches files ending in: `rb,js,css,coffee,scss,sass,erb,html,haml,ru,slim,md`.
+On top of this, it also ignores dotfiles, `.tmp` files, and some other files and directories (like `.git` and `log`).
+Run `rerun --help` to see the actual list.
+
+`--ignore pattern` file glob to ignore (can be set many times). To ignore a directory, you must append '/*' e.g.
+  `--ignore 'coverage/*'`.
+
+  *On top of --pattern and --ignore, we ignore any changes to files and dirs starting with a dot.*
 
 `--signal` (or -s) use specified signal (instead of the default SIGTERM) to terminate the previous process.
 This may be useful for forcing the respective process to terminate as quickly as possible.
@@ -133,7 +139,7 @@ This may be useful for forcing the respective process to terminate as quickly as
 
 `--name` set the app name (for display)
 
-Also --version and --help, naturally.
+Also `--version` and `--help`, naturally.
 
 # Growl Notifications
 
@@ -170,17 +176,21 @@ restart.
 
 # To Do:
 
-* Cooldown (so if a dozen files appear in a burst, say from 'git pull', it only restarts once)
-* If the last element of the command is a `.ru` file and there's no other command then use `rackup`
-* --ignore pattern (currently we're using Listen's default list plus dotfiles)
+## Must have for v1.0
 * ".rerun" file to specify options per project or in $HOME.
+* Make sure to pass through quoted options correctly to target process [bug]
+* Optionally do "bundle install" before and "bundle exec" during launch
+
+## Nice to have
+* Smarter --signal option (specifying signal to try and a timeout to wait, repeated)
+* If the last element of the command is a `.ru` file and there's no other command then use `rackup`
 * Figure out an algorithm so "-x" is not needed (if possible) -- maybe by accepting a "--port" option or reading `config.ru`
 * Specify (or deduce) port to listen for to determine success of a web server launch
-* Make sure to pass through quoted options correctly to target process [bug]
+
+## Wacky Ideas
 * Make it work on Windows, like Guard now does. See
   * https://github.com/guard/guard/issues/59
   * https://github.com/guard/guard/issues/27
-* Optionally do "bundle install" before and "bundle exec" during launch
 * On OS X:
     * use a C library using growl's developer API <http://growl.info/developer/>
     * Use growl's AppleScript or SDK instead of relying on growlnotify
@@ -282,11 +292,16 @@ Based upon and/or inspired by:
 
 # Version History
 
-* v0.9.0
+* v0.10.0   4 May 2014
+  * add '.coffee,.slim,.md' to default pattern (thanks @xylinq)
+  * --ignore option
+
+* v0.9.0    6 March 2014
   * --dir (or -d) can be specified more than once, for multiple directories (thanks again Barry!)
   * --name option
   * press 'p' to pause/unpause filesystem watching (Barry is the man!)
   * works with Listen 2 (note: needs 2.3 or higher)
+  * cooldown works, thanks to patches to underlying Listen gem
   * ignore all dotfiles, and add actual list of ignored dirs and files
 
 * v0.8.2

data/lib/rerun.rb

@@ -10,7 +10,5 @@ require "rerun/glob"
 
 module Rerun
 
-  DEFAULT_PATTERN = "**/*.{rb,js,css,scss,sass,erb,html,haml,ru}"
-
 end
 

data/lib/rerun/options.rb

@@ -1,5 +1,6 @@
 require 'optparse'
 require 'pathname'
+require 'rerun/watcher'
 
 libdir = "#{File.expand_path(File.dirname(File.dirname(__FILE__)))}"
 
@@ -7,14 +8,15 @@ $spec = Gem::Specification.load(File.join(libdir, "..", "rerun.gemspec"))
 
 module Rerun
   class Options
-    DEFAULT_PATTERN = "**/*.{rb,js,css,scss,sass,erb,html,haml,ru}"
+    DEFAULT_PATTERN = "**/*.{rb,js,coffee,css,scss,sass,erb,html,haml,ru,yml,slim,md}"
     DEFAULT_DIRS = ["."]
 
     DEFAULTS = {
         :pattern => DEFAULT_PATTERN,
         :signal => "TERM",
         :growl => true,
-        :name => Pathname.getwd.basename.to_s.capitalize
+        :name => Pathname.getwd.basename.to_s.capitalize,
+        :ignore => []
     }
 
     def self.parse args = ARGV
@@ -34,11 +36,16 @@ module Rerun
           options[:dir] = (options[:dir] || []) + elements
         end
 
-        opts.on("-p pattern", "--pattern pattern", "file glob, default = \"#{DEFAULTS[:pattern]}\"") do |pattern|
+        # todo: rename to "--watch"
+        opts.on("-p pattern", "--pattern pattern", "file glob to watch, default = \"#{DEFAULTS[:pattern]}\"") do |pattern|
           options[:pattern] = pattern
         end
 
-        opts.on("-s", "--signal signal", "terminate process using this signal, default = \"#{DEFAULTS[:signal]}\"") do |signal|
+        opts.on("-i pattern", "--ignore pattern", "file glob to ignore (can be set many times). To ignore a directory, you must append '/*' e.g. --ignore 'coverage/*'") do |pattern|
+          options[:ignore] += [pattern]
+        end
+
+        opts.on("-s signal", "--signal signal", "terminate process using this signal, default = \"#{DEFAULTS[:signal]}\"") do |signal|
           options[:signal] = signal
         end
 
@@ -73,7 +80,7 @@ module Rerun
         end
 
         opts.on_tail ""
-        opts.on_tail "On top of --pattern, we ignore any changes to files and dirs starting with a dot, ending with [#{Listen::Silencer::DEFAULT_IGNORED_EXTENSIONS.join(',')}], or named [#{Listen::Silencer::DEFAULT_IGNORED_DIRECTORIES.join(',')}]."
+        opts.on_tail "On top of --pattern and --ignore, we ignore any changes to files and dirs starting with a dot."
 
       end
 

data/lib/rerun/runner.rb

@@ -97,6 +97,10 @@ module Rerun
       @options[:pattern]
     end
 
+    def ignore
+      @options[:ignore] || []
+    end
+
     def clear?
       @options[:clear]
     end
@@ -175,7 +179,7 @@ module Rerun
 
       unless @watcher
 
-        watcher = Watcher.new(:directory => dirs, :pattern => pattern) do |changes|
+        watcher = Watcher.new(:directory => dirs, :pattern => pattern, :ignore => ignore) do |changes|
 
           message = [:modified, :added, :removed].map do |change|
             count = changes[change].size
@@ -188,7 +192,9 @@ module Rerun
         end
         watcher.start
         @watcher = watcher
-        say "Watching #{dir.join(', ')} for #{pattern} using #{watcher.adapter.class.name.split('::').last} adapter"
+        say "Watching #{dir.join(', ')} for #{pattern}" +
+                (ignore.empty? ? "" : " (ignoring #{ignore.join(',')})") +
+                " using #{watcher.adapter.class.name.split('::').last} adapter"
       end
     end
 
@@ -220,13 +226,13 @@ module Rerun
       if @pid && (@pid != 0)
         notify "stopping", "All good things must come to an end." unless @restarting
         begin
-          timeout(4) do  # todo: escalation timeout setting
+          timeout(5) do  # todo: escalation timeout setting
             # start with a polite SIGTERM
             signal(default_signal) && Process.wait(@pid)
           end
         rescue Timeout::Error
           begin
-            timeout(2) do
+            timeout(5) do
               # escalate to SIGINT aka control-C since some foolish process may be ignoring SIGTERM
               signal("INT") && Process.wait(@pid)
             end

data/lib/rerun/watcher.rb

@@ -14,6 +14,10 @@ module Rerun
   class Watcher
     InvalidDirectoryError = Class.new(RuntimeError)
 
+    #def self.default_ignore
+    #  Listen::Silencer.new(Listen::Listener.new).send :_default_ignore_patterns
+    #end
+
     attr_reader :directory, :pattern, :priority
 
     # Create a file system watcher. Start it by calling #start.
@@ -35,6 +39,7 @@ module Rerun
       @directories = options[:directory]
       @directories = sanitize_dirs(@directories)
       @priority = options[:priority]
+      @ignore = [options[:ignore]].flatten.compact
       @thread = nil
     end
 
@@ -55,9 +60,7 @@ module Rerun
       end
 
       @thread = Thread.new do
-        regexp = Rerun::Glob.new(@pattern).to_regexp
-        dotfiles = /^\.[^.]/  # at beginning of string, a real dot followed by any other character
-        @listener = Listen.to(*@directories, only: regexp, ignore: dotfiles, wait_for_delay: 1) do |modified, added, removed|
+        @listener = Listen.to(*@directories, only: watching, ignore: ignoring, wait_for_delay: 1) do |modified, added, removed|
           if((modified.size + added.size + removed.size) > 0)
             @client_callback.call(:modified => modified, :added => added, :removed => removed)
           end
@@ -72,6 +75,16 @@ module Rerun
       at_exit { stop } # try really hard to clean up after ourselves
     end
 
+    def watching
+      Rerun::Glob.new(@pattern).to_regexp
+    end
+
+    def ignoring
+      # todo: --no-ignore-dotfiles
+      dotfiles = /^\.[^.]/ # at beginning of string, a real dot followed by any other character
+      [dotfiles] + @ignore.map { |x| Rerun::Glob.new(x).to_regexp }
+    end
+
     def adapter
       @listener.registry[:adapter] || (timeout(4) do
         sleep 1 until adapter = @listener.registry[:adapter]

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.9.0'
+  s.version = '0.10.0'
 
   s.description = "Restarts your app when a file changes. A no-frills, command-line alternative to Guard, Shotgun, Autotest, etc."
   s.summary     = "Launches an app, and restarts it whenever the filesystem changes. A no-frills, command-line alternative to Guard, Shotgun, Autotest, etc."
@@ -25,7 +25,7 @@ $spec = Gem::Specification.new do |s|
 
   s.extra_rdoc_files = %w[README.md]
 
-  s.add_dependency 'listen', '~> 2.7'
+  s.add_runtime_dependency 'listen', '~> 2.7', '>= 2.7.3'
 
   s.homepage = "http://github.com/alexch/rerun/"
   s.require_paths = %w[lib]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rerun
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.3
 description: Restarts your app when a file changes. A no-frills, command-line alternative
   to Guard, Shotgun, Autotest, etc.
 email: alex@stinky.com