Merge pull request #64 from MaartenDesnouck/next-version

MaartenDesnouck · web-flow · commit 9441621de620 · 2017-08-06T14:31:41.000+02:00
next version
diff --git a/lib/auth.js b/lib/auth.js
@@ -19,14 +19,11 @@ module.exports = (options) => {
         return getUserInfo(values[0]);
     });
 
-    const finished = gotUserInfo.then((info) => {
+    gotUserInfo.then((info) => {
         process.stdout.write(`You are successfully authenticated as \'${info.email}\'`);
         displayCheckbox('green');
         return;
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, checkedVersion, gotUserInfo, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/clone.js b/lib/clone.js
@@ -37,13 +37,10 @@ module.exports = (identifier) => {
         return unpackRemote(values[1].name);
     });
 
-    const finished = unpacked.then(() => {
+    unpacked.then(() => {
         displayCheckbox('green');
         return;
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotMetadata, downloaded, unpacked, checkedVersion, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/constants.js b/lib/constants.js
@@ -1,4 +1,5 @@
 const path = require('path');
+const os = require('os');
 
 /**
  * Define constants
@@ -15,7 +16,7 @@ function Constants() {
             ],
         },
         'APP_DIR': {
-            value: path.join((process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE), '.google-apps-script'),
+            value: path.join(os.homedir(), '.google-apps-script'),
         },
         'TOKEN_FILE': {
             value: 'token.json',
diff --git a/lib/functions/checkNewVersion.js b/lib/functions/checkNewVersion.js
@@ -44,7 +44,7 @@ function checkNewVersion() {
                         console.log(`${`   ┏`.yellow}${`-`.repeat(scale + 45).yellow}${`┓`.yellow}`);
                         console.log(`${`   |`.yellow}${` `.repeat(scale + 45)}${`|`.yellow}`);
                         console.log(`${`   |`.yellow}${`      Update available ${pjson.version} -> `}${`${latestVersion}`.green}${`        |`.yellow}`);
-                        console.log(`${`   |`.yellow}${`  Run ` + `npm i -g google-apps-script`.blue}${` to update`}${` `.repeat(scale + 2)}${`|`.yellow}`);
+                        console.log(`${`   |`.yellow}${`  Run `}${`npm i -g google-apps-script`.blue}${` to update`}${` `.repeat(scale + 2)}${`|`.yellow}`);
                         console.log(`${`   |`.yellow}${` `.repeat(scale + 45)}${`|`.yellow}`);
                         console.log(`${`   ┗`.yellow}${`-`.repeat(scale + 45).yellow}${`┛`.yellow}`);
                         console.log();
diff --git a/lib/functions/downloadRemote.js b/lib/functions/downloadRemote.js
@@ -38,24 +38,25 @@ function downloadRemote(auth, fileId, dir, method) {
         };
         createFile(file);
 
-        const dest = fs.createWriteStream(path.join(gasDir, constants.META_REMOTE));
+        const remote = path.join(gasDir, constants.META_REMOTE);
         const drive = google.drive('v3');
 
         drive.files.export({
             auth,
             fileId,
             mimeType: constants.MIME_GAS_JSON,
-        }, (err, result) => {
+        }, (err, content) => {
             if (err) {
-                fs.unlinkSync(path.join(gasDir, constants.META_REMOTE));
+                fs.unlinkSync(remote);
                 reject(err);
                 return;
+            } else {
+                createFile({
+                    name: remote,
+                    source: JSON.stringify(content),
+                });
+                resolve();
             }
-        }).pipe(dest);
-
-        dest.on('finish', () => {
-            resolve();
-            return;
         });
     });
 }
diff --git a/lib/functions/packLocal.js b/lib/functions/packLocal.js
@@ -5,7 +5,6 @@ const getAllFiles = require('./getAllFiles.js');
 const constants = require('../constants.js');
 
 const local = path.join(constants.META_DIR, constants.META_LOCAL);
-const remote = path.join(constants.META_DIR, constants.META_REMOTE);
 
 /**
  * Getting the json form of a file.
@@ -20,7 +19,7 @@ function getFileJSON(file, nameWithoutExtension, extension) {
         fs.stat(file, (err, stats) => {
             if (stats.isFile()) {
                 // Read local javascript file
-                fs.readFile(file, 'utf8', (err, content) => {
+                fs.readFile(file, 'utf8', (err, source) => {
                     if (err) {
                         reject(err);
                         return;
@@ -30,7 +29,7 @@ function getFileJSON(file, nameWithoutExtension, extension) {
                     const fileJSON = {
                         name: nameWithoutExtension,
                         type,
-                        source: content,
+                        source,
                     };
                     resolve(fileJSON);
                     return;
@@ -53,20 +52,29 @@ function packLocal() {
     return new Promise((resolve, reject) => {
         const files = getAllFiles('.');
         const promises = [];
+        const filenames = [];
+
         for (const file of files) {
             const extension = path.parse(file).ext;
             const nameWithoutExtension = path.parse(file).name;
-            const folder = path.parse(file).dir
+            const folder = path.parse(file).dir;
 
             // If extension is correct and file does not start with a dot
             if ((extension === '.js' || extension === '.html') && (file[0] !== '.')) {
                 const filename = path.join(folder, nameWithoutExtension).replace(`\\`, `/`);
-                promises.push(getFileJSON(file, filename, extension));
+                if (filenames.includes(filename)) {
+                    reject(`Can't construct a Google Apps Script project with files with the same name: '${filename}.*'`);
+                    return;
+                } else {
+                    filenames.push(filename);
+                    promises.push(getFileJSON(file, filename, extension));
+                }
+
             }
         }
 
         // Reject if there are no correct files
-        if (promises.length === 0) {
+        if (filenames.length === 0) {
             reject(`Can't construct a Google Apps Script project without .js or .html files.`);
             return;
         }
diff --git a/lib/include.js b/lib/include.js
@@ -26,7 +26,7 @@ module.exports = () => {
         return downloadIncludedFiles(values[1], null);
     });
 
-    const finished = downloaded.then((result) => {
+    downloaded.then((result) => {
         process.stdout.write(`${result.successful.length} included file(s) were successfully updated`);
         displayCheckbox('green');
         if (result.failed.length > 0) {
@@ -36,10 +36,7 @@ module.exports = () => {
                 process.stdout.write(`   - ${fail}\n`);
             }
         }
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotId, downloaded, checkedVersion, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/init.js b/lib/init.js
@@ -23,13 +23,10 @@ module.exports = (name) => {
         return remoteCreateProject(values[0], name);
     });
 
-    const finished = createdProject.then((result) => {
+    createdProject.then((result) => {
         displayCheckbox('green');
         clone(result.id, name);
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, createdProject, checkedVersion, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/link.js b/lib/link.js
@@ -32,12 +32,9 @@ module.exports = (identifier) => {
         return downloadRemote(values[1], metadata.id, null, 'link');
     });
 
-    const finished = downloaded.then(() => {
+    downloaded.then(() => {
         displayCheckbox('green');
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotMetadata, downloaded, checkedVersion, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/list.js b/lib/list.js
@@ -13,13 +13,10 @@ module.exports = (nameFilter) => {
     const checkedVersion = checkNewVersion();
     const gotAuth = authenticate([]);
 
-    const listed = Promise.all([gotAuth, checkedVersion, ]).then((values) => {
+    Promise.all([gotAuth, checkedVersion, ]).then((values) => {
         return listScriptFiles(values[0], nameFilter, true, null, []);
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, listed, checkedVersion, ]).catch((err) => {
-        handleError(err, false);
+    }).catch((err) => {
+        handleError(err, true);
         return;
     });
 };
diff --git a/lib/open.js b/lib/open.js
@@ -20,13 +20,10 @@ module.exports = (identifier) => {
         return getMetadata(values[0], values[1]);
     });
 
-    const opened = gotMetadata.then((metadata) => {
+    gotMetadata.then((metadata) => {
         openWebpage(`https://script.google.com/d/${metadata.id}/edit?usp=drive_web`);
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotId, gotMetadata, checkedVersion, opened, ]).catch((err) => {
-        handleError(err, false);
+    }).catch((err) => {
+        handleError(err, true);
         return;
     });
 };
diff --git a/lib/pull.js b/lib/pull.js
@@ -28,27 +28,24 @@ module.exports = (options) => {
         return getMetadata(values[0], values[1]);
     });
 
-    const downloaded = Promise.all([gotMetadata, gotAuth, gotId, ]).then((values) => {
+    const downloaded = Promise.all([gotAuth, gotId, gotMetadata, ]).then((values) => {
         process.stdout.clearLine();
         readline.cursorTo(process.stdout, 0);
-        process.stdout.write(`Pulling \'${values[0].name}\' from Google Drive...`);
-        return downloadRemote(values[1], values[2], '.', 'pull');
+        process.stdout.write(`Pulling \'${values[2].name}\' from Google Drive...`);
+        return downloadRemote(values[0], values[1], '.', 'pull');
     });
 
     const unpacked = downloaded.then(() => {
         return unpackRemote('.');
     });
 
-    const finished = unpacked.then(() => {
+    unpacked.then(() => {
         displayCheckbox('green');
         if (options.include) {
             include();
         }
         return;
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotId, gotMetadata, downloaded, unpacked, checkedVersion, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/push.js b/lib/push.js
@@ -19,43 +19,37 @@ module.exports = () => {
     const gotAuth = authenticate([]);
     const gotId = getId();
 
-    checkedVersion.then(() => {
+    const output = checkedVersion.then(() => {
         process.stdout.write('Pushing code to Google Drive...');
     });
 
-    const gotMetadata = Promise.all([gotAuth, gotId, checkedVersion, ]).then((values) => {
+    let auth;
+    let fileId;
+    const gotMetadata = Promise.all([gotAuth, gotId, checkedVersion, output, ]).then((values) => {
+        auth = values[0];
+        fileId = values[1];
         return getMetadata(values[0], values[1]);
     });
 
-    const downloaded = Promise.all([gotMetadata, gotAuth, gotId, ]).then((values) => {
-        return downloadRemote(values[1], values[2], '.', 'pull');
+    const downloaded = Promise.all([gotAuth, gotId, gotMetadata, ]).then((values) => {
+        return downloadRemote(values[0], values[1], '.', 'pull');
     });
 
-    const packed = gotMetadata.then(() => {
+    const packed = Promise.all([gotMetadata, ]).then(() => {
         return packLocal('.');
     });
 
-    let auth;
-    let fileId;
     const pushed = Promise.all([gotAuth, gotId, downloaded, packed, ]).then((values) => {
-        auth = values[0];
-        fileId = values[1];
         return pushToRemote(auth, fileId, 'local');
     });
 
-    const finished = pushed.then((values) => {
+    pushed.then((values) => {
         displayCheckbox('green');
         return;
     }).catch((err) => {
         // We need to revert and after that show the error
         return pushToRemote(auth, fileId, 'remote').then(() => {
-            handleError(auth, err, true);
+            handleError(err, true);
         });
     });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotId, gotMetadata, packed, checkedVersion, finished, ]).catch((err) => {
-        handleError(err, true);
-        return;
-    });
 };
diff --git a/lib/remote-create.js b/lib/remote-create.js
@@ -23,14 +23,11 @@ module.exports = (name) => {
         return remoteCreateProject(values[0], name);
     });
 
-    const finished = createdProject.then((result) => {
+    createdProject.then((result) => {
         displayCheckbox('green');
         console.log(`[ ${result.id} ] ${result.name}`);
         return;
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, createdProject, checkedVersion, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/remote-delete.js b/lib/remote-delete.js
@@ -33,13 +33,10 @@ module.exports = (identifier) => {
         return remoteDeleteProject(values[0], metadata.id, metadata.name);
     });
 
-    const finished = deleted.then(() => {
+    deleted.then(() => {
         displayCheckbox('green');
         return;
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotMetadata, deleted, checkedVersion, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/remote-rename.js b/lib/remote-rename.js
@@ -33,18 +33,15 @@ module.exports = (identifier, newName) => {
         return remoteRenameProject(values[0], metadata.id, metadata.name, newName);
     });
 
-    const finished = renamed.then((renamed) => {
+    renamed.then((renamed) => {
         if (renamed) {
             displayCheckbox('green');
         } else {
             displayCheckbox('yellow');
             process.stdout.write('Skipped renaming because old and new name appear to be the same\n');
         }
         return;
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotMetadata, renamed, checkedVersion, finished, ]).catch((err) => {
+    }).catch((err) => {
         handleError(err, true);
         return;
     });
diff --git a/lib/show.js b/lib/show.js
@@ -20,13 +20,10 @@ module.exports = (identifier) => {
         return getMetadata(values[0], values[1]);
     });
 
-    const displayed = gotMetadata.then((metadata) => {
+    gotMetadata.then((metadata) => {
         return displayProjectInfo(metadata);
-    });
-
-    // Catch all the errors
-    Promise.all([gotAuth, gotId, gotMetadata, displayed, checkedVersion, ]).catch((err) => {
-        handleError(err, false);
+    }).catch((err) => {
+        handleError(err, true);
         return;
     });
 };
diff --git a/lib/status.js b/lib/status.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
