sfc-utils 1.3.32 → 1.3.35

package/copy/sheets.js

@@ -37,22 +37,22 @@ var cast = function (str, forceStr) {
 };
 
 let googleAuth = (project, directory = null, forceStr = false) => {
-  return new Promise(resolve => {
+  return new Promise(resolveFinal => {
     var auth = null;
     authObj.authenticate({ fallback: false }).then((resp) => {
       auth = resp;
-      grabSheets(auth, project, directory, forceStr).catch(() => {
+      grabSheets(auth, project, directory, forceStr).then(() => resolveFinal()).catch(() => {
         // If the first attempt failed, then make another req using the fallback
         authObj.authenticate({ fallback: true }).then((resp) => {
           auth = resp;
-          grabSheets(auth, project, directory, forceStr).then(() => resolve());
+          grabSheets(auth, project, directory, forceStr).then(() => resolveFinal());
         });
-      }).then(() => resolve());
+      });
     })
     .catch(() => {
       // Failure if we fall back but there's no token
       auth = authObj.task();
-      grabSheets(auth, project, directory, forceStr).then(() => resolve());
+      grabSheets(auth, project, directory, forceStr).then(() => resolveFinal());
     });
   })
 };
@@ -79,7 +79,6 @@ let grabSheets = (auth, project, directory, forceStr) => {
       });
       promiseStack.push(promiseItem);
     }
-
     Promise.all(promiseStack)
       .then(() => {
         // Resolve the whole thing
@@ -144,8 +143,8 @@ let getSheet = async (resolve, reject, auth, spreadsheetId, directory, forceStr)
     console.log(`Saving sheet to ${file_path}`);
     // grunt.file.write(filename, JSON.stringify(out, null, 2));
     writeFile(file_path, JSON.stringify(out, null, 2));
-    resolve(file_path);
   }
+  resolve("Complete");
 };
 
 module.exports = { googleAuth };

package/example/project-config.json

@@ -2,7 +2,7 @@
   "_comment": "The possible paywall values are 'meter' (hit the paywall after a certain number of free stories), 'paywall' (paywall immediately), 'free' (no wall), or 'meter-no-paywall' (count this against the reader's meter, but never show the paywall on this page)",
   "PAYWALL_SETTING": "meter",
   "EMBEDDED": false,
-  "GOOGLE_SHEETS": [],
+  "GOOGLE_SHEETS": ["1v2U2iG7lEZHaKRgGTeg6xKlyTjZnu_C5uQ1CLSD5iEw"],
   "GOOGLE_DOCS": [],
   
   "_domain_explainer": "NOTE: MAIN_DOMAIN will get swapped out based on the MARKEY_KEY when deployed on the server. If you are building it locally for a repo push, you need to set the domain manually here.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfc-utils",
-  "version": "1.3.32",
+  "version": "1.3.35",
   "author": "ewagstaff <evanjwagstaff@gmail.com>",
   "dependencies": {
     "archieml": "^0.4.2",