Merge pull request #22 from firebase/tml-exist2

Stop using deprecated fs.existsSync method

Author: mbleigh

bin/firebase

@@ -10,6 +10,7 @@ var errorOut = require('../lib/errorOut');
 var winston = require('winston');
 var logger = require('../lib/logger');
 var fs = require('fs');
+var fsutils = require('../lib/fsutils');
 var path = require('path');
 var chalk = require('chalk');
 var configstore = require('../lib/configstore');
@@ -53,7 +54,7 @@ require('../lib/fetchMOTD')();
 
 process.on('exit', function(code) {
   code = process.exitCode || code;
-  if (!debugging && code < 2 && fs.existsSync(logFilename)) {
+  if (!debugging && code < 2 && fsutils.fileExistsSync(logFilename)) {
     fs.unlinkSync(logFilename);
   }
 

commands/init.js

@@ -3,6 +3,7 @@ var Command = require('../lib/command');
 var Config = require('../lib/config');
 var prompt = require('../lib/prompt');
 var fs = require('fs-extra');
+var fsutils = require('../lib/fsutils');
 var path = require('path');
 var defaultConfig = require('../templates/firebase.json');
 var _ = require('lodash');
@@ -90,7 +91,7 @@ module.exports = new Command('init')
           return RSVP.resolve();
         }
         var absPath = path.resolve(cwd, options.public || '.');
-        if (!fs.existsSync(absPath)) {
+        if (!fsutils.dirExistsSync(absPath)) {
           fs.mkdirsSync(absPath);
           logger.info(chalk.green('✔ '), 'Public directory', chalk.bold(options.public), 'has been created');
         }

lib/config.js

@@ -5,7 +5,7 @@ var FirebaseError = require('./error');
 var _ = require('lodash');
 var resolveProjectPath = require('./resolveProjectPath');
 var path = require('path');
-var fs = require('fs');
+var fsutils = require('./fsutils');
 var loadCJSON = require('./loadCJSON');
 var parseBoltRules = require('./parseBoltRules');
 var triggerRulesGenerator = require('./triggerRulesGenerator');
@@ -86,7 +86,7 @@ Config.prototype._materialize = function(target) {
 Config.prototype._parseFile = function(target, filePath) {
   var fullPath = resolveProjectPath(this.options.cwd, filePath);
   var ext = path.extname(filePath);
-  if (!fs.existsSync(fullPath)) {
+  if (!fsutils.fileExistsSync(fullPath)) {
     throw new FirebaseError('Parse Error: Imported file ' + filePath + ' does not exist', {exit: 1});
   }
 

lib/deploy/functions/prepare.js

@@ -3,6 +3,7 @@
 var _ = require('lodash');
 var cjson = require('cjson');
 var fs = require('fs');
+var fsutils = require('../../fsutils');
 var path = require('path');
 var resolveProjectPath = require('../../resolveProjectPath');
 var RSVP = require('rsvp');
@@ -17,7 +18,7 @@ module.exports = function(context, options, payload) {
   if (payload.functions) {
     if (!_.has(payload.functions, '.source')) {
       return utils.reject('No .source directory specified under "functions", can\'t deploy Google Cloud Functions', {exit: 1});
-    } else if (!fs.existsSync(resolveProjectPath(options.cwd, payload.functions['.source']))) {
+    } else if (!fsutils.dirExistsSync(resolveProjectPath(options.cwd, payload.functions['.source']))) {
       return utils.reject('.source directory specified under "functions" does not exist, can\'t deploy Google Cloud Functions', {exit: 1});
     }
 
@@ -33,17 +34,17 @@ module.exports = function(context, options, payload) {
     var sourceDirName = payload.functions['.source'];
     var sourceDir = options.config.path(sourceDirName);
     var packageJsonFile = path.join(sourceDir, 'package.json');
-    if (fs.existsSync(packageJsonFile)) {
+    if (fsutils.fileExistsSync(packageJsonFile)) {
       try {
         var data = cjson.load(packageJsonFile);
         var indexJsFile = path.join(sourceDir, data.main || 'index.js');
-        if (!fs.existsSync(indexJsFile)) {
+        if (!fsutils.fileExistsSync(indexJsFile)) {
           return utils.reject(path.relative(options.config.projectDir, indexJsFile) + ' does not exist, can\'t deploy Google Cloud Functions', {exit: 1});
         }
       } catch (e) {
         return utils.reject('There was an error reading ' + sourceDirName + path.sep + 'package.json:\n\n' + e.message, {exit: 1});
       }
-    } else if (!fs.existsSync(path.join(sourceDir, 'function.js'))) {
+    } else if (!fsutils.fileExistsSync(path.join(sourceDir, 'function.js'))) {
       return utils.reject('No npm package found in functions .source directory. Please run \'npm init\' inside ' + sourceDirName, {exit: 1});
     }
   }

lib/deploy/hosting/prepare.js

@@ -3,7 +3,7 @@
 var _ = require('lodash');
 var RSVP = require('rsvp');
 var resolveProjectPath = require('../../resolveProjectPath');
-var fs = require('fs');
+var fsutils = require('../../fsutils');
 var utils = require('../../utils');
 
 module.exports = function(context, options, payload) {
@@ -24,7 +24,7 @@ module.exports = function(context, options, payload) {
 
   if (!_.has(payload, 'hosting.public')) {
     return utils.reject('No public directory specified, can\'t deploy hosting', {exit: 1});
-  } else if (!fs.existsSync(resolveProjectPath(options.cwd, payload.hosting.public))) {
+  } else if (!fsutils.dirExistsSync(resolveProjectPath(options.cwd, payload.hosting.public))) {
     return utils.reject('Specified public directory does not exist, can\'t deploy hosting', {exit: 1});
   }
 

lib/detectProjectRoot.js

@@ -1,11 +1,11 @@
 'use strict';
 
-var fs = require('fs');
+var fsutils = require('./fsutils');
 var path = require('path');
 
 module.exports = function(cwd) {
   var projectRootDir = cwd || process.cwd();
-  while (!fs.existsSync(path.resolve(projectRootDir, './firebase.json'))) {
+  while (!fsutils.fileExistsSync(path.resolve(projectRootDir, './firebase.json'))) {
     var parentDir = path.dirname(projectRootDir);
     if (parentDir === projectRootDir) {
       return null;

lib/fsutils.js

@@ -0,0 +1,22 @@
+'use strict';
+
+var fs = require('fs');
+
+module.exports = {
+  fileExistsSync: function(path) {
+    try {
+      var stats = fs.lstatSync(path);
+      return stats.isFile();
+    } catch (e) {
+      return false;
+    }
+  },
+  dirExistsSync: function(path) {
+    try {
+      var stats = fs.lstatSync(path);
+      return stats.isDirectory();
+    } catch (e) {
+      return false;
+    }
+  }
+};