Merge pull request #34 from firebase/v1.1.3

Jacob Wenger · Jacob Wenger · commit ffa30bcb4d5f · 2014-10-22T15:24:29.000-07:00
v1.1.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.1.3
+- Fixes progress bar so it doesn't stick at 100% at the end of long uploads
+- Improves error messaging on login / token validation if the CLI version is out of date
+
 ## v1.1.2
 - Adds client-side validation of new advanced features with better error messaging
 
diff --git a/lib/api.js b/lib/api.js
@@ -76,7 +76,7 @@ function initApi() {
     }
 
     if (urlParts) {
-      api.adminUrl  = process.env['FIREBASE_ADMIN_URL'];
+      api.adminUrl = process.env['FIREBASE_ADMIN_URL'];
     }
   }
 
diff --git a/lib/app.js b/lib/app.js
@@ -43,7 +43,7 @@ function getPrompt(argv, schema, onComplete, index, results) {
   if (typeof item.beforeValue === 'function') {
     item.beforeValue(results);
   }
-  prompt.get(schema[index], function (error, result) {
+  prompt.get(schema[index], function(error, result) {
     if (error) {
       console.log(chalk.red('Input Error'));
       process.exit(1);
@@ -246,7 +246,7 @@ function uploadSite(settings, directoryRef, argv) {
         }
         if (bar) {
           var uploadedCount = snapshot.hasChild('uploadedCount') ? snapshot.child('uploadedCount').val() : 0;
-          bar.update(uploadedCount / total);
+          bar.update(Math.floor(100 * uploadedCount / total) / 100);
         }
       } else if (status === 'removed') {
         console.log(chalk.green('Sucessfully removed'));
@@ -291,7 +291,7 @@ function getSettings(argv) {
     settingsJSON = fs.readFileSync(settingsFile);
     settings = JSON.parse(settingsJSON);
   } catch (err) {
-    console.log(chalk.red('Initialization Error') +' - Could not read ' +
+    console.log(chalk.red('Initialization Error') + ' - Could not read ' +
                       'firebase.json settings file');
     process.exit(1);
   }
@@ -381,7 +381,7 @@ module.exports = {
             process.exit(1);
           }
           console.log('Writing firebase.json settings file...');
-          var settingsJSON = JSON.stringify(settings, null, 2) + "\n";
+          var settingsJSON = JSON.stringify(settings, null, 2) + '\n';
           try {
             fs.writeFileSync(settingsFile, settingsJSON);
             console.log(chalk.green('Successfully initialized app'));
@@ -565,7 +565,7 @@ module.exports = {
             }
           }
 
-          var settingsJSON = JSON.stringify(settings, null, 2) + "\n";
+          var settingsJSON = JSON.stringify(settings, null, 2) + '\n';
           var settingsFile = path.join(projectDir, 'firebase.json');
           try {
             fs.writeFileSync(settingsFile, settingsJSON);
@@ -606,7 +606,7 @@ module.exports = {
       }
       var settings = getSettings(argv);
       if (typeof(settings.firebase) !== 'string') {
-        console.log(chalk.red('Initialization Error') +' - Could not read ' +
+        console.log(chalk.red('Initialization Error') + ' - Could not read ' +
                           'firebase.json settings file');
         process.exit(1);
       }
@@ -668,7 +668,7 @@ module.exports = {
       }
       var settings = getSettings(argv);
       if (typeof(settings.firebase) !== 'string') {
-        console.log(chalk.red('Initialization Error') +' - Could not read ' +
+        console.log(chalk.red('Initialization Error') + ' - Could not read ' +
                           'firebase.json settings file');
         process.exit(1);
       }
@@ -738,7 +738,7 @@ module.exports = {
   open: function(argv) {
     var settings = getSettings(argv);
     if (typeof(settings.firebase) !== 'string') {
-      console.log(chalk.red('Initialization Error') +' - Could not read ' +
+      console.log(chalk.red('Initialization Error') + ' - Could not read ' +
                         'firebase.json settings file');
       process.exit(1);
     }
diff --git a/lib/auth.js b/lib/auth.js
@@ -41,13 +41,13 @@ var auth = {
       true,
       function(statusCode, response) {
         if (typeof(callback) === 'function') {
-          if (response.success) {
-            setTimeout(callback, 0, null);
-          } else if (response.minCLI) {
-            console.log(chalk.red('Outdated CLI Version') + ' - Please update to at ' +
+          if (typeof(response.error) !== 'undefined') {
+            console.log(chalk.red(response.error.message) + ' - Please update to at ' +
                           'least v' + response.minCLI + ' by running ' +
                           chalk.cyan('npm update -g ' + require('./firebase').name));
             process.exit(1);
+          } else if (response.valid) {
+            setTimeout(callback, 0, null);
           } else {
             setTimeout(callback, 0, new Error('Invalid Access Token'));
           }
@@ -147,23 +147,21 @@ var auth = {
     if (token) {
       this.token = token;
       this.saveConfig(callback);
-    } else if (response.minCLI) {
-      console.log(chalk.red('Outdated CLI Version') + ' - Please update to at least ' +
-                      'v' + response.minCLI + ' by running ' +
-                      chalk.cyan('npm update -g ' + require('./firebase').name));
+    } else if (typeof(response.error) !== 'undefined') {
+      console.log(chalk.red(response.error.message) + ' - Please update to at ' +
+                    'least v' + response.minCLI + ' by running ' +
+                    chalk.cyan('npm update -g ' + require('./firebase').name));
       process.exit(1);
-    } else {
-      if (typeof(callback) === 'function') {
-        setTimeout(callback, 0, new Error('Email or Password Invalid'));
-      }
+    } else if (typeof(callback) === 'function') {
+      setTimeout(callback, 0, new Error('Email or Password Invalid'));
     }
   },
   saveConfig: function(callback) {
     var data = {
       email: this.email,
       token: this.token
     };
-    var dataString = JSON.stringify(data, null, 2) + "\n";
+    var dataString = JSON.stringify(data, null, 2) + '\n';
     try {
       fs.writeFileSync(this.configFile, dataString);
     } catch (err) {
diff --git a/lib/help.js b/lib/help.js
@@ -108,7 +108,7 @@ module.exports = {
             console.log(helpOverview + helpTemplates + helpFooter);
           }, function(error) {
             var errTemplates = '\n                      ';
-            errTemplates +=  chalk.red('Error: ') + 'Could not retrieve available templates.\n';
+            errTemplates += chalk.red('Error: ') + 'Could not retrieve available templates.\n';
 
             console.log(helpOverview + errTemplates + helpFooter);
           });
@@ -145,7 +145,7 @@ module.exports = {
                     '\n' +
                     '      -f, --firebase Overrides the Firebase setting in the firebase.json\n' +
                     '\n' +
-                    '    Deletes the site associated with the Firebase detailed in the firebase.json\n' + 
+                    '    Deletes the site associated with the Firebase detailed in the firebase.json\n' +
                     '    settings file. The current user must have access to the Firebase, and if\n' +
                     '    the user is not currently logged in, they are prompted to do so - see\n' +
                     '    `firebase login --help` for more details.\n');
diff --git a/lib/upload.js b/lib/upload.js
@@ -60,7 +60,7 @@ module.exports = {
       if (message) {
         params.push('message=' + encodeURIComponent(message));
       }
-      var url = api.uploadUrl + '/upload/' + firebase + '?' + params.join('&')
+      var url = api.uploadUrl + '/upload/' + firebase + '?' + params.join('&');
       var readStream = fs.createReadStream(filename);
 
       var r = request.put({
@@ -94,7 +94,7 @@ module.exports = {
       if (message) {
         params.push('message=' + encodeURIComponent(message));
       }
-      var url = api.uploadUrl + '/upload/' + firebase + '?' + params.join('&')
+      var url = api.uploadUrl + '/upload/' + firebase + '?' + params.join('&');
       var readStream = fs.createReadStream(filename);
 
       var r = request.put({
@@ -109,4 +109,4 @@ module.exports = {
       form.append('site', readStream);
     });
   }
-}
+};
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "firebase-tools",
   "preferGlobal": true,
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "The Firebase Command Line Tools",
   "keywords": [
     "firebase",

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ function initApi() {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if (urlParts) {`
`79`		`- api.adminUrl = process.env['FIREBASE_ADMIN_URL'];`
	`79`	`+ api.adminUrl = process.env['FIREBASE_ADMIN_URL'];`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ function getPrompt(argv, schema, onComplete, index, results) {`
`43`	`43`	`if (typeof item.beforeValue === 'function') {`
`44`	`44`	`item.beforeValue(results);`
`45`	`45`	`}`
`46`		`- prompt.get(schema[index], function (error, result) {`
	`46`	`+ prompt.get(schema[index], function(error, result) {`
`47`	`47`	`if (error) {`
`48`	`48`	`console.log(chalk.red('Input Error'));`
`49`	`49`	`process.exit(1);`
`@@ -246,7 +246,7 @@ function uploadSite(settings, directoryRef, argv) {`
`246`	`246`	`}`
`247`	`247`	`if (bar) {`
`248`	`248`	`var uploadedCount = snapshot.hasChild('uploadedCount') ? snapshot.child('uploadedCount').val() : 0;`
`249`		`- bar.update(uploadedCount / total);`
	`249`	`+ bar.update(Math.floor(100 * uploadedCount / total) / 100);`
`250`	`250`	`}`
`251`	`251`	`} else if (status === 'removed') {`
`252`	`252`	`console.log(chalk.green('Sucessfully removed'));`
`@@ -291,7 +291,7 @@ function getSettings(argv) {`
`291`	`291`	`settingsJSON = fs.readFileSync(settingsFile);`
`292`	`292`	`settings = JSON.parse(settingsJSON);`
`293`	`293`	`} catch (err) {`
`294`		`- console.log(chalk.red('Initialization Error') +' - Could not read ' +`
	`294`	`+ console.log(chalk.red('Initialization Error') + ' - Could not read ' +`
`295`	`295`	`'firebase.json settings file');`
`296`	`296`	`process.exit(1);`
`297`	`297`	`}`
`@@ -381,7 +381,7 @@ module.exports = {`
`381`	`381`	`process.exit(1);`
`382`	`382`	`}`
`383`	`383`	`console.log('Writing firebase.json settings file...');`
`384`		`- var settingsJSON = JSON.stringify(settings, null, 2) + "\n";`
	`384`	`+ var settingsJSON = JSON.stringify(settings, null, 2) + '\n';`
`385`	`385`	`try {`
`386`	`386`	`fs.writeFileSync(settingsFile, settingsJSON);`
`387`	`387`	`console.log(chalk.green('Successfully initialized app'));`
`@@ -565,7 +565,7 @@ module.exports = {`
`565`	`565`	`}`
`566`	`566`	`}`
`567`	`567`
`568`		`- var settingsJSON = JSON.stringify(settings, null, 2) + "\n";`
	`568`	`+ var settingsJSON = JSON.stringify(settings, null, 2) + '\n';`
`569`	`569`	`var settingsFile = path.join(projectDir, 'firebase.json');`
`570`	`570`	`try {`
`571`	`571`	`fs.writeFileSync(settingsFile, settingsJSON);`
`@@ -606,7 +606,7 @@ module.exports = {`
`606`	`606`	`}`
`607`	`607`	`var settings = getSettings(argv);`
`608`	`608`	`if (typeof(settings.firebase) !== 'string') {`
`609`		`- console.log(chalk.red('Initialization Error') +' - Could not read ' +`
	`609`	`+ console.log(chalk.red('Initialization Error') + ' - Could not read ' +`
`610`	`610`	`'firebase.json settings file');`
`611`	`611`	`process.exit(1);`
`612`	`612`	`}`
`@@ -668,7 +668,7 @@ module.exports = {`
`668`	`668`	`}`
`669`	`669`	`var settings = getSettings(argv);`
`670`	`670`	`if (typeof(settings.firebase) !== 'string') {`
`671`		`- console.log(chalk.red('Initialization Error') +' - Could not read ' +`
	`671`	`+ console.log(chalk.red('Initialization Error') + ' - Could not read ' +`
`672`	`672`	`'firebase.json settings file');`
`673`	`673`	`process.exit(1);`
`674`	`674`	`}`
`@@ -738,7 +738,7 @@ module.exports = {`
`738`	`738`	`open: function(argv) {`
`739`	`739`	`var settings = getSettings(argv);`
`740`	`740`	`if (typeof(settings.firebase) !== 'string') {`
`741`		`- console.log(chalk.red('Initialization Error') +' - Could not read ' +`
	`741`	`+ console.log(chalk.red('Initialization Error') + ' - Could not read ' +`
`742`	`742`	`'firebase.json settings file');`
`743`	`743`	`process.exit(1);`
`744`	`744`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase-tools",`
`3`	`3`	`"preferGlobal": true,`
`4`		`- "version": "1.1.2",`
	`4`	`+ "version": "1.1.3",`
`5`	`5`	`"description": "The Firebase Command Line Tools",`
`6`	`6`	`"keywords": [`
`7`	`7`	`"firebase",`