rerun 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 358f792dfe92e79b4e621d039a96b4a607dace72
-  data.tar.gz: 94c80e4ff9e1ffdcc6f3fc4d42aa695b486965be
+  metadata.gz: dfeb631293e3c084bb49fe63e960edd9ec01a7bc
+  data.tar.gz: dfacf8cd2c638cc518b3021d3267f09b0f9df91a
 SHA512:
-  metadata.gz: ef6893b335910d5d69f578ae4d3bc9251bfb8894d13557953d0c14e248c6aa0c4eb1affd210682c2e585a329cdf9be56d53e6d95a65733ee58c1fff0367c22e6
-  data.tar.gz: b95e0675a76f4d8b5d87f58f52ea5cdf1e9a37e7947cf296a7688881ad5afdb3eb251f4fd8a0dc2de10f0054373834ea1c1ad70ab716e98c1fb6d8483c1c88a8
+  metadata.gz: 15d53a73449cc4755ca91ebf2c59c5f21b64d9ac97c43c3af3f47c9404e0fea33ba02f6e2b3ab9fe021043fbc60bb9fa0b4f81d2af1363a8bc151136462c53df
+  data.tar.gz: 74e2275e507e39b77ca9f01358178639f2f65154b4255518e550371f5c78fb95a84d90b34e11236bc0db9ea3ba579d21fc38c68edb1368803ac44beb4c4a2574

data/README.md

@@ -113,11 +113,11 @@ Procfile processes locally and restart them all when necessary.
 
 # Options:
 
-`--dir` directory (or directories) to watch (default = "."). Separate multiple paths with ','.
+`--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`.
-It also ignores directories named `.rbx .bundle .git .svn log tmp vendor` and files named `.DS_Store`.
+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.
 
 `--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.
@@ -131,6 +131,8 @@ This may be useful for forcing the respective process to terminate as quickly as
 
 `--no-growl` don't use growl
 
+`--name` set the app name (for display)
+
 Also --version and --help, naturally.
 
 # Growl Notifications
@@ -149,6 +151,7 @@ While the app is (re)running, you can make things happen by pressing keys:
 * **r** -- restart (as if a file had changed)
 * **c** -- clear the screen
 * **x** or **q** -- exit (just like control-C)
+* **p** -- pause/unpause filesystem watching
 
 If you're backgrounding or using Pry or a debugger, you might not want these
 keys to be trapped, so use the `--background` option.
@@ -169,20 +172,23 @@ restart.
 
 * 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`
-* Exclude files beginning with a dot, unless the pattern explicitly says to include them
-* --exclude pattern
+* --ignore pattern (currently we're using Listen's default list plus dotfiles)
 * ".rerun" file to specify options per project or in $HOME.
-* Test on Linux.
-* 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
-* "Failed" icon
-* Figure out an algorithm so "-x" is not needed (if possible)
+* 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]
 * 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
+    * Use OS X notifications
+    * "Failed" icon for notifications
+* On Linux:
+    * Test on Linux.
+    * Use libnotify or notify-send http://www.linuxjournal.com/content/tech-tip-get-notifications-your-scripts-notify-send
 
 # Other projects that do similar things
 
@@ -276,6 +282,13 @@ Based upon and/or inspired by:
 
 # Version History
 
+* v0.9.0
+  * --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)
+  * ignore all dotfiles, and add actual list of ignored dirs and files
+
 * v0.8.2
   * bugfix, forcing Rerun to use Listen v1.0.3 while we work out the troubles we're having with Listen 1.3 and 2.1
 

data/lib/rerun/options.rb

@@ -1,4 +1,5 @@
 require 'optparse'
+require 'pathname'
 
 libdir = "#{File.expand_path(File.dirname(File.dirname(__FILE__)))}"
 
@@ -7,12 +8,13 @@ $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_DIRS = ["."]
 
     DEFAULTS = {
-        :dir => ["."],
         :pattern => DEFAULT_PATTERN,
         :signal => "TERM",
         :growl => true,
+        :name => Pathname.getwd.basename.to_s.capitalize
     }
 
     def self.parse args = ARGV
@@ -27,8 +29,9 @@ module Rerun
         opts.separator ""
         opts.separator "Options:"
 
-        opts.on("-d dir", "--dir dir", "directory to watch, default = \"#{DEFAULTS[:dir]}\". Separate multiple paths with ','.") do |dir|
-          options[:dir] = dir.split(",")
+        opts.on("-d dir", "--dir dir", "directory to watch, default = \"#{DEFAULT_DIRS}\".  Specify multiple paths with ',' or separate '-d dir' option pairs.") do |dir|
+          elements = dir.split(",")
+          options[:dir] = (options[:dir] || []) + elements
         end
 
         opts.on("-p pattern", "--pattern pattern", "file glob, default = \"#{DEFAULTS[:pattern]}\"") do |pattern|
@@ -51,6 +54,10 @@ module Rerun
           options[:background] = true
         end
 
+        opts.on("-n name", "--name name", "name of app used in logs and notifications, default = \"#{DEFAULTS[:name]}\"") do |name|
+          options[:name] = name
+        end
+
         opts.on("--no-growl", "don't use growl") do
           options[:growl] = false
         end
@@ -64,6 +71,10 @@ module Rerun
           puts $spec.version
           return
         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(',')}]."
+
       end
 
       if args.empty?
@@ -72,6 +83,7 @@ module Rerun
       else
         opts.parse! args
         options[:cmd] = args.join(" ")
+        options[:dir] ||= DEFAULT_DIRS
         options
       end
     end

data/lib/rerun/runner.rb

@@ -8,6 +8,8 @@ module Rerun
       runner = new(cmd, options)
       runner.start
       runner.join
+      # apparently runner doesn't keep running anymore (as of Listen 2) so we have to sleep forever :-(
+      sleep 10000 while true  # :-(
     end
 
     include System
@@ -30,6 +32,8 @@ module Rerun
             when 'r'
               say "Restarting"
               restart
+            when 'p'
+              toggle_pause if watcher_running?
             when 'x', 'q'
               die
               break  # the break will stop this thread, in case the 'die' doesn't
@@ -37,6 +41,7 @@ module Rerun
               puts "\n#{c.inspect} pressed inside rerun"
               puts [["c", "clear screen"],
                ["r", "restart"],
+               ["p", "toggle pause"],
                ["x or q", "stop and exit"]
               ].map{|key, description| "  #{key} -- #{description}"}.join("\n")
               puts
@@ -60,6 +65,26 @@ module Rerun
       @restarting = false
     end
 
+    def watcher_running?
+      @watcher && @watcher.running?
+    end
+
+    def toggle_pause
+      unless @pausing
+        say "Pausing.  Press 'p' again to resume."
+        @watcher.pause
+        @pausing = true
+      else
+        say "Resuming"
+        @watcher.unpause
+        @pausing = false
+      end
+    end
+
+    def unpause
+      @watcher.unpause
+    end
+
     def dir
       @options[:dir]
     end
@@ -80,6 +105,10 @@ module Rerun
       @options[:exit]
     end
 
+    def app_name
+      @options[:name]
+    end
+
     def start
       if windows?
         raise "Sorry, Rerun does not work on Windows."

data/lib/rerun/system.rb

@@ -24,11 +24,6 @@ module Rerun
       growlnotify
     end
 
-    def app_name
-      # todo: make sure this works in non-Mac and non-Unix environments
-      File.expand_path(".").gsub(/^.*\//, '').capitalize
-    end
-
     def icon
       here = File.expand_path(File.dirname(__FILE__))
       icondir = File.expand_path("#{here}/../../icons")

data/lib/rerun/watcher.rb

@@ -12,6 +12,8 @@ Thread.abort_on_exception = true
 #
 module Rerun
   class Watcher
+    InvalidDirectoryError = Class.new(RuntimeError)
+
     attr_reader :directory, :pattern, :priority
 
     # Create a file system watcher. Start it by calling #start.
@@ -41,7 +43,7 @@ module Rerun
       dirs.map do |d|
         d.chomp!("/")
         unless FileTest.exists?(d) && FileTest.readable?(d) && FileTest.directory?(d)
-          raise InvalidDirectoryError, "Directory '#{d}' either doesnt exist or isnt readable"
+          raise InvalidDirectoryError, "Directory '#{d}' either doesnt exist or isn't readable"
         end
         File.expand_path(d)
       end
@@ -54,12 +56,13 @@ module Rerun
 
       @thread = Thread.new do
         regexp = Rerun::Glob.new(@pattern).to_regexp
-        dirs = @directories
-        params = dirs << { :filter => regexp, :relative_paths => false }
-        @listener = Listen::Listener.new(*params) do |modified, added, removed|
-          @client_callback.call(:modified => modified, :added => added, :removed => removed)
+        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|
+          if((modified.size + added.size + removed.size) > 0)
+            @client_callback.call(:modified => modified, :added => added, :removed => removed)
+          end
         end
-        @listener.start!
+        @listener.start
       end
 
       @thread.priority = @priority
@@ -70,10 +73,10 @@ module Rerun
     end
 
     def adapter
-      timeout(4) do
-        sleep 1 until adapter = @listener.instance_variable_get(:@adapter)
+      @listener.registry[:adapter] || (timeout(4) do
+        sleep 1 until adapter = @listener.registry[:adapter]
         adapter
-      end
+      end)
     end
 
     # kill the file watcher thread
@@ -93,5 +96,18 @@ module Rerun
     rescue Interrupt => e
       # don't care
     end
+
+    def pause
+      @listener.pause if @listener
+    end
+
+    def unpause
+      @listener.unpause if @listener
+    end
+
+    def running?
+      @listener && @listener.instance_variable_get(:@adapter)
+    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.8.2'
+  s.version = '0.9.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,8 +25,10 @@ $spec = Gem::Specification.new do |s|
 
   s.extra_rdoc_files = %w[README.md]
 
-  s.add_dependency 'listen', '~> 1.0.3'
+  s.add_dependency 'listen', '~> 2.7'
 
   s.homepage = "http://github.com/alexch/rerun/"
   s.require_paths = %w[lib]
+
+  s.license = 'MIT'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rerun
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '2.7'
 description: Restarts your app when a file changes. A no-frills, command-line alternative
   to Guard, Shotgun, Autotest, etc.
 email: alex@stinky.com
@@ -33,21 +33,22 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- README.md
 - LICENSE
+- README.md
 - Rakefile
-- rerun.gemspec
 - bin/rerun
 - icons/rails_grn_sml.png
 - icons/rails_red_sml.png
+- lib/rerun.rb
 - lib/rerun/glob.rb
 - lib/rerun/options.rb
 - lib/rerun/runner.rb
 - lib/rerun/system.rb
 - lib/rerun/watcher.rb
-- lib/rerun.rb
+- rerun.gemspec
 homepage: http://github.com/alexch/rerun/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -55,17 +56,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: Launches an app, and restarts it whenever the filesystem changes. A no-frills,