Merge branch 'master' into vscode

CHANGELOG.md

@@ -1,3 +1,26 @@
+0.5.1 (2017-04-09)
+==================
+Feature enhancements:
+
+* Added or improved file type filtering for vim.
+* [FEATURE #34](https://github.com/BurntSushi/ripgrep/issues/34):
+  Add a `-o/--only-matching` flag.
+* [FEATURE #377](https://github.com/BurntSushi/ripgrep/issues/377):
+  Column numbers can now be customized with a color. (The default is
+  no color.)
+* [FEATURE #419](https://github.com/BurntSushi/ripgrep/issues/419):
+  Added `-0` short flag option for `--null`.
+
+Bug fixes:
+
+* [BUG #381](https://github.com/BurntSushi/ripgrep/issues/381):
+  Include license text in all subcrates.
+* [BUG #418](https://github.com/BurntSushi/ripgrep/issues/418),
+  [BUG #426](https://github.com/BurntSushi/ripgrep/issues/426),
+  [BUG #439](https://github.com/BurntSushi/ripgrep/issues/439):
+  Fix a few bugs with `-h/--help` output.
+
+
 0.5.0 (2017-03-12)
 ==================
 This is a new minor version release of ripgrep that includes one minor breaking

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ripgrep"
-version = "0.5.0"  #:version
+version = "0.5.1"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 Line oriented search tool using Rust's regex library. Combines the raw
@@ -28,11 +28,11 @@ path = "tests/tests.rs"
 [dependencies]
 atty = "0.2.2"
 bytecount = "0.1.4"
-clap = "2.20.5"
+clap = "2.23.1"
 encoding_rs = "0.5.0"
 env_logger = { version = "0.4", default-features = false }
 grep = { version = "0.1.5", path = "grep" }
-ignore = { version = "0.1.7", path = "ignore" }
+ignore = { version = "0.1.9", path = "ignore" }
 lazy_static = "0.2"
 libc = "0.2"
 log = "0.3"
@@ -44,7 +44,7 @@ same-file = "0.1.1"
 termcolor = { version = "0.3.0", path = "termcolor" }
 
 [build-dependencies]
-clap = "2.18"
+clap = "2.23.1"
 lazy_static = "0.2"
 
 [features]

README.md

@@ -230,11 +230,10 @@ colorize your output and show line numbers, just like The Silver Searcher.
 Coloring works on Windows too! Colors can be controlled more granularly with
 the `--color` flag.
 
-One last thing before we get started: `ripgrep` assumes UTF-8 *everywhere*. It
-can still search files that are invalid UTF-8 (like, say, latin-1), but it will
-simply not work on UTF-16 encoded files or other more exotic encodings.
-[Support for other encodings may
-happen.](https://github.com/BurntSushi/ripgrep/issues/1)
+One last thing before we get started: generally speaking, `ripgrep` assumes the
+input is reading is UTF-8. However, if ripgrep notices a file is encoded as
+UTF-16, then it will know how to search it. For other encodings, you'll need to
+explicitly specify them with the `-E/--encoding` flag.
 
 To recursively search the current directory, while respecting all `.gitignore`
 files, ignore hidden files and directories and skip binary files:
@@ -379,6 +378,51 @@ $ cargo test
 
 from the repository root.
 
+### Tips
+
+#### Windows Powershell
+
+##### Powershell Profile
+
+To customize powershell on start-up there is a special powershell script that has to be created.
+In order to find its location run command `Get-Command $profile | Select-Object -ExpandProperty Definition`
+See [more](https://technet.microsoft.com/en-us/library/bb613488(v=vs.85).aspx) for profile details.
+
+Any powershell code in this file gets evaluated at the start of console.
+This way you can have own aliases to be created at start.
+
+##### Setup function alias
+
+Often you can find a need to make alias for the favourite utility.
+
+But powershell function aliases do not behave like your typical linux shell alias.
+
+You always need to propagate arguments and **Stdin** input.
+But it cannot be done simply as `function grep() { $input | rg.exe --hidden $args }`
+
+Use below example as reference to how setup alias in powershell.
+
+```powershell
+function grep {
+    $count = @($input).Count
+    $input.Reset()
+
+    if ($count) {
+        $input | rg.exe --hidden $args
+    }
+    else {
+        rg.exe --hidden $args
+    }
+}
+```
+
+Powershell special variables:
+* input - is powershell **Stdin** object that allows you to access its content.
+* args - is array of arguments passed to this function.
+
+This alias checks whether there is **Stdin** input and propagates only if there is some lines.
+Otherwise empty `$input` will make powershell to trigger `rg` to search empty **Stdin**
+
 ### Known issues
 
 #### I just hit Ctrl+C in the middle of ripgrep's output and now my terminal's foreground color is wrong!

appveyor.yml

@@ -40,7 +40,7 @@ before_deploy:
   - cargo build --release
   - mkdir staging
   - copy target\release\rg.exe staging
-  - copy target\release\build\ripgrep-*\out\_rg.ps1 staging
+  - ps: copy target\release\build\ripgrep-*\out\_rg.ps1 staging
   - cd staging
     # release zipfile will look like 'rust-everywhere-v1.2.3-x86_64-pc-windows-msvc'
   - 7z a ../%PROJECT_NAME%-%APPVEYOR_REPO_TAG_NAME%-%TARGET%.zip *

build.rs

@@ -19,7 +19,7 @@ fn main() {
     };
     fs::create_dir_all(&outdir).unwrap();
 
-    let mut app = app::app_short();
+    let mut app = app::app();
     app.gen_completions("rg", Shell::Bash, &outdir);
     app.gen_completions("rg", Shell::Fish, &outdir);
     app.gen_completions("rg", Shell::Zsh, &outdir);

ci/install.sh

@@ -17,9 +17,6 @@ install_c_toolchain() {
 }
 
 install_rustup() {
-    # uninstall the rust toolchain installed by travis, we are going to use rustup
-    sh ~/rust/lib/rustlib/uninstall.sh
-
     curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain=$TRAVIS_RUST_VERSION
 
     rustc -V

doc/rg.1

@@ -181,7 +181,7 @@ Styles are limited to nobold, bold, nointense or intense.
 .RS
 .PP
 The format of the flag is {type}:{attribute}:{value}.
-{type} should be one of path, line or match.
+{type} should be one of path, line, column or match.
 {attribute} can be fg, bg or style.
 Value is either a color (for fg and bg) or a text style.
 A special format, {type}:none, will clear all color settings for {type}.
@@ -299,6 +299,13 @@ Follow symlinks.
 .RS
 .RE
 .TP
+.B \-M, \-\-max\-columns \f[I]NUM\f[]
+Don\[aq]t print lines longer than this limit in bytes.
+Longer lines are omitted, and only the number of matches in that line is
+printed.
+.RS
+.RE
+.TP
 .B \-m, \-\-max\-count \f[I]NUM\f[]
 Limit the number of matching lines per file searched to NUM.
 .RS
@@ -355,14 +362,20 @@ Note that .ignore files will continue to be respected.
 .RS
 .RE
 .TP
-.B \-\-null
+.B \-0, \-\-null
 Whenever a file name is printed, follow it with a NUL byte.
 This includes printing filenames before matches, and when printing a
 list of matching files such as with \-\-count, \-\-files\-with\-matches
 and \-\-files.
 .RS
 .RE
 .TP
+.B \-o, \-\-only\-matching
+Print only the matched (non\-empty) parts of a matching line, with each
+such part on a separate output line.
+.RS
+.RE
+.TP
 .B \-\-path\-separator \f[I]SEPARATOR\f[]
 The path separator to use when printing file paths.
 This defaults to your platform\[aq]s path separator, which is / on Unix

doc/rg.1.md

@@ -123,9 +123,9 @@ Project home page: https://github.com/BurntSushi/ripgrep
   black. Styles are limited to nobold, bold, nointense or intense.
 
     The format of the flag is {type}:{attribute}:{value}. {type} should be one
-    of path, line or match. {attribute} can be fg, bg or style. Value is either
-    a color (for fg and bg) or a text style. A special format, {type}:none,
-    will clear all color settings for {type}.
+    of path, line, column or match. {attribute} can be fg, bg or style. Value
+    is either a color (for fg and bg) or a text style. A special format,
+    {type}:none, will clear all color settings for {type}.
 
     For example, the following command will change the match color to magenta
     and the background color for line numbers to yellow:
@@ -243,12 +243,16 @@ Project home page: https://github.com/BurntSushi/ripgrep
 : Don't respect version control ignore files (e.g., .gitignore).
   Note that .ignore files will continue to be respected.
 
---null
+-0, --null
 : Whenever a file name is printed, follow it with a NUL byte.
   This includes printing filenames before matches, and when printing
   a list of matching files such as with --count, --files-with-matches
   and --files.
 
+-o, --only-matching
+: Print only the matched (non-empty) parts of a matching line, with each such
+  part on a separate output line.
+
 --path-separator *SEPARATOR*
 : The path separator to use when printing file paths. This defaults to your
   platform's path separator, which is / on Unix and \\ on Windows. This flag is