0.2.6

This was probably a transcription error when moving the ignore matcher
code out of ripgrep core. Specifically, the override glob matcher should
not ignore directories if they don't match.

Fixes #206

.gitignore

@@ -3,3 +3,4 @@ tags
 target
 /grep/Cargo.lock
 /globset/Cargo.lock
+/ignore/Cargo.lock

CHANGELOG.md

@@ -1,4 +1,16 @@
-0.2.4
+0.2.6
+=====
+Feature enhancements:
+
+* Added or improved file type filtering for Fish.
+
+Bug fixes:
+
+* [BUG #206](https://github.com/BurntSushi/ripgrep/issues/206):
+  Fixed a regression with `-g/--glob` flag in `0.2.5`.
+
+
+0.2.5
 =====
 Feature enhancements:
 
@@ -24,6 +36,12 @@ Bug fixes:
 * [BUG #184](https://github.com/BurntSushi/ripgrep/issues/184):
   Fixed a bug related to interpreting gitignore files in parent directories.
 
+
+0.2.4
+=====
+SKIPPED.
+
+
 0.2.3
 =====
 Bug fixes:

Cargo.lock

@@ -1,13 +1,13 @@
 [root]
 name = "ripgrep"
-version = "0.2.3"
+version = "0.2.5"
 dependencies = [
  "ctrlc 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "deque 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "docopt 0.6.86 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "grep 0.1.3",
- "ignore 0.1.1",
+ "ignore 0.1.3",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -107,7 +107,7 @@ dependencies = [
 
 [[package]]
 name = "ignore"
-version = "0.1.1"
+version = "0.1.3"
 dependencies = [
  "globset 0.1.1",
  "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ripgrep"
-version = "0.2.4"  #:version
+version = "0.2.6"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 Line oriented search tool using Rust's regex library. Combines the raw
@@ -29,7 +29,7 @@ deque = "0.3"
 docopt = "0.6"
 env_logger = "0.3"
 grep = { version = "0.1.3", path = "grep" }
-ignore = { version = "0.1.1", path = "ignore" }
+ignore = { version = "0.1.3", path = "ignore" }
 lazy_static = "0.2"
 libc = "0.2"
 log = "0.3"

appveyor.yml

@@ -60,6 +60,7 @@ deploy:
 
 branches:
   only:
+    - /\d+\.\d+\.\d+/
     - master
     # - appveyor
     # - /\d+\.\d+\.\d+/

ignore/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ignore"
-version = "0.1.1"  #:version
+version = "0.1.3"  #:version
 authors = ["Andrew Gallant <jamslam@gmail.com>"]
 description = """
 A fast library for efficiently matching ignore files such as `.gitignore`

ignore/src/overrides.rs

@@ -79,8 +79,9 @@ impl Override {
     ///
     /// If there are no overrides, then this always returns `Match::None`.
     ///
-    /// If there is at least one whitelist override, then this never returns
-    /// `Match::None`, since non-matches are interpreted as ignored.
+    /// If there is at least one whitelist override and `is_dir` is false, then
+    /// this never returns `Match::None`, since non-matches are interpreted as
+    /// ignored.
     ///
     /// The given path is matched to the globs relative to the path given
     /// when building the override matcher. Specifically, before matching
@@ -97,7 +98,7 @@ impl Override {
             return Match::None;
         }
         let mat = self.0.matched(path, is_dir).invert();
-        if mat.is_none() && self.num_whitelists() > 0 {
+        if mat.is_none() && self.num_whitelists() > 0 && !is_dir {
             return Match::Ignore(Glob::unmatched());
         }
         mat.map(move |giglob| Glob(GlobInner::Matched(giglob)))
@@ -166,7 +167,7 @@ mod tests {
         assert!(ov.matched("a.foo", false).is_whitelist());
         assert!(ov.matched("a.foo", true).is_whitelist());
         assert!(ov.matched("a.rs", false).is_ignore());
-        assert!(ov.matched("a.rs", true).is_ignore());
+        assert!(ov.matched("a.rs", true).is_none());
         assert!(ov.matched("a.bar", false).is_ignore());
         assert!(ov.matched("a.bar", true).is_ignore());
     }
@@ -199,4 +200,18 @@ mod tests {
         assert!(ov.matched("baz/a", false).is_whitelist());
         assert!(ov.matched("baz/a/b", false).is_whitelist());
     }
+
+    #[test]
+    fn allow_directories() {
+        // This tests that directories are NOT ignored when they are unmatched.
+        let ov = ov(&["*.rs"]);
+        assert!(ov.matched("foo.rs", false).is_whitelist());
+        assert!(ov.matched("foo.c", false).is_ignore());
+        assert!(ov.matched("foo", false).is_ignore());
+        assert!(ov.matched("foo", true).is_none());
+        assert!(ov.matched("src/foo.rs", false).is_whitelist());
+        assert!(ov.matched("src/foo.c", false).is_ignore());
+        assert!(ov.matched("src/foo", false).is_ignore());
+        assert!(ov.matched("src/foo", true).is_none());
+    }
 }

ignore/src/types.rs

@@ -99,6 +99,7 @@ const DEFAULT_TYPES: &'static [(&'static str, &'static [&'static str])] = &[
     ("d", &["*.d"]),
     ("elisp", &["*.el"]),
     ("erlang", &["*.erl", "*.hrl"]),
+    ("fish", &["*.fish"]),
     ("fortran", &[
         "*.f", "*.F", "*.f77", "*.F77", "*.pfo",
         "*.f90", "*.F90", "*.f95", "*.F95",

pkg/brew/ripgrep-bin.rb

@@ -1,9 +1,9 @@
 class RipgrepBin < Formula
-  version '0.2.3'
+  version '0.2.5'
   desc "Search tool like grep and The Silver Searcher."
   homepage "https://github.com/BurntSushi/ripgrep"
   url "https://github.com/BurntSushi/ripgrep/releases/download/#{version}/ripgrep-#{version}-x86_64-apple-darwin.tar.gz"
-  sha256 "7407555dfe040a2631a7efdd1eea62cf1d1c50e5a6ecf8ee82e0bef9d5f37298"
+  sha256 "c6775a50c6f769de2ee66892a700961ec60a85219aa414ef6880dfcc17bf2467"
 
   conflicts_with "ripgrep"
 

tests/tests.rs

@@ -865,6 +865,16 @@ clean!(regression_184, "test", ".", |wd: WorkDir, mut cmd: Command| {
     assert_eq!(lines, "baz:test\n");
 });
 
+// See: https://github.com/BurntSushi/ripgrep/issues/206
+clean!(regression_206, "test", ".", |wd: WorkDir, mut cmd: Command| {
+    wd.create_dir("foo");
+    wd.create("foo/bar.txt", "test");
+    cmd.arg("-g").arg("*.txt");
+
+    let lines: String = wd.stdout(&mut cmd);
+    assert_eq!(lines, format!("{}:test\n", path("foo/bar.txt")));
+});
+
 // See: https://github.com/BurntSushi/ripgrep/issues/20
 sherlock!(feature_20_no_filename, "Sherlock", ".",
 |wd: WorkDir, mut cmd: Command| {