0.8.3

`'fc' -l 1` generated an error message on bash

.gitignore

@@ -1,2 +1,3 @@
 pkg
 Gemfile.lock
+.DS_Store

README.md

@@ -5,6 +5,8 @@ fzf is a general-purpose fuzzy finder for your shell.
 
 ![](https://raw.github.com/junegunn/i/master/fzf.gif)
 
+([tmux integration!](https://cloud.githubusercontent.com/assets/700826/2593609/3ec13962-ba83-11e3-88d3-f9f95bd8a64b.gif))
+
 It was heavily inspired by [ctrlp.vim](https://github.com/kien/ctrlp.vim) and
 the likes.
 
@@ -16,54 +18,33 @@ fzf requires Ruby (>= 1.8.5).
 Installation
 ------------
 
-Download [fzf executable](https://raw.github.com/junegunn/fzf/master/fzf) and
-put it somewhere in your search $PATH.
-
-```sh
-mkdir -p ~/bin
-wget https://raw.github.com/junegunn/fzf/master/fzf -O ~/bin/fzf
-chmod +x ~/bin/fzf
-```
-
-Or you can just clone this repository and run
+Clone this repository and run
 [install](https://github.com/junegunn/fzf/blob/master/install) script.
 
 ```sh
-git clone https://github.com/junegunn/fzf.git
-fzf/install
+git clone https://github.com/junegunn/fzf.git ~/.fzf
+~/.fzf/install
 ```
 
-Make sure that ~/bin is included in $PATH.
+The script will setup:
 
-```sh
-export PATH=$PATH:~/bin
-```
+- `fzf` executable
+- Key bindings (`CTRL-T`, `CTRL-R`, and `ALT-C`) for bash and zsh
+- Fuzzy auto-completion for bash
 
-### Install as Ruby gem
-
-fzf can be installed as a Ruby gem
-
-```
-gem install fzf
-```
-
-It's a bit easier to install and update the script but the Ruby gem version
-takes slightly longer to start.
+If you don't use bash or zsh, you have to manually place fzf executable in a
+directory included in `$PATH`. Key bindings are not yet supported.
 
 ### Install as Vim plugin
 
-You can use any Vim plugin manager to install fzf for Vim. If you don't use one,
-I recommend you try [vim-plug](https://github.com/junegunn/vim-plug).
+Once you have cloned the repository, add the following line to your .vimrc.
 
-1. [Install vim-plug](https://github.com/junegunn/vim-plug#usage)
-2. Edit your .vimrc
+```vim
+set rtp+=~/.fzf
+```
 
-        call plug#begin()
-        Plug 'junegunn/fzf'
-        " ...
-        call plug#end()
-
-3. Run `:PlugInstall`
+Or you may use any Vim plugin manager, such as
+[vim-plug](https://github.com/junegunn/vim-plug).
 
 Usage
 -----
@@ -71,12 +52,35 @@ Usage
 ```
 usage: fzf [options]
 
-  -m, --multi      Enable multi-select
-  -x, --extended   Extended-search mode
-  -s, --sort=MAX   Maximum number of matched items to sort. Default: 1000
-  +s, --no-sort    Do not sort the result. Keep the sequence unchanged.
-  +i               Case-sensitive match
-  +c, --no-color   Disable colors
+  Search
+    -x, --extended       Extended-search mode
+    -e, --extended-exact Extended-search mode (exact match)
+    -i                   Case-insensitive match (default: smart-case match)
+    +i                   Case-sensitive match
+    -n, --nth=[-]N[,..]  Comma-separated list of field indexes for limiting
+                         search scope (positive or negative integers)
+    -d, --delimiter=STR  Field delimiter regex for --nth (default: AWK-style)
+
+  Search result
+    -s, --sort=MAX       Maximum number of matched items to sort (default: 1000)
+    +s, --no-sort        Do not sort the result. Keep the sequence unchanged.
+
+  Interface
+    -m, --multi          Enable multi-select with tab/shift-tab
+        --no-mouse       Disable mouse
+    +c, --no-color       Disable colors
+    +2, --no-256         Disable 256-color
+        --black          Use black background
+
+  Scripting
+    -q, --query=STR      Start the finder with the given query
+    -1, --select-1       Automatically select the only match
+    -0, --exit-0         Exit immediately when there's no match
+    -f, --filter=STR     Filter mode. Do not start interactive finder.
+
+  Environment variables
+    FZF_DEFAULT_COMMAND  Default command to use when input is tty
+    FZF_DEFAULT_OPTS     Defaults options. (e.g. "-x -m --sort 10000")
 ```
 
 fzf will launch curses-based finder, read the list from STDIN, and write the
@@ -101,21 +105,25 @@ If you want to preserve the exact sequence of the input, provide `--no-sort` (or
 history | fzf +s
 ```
 
-### Key binding
+### Keys
 
 Use CTRL-J and CTRL-K (or CTRL-N and CTRL-P) to change the selection, press
-enter key to select the item. CTRL-C will terminate the finder.
+enter key to select the item. CTRL-C, CTRL-G, or ESC will terminate the finder.
 
 The following readline key bindings should also work as expected.
 
 - CTRL-A / CTRL-E
 - CTRL-B / CTRL-F
-- CTRL-W / CTRL-U
+- CTRL-W / CTRL-U / CTRL-Y
 - ALT-B / ALT-F
 
 If you enable multi-select mode with `-m` option, you can select multiple items
 with TAB or Shift-TAB key.
 
+You can also use mouse. Double-click on an item to select it or shift-click (or
+ctrl-click) to select multiple items. Use mouse wheel to move the cursor up and
+down.
+
 ### Extended-search mode
 
 With `-x` or `--extended` option, fzf will start in "extended-search mode".
@@ -132,48 +140,39 @@ such as: `^music .mp3$ sbtrkt !rmx`
 | `'wild`  | Items that include `wild`        | exact-match (quoted) |
 | `!'fire` | Items that do not include `fire` | inverse-exact-match  |
 
-Usage as Vim plugin
--------------------
+If you don't need fuzzy matching and do not wish to "quote" every word, start
+fzf with `-e` or `--extended-exact` option.
 
-If you install fzf as a Vim plugin, `:FZF` command will be added.
-
-```vim
-:FZF
-:FZF --no-sort
-```
-
-You can override the command which produces input to fzf.
-
-```vim
-let g:fzf_command = 'find . -type f'
-```
-
-Most of the time, you will prefer native Vim plugins with better integration
-with Vim. The only reason one might consider using fzf in Vim is its speed. For
-a very large list of files, fzf is significantly faster and it does not block.
-
-Useful bash examples
---------------------
+Useful examples
+---------------
 
 ```sh
-# vimf - Open selected file in Vim
-vimf() {
-  FILE=$(fzf) && vim "$FILE"
+# fe [FUZZY PATTERN] - Open the selected file with the default editor
+#   - Bypass fuzzy finder if there's only one match (--select-1)
+#   - Exit if there's no match (--exit-0)
+fe() {
+  local file
+  file=$(fzf --query="$1" --select-1 --exit-0)
+  [ -n "$file" ] && ${EDITOR:-vim} "$file"
 }
 
 # fd - cd to selected directory
 fd() {
-  DIR=$(find ${1:-*} -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf) && cd "$DIR"
+  local dir
+  dir=$(find ${1:-*} -path '*/\.*' -prune \
+                  -o -type d -print 2> /dev/null | fzf +m) &&
+  cd "$dir"
 }
 
 # fda - including hidden directories
 fda() {
-  DIR=$(find ${1:-*} -type d 2> /dev/null | fzf) && cd "$DIR"
+  local dir
+  dir=$(find ${1:-.} -type d 2> /dev/null | fzf +m) && cd "$dir"
 }
 
 # fh - repeat history
 fh() {
-  eval $(history | fzf +s | sed 's/ *[0-9]* *//')
+  eval $(([ -n "$ZSH_NAME" ] && fc -l 1 || history) | fzf +s | sed 's/ *[0-9]* *//')
 }
 
 # fkill - kill process
@@ -181,81 +180,254 @@ fkill() {
   ps -ef | sed 1d | fzf -m | awk '{print $2}' | xargs kill -${1:-9}
 }
 
-# (Assuming you don't use the default CTRL-T and CTRL-R)
+# fbr - checkout git branch
+fbr() {
+  local branches branch
+  branches=$(git branch) &&
+  branch=$(echo "$branches" | fzf +s +m) &&
+  git checkout $(echo "$branch" | sed "s/.* //")
+}
 
-# CTRL-T - Paste the selected file path into the command line
-bind '"\er": redraw-current-line'
-bind '"\C-t": " \C-u \C-a\C-k$(fzf)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er"'
+# fco - checkout git commit
+fco() {
+  local commits commit
+  commits=$(git log --pretty=oneline --abbrev-commit --reverse) &&
+  commit=$(echo "$commits" | fzf +s +m -e) &&
+  git checkout $(echo "$commit" | sed "s/ .*//")
+}
 
-# CTRL-R - Paste the selected command from history into the command line
-bind '"\C-r": " \C-e\C-u$(history | fzf +s | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
+# ftags - search ctags
+ftags() {
+  local line
+  [ -e tags ] &&
+  line=$(
+    awk 'BEGIN { FS="\t" } !/^!/ {print toupper($4)"\t"$1"\t"$2"\t"$3}' tags |
+    cut -c1-80 | fzf --nth=1,2
+  ) && $EDITOR $(cut -f3 <<< "$line") -c "set nocst" \
+                                      -c "silent tag $(cut -f2 <<< "$line")"
+}
 ```
 
-zsh widgets
------------
+Key bindings for command line
+-----------------------------
+
+The install script will setup the following key bindings.
+
+### bash/zsh
+
+- `CTRL-T` - Paste the selected file path(s) into the command line
+- `CTRL-R` - Paste the selected command from history into the command line
+- `ALT-C` - cd into the selected directory
+
+If you're on a tmux session, `CTRL-T` will launch fzf in a new split-window. You
+may disable this tmux integration by setting `FZF_TMUX` to 0, or change the
+height of the window with `FZF_TMUX_HEIGHT` (e.g. `20`, `50%`).
+
+The source code can be found in `~/.fzf.bash` and in `~/.fzf.zsh`.
+
+Auto-completion
+---------------
+
+Disclaimer: *Auto-completion feature is currently experimental, it can change
+over time*
+
+### bash
+
+#### Files and directories
+
+Fuzzy completion for files and directories can be triggered if the word before
+the cursor ends with the trigger sequence which is by default `**`.
+
+- `COMMAND [DIRECTORY/][FUZZY_PATTERN]**<TAB>`
 
 ```sh
-# CTRL-T - Paste the selected file(s) path into the command line
-fzf-file-widget() {
-  local FILES
-  local IFS="
-"
-  FILES=($(
-    find * -path '*/\.*' -prune \
-    -o -type f -print \
-    -o -type l -print 2> /dev/null | fzf -m))
-  unset IFS
-  FILES=$FILES:q
-  LBUFFER="${LBUFFER%% #} $FILES"
-  zle redisplay
-}
-zle     -N   fzf-file-widget
-bindkey '^T' fzf-file-widget
+# Files under current directory
+# - You can select multiple items with TAB key
+vim **<TAB>
 
-# ALT-C - cd into the selected directory
-fzf-cd-widget() {
-  cd "${$(find * -path '*/\.*' -prune \
-          -o -type d -print 2> /dev/null | fzf):-.}"
-  zle reset-prompt
-}
-zle     -N    fzf-cd-widget
-bindkey '\ec' fzf-cd-widget
+# Files under parent directory
+vim ../**<TAB>
 
-# CTRL-R - Paste the selected command from history into the command line
-fzf-history-widget() {
-  LBUFFER=$(history | fzf +s | sed "s/ *[0-9]* *//")
-  zle redisplay
-}
-zle     -N   fzf-history-widget
-bindkey '^R' fzf-history-widget
+# Files under parent directory that match `fzf`
+vim ../fzf**<TAB>
+
+# Files under your home directory
+vim ~/**<TAB>
+
+
+# Directories under current directory (single-selection)
+cd **<TAB>
+
+# Directories under ~/github that match `fzf`
+cd ~/github/fzf**<TAB>
+```
+
+#### Process IDs
+
+Fuzzy completion for PIDs is provided for kill command. In this case
+there is no trigger sequence, just press tab key after kill command.
+
+```sh
+# Can select multiple processes with <TAB> or <Shift-TAB> keys
+kill -9 <TAB>
+```
+
+#### Host names
+
+For ssh and telnet commands, fuzzy completion for host names is provided. The
+names are extracted from /etc/hosts and ~/.ssh/config.
+
+```sh
+ssh **<TAB>
+telnet **<TAB>
+```
+
+#### Settings
+
+```sh
+# Use ~~ as the trigger sequence instead of the default **
+export FZF_COMPLETION_TRIGGER='~~'
+
+# Options to fzf command
+export FZF_COMPLETION_OPTS='+c -x'
+```
+
+### zsh
+
+TODO :smiley:
+
+(Pull requests are appreciated.)
+
+Usage as Vim plugin
+-------------------
+
+(fzf is a command-line utility, naturally it is only accessible in terminal Vim)
+
+### `:FZF[!]`
+
+If you have set up fzf for Vim, `:FZF` command will be added.
+
+```vim
+" Look for files under current directory
+:FZF
+
+" Look for files under your home directory
+:FZF ~
+
+" With options
+:FZF --no-sort -m /tmp
+```
+
+Note that the environment variables `FZF_DEFAULT_COMMAND` and `FZF_DEFAULT_OPTS`
+also apply here.
+
+If you're on a tmux session, `:FZF` will launch fzf in a new split-window whose
+height can be adjusted with `g:fzf_tmux_height` (default: '40%'). However, the
+bang version (`:FZF!`) will always start in fullscreen.
+
+### `fzf#run([options])`
+
+For more advanced uses, you can call `fzf#run()` function which returns the list
+of the selected items.
+
+`fzf#run()` may take an options-dictionary:
+
+| Option name | Type          | Description                                                         |
+| ----------- | ------------- | ------------------------------------------------------------------- |
+| `source`    | string        | External command to generate input to fzf (e.g. `find .`)           |
+| `source`    | list          | Vim list as input to fzf                                            |
+| `sink`      | string        | Vim command to handle the selected item (e.g. `e`, `tabe`)          |
+| `sink`      | funcref       | Reference to function to process each selected item                 |
+| `options`   | string        | Options to fzf                                                      |
+| `dir`       | string        | Working directory                                                   |
+| `tmux`      | number/string | Use tmux split if possible with the given height (e.g. `20`, `50%`) |
+
+#### Examples
+
+If `sink` option is not given, `fzf#run` will simply return the list.
+
+```vim
+let items = fzf#run({ 'options': '-m +c', 'dir': '~', 'source': 'ls' })
+```
+
+But if `sink` is given as a string, the command will be executed for each
+selected item.
+
+```vim
+" Each selected item will be opened in a new tab
+let items = fzf#run({ 'sink': 'tabe', 'options': '-m +c', 'dir': '~', 'source': 'ls' })
+```
+
+We can also use a Vim list as the source as follows:
+
+```vim
+" Choose a color scheme with fzf
+nnoremap <silent> <Leader>C :call fzf#run({
+\   'source':
+\     map(split(globpath(&rtp, "colors/*.vim"), "\n"),
+\         "substitute(fnamemodify(v:val, ':t'), '\\..\\{-}$', '', '')"),
+\   'sink':    'colo',
+\   'options': '+m',
+\   'tmux':    15
+\ })<CR>
+```
+
+`sink` option can be a function reference. The following example creates a
+handy mapping that selects an open buffer.
+
+```vim
+" List of buffers
+function! g:buflist()
+  redir => ls
+  silent ls
+  redir END
+  return split(ls, '\n')
+endfunction
+
+function! g:bufopen(e)
+  execute 'buffer '. matchstr(a:e, '^[ 0-9]*')
+endfunction
+
+nnoremap <silent> <Leader><Enter> :call fzf#run({
+\   'source':  g:buflist(),
+\   'sink':    function('g:bufopen'),
+\   'options': '+m +s',
+\   'tmux':    15
+\ })<CR>
 ```
 
 Tips
 ----
 
-### Faster startup with `--disable-gems` options
+### Rendering issues
 
-If you're running Ruby 1.9 or above, you can improve the startup time with
-`--disable-gems` option to Ruby.
+If you have any rendering issues, check the followings:
 
-- `time ruby ~/bin/fzf -h`
-    - 0.077 sec
-- `time ruby --disable-gems ~/bin/fzf -h`
-    - 0.025 sec
+1. Make sure `$TERM` is correctly set. fzf will use 256-color only if it
+  contains `256` (e.g. `xterm-256color`)
+2. If you're on screen or tmux, `$TERM` should be either `screen` or
+  `screen-256color`
+3. Some terminal emulators (e.g. mintty) have problem displaying default
+  background color and make some text unable to read. In that case, try `--black`
+  option. And if it solves your problem, I recommend including it in
+  `FZF_DEFAULT_OPTS` for further convenience.
+4. If you still have problem, try `--no-256` option or even `--no-color`.
+5. Ruby 1.9 or above is required for correctly displaying unicode characters.
 
-Define fzf alias with the option as follows:
+### Ranking algorithm
+
+fzf sorts the result first by the length of the matched substring, then by the
+length of the whole string. However it only does so when the number of matches
+is less than the limit which is by default 1000, in order to avoid the cost of
+sorting a large list and limit the response time of the query.
+
+This limit can be adjusted with `-s` option, or with the environment variable
+`FZF_DEFAULT_OPTS`.
 
 ```sh
-alias fzf='ruby --disable-gems ~/bin/fzf'
+export FZF_DEFAULT_OPTS="--sort 20000"
 ```
 
-### Incorrect display on Ruby 1.8
-
-It is reported that the output of fzf can become unreadable on some terminals
-when it's running on Ruby 1.8. If you experience the problem, upgrade your Ruby
-to 1.9 or above. Ruby 1.9 or above is also required for displaying Unicode
-characters.
-
 License
 -------
 

ext/mkrf_conf.rb

@@ -0,0 +1,9 @@
+require 'rubygems/dependency_installer'
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.1.0')
+  Gem::DependencyInstaller.new.install 'curses', '~> 1.0'
+end
+
+File.open(File.expand_path('../Rakefile', __FILE__), 'w') do |f|
+  f.puts 'task :default'
+end

fzf-completion.bash

@@ -0,0 +1,167 @@
+#!/bin/bash
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/-completion.bash
+#
+# - $FZF_COMPLETION_TRIGGER (default: '**')
+# - $FZF_COMPLETION_OPTS    (default: empty)
+
+_fzf_opts_completion() {
+  local cur prev opts
+  COMPREPLY=()
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  prev="${COMP_WORDS[COMP_CWORD-1]}"
+  opts="-m --multi -x --extended -s --sort +s +i +c --no-color"
+
+  case "${prev}" in
+  --sort|-s)
+    COMPREPLY=( $(compgen -W "$(seq 2000 1000 10000)" -- ${cur}) )
+    return 0
+    ;;
+  esac
+
+  if [[ ${cur} =~ ^-|\+ ]]; then
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+    return 0
+  fi
+
+  return 0
+}
+
+_fzf_generic_completion() {
+  local cur base dir leftover matches trigger
+  COMPREPLY=()
+  trigger=${FZF_COMPLETION_TRIGGER:-**}
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  if [[ ${cur} == *"$trigger" ]]; then
+    base=${cur:0:${#cur}-${#trigger}}
+    eval base=$base
+
+    dir="$base"
+    while [ 1 ]; do
+      if [ -z "$dir" -o -d "$dir" ]; then
+        leftover=${base/#"$dir"}
+        leftover=${leftover/#\/}
+        [ "$dir" = './' ] && dir=''
+        tput sc
+        matches=$(find "$dir"* $1 2> /dev/null | fzf $FZF_COMPLETION_OPTS $2 -q "$leftover" | while read item; do
+          printf '%q ' "$item"
+        done)
+        matches=${matches% }
+        if [ -n "$matches" ]; then
+          COMPREPLY=( "$matches" )
+        else
+          COMPREPLY=( "$cur" )
+        fi
+        tput rc
+        return 0
+      fi
+      dir=$(dirname "$dir")
+      [[ "$dir" =~ /$ ]] || dir="$dir"/
+    done
+  fi
+}
+
+_fzf_all_completion() {
+  _fzf_generic_completion \
+    "-name .git -prune -o -name .svn -prune -o -type d -print -o -type f -print -o -type l -print" \
+    "-m"
+}
+
+_fzf_file_completion() {
+  _fzf_generic_completion \
+    "-name .git -prune -o -name .svn -prune -o -type f -print -o -type l -print" \
+    "-m"
+}
+
+_fzf_dir_completion() {
+  _fzf_generic_completion \
+    "-name .git -prune -o -name .svn -prune -o -type d -print" \
+    ""
+}
+
+_fzf_kill_completion() {
+  [ -n "${COMP_WORDS[COMP_CWORD]}" ] && return 1
+
+  local selected
+  tput sc
+  selected=$(ps -ef | sed 1d | fzf -m $FZF_COMPLETION_OPTS | awk '{print $2}' | tr '\n' ' ')
+  tput rc
+
+  if [ -n "$selected" ]; then
+    COMPREPLY=( "$selected" )
+    return 0
+  fi
+}
+
+_fzf_telnet_completion() {
+  local cur selected trigger
+  trigger=${FZF_COMPLETION_TRIGGER:-**}
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  [[ ${cur} == *"$trigger" ]] || return 1
+  cur=${cur:0:${#cur}-${#trigger}}
+
+  tput sc
+  selected=$(grep -v '^\s*\(#\|$\)' /etc/hosts | awk '{print $2}' | sort -u | fzf $FZF_COMPLETION_OPTS -q "$cur")
+  tput rc
+
+  if [ -n "$selected" ]; then
+    COMPREPLY=("$selected")
+    return 0
+  fi
+}
+
+_fzf_ssh_completion() {
+  local cur selected trigger
+  trigger=${FZF_COMPLETION_TRIGGER:-**}
+  cur="${COMP_WORDS[COMP_CWORD]}"
+  [[ ${cur} == *"$trigger" ]] || return 1
+  cur=${cur:0:${#cur}-${#trigger}}
+
+  tput sc
+  selected=$(cat \
+    <(cat ~/.ssh/config /etc/ssh/ssh_config 2> /dev/null | grep -i ^host) \
+    <(grep -v '^\s*\(#\|$\)' /etc/hosts) | \
+    awk '{print $2}' | sort -u | fzf $FZF_COMPLETION_OPTS -q "$cur")
+  tput rc
+
+  if [ -n "$selected" ]; then
+    COMPREPLY=("$selected")
+    return 0
+  fi
+}
+
+complete -F _fzf_opts_completion fzf
+
+# Directory
+for cmd in "cd pushd rmdir"; do
+  complete -F _fzf_dir_completion -o default -o bashdefault $cmd
+done
+
+# File
+for cmd in "
+  awk cat diff diff3
+  emacs ex file ftp g++ gcc gvim head hg java
+  javac ld less more mvim patch perl python ruby
+  sed sftp sort source tail tee uniq vi view vim wc"; do
+  complete -F _fzf_file_completion -o default -o bashdefault $cmd
+done
+
+# Anything
+for cmd in "
+  basename bunzip2 bzip2 chmod chown curl cp dirname du
+  find git grep gunzip gzip hg jar
+  ln ls mv open rm rsync scp
+  svn tar unzip zip"; do
+  complete -F _fzf_all_completion -o default -o bashdefault $cmd
+done
+
+# Kill completion
+complete -F _fzf_kill_completion -o nospace -o default -o bashdefault kill
+
+# Host completion
+complete -F _fzf_ssh_completion -o default -o bashdefault ssh
+complete -F _fzf_telnet_completion -o default -o bashdefault telnet
+

fzf-completion.zsh

@@ -0,0 +1,9 @@
+#!/bin/zsh
+#     ____      ____
+#    / __/___  / __/
+#   / /_/_  / / /_
+#  / __/ / /_/ __/
+# /_/   /___/_/-completion.zsh
+#
+
+# TODO

fzf.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'fzf'
-  spec.version       = '0.4.0'
+  spec.version       = '0.8.3'
   spec.authors       = ['Junegunn Choi']
   spec.email         = ['junegunn.c@gmail.com']
   spec.description   = %q{Fuzzy finder for your shell}
@@ -12,4 +12,6 @@ Gem::Specification.new do |spec|
   spec.bindir        = '.'
   spec.files         = %w[fzf.gemspec]
   spec.executables   = 'fzf'
+
+  spec.extensions   += ['ext/mkrf_conf.rb']
 end

install

@@ -1,7 +1,260 @@
 #!/bin/bash
 
 cd `dirname $BASH_SOURCE`
-mkdir -p ~/bin
-ln -sf `pwd`/fzf ~/bin/fzf
-chmod +x ~/bin/fzf
+fzf_base=`pwd`
+
+# ruby executable
+echo -n "Checking Ruby executable ... "
+ruby=`which ruby`
+if [ $? -ne 0 ]; then
+  echo "ruby executable not found!"
+  exit 1
+fi
+
+# System ruby is preferred
+curses_check="begin; require 'curses'; rescue Exception; exit 1; end"
+system_ruby=/usr/bin/ruby
+if [ -x $system_ruby -a $system_ruby != "$ruby" ]; then
+  $system_ruby --disable-gems -e "$curses_check" 2> /dev/null
+  [ $? -eq 0 ] && ruby=$system_ruby
+fi
+
+echo "OK ($ruby)"
+
+# Curses-support
+echo -n "Checking Curses support ... "
+"$ruby" -e "$curses_check"
+if [ $? -eq 0 ]; then
+  echo "OK"
+else
+  echo "Not found"
+  echo "Installing 'curses' gem ... "
+  /usr/bin/env gem install curses -v 1.0.0 --user-install
+  if [ $? -ne 0 ]; then
+    echo
+    echo "Failed to install 'curses' gem."
+    if [[ $(uname -r) =~ 'ARCH' ]]; then
+      echo "Make sure that base-devel package group is installed."
+    fi
+    exit 1
+  fi
+fi
+
+# Ruby version
+echo -n "Checking Ruby version ... "
+"$ruby" -e 'exit RUBY_VERSION >= "1.9"'
+if [ $? -eq 0 ]; then
+  echo ">= 1.9"
+  "$ruby" --disable-gems -e "$curses_check"
+  if [ $? -eq 0 ]; then
+    fzf_cmd="$ruby --disable-gems $fzf_base/fzf"
+  else
+    fzf_cmd="$ruby $fzf_base/fzf"
+  fi
+else
+  echo "< 1.9"
+  fzf_cmd="$ruby $fzf_base/fzf"
+fi
+
+# Auto-completion
+read -p "Do you want to add auto-completion support? ([y]/n) " -n 1 -r
+echo
+[[ ! $REPLY =~ ^[Nn]$ ]]
+auto_completion=$?
+
+# Key-bindings
+read -p "Do you want to add key bindings? ([y]/n) " -n 1 -r
+echo
+[[ ! $REPLY =~ ^[Nn]$ ]]
+key_bindings=$?
+
+echo
+for shell in bash zsh; do
+  echo -n "Generate ~/.fzf.$shell ... "
+  src=~/.fzf.${shell}
+
+  fzf_completion="source $fzf_base/fzf-completion.${shell}"
+  if [ $auto_completion -ne 0 ]; then
+    fzf_completion="# $fzf_completion"
+  fi
+
+  cat > $src << EOF
+# Setup fzf function
+# ------------------
+unalias fzf 2> /dev/null
+fzf() {
+  $fzf_cmd "\$@"
+}
+export -f fzf > /dev/null
+
+# Auto-completion
+# ---------------
+[[ \$- =~ i ]] && $fzf_completion
+
+EOF
+
+  if [ $key_bindings -eq 0 ]; then
+    if [ $shell = bash ]; then
+      cat >> $src << "EOFZF"
+# Key bindings
+# ------------
+__fsel() {
+  find * -path '*/\.*' -prune \
+    -o -type f -print \
+    -o -type d -print \
+    -o -type l -print 2> /dev/null | fzf -m | while read item; do
+    printf '%q ' "$item"
+  done
+  echo
+}
+
+if [[ $- =~ i ]]; then
+
+__fsel_tmux() {
+  local height
+  height=${FZF_TMUX_HEIGHT:-40%}
+  if [[ $height =~ %$ ]]; then
+    height="-p ${height%\%}"
+  else
+    height="-l $height"
+  fi
+  tmux split-window $height "bash -c 'source ~/.fzf.bash; tmux send-keys -t $TMUX_PANE \"\$(__fsel)\"'"
+}
+
+__fcd() {
+  local dir
+  dir=$(find ${1:-*} -path '*/\.*' -prune -o -type d -print 2> /dev/null | fzf +m) && printf 'cd %q' "$dir"
+}
+
+__use_tmux=0
+[ -n "$TMUX_PANE" -a ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ] && __use_tmux=1
+
+if [ -z "$(set -o | grep '^vi.*on')" ]; then
+  # Required to refresh the prompt after fzf
+  bind '"\er": redraw-current-line'
+
+  # CTRL-T - Paste the selected file path into the command line
+  if [ $__use_tmux -eq 1 ]; then
+    bind '"\C-t": " \C-u \C-a\C-k$(__fsel_tmux)\e\C-e\C-y\C-a\C-d\C-y\ey\C-h"'
+  else
+    bind '"\C-t": " \C-u \C-a\C-k$(__fsel)\e\C-e\C-y\C-a\C-y\ey\C-h\C-e\er"'
+  fi
+
+  # CTRL-R - Paste the selected command from history into the command line
+  bind '"\C-r": " \C-e\C-u$(HISTTIMEFORMAT= history | fzf +s | sed \"s/ *[0-9]* *//\")\e\C-e\er"'
+
+  # ALT-C - cd into the selected directory
+  bind '"\ec": " \C-e\C-u$(__fcd)\e\C-e\er\C-m"'
+else
+  bind '"\C-x\C-e": shell-expand-line'
+  bind '"\C-x\C-r": redraw-current-line'
+
+  # CTRL-T - Paste the selected file path into the command line
+  # - FIXME: Selected items are attached to the end regardless of cursor position
+  if [ $__use_tmux -eq 1 ]; then
+    bind '"\C-t": "\e$a \eddi$(__fsel_tmux)\C-x\C-e\e0P$xa"'
+  else
+    bind '"\C-t": "\e$a \eddi$(__fsel)\C-x\C-e\e0Px$a \C-x\C-r"'
+  fi
+
+  # CTRL-R - Paste the selected command from history into the command line
+  bind '"\C-r": "\eddi$(HISTTIMEFORMAT= history | fzf +s | sed \"s/ *[0-9]* *//\")\C-x\C-e\e$a\C-x\C-r"'
+
+  # ALT-C - cd into the selected directory
+  bind '"\ec": "\eddi$(__fcd)\C-x\C-e\C-x\C-r\C-m"'
+fi
+
+unset __use_tmux
+
+fi
+EOFZF
+    else
+      cat >> $src << "EOFZF"
+# Key bindings
+# ------------
+# CTRL-T - Paste the selected file path(s) into the command line
+__fsel() {
+  set -o nonomatch
+  find * -path '*/\.*' -prune \
+    -o -type f -print \
+    -o -type d -print \
+    -o -type l -print 2> /dev/null | fzf -m | while read item; do
+    printf '%q ' "$item"
+  done
+  echo
+}
+
+if [[ $- =~ i ]]; then
+
+if [ -n "$TMUX_PANE" -a ${FZF_TMUX:-1} -ne 0 -a ${LINES:-40} -gt 15 ]; then
+  fzf-file-widget() {
+    local height
+    height=${FZF_TMUX_HEIGHT:-40%}
+    if [[ $height =~ %$ ]]; then
+      height="-p ${height%\%}"
+    else
+      height="-l $height"
+    fi
+    tmux split-window $height "zsh -c 'source ~/.fzf.zsh; tmux send-keys -t $TMUX_PANE \"\$(__fsel)\"'"
+  }
+else
+  fzf-file-widget() {
+    LBUFFER="${LBUFFER%% #}$(__fsel)"
+    zle redisplay
+  }
+fi
+zle     -N   fzf-file-widget
+bindkey '^T' fzf-file-widget
+
+# ALT-C - cd into the selected directory
+fzf-cd-widget() {
+  cd "${$(set -o nonomatch; find * -path '*/\.*' -prune \
+          -o -type d -print 2> /dev/null | fzf):-.}"
+  zle reset-prompt
+}
+zle     -N    fzf-cd-widget
+bindkey '\ec' fzf-cd-widget
+
+# CTRL-R - Paste the selected command from history into the command line
+fzf-history-widget() {
+  LBUFFER=$(fc -l 1 | fzf +s | sed "s/ *[0-9]* *//")
+  zle redisplay
+}
+zle     -N   fzf-history-widget
+bindkey '^R' fzf-history-widget
+
+fi
+EOFZF
+    fi
+  fi
+
+  echo "OK"
+done
+
+echo
+for shell in bash zsh; do
+  rc=~/.${shell}rc
+  src="source ~/.fzf.${shell}"
+
+  echo "Update $rc:"
+  echo "  - $src"
+  line=$(grep -nF "$src" $rc | sed 's/:.*//')
+  if [ -n "$line" ]; then
+    echo "    - Already exists (line #$line)"
+  else
+    echo $src >> $rc
+    echo "    - Added"
+  fi
+  echo
+done
+
+cat << EOF
+Finished. Reload your .bashrc or .zshrc.
+   source ~/.bashrc  # bash
+   source ~/.zshrc   # zsh
+
+To uninstall fzf, simply remove the added line.
+
+For more information, see: https://github.com/junegunn/fzf
+EOF
 

plugin/fzf.vim

@@ -1,4 +1,4 @@
-" Copyright (c) 2013 Junegunn Choi
+" Copyright (c) 2014 Junegunn Choi
 "
 " MIT License
 "
@@ -21,25 +21,187 @@
 " OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 " WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-let s:exec = expand('<sfile>:h:h').'/fzf'
+let s:min_tmux_height = 3
+let s:default_tmux_height = '40%'
 
-function! s:fzf(args)
-  try
-    let tf = tempname()
-    let prefix = exists('g:fzf_command') ? g:fzf_command.'|' : ''
-    let fzf = executable(s:exec) ? s:exec : 'fzf'
-    execute "silent !".prefix.fzf." ".a:args." > ".tf
-    if !v:shell_error
-      let file = join(readfile(tf), '')
-      if !empty(file)
-        execute 'silent e '.file
-      endif
-    endif
-  finally
-    silent! call delete(tf)
-    redraw!
-  endtry
+let s:cpo_save = &cpo
+set cpo&vim
+
+call system('type fzf')
+if v:shell_error
+  let s:fzf_rb = expand('<sfile>:h:h').'/fzf'
+  if executable(s:fzf_rb)
+    let s:exec = s:fzf_rb
+  else
+    echoerr 'fzf executable not found'
+    finish
+  endif
+else
+  let s:exec = 'fzf'
+endif
+
+function! s:tmux_enabled()
+  if exists('s:tmux')
+    return s:tmux
+  endif
+
+  let s:tmux = 0
+  if exists('$TMUX')
+    let output = system('tmux -V')
+    let s:tmux = !v:shell_error && output >= 'tmux 1.7'
+  endif
+  return s:tmux
 endfunction
 
-command! -nargs=* FZF call s:fzf(<q-args>)
+function! s:shellesc(arg)
+  return '"'.substitute(a:arg, '"', '\\"', 'g').'"'
+endfunction
+
+function! s:escape(path)
+  return substitute(a:path, ' ', '\\ ', 'g')
+endfunction
+
+function! fzf#run(...) abort
+  if has('gui_running')
+    echohl Error
+    echo 'GVim is not supported'
+    return []
+  endif
+  let dict   = exists('a:1') ? a:1 : {}
+  let temps  = { 'result': tempname() }
+  let optstr = get(dict, 'options', '')
+
+  if has_key(dict, 'source')
+    let source = dict.source
+    let type = type(source)
+    if type == 1
+      let prefix = source.'|'
+    elseif type == 3
+      let temps.input = tempname()
+      call writefile(source, temps.input)
+      let prefix = 'cat '.s:shellesc(temps.input).'|'
+    else
+      throw 'Invalid source type'
+    endif
+  else
+    let prefix = ''
+  endif
+  let command = prefix.s:exec.' '.optstr.' > '.temps.result
+
+  if s:tmux_enabled() && has_key(dict, 'tmux') &&
+        \ dict.tmux > 0 && winheight(0) >= s:min_tmux_height
+    return s:execute_tmux(dict, command, temps)
+  else
+    return s:execute(dict, command, temps)
+  endif
+endfunction
+
+function! s:pushd(dict)
+  if has_key(a:dict, 'dir')
+    let a:dict.prev_dir = getcwd()
+    execute 'chdir '.s:escape(a:dict.dir)
+  endif
+endfunction
+
+function! s:popd(dict)
+  if has_key(a:dict, 'prev_dir')
+    execute 'chdir '.s:escape(remove(a:dict, 'prev_dir'))
+  endif
+endfunction
+
+function! s:execute(dict, command, temps)
+  call s:pushd(a:dict)
+  silent !clear
+  execute 'silent !'.a:command
+  redraw!
+  if v:shell_error
+    return []
+  else
+    return s:callback(a:dict, a:temps, 0)
+  endif
+endfunction
+
+function! s:execute_tmux(dict, command, temps)
+  if has_key(a:dict, 'dir')
+    let command = 'cd '.s:escape(a:dict.dir).' && '.a:command
+  else
+    let command = a:command
+  endif
+
+  if type(a:dict.tmux) == 1 && a:dict.tmux =~ '%$'
+    let height = '-p '.a:dict.tmux[0:-2]
+  else
+    let height = '-l '.a:dict.tmux
+  endif
+
+  let s:pane = substitute(
+    \ system(
+      \ printf(
+        \ 'tmux split-window %s -P -F "#{pane_id}" %s',
+        \ height, s:shellesc(command))), '\n', '', 'g')
+  let s:dict = a:dict
+  let s:temps = a:temps
+
+  augroup fzf_tmux
+    autocmd!
+    autocmd VimResized * nested call s:tmux_check()
+  augroup END
+endfunction
+
+function! s:tmux_check()
+  let panes = split(system('tmux list-panes -a -F "#{pane_id}"'), '\n')
+
+  if index(panes, s:pane) < 0
+    augroup fzf_tmux
+      autocmd!
+    augroup END
+
+    call s:callback(s:dict, s:temps, 1)
+    redraw
+  endif
+endfunction
+
+function! s:callback(dict, temps, cd)
+  if !filereadable(a:temps.result)
+    let lines = []
+  else
+    if a:cd | call s:pushd(a:dict) | endif
+
+    let lines = readfile(a:temps.result)
+    if has_key(a:dict, 'sink')
+      for line in lines
+        if type(a:dict.sink) == 2
+          call a:dict.sink(line)
+        else
+          execute a:dict.sink.' '.s:escape(line)
+        endif
+      endfor
+    endif
+  endif
+
+  for tf in values(a:temps)
+    silent! call delete(tf)
+  endfor
+
+  call s:popd(a:dict)
+
+  return lines
+endfunction
+
+function! s:cmd(bang, ...) abort
+  let args = copy(a:000)
+  let opts = {}
+  if len(args) > 0 && isdirectory(expand(args[-1]))
+    let opts.dir = remove(args, -1)
+  endif
+  if !a:bang
+    let opts.tmux = get(g:, 'fzf_tmux_height', s:default_tmux_height)
+  endif
+  call fzf#run(extend({ 'sink': 'e', 'options': join(args) }, opts))
+endfunction
+
+command! -nargs=* -complete=dir -bang FZF call s:cmd('<bang>' == '!', <f-args>)
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
 

test/fzf.vader

@@ -0,0 +1,37 @@
+Execute (Setup):
+  let g:dir = fnamemodify(g:vader_file, ':p:h')
+  Log 'Test directory: ' . g:dir
+
+Execute (fzf#run with dir option):
+  let result = fzf#run({ 'options': '--filter=vdr', 'dir': g:dir })
+  AssertEqual ['fzf.vader'], result
+
+  let result = sort(fzf#run({ 'options': '--filter e', 'dir': g:dir }))
+  AssertEqual ['fzf.vader', 'test_fzf.rb'], result
+
+Execute (fzf#run with Funcref command):
+  let g:ret = []
+  function! g:proc(e)
+    call add(g:ret, a:e)
+  endfunction
+  let result = sort(fzf#run({ 'sink': function('g:proc'), 'options': '--filter e', 'dir': g:dir }))
+  AssertEqual ['fzf.vader', 'test_fzf.rb'], result
+  AssertEqual ['fzf.vader', 'test_fzf.rb'], sort(g:ret)
+
+Execute (fzf#run with string source):
+  let result = sort(fzf#run({ 'source': 'echo hi', 'options': '-f i' }))
+  AssertEqual ['hi'], result
+
+Execute (fzf#run with list source):
+  let result = sort(fzf#run({ 'source': ['hello', 'world'], 'options': '-f e' }))
+  AssertEqual ['hello'], result
+  let result = sort(fzf#run({ 'source': ['hello', 'world'], 'options': '-f o' }))
+  AssertEqual ['hello', 'world'], result
+
+Execute (fzf#run with string source):
+  let result = sort(fzf#run({ 'source': 'echo hi', 'options': '-f i' }))
+  AssertEqual ['hi'], result
+
+Execute (Cleanup):
+  unlet g:dir
+  Restore

test/test_fzf.rb

@@ -1,50 +1,151 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+require 'curses'
+require 'timeout'
+require 'stringio'
 require 'minitest/autorun'
 $LOAD_PATH.unshift File.expand_path('../..', __FILE__)
 ENV['FZF_EXECUTABLE'] = '0'
 load 'fzf'
 
 class TestFZF < MiniTest::Unit::TestCase
+  def setup
+    ENV.delete 'FZF_DEFAULT_SORT'
+    ENV.delete 'FZF_DEFAULT_OPTS'
+    ENV.delete 'FZF_DEFAULT_COMMAND'
+  end
+
   def test_default_options
     fzf = FZF.new []
-    assert_equal 1000, fzf.sort
+    assert_equal 1000,  fzf.sort
     assert_equal false, fzf.multi
-    assert_equal true, fzf.color
-    assert_equal Regexp::IGNORECASE, fzf.rxflag
+    assert_equal true,  fzf.color
+    assert_equal nil,   fzf.rxflag
+    assert_equal true,  fzf.mouse
+    assert_equal nil,   fzf.nth
+    assert_equal true,  fzf.color
+    assert_equal false, fzf.black
+    assert_equal true,  fzf.ansi256
+    assert_equal '',    fzf.query.get
+    assert_equal false, fzf.select1
+    assert_equal false, fzf.exit0
+    assert_equal nil,   fzf.filter
+    assert_equal nil,   fzf.extended
+  end
 
-    begin
-      ENV['FZF_DEFAULT_SORT'] = '1500'
-      fzf = FZF.new []
-      assert_equal 1500, fzf.sort
-    ensure
-      ENV.delete 'FZF_DEFAULT_SORT'
-    end
+  def test_environment_variables
+    # Deprecated
+    ENV['FZF_DEFAULT_SORT'] = '20000'
+    fzf = FZF.new []
+    assert_equal 20000, fzf.sort
+    assert_equal nil,   fzf.nth
+
+    ENV['FZF_DEFAULT_OPTS'] =
+      '-x -m -s 10000 -q "  hello  world  " +c +2 --select-1 -0 ' +
+      '--no-mouse -f "goodbye world" --black --nth=3,-1,2'
+    fzf = FZF.new []
+    assert_equal 10000,   fzf.sort
+    assert_equal '  hello  world  ',
+                          fzf.query.get
+    assert_equal 'goodbye world',
+                          fzf.filter
+    assert_equal :fuzzy,  fzf.extended
+    assert_equal true,    fzf.multi
+    assert_equal false,   fzf.color
+    assert_equal false,   fzf.ansi256
+    assert_equal true,    fzf.black
+    assert_equal false,   fzf.mouse
+    assert_equal true,    fzf.select1
+    assert_equal true,    fzf.exit0
+    assert_equal [3, -1, 2], fzf.nth
   end
 
   def test_option_parser
     # Long opts
-    fzf = FZF.new %w[--sort=2000 --no-color --multi +i]
-    assert_equal 2000, fzf.sort
-    assert_equal true, fzf.multi
-    assert_equal false, fzf.color
-    assert_equal 0, fzf.rxflag
+    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query hello --select-1
+                     --exit-0 --filter=howdy --extended-exact
+                     --no-mouse --no-256 --nth=1]
+    assert_equal 2000,    fzf.sort
+    assert_equal true,    fzf.multi
+    assert_equal false,   fzf.color
+    assert_equal false,   fzf.ansi256
+    assert_equal false,   fzf.black
+    assert_equal false,   fzf.mouse
+    assert_equal 0,       fzf.rxflag
+    assert_equal 'hello', fzf.query.get
+    assert_equal true,    fzf.select1
+    assert_equal true,    fzf.exit0
+    assert_equal 'howdy', fzf.filter
+    assert_equal :exact,  fzf.extended
+    assert_equal [1],     fzf.nth
+
+    # Long opts (left-to-right)
+    fzf = FZF.new %w[--sort=2000 --no-color --multi +i --query=hello
+                     --filter a --filter b --no-256 --black --nth -1 --nth -2
+                     --select-1 --exit-0 --no-select-1 --no-exit-0
+                     --no-sort -i --color --no-multi --256]
+    assert_equal nil,     fzf.sort
+    assert_equal false,   fzf.multi
+    assert_equal true,    fzf.color
+    assert_equal true,    fzf.ansi256
+    assert_equal true,    fzf.black
+    assert_equal true,    fzf.mouse
+    assert_equal 1,       fzf.rxflag
+    assert_equal 'b',     fzf.filter
+    assert_equal 'hello', fzf.query.get
+    assert_equal false,   fzf.select1
+    assert_equal false,   fzf.exit0
+    assert_equal nil,     fzf.extended
+    assert_equal [-2],    fzf.nth
 
     # Short opts
-    fzf = FZF.new %w[-s 2000 +c -m +i]
-    assert_equal 2000, fzf.sort
-    assert_equal true, fzf.multi
-    assert_equal false, fzf.color
-    assert_equal 0, fzf.rxflag
+    fzf = FZF.new %w[-s2000 +c -m +i -qhello -x -fhowdy +2 -n3 -1 -0]
+    assert_equal 2000,    fzf.sort
+    assert_equal true,    fzf.multi
+    assert_equal false,   fzf.color
+    assert_equal false,   fzf.ansi256
+    assert_equal 0,       fzf.rxflag
+    assert_equal 'hello', fzf.query.get
+    assert_equal 'howdy', fzf.filter
+    assert_equal :fuzzy,  fzf.extended
+    assert_equal [3],     fzf.nth
+    assert_equal true,    fzf.select1
+    assert_equal true,    fzf.exit0
+
+    # Left-to-right
+    fzf = FZF.new %w[-s 2000 +c -m +i -qhello -x -fgoodbye +2 -n3 -n4,5
+                     -s 3000 -c +m -i -q world +x -fworld -2 --black --no-black
+                     -1 -0 +1 +0
+                    ]
+    assert_equal 3000,    fzf.sort
+    assert_equal false,   fzf.multi
+    assert_equal true,    fzf.color
+    assert_equal true,    fzf.ansi256
+    assert_equal false,   fzf.black
+    assert_equal 1,       fzf.rxflag
+    assert_equal 'world', fzf.query.get
+    assert_equal false,   fzf.select1
+    assert_equal false,   fzf.exit0
+    assert_equal 'world', fzf.filter
+    assert_equal nil,     fzf.extended
+    assert_equal [4, 5],  fzf.nth
+  rescue SystemExit => e
+    assert false, "Exited"
   end
 
   def test_invalid_option
-    [%w[-s 2000 +s], %w[yo dawg]].each do |argv|
+    [%w[--unknown], %w[yo dawg]].each do |argv|
       assert_raises(SystemExit) do
         fzf = FZF.new argv
       end
     end
+    assert_raises(SystemExit) do
+      fzf = FZF.new %w[--nth=0]
+    end
+    assert_raises(SystemExit) do
+      fzf = FZF.new %w[-n 0]
+    end
   end
 
   # FIXME Only on 1.9 or above
@@ -139,15 +240,59 @@ class TestFZF < MiniTest::Unit::TestCase
     # TODO : partial_cache
   end
 
+  def test_fuzzy_matcher_rxflag
+    assert_equal nil, FZF::FuzzyMatcher.new(nil).rxflag
+    assert_equal 0, FZF::FuzzyMatcher.new(0).rxflag
+    assert_equal 1, FZF::FuzzyMatcher.new(1).rxflag
+
+    assert_equal 1, FZF::FuzzyMatcher.new(nil).rxflag_for('abc')
+    assert_equal 0, FZF::FuzzyMatcher.new(nil).rxflag_for('Abc')
+    assert_equal 0, FZF::FuzzyMatcher.new(0).rxflag_for('abc')
+    assert_equal 0, FZF::FuzzyMatcher.new(0).rxflag_for('Abc')
+    assert_equal 1, FZF::FuzzyMatcher.new(1).rxflag_for('abc')
+    assert_equal 1, FZF::FuzzyMatcher.new(1).rxflag_for('Abc')
+  end
+
   def test_fuzzy_matcher_case_sensitive
+    # Smart-case match (Uppercase found)
+    assert_equal [['Fruit', [[0, 5]]]],
+      FZF::FuzzyMatcher.new(nil).match(%w[Fruit Grapefruit], 'Fruit', '', '').sort
+
+    # Smart-case match (Uppercase not-found)
+    assert_equal [["Fruit", [[0, 5]]], ["Grapefruit", [[5, 10]]]],
+      FZF::FuzzyMatcher.new(nil).match(%w[Fruit Grapefruit], 'fruit', '', '').sort
+
+    # Case-sensitive match (-i)
     assert_equal [['Fruit', [[0, 5]]]],
       FZF::FuzzyMatcher.new(0).match(%w[Fruit Grapefruit], 'Fruit', '', '').sort
 
+    # Case-insensitive match (+i)
     assert_equal [["Fruit", [[0, 5]]], ["Grapefruit", [[5, 10]]]],
       FZF::FuzzyMatcher.new(Regexp::IGNORECASE).
       match(%w[Fruit Grapefruit], 'Fruit', '', '').sort
   end
 
+  def test_extended_fuzzy_matcher_case_sensitive
+    %w['Fruit Fruit$].each do |q|
+      # Smart-case match (Uppercase found)
+      assert_equal [['Fruit', [[0, 5]]]],
+        FZF::ExtendedFuzzyMatcher.new(nil).match(%w[Fruit Grapefruit], q, '', '').sort
+
+      # Smart-case match (Uppercase not-found)
+      assert_equal [["Fruit", [[0, 5]]], ["Grapefruit", [[5, 10]]]],
+        FZF::ExtendedFuzzyMatcher.new(nil).match(%w[Fruit Grapefruit], q.downcase, '', '').sort
+
+      # Case-sensitive match (-i)
+      assert_equal [['Fruit', [[0, 5]]]],
+        FZF::ExtendedFuzzyMatcher.new(0).match(%w[Fruit Grapefruit], q, '', '').sort
+
+      # Case-insensitive match (+i)
+      assert_equal [["Fruit", [[0, 5]]], ["Grapefruit", [[5, 10]]]],
+        FZF::ExtendedFuzzyMatcher.new(Regexp::IGNORECASE).
+        match(%w[Fruit Grapefruit], q, '', '').sort
+    end
+  end
+
   def test_extended_fuzzy_matcher
     matcher = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE
     list = %w[
@@ -184,6 +329,11 @@ class TestFZF < MiniTest::Unit::TestCase
       assert_equal list.length,     match.call('j', '').length
       assert_equal list.length - 1, match.call('^j', '').length
 
+      # ^ + $
+      assert_equal 0, match.call('^juici$', '').length
+      assert_equal 1, match.call('^juice$', '').length
+      assert_equal 0, match.call('^.*$', '').length
+
       # !
       assert_equal 0, match.call('!j', '').length
 
@@ -250,7 +400,7 @@ class TestFZF < MiniTest::Unit::TestCase
        ["0____1",   [[0, 6]]],
        ["0_____1",  [[0, 7]]],
        ["0______1", [[0, 8]]]],
-      FZF.new([]).sort_by_rank(matcher.match(list, '01', '', '')))
+      FZF.sort(matcher.match(list, '01', '', '')))
 
     assert_equal(
       [["01",       [[0, 1], [1, 2]]],
@@ -261,16 +411,38 @@ class TestFZF < MiniTest::Unit::TestCase
        ["____0_1",  [[4, 5], [6, 7]]],
        ["0______1", [[0, 1], [7, 8]]],
        ["___01___", [[3, 4], [4, 5]]]],
-      FZF.new([]).sort_by_rank(xmatcher.match(list, '0 1', '', '')))
+      FZF.sort(xmatcher.match(list, '0 1', '', '')))
 
     assert_equal(
-      [["_01_",     [[1, 3], [0, 4]]],
-       ["0____1",   [[0, 6], [1, 3]]],
-       ["0_____1",  [[0, 7], [1, 3]]],
-       ["0______1", [[0, 8], [1, 3]]],
-       ["___01___", [[3, 5], [0, 2]]],
-       ["____0_1",  [[4, 7], [0, 2]]]],
-      FZF.new([]).sort_by_rank(xmatcher.match(list, '01 __', '', '')))
+      [["_01_",     [[1, 3], [0, 4]], [4, 4, "_01_"]],
+       ["___01___", [[3, 5], [0, 2]], [4, 8, "___01___"]],
+       ["____0_1",  [[4, 7], [0, 2]], [5, 7, "____0_1"]],
+       ["0____1",   [[0, 6], [1, 3]], [6, 6, "0____1"]],
+       ["0_____1",  [[0, 7], [1, 3]], [7, 7, "0_____1"]],
+       ["0______1", [[0, 8], [1, 3]], [8, 8, "0______1"]]],
+      FZF.sort(xmatcher.match(list, '01 __', '', '')).map { |tuple|
+        tuple << FZF.rank(tuple)
+      }
+    )
+  end
+
+  def test_extended_exact_mode
+    exact = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE, :exact
+    fuzzy = FZF::ExtendedFuzzyMatcher.new Regexp::IGNORECASE, :fuzzy
+    list = %w[
+      extended-exact-mode-not-fuzzy
+      extended'-fuzzy-mode
+    ]
+    assert_equal 2, fuzzy.match(list, 'extended', '', '').length
+    assert_equal 2, fuzzy.match(list, 'mode extended', '', '').length
+    assert_equal 2, fuzzy.match(list, 'xtndd', '', '').length
+    assert_equal 2, fuzzy.match(list, "'-fuzzy", '', '').length
+
+    assert_equal 2, exact.match(list, 'extended', '', '').length
+    assert_equal 2, exact.match(list, 'mode extended', '', '').length
+    assert_equal 0, exact.match(list, 'xtndd', '', '').length
+    assert_equal 1, exact.match(list, "'-fuzzy", '', '').length
+    assert_equal 2, exact.match(list, "-fuzzy", '', '').length
   end
 
   if RUBY_PLATFORM =~ /darwin/
@@ -293,8 +465,25 @@ class TestFZF < MiniTest::Unit::TestCase
     def test_nfd
       nfc = '한글'
       nfd = FZF::UConv.nfd(nfc)
-      assert_equal 6, nfd.length
-      assert_equal NFD, nfd
+      assert_equal 2, nfd.length
+      assert_equal 6, nfd.join.length
+      assert_equal NFD, nfd.join
+    end
+
+    def test_nfd_fuzzy_matcher
+      matcher = FZF::FuzzyMatcher.new 0
+      assert_equal [], matcher.match([NFD + NFD], '할', '', '')
+      match   = matcher.match([NFD + NFD], '글글', '', '')
+      assert_equal [[NFD + NFD, [[3, 12]]]], match
+      assert_equal ['한글한글', [[1, 4]]], FZF::UConv.nfc(*match.first)
+    end
+
+    def test_nfd_extended_fuzzy_matcher
+      matcher = FZF::ExtendedFuzzyMatcher.new 0
+      assert_equal [], matcher.match([NFD], "'글글", '', '')
+      match   = matcher.match([NFD], "'한글", '', '')
+      assert_equal [[NFD, [[0, 6]]]], match
+      assert_equal ['한글', [[0, 2]]], FZF::UConv.nfc(*match.first)
     end
   end
 
@@ -302,5 +491,175 @@ class TestFZF < MiniTest::Unit::TestCase
     assert_equal ["a", "b", "c", "\xFF", "d", "e", "f"],
       FZF::UConv.split("abc\xFFdef")
   end
+
+  # ^$ -> matches empty item
+  def test_format_empty_item
+    fzf = FZF.new []
+    item = ['', [[0, 0]]]
+    line, offsets = fzf.convert_item item
+    tokens        = fzf.format line, 80, offsets
+    assert_equal [], tokens
+  end
+
+  def test_mouse_event
+    interval = FZF::MouseEvent::DOUBLE_CLICK_INTERVAL
+    me = FZF::MouseEvent.new nil
+    me.v = 10
+    assert_equal false, me.double?(10)
+    assert_equal false, me.double?(20)
+    me.v = 20
+    assert_equal false, me.double?(10)
+    assert_equal false, me.double?(20)
+    me.v = 20
+    assert_equal false, me.double?(10)
+    assert_equal true,  me.double?(20)
+    sleep interval
+    assert_equal false,  me.double?(20)
+  end
+
+  def test_nth_match
+    list = [
+      ' first  second  third',
+      'fourth	 fifth   sixth',
+    ]
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE
+    assert_equal list, matcher.match(list, 'f', '', '').map(&:first)
+    assert_equal [
+      [list[0], [[2,  5]]],
+      [list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [2]
+    assert_equal [[list[1], [[8, 9]]]], matcher.match(list, 'f', '', '')
+    assert_equal [[list[0], [[8, 9]]]], matcher.match(list, 's', '', '')
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [3]
+    assert_equal [[list[0], [[19, 20]]]], matcher.match(list, 'r', '', '')
+
+    # Comma-separated
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [3, 1]
+    assert_equal [[list[0], [[19, 20]]], [list[1], [[3, 4]]]], matcher.match(list, 'r', '', '')
+
+    # Ordered
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [1, 3]
+    assert_equal [[list[0], [[3, 4]]], [list[1], [[3, 4]]]], matcher.match(list, 'r', '', '')
+
+    regex = FZF.build_delim_regex "\t"
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [1], regex
+    assert_equal [[list[0], [[3, 10]]]], matcher.match(list, 're', '', '')
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [2], regex
+    assert_equal [], matcher.match(list, 'r', '', '')
+    assert_equal [[list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
+
+    # Negative indexing
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [-1], regex
+    assert_equal [[list[0], [[3, 6]]]], matcher.match(list, 'rt', '', '')
+    assert_equal [[list[0], [[2, 5]]], [list[1], [[9, 17]]]], matcher.match(list, 'is', '', '')
+
+    # Regex delimiter
+    regex = FZF.build_delim_regex "[ \t]+"
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [1], regex
+    assert_equal [list[1]], matcher.match(list, 'f', '', '').map(&:first)
+
+    matcher = FZF::FuzzyMatcher.new Regexp::IGNORECASE, [2], regex
+    assert_equal [[list[0], [[1, 2]]], [list[1], [[8, 9]]]], matcher.match(list, 'f', '', '')
+  end
+
+  def stream_for str
+    StringIO.new(str).tap do |sio|
+      sio.instance_eval do
+        alias org_gets gets
+
+        def gets
+          org_gets.tap { |e| sleep 0.5 unless e.nil? }
+        end
+      end
+    end
+  end
+
+  def test_select_1
+    stream = stream_for "Hello\nWorld"
+    output = StringIO.new
+
+    begin
+      $stdout = output
+      FZF.new(%w[--query=ol --select-1], stream).start
+    rescue SystemExit => e
+      assert_equal 0, e.status
+      assert_equal 'World', output.string.chomp
+    ensure
+      $stdout = STDOUT
+    end
+  end
+
+  def test_select_1_without_query
+    stream = stream_for "Hello World"
+    output = StringIO.new
+
+    begin
+      $stdout = output
+      FZF.new(%w[--select-1], stream).start
+    rescue SystemExit => e
+      assert_equal 0, e.status
+      assert_equal 'Hello World', output.string.chomp
+    ensure
+      $stdout = STDOUT
+    end
+  end
+
+  def test_select_1_ambiguity
+    stream = stream_for "Hello\nWorld"
+    begin
+      Timeout::timeout(3) do
+        FZF.new(%w[--query=o --select-1], stream).start
+      end
+      flunk 'Should not reach here'
+    rescue Exception => e
+      Curses.close_screen
+      assert_instance_of Timeout::Error, e
+    end
+  end
+
+  def test_exit_0
+    stream = stream_for "Hello\nWorld"
+    output = StringIO.new
+
+    begin
+      $stdout = output
+      FZF.new(%w[--query=zz --exit-0], stream).start
+    rescue SystemExit => e
+      assert_equal 0, e.status
+      assert_equal '', output.string
+    ensure
+      $stdout = STDOUT
+    end
+  end
+
+  def test_exit_0_without_query
+    stream = stream_for ""
+    output = StringIO.new
+
+    begin
+      $stdout = output
+      FZF.new(%w[--exit-0], stream).start
+    rescue SystemExit => e
+      assert_equal 0, e.status
+      assert_equal '', output.string
+    ensure
+      $stdout = STDOUT
+    end
+  end
+
+  def test_ranking_overlap_match_regions
+    list = [
+      '1           3   4      2',
+      '1           2   3    4'
+    ]
+    assert_equal [
+      ['1           2   3    4',   [[0, 13], [16, 22]]],
+      ['1           3   4      2', [[0, 24], [12, 17]]],
+    ], FZF.sort(FZF::ExtendedFuzzyMatcher.new(nil).match(list, '12 34', '', ''))
+  end
 end