Merge branch 'hotfix/windows-glob-fix'

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Push Changelog
 All notable changes to Push will be documented in this file. If this file has appeared within Visual Studio Code, it means that Push has had a notable update. You can easily disable this feature by setting the `njpPush.showChangelog` to `false`.
 
+## 0.5.1
+ - Fixed path detection and handling for certain cases in Windows. Sorry, Windows users! (Thanks, Matt!)
+
 ## 0.5.0
  - Add support for environments within service configs. This is a big feature, please check the README!
  - Altered the settingsFile configuration somewhat. New service settings files will be named `.push.settings.jsonc` to signify that they can contain comments. Your current service files will still work with the old filename, but if you have customised the filename, please take note of this setting and its partner setting, `settingsFileGlob`.

package.json

@@ -2,7 +2,7 @@
   "name": "push",
   "displayName": "Push",
   "description": "SFTP and File based uploading",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "publisher": "njp-anderson",
   "engines": {
     "vscode": "^1.22.0"

src/Push.js

@@ -325,8 +325,9 @@ class Push extends PushBase {
 			// Settings retrieved from JSON file within context
 			newConfig.env = settings.data.env;
 			newConfig.serviceName = settings.data.service;
-			newConfig.serviceFilename = settings.file,
-				newConfig.service = settings.data[newConfig.serviceName];
+			newConfig.serviceFilename = settings.file;
+			newConfig.serviceUri = settings.uri;
+			newConfig.service = settings.data[newConfig.serviceName];
 			newConfig.serviceSettingsHash = settings.hash;
 
 			// Expand environment variables

src/lib/Paths.js

@@ -6,7 +6,6 @@ const glob = require('glob');
 
 const ExtendedStream = require('./ExtendedStream');
 const PathCache = require('../lib/PathCache');
-const PushError = require('../lib/PushError');
 
 class Paths {
 	fileExists(file) {
@@ -204,8 +203,6 @@ class Paths {
 	 * @param {array} [ignoreGlobs] - List of globs to ignore.
 	 */
 	getDirectoryContentsAsFiles(include, ignoreGlobs = [], followSymlinks = false) {
-		let parsed;
-
 		if (include instanceof vscode.Uri) {
 			// Create path out of Uri
 			include = `${this.getNormalPath(include)}${path.sep}**`;
@@ -216,14 +213,9 @@ class Paths {
 			include = path.join.apply(path, include);
 		}
 
-		include = (include.split(path.sep)).join('/');
-		parsed = path.parse(include);
-
-		include = include.replace(parsed.root, '/');
-
 		return new Promise((resolve, reject) => {
 			new glob.Glob(
-				include,
+				this.ensureGlobPath(include),
 				this.getGlobOptions({
 					ignore: ignoreGlobs,
 					follow: followSymlinks
@@ -246,7 +238,7 @@ class Paths {
 			}
 
 			new glob.Glob(
-				`${this.getNormalPath(uri)}`,
+				`${this.ensureGlobPath(uri)}`,
 				this.getGlobOptions({
 					ignore: ignoreGlobs
 				}),
@@ -289,7 +281,7 @@ class Paths {
 	 * the root of the active workspace is reached.
 	 * @param {string} file - The filename to look for. Supports globs.
 	 * @param {string} startDir - The directory to start looking in.
-	 * @returns {string|null} - Either the matched filename, or `null`.
+	 * @returns {Uri|null} - Either the matched Uri, or `null`.
 	 */
 	findFileInAncestors(file, startDir) {
 		let matches,
@@ -302,19 +294,22 @@ class Paths {
 			};
 
 		// while (!fs.existsSync(startDir + path.sep + file)) {
-		while (!(matches = (glob.sync(startDir + path.sep + file, globOptions))).length) {
-			// console.log(glob.sync(startDir + path.sep + file));
+		while (!(matches = (glob.sync(
+				this.ensureGlobPath(startDir + path.sep + file),
+				globOptions
+			))).length) {
 			if (rootPaths.indexOf(startDir) !== -1 || loop === 50) {
 				// dir matches any root paths or hard loop limit reached
 				return null;
 			}
 
 			// Strip off directory basename
-			startDir = startDir.substring(0, startDir.lastIndexOf(path.sep));
+			startDir = path.dirname(startDir);
+			// startDir = startDir.substring(0, startDir.lastIndexOf('/'));
 			loop += 1;
 		}
 
-		return matches[0];
+		return vscode.Uri.file(matches[0]);
 	}
 
 	/**
@@ -465,6 +460,16 @@ class Paths {
 			});
 		});
 	}
+
+	/**
+	 * Ensures a path can be used with glob (even on windows)
+	 * @param {string} pathName - The path to make glob 'friendly'
+	 */
+	ensureGlobPath(pathName) {
+		pathName = this.getNormalPath(pathName);
+		pathName = pathName.replace(/\\/g, '/');
+		return pathName;
+	}
 }
 
 Paths.sep = path.sep;

src/lib/ServiceSettings.js

@@ -124,10 +124,10 @@ class ServiceSettings {
 
 	getServerFile(dir, settingsFilename) {
 		// Find the settings file
-		let file = this.paths.findFileInAncestors(
+		let file = this.paths.getNormalPath(this.paths.findFileInAncestors(
 			settingsFilename,
 			dir
-		);
+		));
 
 		if (file !== '' && fs.existsSync(file)) {
 			// File isn't empty and exists - read and set into cache
@@ -187,6 +187,7 @@ class ServiceSettings {
 				// Cache entry
 				this.settingsCache[uriPath] = {
 					file: settings.file,
+					uri: vscode.Uri.file(settings.file),
 					fileContents: settings.contents,
 					newFile,
 					data,