adjust glob handling to allow posix and OS separators

fixes #320

Author: aronatkins

CHANGELOG.md

@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Quarto content automatically ignores `name.html` and `name_files` when
   `name.md`, `name.ipynb`, `name.Rmd`, or `name.qmd` is an input. (#553)
 
+- Patterns provided to `--exclude` allow NT-style paths on Windows. (#320)
+
 ### Removed
 
 - Python 3.7 support.

rsconnect/models.py

@@ -2,7 +2,7 @@
 Data models
 """
 
-import os
+import pathlib
 import re
 
 import fnmatch
@@ -163,6 +163,7 @@ class GlobMatcher(object):
     """
 
     def __init__(self, pattern):
+        pattern = pathlib.PurePath(pattern).as_posix()
         if pattern.endswith("/**/*"):
             # Note: the index used here makes sure the pattern has a trailing
             # slash.  We want that.
@@ -185,7 +186,8 @@ def _to_parts_list(pattern):
         :return: a list of pattern pieces and the index of the special '**' pattern.
         The index will be None if `**` is never found.
         """
-        parts = pattern.split(os.path.sep)
+        # Incoming pattern is ALWAYS a Posix-style path.
+        parts = pattern.split("/")
         depth_wildcard_index = None
         for index, name in enumerate(parts):
             if name == "**":
@@ -197,10 +199,12 @@ def _to_parts_list(pattern):
         return parts, depth_wildcard_index
 
     def _match_with_starts_with(self, path):
+        path = pathlib.PurePath(path).as_posix()
         return path.startswith(self._pattern)
 
     def _match_with_list_parts(self, path):
-        parts = path.split(os.path.sep)
+        path = pathlib.PurePath(path).as_posix()
+        parts = path.split("/")
 
         def items_match(i1, i2):
             if i2 >= len(parts):

tests/test_models.py

@@ -88,11 +88,30 @@ def test_glob_matcher(self):
         cases = [
             ("dir", "dir", True),
             ("dir", "file", False),
+            ("*.txt", "file.txt", True),
+            ("*.txt", "file.csv", False),
+
             ("dir", "dir/file", False),
+            ("dir/*", "file", False),
+            ("dir/*", "dir/file", True),
+            ("dir/*", "dir/sub/file", False),
             ("dir/*.txt", "file", False),
             ("dir/*.txt", "dir/file", False),
             ("dir/*.txt", "dir/file.txt", True),
             ("dir/*.txt", "dir/.txt", True),
+
+            # recursive wildcard pattern using "/" (input paths using OS separator)
+            ("dir/**/*", "dirfile.txt", False),
+            ("dir/**/*", os.path.join("dirother", "a.txt"), False),
+            ("dir/**/*", os.path.join("dir", "a.txt"), True),
+            ("dir/**/*", os.path.join("dir", "sub", "a.txt"), True),
+            ("dir/**/*.txt", os.path.join("dirother", "a.txt"), False),
+            ("dir/**/*.txt", os.path.join("dir", "a.txt"), True),
+            ("dir/**/*.txt", os.path.join("dir", "a.csv"), False),
+            ("dir/**/*.txt", os.path.join("dir", "sub", "a.txt"), True),
+            ("dir/**/*.txt", os.path.join("dir", "sub", "a.csv"), False),
+
+            # recursive wildcards using OS path separator.
             (os.path.join("dir", "**", "*.txt"), os.path.join("dir", "a.txt"), True),
             (os.path.join("dir", "**", "*.txt"), os.path.join("dir", "sub", "a.txt"), True),
             (os.path.join("dir", "**", "*.txt"), os.path.join("dir", "sub", "sub", "a.txt"), True),
@@ -103,15 +122,13 @@ def test_glob_matcher(self):
             (os.path.join("dir", "**", "*"), os.path.join("dir", "abc"), True),
         ]
 
-        for case in cases:
-            matcher = GlobMatcher(case[0])
-            msg = "Pattern: %s, Path: %s, expected: %s, got: %s" % (
-                case[0],
-                case[1],
-                case[2],
-                not case[2],
+        for pattern, path, expected in cases:
+            matcher = GlobMatcher(pattern)
+            self.assertEqual(
+                matcher.matches(path),
+                expected,
+                f"pattern: {pattern}; path: {path}; expected: {expected}",
             )
-            self.assertEqual(matcher.matches(case[1]), case[2], msg)
 
         with self.assertRaises(ValueError):
             GlobMatcher(os.path.join(".", "blah", "**", "blah", "**", "*.txt"))