Merge pull request #3 from Megapixel99/develop

Develop

.gitignore

@@ -1 +1,2 @@
 node_modules/
+binarys/

CONTRIBUTING.md

@@ -15,8 +15,8 @@ and
 ```bash
 $ npm install -g pkg
 ```
-##### Building:
-Before pushing any changes, please build the project using:
+##### Building/Releasing:
+Before releasing any new versions, please build the project binary(s) using:
 ```bash
 $ pkg --out-path $PATH_TO_PROJECT/GAM/binarys PATH_TO_PROJECT/GAM/src/manager.js
 ```
@@ -25,4 +25,4 @@ $ pkg --out-path $PATH_TO_PROJECT/GAM/binarys PATH_TO_PROJECT/GAM/src/manager.js
 ##### To Do:
 - Modify build script for Windows and Linux
 - Add CLI option to view current alias
-- Add CLI option to create backups of SSH keys
+- Add CLI option to create backups of SSH keys (In progress)

README.md

@@ -26,6 +26,9 @@ To view a full list of commands and options:
 $ gam help
 ```
 
+****If you have pre-exsisting SSH keys, you may have to recreate them, and copy
+the old keys into the new one to use this CLI application.****
+
 ## Contributing
 Please see `CONTRIBUTING.md`
 

package.json

@@ -1,6 +1,6 @@
 {
  "name": "gam",
- "version": "1.0.0",
+ "version": "1.0.1",
  "description": "GAM is a NodeJS application for managing multiple Git accounts (aliases).",
  "main": "index.js",
  "scripts": {

src/methods.js

@@ -65,14 +65,15 @@ function generateKey(alias, email, passphrase, bits, dir) {
 }
 
 function changeEmail(email) {
- new Promise(function(resolve, reject) {
+ return new Promise(function(resolve, reject) {
  exec("git config --global user.email " + "\"" + email + "\"", (error, stdout, stderr) => {
  if (error) {
  reject(error);
  }
  if (stderr) {
  reject(stderr);
  }
+ resolve();
  });
  }).then(function() {
  exec("git config --local user.email " + "\"" + email + "\"", (error2, stdout, stderr2) => {
@@ -82,20 +83,20 @@ function changeEmail(email) {
  if (stderr2) {
  reject(stderr2);
  }
- resolve();
  });
  });
 }
 
 function changeName(name) {
- new Promise(function(resolve, reject) {
+ return new Promise(function(resolve, reject) {
  exec("git config --global user.name " + "\"" + name + "\"", (error, stdout, stderr) => {
  if (error) {
  reject(error);
  }
  if (stderr) {
  reject(stderr);
  }
+ resolve();
  });
  }).then(function() {
  exec("git config --local user.name " + "\"" + name + "\"", (error2, stdout, stderr2) => {
@@ -105,7 +106,6 @@ function changeName(name) {
  if (stderr2) {
  reject(stderr2);
  }
- resolve();
  });
  })
 }
@@ -258,11 +258,8 @@ async function changeAlias(alias, dir) {
  fs.writeFileSync(path.join(dir, "id_rsa"), fs.readFileSync(path.join(dir, "id_rsa_" + alias)))
  ]
  Promise.all(promises).then(async function() {
- let new_promises = [
- changeEmail(email),
- changeName(name)
- ]
- Promise.all(new_promises).then(async function() {
+ await changeEmail(email).then(async function() {
+ await changeName(name);
  console.log("Successfully changed git alias" + "\n" +
  "Current alias: " + alias);
  }).catch(function(err) {