Append newline at the end of the file if necessary

* Adds separator.length() to calculation for desired width.
* Replaces use of term_width with options.term_width.
* Adds the comma and space separator to calculation for line-wrapping.

.travis.yml

@@ -6,23 +6,43 @@ matrix:
     - os: linux
       rust: stable
       env: TARGET=x86_64-unknown-linux-gnu
+    - os: linux
+      rust: stable
+      env:
+        - TARGET=x86_64-unknown-linux-musl
+        - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc
     - os: osx
       rust: stable
       env: TARGET=x86_64-apple-darwin
 
     # Minimum Rust supported channel.
     - os: linux
-      rust: 1.22.1
+      rust: 1.24.0
       env: TARGET=x86_64-unknown-linux-gnu
+    - os: linux
+      rust: 1.24.0
+      env:
+        - TARGET=x86_64-unknown-linux-musl
+        - CC_x86_64_unknown_linux_musl=/usr/bin/musl-gcc
     - os: osx
-      rust: 1.22.1
+      rust: 1.24.0
       env: TARGET=x86_64-apple-darwin
 
+    # Code formatting check
+    - os: linux
+      rust: nightly
+      # skip the global install step
+      install:
+        - cargo install --debug --force rustfmt-nightly
+      script: cargo fmt -- --write-mode=diff
+
 addons:
   apt:
     packages:
       # needed for i686-unknown-linux-gnu target
       - gcc-multilib
+      # needed for musl targets
+      - musl-tools
       # needed to build deb packages
       - fakeroot
 
@@ -43,8 +63,9 @@ script:
   - cargo build --target $TARGET --verbose
   - cargo test --target $TARGET --verbose
   # Run 'bat' on its own source code and the README
-  - cargo run --target $TARGET -- src/main.rs
+  # Piping to 'cat' forces the tty check to fail so that a pager is not used
-  - cargo run --target $TARGET -- README.md
+  - cargo run --target $TARGET -- src/main.rs | cat
+  - cargo run --target $TARGET -- README.md | cat
 
 before_deploy:
   - bash ci/before_deploy.bash

Cargo.lock

@@ -8,7 +8,7 @@ dependencies = [
 
 [[package]]
 name = "ansi_term"
-version = "0.9.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -21,7 +21,7 @@ dependencies = [
 
 [[package]]
 name = "atty"
-version = "0.2.8"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -31,13 +31,13 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -46,7 +46,7 @@ name = "backtrace-sys"
 version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -61,15 +61,15 @@ dependencies = [
 
 [[package]]
 name = "bat"
-version = "0.2.1"
+version = "0.3.0"
 dependencies = [
- "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "console 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "directories 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "directories 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "git2 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "git2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "syntect 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -80,17 +80,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "bitflags"
-version = "0.9.1"
+version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bitflags"
-version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -98,19 +93,28 @@ name = "byteorder"
 version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "bytes"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "cc"
-version = "1.0.9"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "cfg-if"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "chrono"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -124,8 +128,8 @@ version = "2.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "atty 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "textwrap 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -145,10 +149,10 @@ dependencies = [
 
 [[package]]
 name = "cmake"
-version = "0.1.29"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -159,8 +163,8 @@ dependencies = [
  "clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -168,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "directories"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -186,7 +190,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "os_pipe 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "shared_child 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -195,7 +199,7 @@ name = "error-chain"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "backtrace 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -217,7 +221,7 @@ name = "fuchsia-zircon"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -226,14 +230,20 @@ name = "fuchsia-zircon-sys"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "gcc"
+version = "0.3.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "git2"
-version = "0.6.11"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "libgit2-sys 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libgit2-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -244,7 +254,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "unicode-normalization 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "iovec"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -283,14 +302,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.6.19"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cmake 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -298,9 +317,9 @@ name = "libz-sys"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "vcpkg 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -309,6 +328,14 @@ name = "linked-hash-map"
 version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "log"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.6"
@@ -327,17 +354,19 @@ name = "miniz-sys"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cc 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "nix"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -360,7 +389,7 @@ name = "onig"
 version = "3.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "onig_sys 68.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -371,20 +400,19 @@ name = "onig_sys"
 version = "68.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cmake 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "duct 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
- "pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "os_pipe"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -397,21 +425,21 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot_core 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "parking_lot_core"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "smallvec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -422,7 +450,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.9"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -432,14 +460,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "chrono 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
  "xml-rs 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "0.3.1"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -447,10 +475,10 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -478,12 +506,12 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "thread_local 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "utf8-ranges 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -495,7 +523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "regex-syntax"
-version = "0.5.5"
+version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -503,7 +531,7 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -521,38 +549,27 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.37"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde_derive"
-version = "1.0.37"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive_internals 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_derive_internals"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.13"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -567,7 +584,7 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -582,11 +599,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "syn"
-version = "0.13.1"
+version = "0.13.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "proc-macro2 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -596,16 +613,16 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "flate2 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "onig 3.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "plist 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "yaml-rust 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -681,7 +698,7 @@ dependencies = [
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -770,7 +787,7 @@ name = "xml-rs"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -783,24 +800,24 @@ dependencies = [
 
 [metadata]
 "checksum aho-corasick 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d6531d44de723825aa81398a6415283229725a00fa30713812ab9323faa82fc4"
+"checksum ansi_term 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-"checksum ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "23ac7c30002a5accbf7e8987d0632fa6de155b7c3d39d0067317a391e00a2ef6"
+"checksum atty 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "2fc4a1aa4c24c0718a250f0681885c1af91419d242f29eb8f2ab28502d80dbd1"
-"checksum atty 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "af80143d6f7608d746df1520709e5d141c96f240b0e62b0aa41bdfb53374d9d4"
+"checksum backtrace 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea58cd16fd6c9d120b5bcb01d63883ae4cc7ba2aed35c1841b862a3c7ef6639"
-"checksum backtrace 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ebbe525f66f42d207968308ee86bc2dd60aa5fab535b22e616323a173d097d8e"
 "checksum backtrace-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "44585761d6161b0f57afc49482ab6bd067e4edef48c12a152c237eb0203f7661"
 "checksum base64 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7c4a342b450b268e1be8036311e2c613d7f8a7ed31214dff1cc3b60852a3168d"
 "checksum bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bda13183df33055cbb84b847becce220d392df502ebe7a4a78d7021771ed94d0"
-"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5"
+"checksum bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c54bb8f454c567f21197eefcdbf5679d0bd99f2ddbe52e84c77061952e6789"
-"checksum bitflags 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b3c30d3802dfb7281680d6285f2ccdaa8c2d8fee41f93805dba5c4cf50dc23cf"
 "checksum byteorder 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "73b5bdfe7ee3ad0b99c9801d58807a9dbc9e09196365b0203853b99889ab3c87"
-"checksum cc 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2b4911e4bdcb4100c7680e7e854ff38e23f1b34d4d9e079efae3da2801341ffc"
+"checksum bytes 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2f1d50c876fb7545f5f289cd8b2aee3f359d073ae819eed5d6373638e2c61e59"
-"checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
+"checksum cc 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "0ebb87d1116151416c0cf66a0e3fb6430cccd120fd6300794b4dfaa050ac40ba"
-"checksum chrono 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ba5f60682a4c264e7f8d77b82e7788938a76befdf949d4a98026d19099c9d873"
+"checksum cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "405216fd8fe65f718daa7102ea808a946b6ce40c742998fbfd3463645552de18"
+"checksum chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1cce36c92cb605414e9b824f866f5babe0a0368e39ea07393b9b63cf3844c0e6"
 "checksum clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f16b89cbb9ee36d87483dc939fe9f1e13c05898d56d7b230a0d4dff033a536"
 "checksum clicolors-control 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1f84dec9bc083ce2503908cd305af98bd363da6f54bf8d4bf0ac14ee749ad5d1"
-"checksum cmake 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "56d741ea7a69e577f6d06b36b7dff4738f680593dc27a701ffa8506b73ce28bb"
+"checksum cmake 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "95470235c31c726d72bf2e1f421adc1e65b9d561bf5529612cbe1a72da1467b3"
 "checksum console 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7649ca90478264b9686aac8d269fcb014f14c2bed7c79a7e51b9f6afd4d783eb"
-"checksum directories 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "52bdea76de17dee3b166076dc4eeaf1d3df65fc094918a16776c2675b79ced50"
+"checksum directories 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2561db021b6f1321d0f16b67ed28ce843ef4610dfaa432e3ffa2e8a3050ebf"
 "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
 "checksum duct 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "166298c17c5b4fe5997b962c2f22e887c7c5adc44308eb9103ce5b66af45a423"
 "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
@@ -808,52 +825,54 @@ dependencies = [
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-"checksum git2 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "ee5b4bb7cd2a44e6e5ee3a26ba6a9ca10d4ce2771cdc3839bbc54b47b7d1be84"
+"checksum gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)" = "5e33ec290da0d127825013597dbdfc28bee4964690c7ce1166cbc2a7bd08b1bb"
+"checksum git2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f41c0035c37ec11ed3f1e1946a76070b0c740393687e9a9c7612f6a709036b3"
 "checksum idna 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "014b298351066f1512874135335d62a789ffe78a9974f94b43ed5621951eaf7d"
+"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08"
 "checksum itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682"
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
 "checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
 "checksum libc 0.2.40 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd41f331ac7c5b8ac259b8bf82c75c0fb2e469bbf37d2becbba9a6a2221965b"
-"checksum libgit2-sys 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "6eeae66e7b1c995de45cb4e65c5ab438a96a7b4077e448645d4048dc753ad357"
+"checksum libgit2-sys 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1ecbd6428006c321c29b6c8a895f0d90152f1cf4fd8faab69fc436a3d9594f63"
 "checksum libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16"
 "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
+"checksum log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "89f010e843f2b1a31dbd316b3b8d443758bc634bed37aabade59c686d644e0a2"
 "checksum matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "100aabe6b8ff4e4a7e32c1c13523379802df0772b82466207ac25b013f193376"
 "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
 "checksum miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "609ce024854aeb19a0ef7567d348aaa5a746b32fb72e336df7fcc16869d7e2b4"
-"checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32"
+"checksum nix 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fd5681d13fda646462cfbd4e5f2051279a89a544d50eb98c365b507246839f"
 "checksum num-integer 0.1.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f8d26da319fb45674985c78f1d1caf99aa4941f785d384a2ae36d0740bc3e2fe"
 "checksum num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dee092fcdf725aee04dd7da1d21debff559237d49ef1cb3e69bcb8ece44c7364"
 "checksum onig 3.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f5eeb268a4620c74ea5768c6d2ccd492d60a47a8754666b91a46bfc35cd4d1ba"
 "checksum onig_sys 68.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c6be7c4f985508684e54f18dd37f71e66f3e1ad9318336a520d7e42f0d3ea8e"
-"checksum os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f547689aea1f11fac90333d573854a8e3e52a9160df1c42aefa8cd16734a3c0"
+"checksum os_pipe 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "934868c3f86ed7a39ef63d88edeac5bd49a0c843192651900e9ce1178cbbf157"
 "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
-"checksum parking_lot 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd9d732f2de194336fb02fe11f9eed13d9e76f13f4315b4d88a14ca411750cd"
+"checksum parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac"
-"checksum parking_lot_core 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "538ef00b7317875071d5e00f603f24d16f0b474c1a5fc0ccb8b454ca72eafa79"
+"checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
 "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831"
-"checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903"
+"checksum pkg-config 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "110d5ee3593dbb73f56294327fe5668bcc997897097cbc76b51e7aed3f52452f"
 "checksum plist 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c61ac2afed2856590ae79d6f358a24b85ece246d2aa134741a66d589519b7503"
-"checksum proc-macro2 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "388d7ea47318c5ccdeb9ba6312cee7d3f65dd2804be8580a170fce410d50b786"
+"checksum proc-macro2 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "1b06e2f335f48d24442b35a19df506a835fb3547bc3c06ef27340da9acf5cae7"
-"checksum quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7b0ff51282f28dc1b53fd154298feaa2e77c5ea0dba68e1fd8b03b72fbe13d2a"
+"checksum quote 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9949cfe66888ffe1d53e6ec9d9f3b70714083854be20fd5e271b232a017401e8"
 "checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
 "checksum redox_syscall 0.1.37 (registry+https://github.com/rust-lang/crates.io-index)" = "0d92eecebad22b767915e4d529f89f28ee96dbbf5a4810d2b844373f136417fd"
 "checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
-"checksum regex 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "aec3f58d903a7d2a9dc2bf0e41a746f4530e0cab6b615494e058f67a3ef947fb"
+"checksum regex 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
 "checksum regex-syntax 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8e931c58b93d86f080c734bfd2bce7dd0079ae2331235818133c8be7f422e20e"
-"checksum regex-syntax 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "bd90079345f4a4c3409214734ae220fd773c6f2e8a543d07370c6c1c369cfbfb"
+"checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
-"checksum rustc-demangle 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11fb43a206a04116ffd7cfcf9bcb941f8eb6cc7ff667272246b0a1c74259a3cb"
+"checksum rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "76d7ba1feafada44f2d38eed812bd2489a03c0f5abb975799251518b68848649"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
 "checksum same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb6eded0b06a0b512c8ddbcf04089138c9b4362c2f696f3c3d76039d68f3637"
-"checksum serde 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "d3bcee660dcde8f52c3765dd9ca5ee36b4bf35470a738eb0bd5a8752b0389645"
+"checksum serde 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)" = "21924cc18e5281f232a17c040355fac97732b42cf019c24996a1642bcb169cdb"
-"checksum serde_derive 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "f1711ab8b208541fa8de00425f6a577d90f27bb60724d2bb5fd911314af9668f"
+"checksum serde_derive 1.0.51 (registry+https://github.com/rust-lang/crates.io-index)" = "9c624a90bec6fe9bc60d275d7af71c72c26b24cd6c6776d8e344dc4044caa3e2"
-"checksum serde_derive_internals 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "89b340a48245bc03ddba31d0ff1709c118df90edc6adabaca4aac77aea181cce"
+"checksum serde_json 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "f3ad6d546e765177cf3dded3c2e424a8040f870083a0e64064746b958ece9cb1"
-"checksum serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "5c508584d9913df116b91505eec55610a2f5b16e9ed793c46e4d0152872b3e74"
 "checksum shared_child 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bcd5e483b3475af9bc2a35311c2f3bbf0bd98fde91410ab15a0d4ba3c3127b4e"
-"checksum smallvec 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44db0ecb22921ef790d17ae13a3f6d15784183ff5f2a01aa32098c7498d2b4b9"
+"checksum smallvec 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03dab98ab5ded3a8b43b2c80751194608d0b2aa0f1d46cf95d1c35e192844aa7"
 "checksum stable_deref_trait 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "15132e0e364248108c5e2c02e3ab539be8d6f5d52a01ca9bbf27ed657316f02b"
 "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
-"checksum syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91b52877572087400e83d24b9178488541e3d535259e04ff17a63df1e5ceff59"
+"checksum syn 0.13.7 (registry+https://github.com/rust-lang/crates.io-index)" = "61b8f1b737f929c6516ba46a3133fd6d5215ad8a62f66760f851f7048aebedfb"
 "checksum syntect 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eceb461f684c9e8e00f7a50055698af62c76d5b86e4ad50b4311acd5f655d606"
 "checksum term_size 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e5b9a66db815dcfd2da92db471106457082577c3c278d4138ab3e3b4e189327"
 "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096"
@@ -863,7 +882,7 @@ dependencies = [
 "checksum time 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "a15375f1df02096fb3317256ce2cee6a1f42fc84ea5ad5fc8c421cfe40c73098"
 "checksum ucd-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fd2be2d6639d0f8fe6cdda291ad456e23629558d466e2789d2c3e9892bda285d"
 "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
-"checksum unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "51ccda9ef9efa3f7ef5d91e8f9b83bbe6955f9bf86aec89d5cce2c874625920f"
+"checksum unicode-normalization 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "90d662d111b0dbb08a180f2761026cba648c258023c355954a7c00e00e354636"
 "checksum unicode-width 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bf3a113775714a22dcb774d8ea3655c53a32debae63a063acc00a91cc586245f"
 "checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"

Cargo.toml

@@ -7,18 +7,18 @@ license = "MIT/Apache-2.0"
 name = "bat"
 readme = "README.md"
 repository = "https://github.com/sharkdp/bat"
-version = "0.2.2"
+version = "0.3.0"
 
 [dependencies]
 atty = "0.2.2"
-ansi_term = "0.9"
+ansi_term = "0.10"
 console = "0.6"
 error-chain = "0.11"
-directories = "0.9"
+directories = "0.10"
 lazy_static = "1.0"
 
 [dependencies.git2]
-version = "0.6"
+version = "0.7"
 default-features = false
 features = []
 

README.md

@@ -9,13 +9,15 @@ A *cat(1)* clone with syntax highlighting and Git integration.
 
 ### Syntax highlighting
 
-`bat` supports syntax highlighting for a large number of programming and markup languages:
+`bat` supports syntax highlighting for a large number of programming and markup
+languages:
 
 ![Syntax highlighting example](https://imgur.com/rGsdnDe.png)
 
 ### Git integration
 
-`bat` communicates with `git` to show modifications with respect to the index (see left side bar):
+`bat` communicates with `git` to show modifications with respect to the index
+(see left side bar):
 
 ![Git integration example](https://i.imgur.com/2lSW4RE.png)
 
@@ -23,11 +25,14 @@ A *cat(1)* clone with syntax highlighting and Git integration.
 
 ### From binaries
 
-Check out the [Release page](https://github.com/sharkdp/bat/releases) for binary builds and Debian packages.
+Check out the [Release page](https://github.com/sharkdp/bat/releases) for
+binary builds and Debian packages.
 
-### Arch Linux
+#### Arch Linux
 
-On Arch Linux, you can install [the AUR package](https://aur.archlinux.org/packages/bat/) via yaourt, or manually:
+On Arch Linux, you can install
+[the AUR package](https://aur.archlinux.org/packages/bat/) via yaourt, or
+manually:
 
 ```bash
 git clone https://aur.archlinux.org/bat.git
@@ -37,23 +42,32 @@ makepkg -si
 
 ### From source
 
-If you want to build to compile `bat` from source, you need Rust 1.22 or higher.
+If you want to build to compile `bat` from source, you need Rust 1.24 or
-You can then use `cargo` to build everything:
+higher. You can then use `cargo` to build everything:
 
 ``` bash
 cargo install bat
 ```
 
+On macOS, you might have to install `cmake` (`brew install cmake`) in order for
+some dependencies to be built.
+
 ## Customization
 
-`bat` uses the excellent [`syntect`](https://github.com/trishume/syntect/) library for syntax highlighting. `syntect` can read any [Sublime Text `.sublime-syntax` files](https://www.sublimetext.com/docs/3/syntax.html) and themes.
+`bat` uses the excellent [`syntect`](https://github.com/trishume/syntect/)
+library for syntax highlighting. `syntect` can read any
+[Sublime Text `.sublime-syntax` file](https://www.sublimetext.com/docs/3/syntax.html)
+and theme.
 
 To build your own language-set and theme, follow these steps:
 
 Create a folder with a syntax highlighting theme:
+
 ``` bash
-mkdir -p ~/.config/bat/themes
+BAT_CONFIG_DIR="$(bat cache --config-dir)"
-cd ~/.config/bat/themes
+
+mkdir -p "$BAT_CONFIG_DIR/themes"
+cd "$BAT_CONFIG_DIR/themes"
 
 # Download a theme, for example:
 git clone https://github.com/jonschlinkert/sublime-monokai-extended
@@ -63,9 +77,10 @@ ln -s "sublime-monokai-extended/Monokai Extended.tmTheme" Default.tmTheme
 ```
 
 Create a folder with language definition files:
+
 ``` bash
-mkdir -p ~/.config/bat/syntax
+mkdir -p "$BAT_CONFIG_DIR/syntax"
-cd ~/.config/bat/syntax
+cd "$BAT_CONFIG_DIR/syntax"
 
 # Download some language definition files, for example:
 git clone https://github.com/sublimehq/Packages/
@@ -75,6 +90,13 @@ git clone https://github.com/jonschlinkert/sublime-markdown-extended
 
 Finally, use the following command to parse all these files into a binary
 cache:
+
 ``` bash
-bat init-cache
+bat cache --init
+```
+
+If you ever want to go back to the default settings, call:
+
+``` bash
+bat cache --clear
 ```

assets/create.sh

@@ -17,8 +17,17 @@ if [ ! -e "$SYNTAX_FOLDER" ]; then
     (
         cd "$SYNTAX_FOLDER"
         git clone https://github.com/sublimehq/Packages/
+
+        # Patch JavaScript syntax
+        sed -i -e 's/{{identifier_break}}+/{{identifier_break}}/' Packages/JavaScript/JavaScript.sublime-syntax
+
+        # Use extended Markdown syntax
         rm -rf Packages/Markdown
         git clone https://github.com/jonschlinkert/sublime-markdown-extended
+
+        # Add additional sxntax definitions
+        git clone https://github.com/princemaple/elixir-sublime-syntax/
+        git clone https://github.com/sharkdp/sublime_toml_highlighting
     )
 fi
 

src/main.rs

@@ -17,36 +17,39 @@ extern crate directories;
 extern crate git2;
 extern crate syntect;
 
+mod printer;
 mod terminal;
 
 use std::collections::HashMap;
 use std::env;
 use std::fs::{self, File};
-use std::io::{self, BufRead, StdoutLock, Write};
+use std::io::{self, BufRead, BufReader, Write};
-use std::path::Path;
+use std::path::{Path, PathBuf};
-use std::process;
+use std::process::{self, Child, Command, Stdio};
+
+#[cfg(unix)]
+use std::os::unix::fs::FileTypeExt;
 
 use ansi_term::Colour::{Fixed, Green, Red, White, Yellow};
 use ansi_term::Style;
 use atty::Stream;
-use clap::{App, AppSettings, Arg, SubCommand};
+use clap::{App, AppSettings, Arg, ArgGroup, SubCommand};
-use console::Term;
 use directories::ProjectDirs;
 use git2::{DiffOptions, IntoCString, Repository};
 
 use syntect::dumps::{dump_to_file, from_binary, from_reader};
-use syntect::easy::HighlightFile;
+use syntect::easy::HighlightLines;
 use syntect::highlighting::{Theme, ThemeSet};
 use syntect::parsing::SyntaxSet;
 
-use terminal::as_terminal_escaped;
+use printer::Printer;
 
 lazy_static! {
     static ref PROJECT_DIRS: ProjectDirs = ProjectDirs::from("", "", crate_name!());
 }
 
 mod errors {
-    error_chain!{
+    error_chain! {
         foreign_links {
             Io(::std::io::Error);
         }
@@ -55,104 +58,175 @@ mod errors {
 
 use errors::*;
 
-struct Options {
+pub enum OptionsStyle {
-    true_color: bool,
+    Plain,
+    LineNumbers,
+    Full,
+}
+
+pub struct Options<'a> {
+    pub true_color: bool,
+    pub style: OptionsStyle,
+    pub language: Option<&'a str>,
+    pub colored_output: bool,
+    pub paging: bool,
+    pub term_width: usize,
+}
+
+enum OutputType {
+    Pager(Child),
+    Stdout(io::Stdout),
+}
+
+impl OutputType {
+    fn pager() -> Result<Self> {
+        Ok(OutputType::Pager(Command::new("less")
+            .args(&["--quit-if-one-screen", "--RAW-CONTROL-CHARS", "--no-init"])
+            .stdin(Stdio::piped())
+            .spawn()
+            .chain_err(|| "Could not spawn pager")?))
+    }
+
+    fn stdout() -> Self {
+        OutputType::Stdout(io::stdout())
+    }
+
+    fn handle(&mut self) -> Result<&mut Write> {
+        Ok(match *self {
+            OutputType::Pager(ref mut command) => command
+                .stdin
+                .as_mut()
+                .chain_err(|| "Could not open stdin for pager")?,
+            OutputType::Stdout(ref mut handle) => handle,
+        })
+    }
+}
+
+impl Drop for OutputType {
+    fn drop(&mut self) {
+        if let OutputType::Pager(ref mut command) = *self {
+            let _ = command.wait();
+        }
+    }
 }
 
 #[derive(Copy, Clone, Debug)]
-enum LineChange {
+pub enum LineChange {
     Added,
     RemovedAbove,
     RemovedBelow,
     Modified,
 }
 
-type LineChanges = HashMap<u32, LineChange>;
+pub type LineChanges = HashMap<u32, LineChange>;
 
-const PANEL_WIDTH: usize = 7;
 const GRID_COLOR: u8 = 238;
+const LINE_NUMBER_COLOR: u8 = 244;
 
-fn print_horizontal_line(
+#[derive(Default)]
-    handle: &mut StdoutLock,
+pub struct Colors {
-    grid_char: char,
+    pub grid: Style,
-    term_width: usize,
+    pub filename: Style,
-) -> Result<()> {
+    pub git_added: Style,
-    let hline = "─".repeat(term_width - (PANEL_WIDTH + 1));
+    pub git_removed: Style,
-    let hline = format!("{}{}{}", "─".repeat(PANEL_WIDTH), grid_char, hline);
+    pub git_modified: Style,
-
+    pub line_number: Style,
-    writeln!(handle, "{}", Fixed(GRID_COLOR).paint(hline))?;
-
-    Ok(())
 }
 
-fn print_file<P: AsRef<Path>>(
+impl Colors {
+    fn plain() -> Self {
+        Colors::default()
+    }
+
+    fn colored() -> Self {
+        Colors {
+            grid: Fixed(GRID_COLOR).normal(),
+            filename: White.bold(),
+            git_added: Green.normal(),
+            git_removed: Red.normal(),
+            git_modified: Yellow.normal(),
+            line_number: Fixed(LINE_NUMBER_COLOR).normal(),
+        }
+    }
+}
+
+fn print_file(
     options: &Options,
     theme: &Theme,
     syntax_set: &SyntaxSet,
-    filename: P,
+    printer: &mut Printer,
-    line_changes: &Option<LineChanges>,
+    filename: Option<&str>,
 ) -> Result<()> {
-    let mut highlighter = HighlightFile::new(filename.as_ref(), syntax_set, theme)?;
+    let stdin = io::stdin(); // TODO: this is not always needed
 
-    let stdout = io::stdout();
+    let mut reader: Box<BufRead> = match filename {
-    let mut handle = stdout.lock();
+        None => Box::new(stdin.lock()),
+        Some(filename) => Box::new(BufReader::new(File::open(filename)?)),
+    };
 
-    let term = Term::stdout();
+    let syntax = match (options.language, filename) {
-    let (_, term_width) = term.size();
+        (Some(language), _) => syntax_set.find_syntax_by_token(language),
-    let term_width = term_width as usize;
+        (None, Some(filename)) => {
+            #[cfg(not(unix))]
+            let may_read_from_file = true;
 
-    print_horizontal_line(&mut handle, '┬', term_width)?;
+            // Do not peek at the file (to determine the syntax) if it is a FIFO because they can
+            // only be read once.
+            #[cfg(unix)]
+            let may_read_from_file = !fs::metadata(filename)?.file_type().is_fifo();
 
-    writeln!(
+            if may_read_from_file {
-        handle,
+                syntax_set.find_syntax_for_file(filename)?
-        "{}{} File {}",
+            } else {
-        " ".repeat(PANEL_WIDTH),
+                None
-        Fixed(GRID_COLOR).paint("│"),
-        White.bold().paint(filename.as_ref().to_string_lossy())
-    )?;
-
-    print_horizontal_line(&mut handle, '┼', term_width)?;
-
-    for (idx, maybe_line) in highlighter.reader.lines().enumerate() {
-        let line_nr = idx + 1;
-        let line = maybe_line.unwrap_or_else(|_| "<INVALID UTF-8>".into());
-        let regions = highlighter.highlight_lines.highlight(&line);
-
-        let line_change = if let Some(ref changes) = *line_changes {
-            match changes.get(&(line_nr as u32)) {
-                Some(&LineChange::Added) => Green.paint("+"),
-                Some(&LineChange::RemovedAbove) => Red.paint("‾"),
-                Some(&LineChange::RemovedBelow) => Red.paint("_"),
-                Some(&LineChange::Modified) => Yellow.paint("~"),
-                _ => Style::default().paint(" "),
             }
-        } else {
+        }
-            Style::default().paint(" ")
+        (None, None) => None,
+    };
+
+    let syntax = syntax.unwrap_or_else(|| syntax_set.find_syntax_plain_text());
+    let mut highlighter = HighlightLines::new(syntax, theme);
+
+    printer.print_header(filename)?;
+
+    let mut line_nr = 1;
+    let mut line_buffer = String::new();
+    loop {
+        line_buffer.clear();
+        let num_bytes = reader.read_line(&mut line_buffer);
+
+        let line = match num_bytes {
+            Ok(0) => {
+                break;
+            }
+            Ok(_) => {
+                if !line_buffer.ends_with("\n") {
+                    line_buffer.push('\n');
+                }
+                &line_buffer
+            }
+            Err(_) => "<bat: INVALID UTF-8>\n",
         };
 
-        writeln!(
+        let regions = highlighter.highlight(line);
-            handle,
+
-            "{} {} {} {}",
+        printer.print_line(line_nr, &regions)?;
-            Fixed(244).paint(format!("{:4}", line_nr)),
+
-            line_change,
+        line_nr += 1;
-            Fixed(GRID_COLOR).paint("│"),
-            as_terminal_escaped(&regions, options.true_color)
-        )?;
     }
 
-    print_horizontal_line(&mut handle, '┴', term_width)?;
+    printer.print_footer()?;
 
     Ok(())
 }
 
 fn get_git_diff(filename: &str) -> Option<LineChanges> {
-    let repo = Repository::open_from_env().ok()?;
+    let repo = Repository::discover(&filename).ok()?;
-    let workdir = repo.workdir()?;
+    let path_absolute = fs::canonicalize(&filename).ok()?;
-    let current_dir = env::current_dir().ok()?;
+    let path_relative_to_repo = path_absolute.strip_prefix(repo.workdir()?).ok()?;
-    let filepath = current_dir.join(Path::new(&filename));
 
     let mut diff_options = DiffOptions::new();
-    let pathspec = format!("*{}", filename).into_c_string().ok()?;
+    let pathspec = path_relative_to_repo.into_c_string().ok()?;
     diff_options.pathspec(pathspec);
     diff_options.context_lines(0);
 
@@ -174,7 +248,7 @@ fn get_git_diff(filename: &str) -> Option<LineChanges> {
         Some(&mut |delta, hunk| {
             let path = delta.new_file().path().unwrap_or_else(|| Path::new(""));
 
-            if filepath != workdir.join(path) {
+            if path_relative_to_repo != path {
                 return false;
             }
 
@@ -208,6 +282,14 @@ fn get_git_diff(filename: &str) -> Option<LineChanges> {
     Some(line_changes)
 }
 
+fn get_output_type(paging: bool) -> OutputType {
+    if paging {
+        OutputType::pager().unwrap_or_else(|_| OutputType::stdout())
+    } else {
+        OutputType::stdout()
+    }
+}
+
 fn is_truecolor_terminal() -> bool {
     env::var("COLORTERM")
         .map(|colorterm| colorterm == "truecolor" || colorterm == "24bit")
@@ -220,6 +302,14 @@ struct HighlightingAssets {
 }
 
 impl HighlightingAssets {
+    fn theme_set_path() -> PathBuf {
+        PROJECT_DIRS.cache_dir().join("theme_set")
+    }
+
+    fn syntax_set_path() -> PathBuf {
+        PROJECT_DIRS.cache_dir().join("syntax_set")
+    }
+
     fn from_files() -> Result<Self> {
         let config_dir = PROJECT_DIRS.config_dir();
 
@@ -237,7 +327,7 @@ impl HighlightingAssets {
 
         let mut syntax_set = SyntaxSet::new();
         let syntax_dir = config_dir.join("syntax");
-        let _ = syntax_set.load_syntaxes(syntax_dir, false);
+        let _ = syntax_set.load_syntaxes(syntax_dir, true);
         syntax_set.load_plain_text_syntax();
 
         Ok(HighlightingAssets {
@@ -248,45 +338,46 @@ impl HighlightingAssets {
 
     fn save(&self) -> Result<()> {
         let cache_dir = PROJECT_DIRS.cache_dir();
-        let theme_set_path = cache_dir.join("theme_set");
-        let syntax_set_path = cache_dir.join("syntax_set");
-
         let _ = fs::create_dir(cache_dir);
 
-        dump_to_file(&self.theme_set, &theme_set_path).map_err(|_| {
+        print!(
+            "Writing theme set to {} ... ",
+            Self::theme_set_path().to_string_lossy()
+        );
+        dump_to_file(&self.theme_set, &Self::theme_set_path()).map_err(|_| {
             io::Error::new(
                 io::ErrorKind::Other,
                 format!(
                     "Could not save theme set to {}",
-                    theme_set_path.to_string_lossy()
+                    Self::theme_set_path().to_string_lossy()
                 ),
             )
         })?;
-        println!("Wrote theme set to {}", theme_set_path.to_string_lossy());
+        println!("okay");
 
-        dump_to_file(&self.syntax_set, &syntax_set_path).map_err(|_| {
+        print!(
+            "Writing syntax set to {} ... ",
+            Self::syntax_set_path().to_string_lossy()
+        );
+        dump_to_file(&self.syntax_set, &Self::syntax_set_path()).map_err(|_| {
             io::Error::new(
                 io::ErrorKind::Other,
                 format!(
                     "Could not save syntax set to {}",
-                    syntax_set_path.to_string_lossy()
+                    Self::syntax_set_path().to_string_lossy()
                 ),
             )
         })?;
-        println!("Wrote syntax set to {}", syntax_set_path.to_string_lossy());
+        println!("okay");
 
         Ok(())
     }
 
     fn from_cache() -> Result<Self> {
-        let cache_dir = PROJECT_DIRS.cache_dir();
+        let syntax_set_file = File::open(&Self::syntax_set_path()).chain_err(|| {
-        let theme_set_path = cache_dir.join("theme_set");
-        let syntax_set_path = cache_dir.join("syntax_set");
-
-        let syntax_set_file = File::open(&syntax_set_path).chain_err(|| {
             format!(
                 "Could not load cached syntax set '{}'",
-                syntax_set_path.to_string_lossy()
+                Self::syntax_set_path().to_string_lossy()
             )
         })?;
         let mut syntax_set: SyntaxSet = from_reader(syntax_set_file).map_err(|_| {
@@ -297,10 +388,10 @@ impl HighlightingAssets {
         })?;
         syntax_set.link_syntaxes();
 
-        let theme_set_file = File::open(&theme_set_path).chain_err(|| {
+        let theme_set_file = File::open(&Self::theme_set_path()).chain_err(|| {
             format!(
                 "Could not load cached theme set '{}'",
-                theme_set_path.to_string_lossy()
+                Self::theme_set_path().to_string_lossy()
             )
         })?;
         let theme_set: ThemeSet = from_reader(theme_set_file).map_err(|_| {
@@ -329,7 +420,9 @@ impl HighlightingAssets {
 }
 
 fn run() -> Result<()> {
-    let clap_color_setting = if atty::is(Stream::Stdout) {
+    let interactive_terminal = atty::is(Stream::Stdout);
+
+    let clap_color_setting = if interactive_terminal {
         AppSettings::ColoredHelp
     } else {
         AppSettings::ColorNever
@@ -337,35 +430,152 @@ fn run() -> Result<()> {
 
     let app_matches = App::new(crate_name!())
         .version(crate_version!())
-        .setting(clap_color_setting)
+        .global_setting(clap_color_setting)
-        .setting(AppSettings::DeriveDisplayOrder)
+        .global_setting(AppSettings::DeriveDisplayOrder)
-        .setting(AppSettings::UnifiedHelpMessage)
+        .global_setting(AppSettings::UnifiedHelpMessage)
-        .setting(AppSettings::NextLineHelp)
+        .global_setting(AppSettings::NextLineHelp)
-        .setting(AppSettings::DisableVersion)
+        .setting(AppSettings::InferSubcommands)
+        .setting(AppSettings::ArgsNegateSubcommands)
+        .setting(AppSettings::DisableHelpSubcommand)
+        .setting(AppSettings::VersionlessSubcommands)
         .max_term_width(90)
         .about(crate_description!())
+        .arg(
+            Arg::with_name("language")
+                .short("l")
+                .long("language")
+                .help("Set the language for highlighting")
+                .takes_value(true),
+        )
         .arg(
             Arg::with_name("FILE")
                 .help("File(s) to print")
                 .multiple(true)
                 .empty_values(false),
         )
+        .arg(
+            Arg::with_name("style")
+                .long("style")
+                .possible_values(&["auto", "plain", "line-numbers", "full"])
+                .default_value("auto")
+                .help("Additional info to display along with content"),
+        )
+        .arg(
+            Arg::with_name("color")
+                .long("color")
+                .takes_value(true)
+                .possible_values(&["auto", "never", "always"])
+                .default_value("auto")
+                .help("When to use colors"),
+        )
+        .arg(
+            Arg::with_name("paging")
+                .long("paging")
+                .takes_value(true)
+                .possible_values(&["auto", "never", "always"])
+                .default_value("auto")
+                .help("When to use the pager"),
+        )
+        .arg(
+            Arg::with_name("list-languages")
+                .long("list-languages")
+                .help("Displays supported languages"),
+        )
         .subcommand(
-            SubCommand::with_name("init-cache")
+            SubCommand::with_name("cache")
-                .about("Load syntax definitions and themes into cache"),
+                .about("Modify the syntax-definition and theme cache")
+                .arg(
+                    Arg::with_name("init")
+                        .long("init")
+                        .short("i")
+                        .help("Initialize the cache by loading from the config dir"),
+                )
+                .arg(
+                    Arg::with_name("clear")
+                        .long("clear")
+                        .short("c")
+                        .help("Reset the cache"),
+                )
+                .arg(
+                    Arg::with_name("config-dir")
+                        .long("config-dir")
+                        .short("d")
+                        .help("Show the configuration directory"),
+                )
+                .group(
+                    ArgGroup::with_name("cache-actions")
+                        .args(&["init", "clear", "config-dir"])
+                        .required(true),
+                ),
         )
         .help_message("Print this help message.")
         .version_message("Show version information.")
         .get_matches();
 
     match app_matches.subcommand() {
-        ("init-cache", Some(_)) => {
+        ("cache", Some(cache_matches)) => {
-            let assets = HighlightingAssets::from_files()?;
+            if cache_matches.is_present("init") {
-            assets.save()?;
+                let assets = HighlightingAssets::from_files()?;
+                assets.save()?;
+            } else if cache_matches.is_present("clear") {
+                print!("Clearing theme set cache ... ");
+                fs::remove_file(HighlightingAssets::theme_set_path())?;
+                println!("okay");
+
+                print!("Clearing syntax set cache ... ");
+                fs::remove_file(HighlightingAssets::syntax_set_path())?;
+                println!("okay");
+            } else if cache_matches.is_present("config-dir") {
+                println!("{}", PROJECT_DIRS.config_dir().to_string_lossy());
+            }
         }
         _ => {
+            let files: Vec<Option<&str>> = app_matches
+                .values_of("FILE")
+                .map(|values| {
+                    values
+                        .map(|filename| {
+                            if filename == "-" {
+                                None
+                            } else {
+                                Some(filename)
+                            }
+                        })
+                        .collect()
+                })
+                .unwrap_or_else(|| vec![None]); // read from stdin (None) if no args are given
+
             let options = Options {
                 true_color: is_truecolor_terminal(),
+                style: match app_matches.value_of("style") {
+                    Some("plain") => OptionsStyle::Plain,
+                    Some("line-numbers") => OptionsStyle::LineNumbers,
+                    Some("full") => OptionsStyle::Full,
+                    Some("auto") | _ => if interactive_terminal {
+                        OptionsStyle::Full
+                    } else {
+                        OptionsStyle::Plain
+                    },
+                },
+                language: app_matches.value_of("language"),
+                colored_output: match app_matches.value_of("color") {
+                    Some("always") => true,
+                    Some("never") => false,
+                    _ => interactive_terminal,
+                },
+                paging: match app_matches.value_of("paging") {
+                    Some("always") => true,
+                    Some("never") => false,
+                    Some("auto") | _ => if files.contains(&None) {
+                        // If we are reading from stdin, only enable paging if we write to an
+                        // interactive terminal and if we do not *read* from an interactive
+                        // terminal.
+                        interactive_terminal && !atty::is(Stream::Stdin)
+                    } else {
+                        interactive_terminal
+                    },
+                },
+                term_width: console::Term::stdout().size().1 as usize,
             };
 
             let assets =
@@ -378,11 +588,58 @@ fn run() -> Result<()> {
                 )
             })?;
 
-            if let Some(files) = app_matches.values_of("FILE") {
+            if app_matches.is_present("list-languages") {
-                for file in files {
+                let languages = assets.syntax_set.syntaxes();
-                    let line_changes = get_git_diff(&file.to_string());
+
-                    print_file(&options, theme, &assets.syntax_set, file, &line_changes)?;
+                let longest = languages
+                    .iter()
+                    .filter(|s| !s.hidden && s.file_extensions.len() > 0)
+                    .map(|s| s.name.len())
+                    .max()
+                    .unwrap_or(32); // Fallback width if they have no language definitions.
+
+                let separator = " ";
+                for lang in languages {
+                    if lang.hidden || lang.file_extensions.len() == 0 {
+                        continue;
+                    }
+                    print!("{:width$}{}", lang.name, separator, width = longest);
+
+                    // Line-wrapping for the possible file extension overflow.
+                    let desired_width = options.term_width - longest - separator.len();
+                    // Number of characters on this line so far, wrap before `desired_width`
+                    let mut num_chars = 0;
+
+                    let comma_separator = ", ";
+                    let mut extension = lang.file_extensions.iter().peekable();
+                    while let Some(word) = extension.next() {
+                        // If we can't fit this word in, then create a line break and align it in.
+                        let new_chars = word.len() + comma_separator.len();
+                        if num_chars + new_chars >= desired_width {
+                            num_chars = 0;
+                            print!("\n{:width$}{}", "", separator, width = longest);
+                        }
+
+                        num_chars += new_chars;
+                        print!("{}", Green.paint(word as &str));
+                        if extension.peek().is_some() {
+                            print!("{}", comma_separator);
+                        }
+                    }
+                    println!();
                 }
+
+                return Ok(());
+            }
+
+            let mut output_type = get_output_type(options.paging);
+            let handle = output_type.handle()?;
+            let mut printer = Printer::new(handle, &options);
+
+            for file in files {
+                printer.line_changes = file.and_then(|filename| get_git_diff(filename));
+
+                print_file(&options, theme, &assets.syntax_set, &mut printer, file)?;
             }
         }
     }

src/printer.rs

@@ -0,0 +1,145 @@
+use ansi_term::Style;
+use errors::*;
+use std::io::Write;
+use syntect::highlighting;
+use terminal::as_terminal_escaped;
+use {Colors, LineChange, LineChanges, Options, OptionsStyle};
+
+const PANEL_WIDTH: usize = 7;
+
+pub struct Printer<'a> {
+    handle: &'a mut Write,
+    colors: Colors,
+    options: &'a Options<'a>,
+    pub line_changes: Option<LineChanges>,
+}
+
+impl<'a> Printer<'a> {
+    pub fn new(handle: &'a mut Write, options: &'a Options) -> Self {
+        let colors = if options.colored_output {
+            Colors::colored()
+        } else {
+            Colors::plain()
+        };
+
+        Printer {
+            handle,
+            colors,
+            options,
+            line_changes: None,
+        }
+    }
+
+    pub fn print_header(&mut self, filename: Option<&str>) -> Result<()> {
+        match self.options.style {
+            OptionsStyle::Full => {}
+            _ => return Ok(()),
+        }
+
+        self.print_horizontal_line('┬')?;
+
+        write!(
+            self.handle,
+            "{}{} ",
+            " ".repeat(PANEL_WIDTH),
+            self.colors.grid.paint("│"),
+        )?;
+
+        writeln!(
+            self.handle,
+            "{}{}",
+            filename.map_or("", |_| "File: "),
+            self.colors.filename.paint(filename.unwrap_or("STDIN"))
+        )?;
+
+        self.print_horizontal_line('┼')
+    }
+
+    pub fn print_footer(&mut self) -> Result<()> {
+        if let OptionsStyle::Full = self.options.style {
+            self.print_horizontal_line('┴')
+        } else {
+            Ok(())
+        }
+    }
+
+    pub fn print_line(
+        &mut self,
+        line_number: usize,
+        regions: &[(highlighting::Style, &str)],
+    ) -> Result<()> {
+        let decorations = vec![
+            self.print_line_number(line_number),
+            self.print_git_marker(line_number),
+            self.print_line_border(),
+            Some(as_terminal_escaped(
+                &regions,
+                self.options.true_color,
+                self.options.colored_output,
+            )),
+        ];
+
+        write!(
+            self.handle,
+            "{}",
+            decorations
+                .into_iter()
+                .filter_map(|dec| dec)
+                .collect::<Vec<_>>()
+                .join(" ")
+        )?;
+
+        Ok(())
+    }
+
+    fn print_line_number(&self, line_number: usize) -> Option<String> {
+        if let OptionsStyle::Plain = self.options.style {
+            return None;
+        }
+
+        Some(
+            self.colors
+                .line_number
+                .paint(format!("{:4}", line_number))
+                .to_string(),
+        )
+    }
+
+    fn print_git_marker(&self, line_number: usize) -> Option<String> {
+        match self.options.style {
+            OptionsStyle::Full => {}
+            _ => return None,
+        }
+
+        let marker = if let Some(ref changes) = self.line_changes {
+            match changes.get(&(line_number as u32)) {
+                Some(&LineChange::Added) => self.colors.git_added.paint("+"),
+                Some(&LineChange::RemovedAbove) => self.colors.git_removed.paint("‾"),
+                Some(&LineChange::RemovedBelow) => self.colors.git_removed.paint("_"),
+                Some(&LineChange::Modified) => self.colors.git_modified.paint("~"),
+                _ => Style::default().paint(" "),
+            }
+        } else {
+            Style::default().paint(" ")
+        };
+
+        Some(marker.to_string())
+    }
+
+    fn print_line_border(&self) -> Option<String> {
+        if let OptionsStyle::Plain = self.options.style {
+            return None;
+        }
+
+        Some(self.colors.grid.paint("│").to_string())
+    }
+
+    fn print_horizontal_line(&mut self, grid_char: char) -> Result<()> {
+        let hline = "─".repeat(self.options.term_width - (PANEL_WIDTH + 1));
+        let hline = format!("{}{}{}", "─".repeat(PANEL_WIDTH), grid_char, hline);
+
+        writeln!(self.handle, "{}", self.colors.grid.paint(hline))?;
+
+        Ok(())
+    }
+}

src/terminal.rs

@@ -1,6 +1,7 @@
 use std::fmt::Write;
 
 use ansi_term::Colour::{Fixed, RGB};
+use ansi_term::Style;
 use syntect::highlighting;
 
 /// Approximate a 24 bit color value by a 8 bit ANSI code
@@ -25,14 +26,20 @@ fn rgb2ansi(r: u8, g: u8, b: u8) -> u8 {
     }
 }
 
-pub fn as_terminal_escaped(v: &[(highlighting::Style, &str)], true_color: bool) -> String {
+pub fn as_terminal_escaped(
+    v: &[(highlighting::Style, &str)],
+    true_color: bool,
+    colored: bool,
+) -> String {
     let mut s: String = String::new();
     for &(ref style, text) in v.iter() {
-        let style = if true_color {
+        let style = if !colored {
-            RGB(style.foreground.r, style.foreground.g, style.foreground.b)
+            Style::default()
+        } else if true_color {
+            RGB(style.foreground.r, style.foreground.g, style.foreground.b).normal()
         } else {
             let ansi = rgb2ansi(style.foreground.r, style.foreground.g, style.foreground.b);
-            Fixed(ansi)
+            Fixed(ansi).normal()
         };
 
         write!(s, "{}", style.paint(text)).unwrap();