Merge pull request #899 from opencomponents/fixComponentReloadingOnWindows

Fix oc-cli breaking on Windows when modifying files

Author: matteofigus

src/cli/domain/watch.js

@@ -19,7 +19,7 @@ module.exports = function(dirs, baseDir, changed) {
       (fileName, currentStat, previousStat) => {
         if (!!currentStat || !!previousStat) {
           const componentDir = dirs.find(dir =>
-            Boolean(fileName.match(dir + path.sep))
+            Boolean(fileName.match(escapeRegularExpression(dir + path.sep)))
           );
           changed(null, fileName, componentDir);
         }
@@ -29,3 +29,7 @@ module.exports = function(dirs, baseDir, changed) {
     changed(err);
   }
 };
+
+function escapeRegularExpression(text) {
+  return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}

test/unit/cli-domain-watch.js

@@ -5,7 +5,7 @@ const injectr = require('injectr');
 const sinon = require('sinon');
 
 describe('cli : domain : watch', () => {
-  const execute = (fileChanged, cb) => {
+  const execute = (fileChanged, separator, cb) => {
     class Stats {
       constructor(settings) {
         this.stuff = settings.stuff;
@@ -15,7 +15,7 @@ describe('cli : domain : watch', () => {
     const watch = injectr('../../src/cli/domain/watch.js', {
       path: {
         resolve: x => x,
-        sep: '/'
+        sep: separator
       },
       watch: {
         watchTree: sinon
@@ -30,6 +30,7 @@ describe('cli : domain : watch', () => {
 
     watch(
       [
+        'C:\\Windows-like\\path\\to\\yet-another-component',
         '/path/to/my-component',
         '/path/to/my-component2',
         '/path/to/some-other-component'
@@ -44,6 +45,7 @@ describe('cli : domain : watch', () => {
     before(done => {
       execute(
         '/path/to/my-component/server.js',
+        '/',
         (error, fileName, componentDir) => {
           result = { error, fileName, componentDir };
           done();
@@ -69,6 +71,7 @@ describe('cli : domain : watch', () => {
     before(done => {
       execute(
         '/path/to/my-component2/server.js',
+        '/',
         (error, fileName, componentDir) => {
           result = { error, fileName, componentDir };
           done();
@@ -88,4 +91,34 @@ describe('cli : domain : watch', () => {
       expect(result.componentDir).to.equal('/path/to/my-component2');
     });
   });
+
+  describe('when a file from a component on Windows-like path changes', () => {
+    let result;
+    before(done => {
+      execute(
+        'C:\\Windows-like\\path\\to\\yet-another-component\\server.js',
+        '\\',
+        (error, fileName, componentDir) => {
+          result = { error, fileName, componentDir };
+          done();
+        }
+      );
+    });
+
+    it('should return no error', () => {
+      expect(result.error).to.be.null;
+    });
+
+    it('should return the fileName', () => {
+      expect(result.fileName).to.equal(
+        'C:\\Windows-like\\path\\to\\yet-another-component\\server.js'
+      );
+    });
+
+    it('should return the component folder', () => {
+      expect(result.componentDir).to.equal(
+        'C:\\Windows-like\\path\\to\\yet-another-component'
+      );
+    });
+  });
 });