Merge pull request #18 from leedium/v2.3.1

V2.3.1

Author: David

README.md

@@ -7,14 +7,27 @@ There is almost to 70% savings in time including the DCU and PLSU transfer proce
 This is still a work in process but has saved me quite some time
 *Web Content data is currently not supported and coming in a later OCC release. (Dec 2018)
 
-### version 
-2.1.1
-- fixes issue with global files not copying
+## \*\* There have been a few users who have reported issues with nodegit and getting the following error:
+`Error: Cannot find module '../build/Debug/nodegit.node'`  
+I can't simulate this issue. If I have time I can look further, but please try [version 2.0.0](https://github.com/leedium/occ-instance-migrator/tree/v2.0.0) as it uses the os installed version of git (which you need to have installed) so give that a try and let me know
+
+### current version
+2.3.1
+
+#### change log
+2.3.1
+    - error handling for missing options/parameters
+
+2.2.1
+    - fixes issue with global files not copying
 
 2.1.0
-- remove os installed git for npm node git
-- other bug fixes
+    - remove os-installed git dependency for npm nodegit
+    - other bug fixes
 
+2.0.0
+    - working version with os-git dependency
+    
 # ATTENTION
 REMEMBER, this will use DCU/PLUS transferALL from TARGET to SOURCE instance.  PLEASE KNOW WHAT YOU ARE DOING.
 

app/app.js

@@ -50,6 +50,10 @@ exports.main = function(argv) {
                 git cli - https://git-scm.com/downloads
                 Oracle DCU -  https://docs.oracle.com/cd/E97801_01/Cloud.18C/ExtendingCC/html/s4305usethedcutograbanduploadsourceco01.html `
     )
+    .command(
+      "oim, -s [sourceserver] -t [sourcekey] -u [targetserver] -v [targetkey]",
+      "Execute a dcu transferAll from source to target instance"
+    )
 
     .usage(
       "-s [sourceserver] -t [sourcekey] -u [targetserver] -v [targetkey]",
@@ -88,12 +92,7 @@ exports.main = function(argv) {
     .parse(argv);
 
   //set defaults
-
-  if (typeof program.taskdelay === "undefined" || isNaN(program.taskdelay)) {
-    program.taskdelay = constants.TASK_DELAY;
-  }
-
-  start();
+    start();
 
   /**
    * Task to clean the working folder before DCU grab executes
@@ -165,7 +164,7 @@ exports.main = function(argv) {
           // DCU TransferAll assets to target server
           await transferAll(program);
         }
-          else{
+        else{
           resolve();
         }
 

app/occ-token-generator.js

@@ -59,7 +59,7 @@ const loginToOCC = (adminServer, token) => {
  */
 const generateToken = async (server, token) => {
   return new Promise((resolve, reject) => {
-    server.indexOf(HTTPS_PREFIX) !== 0 ? `${HTTPS_PREFIX}${server}` : server;
+    server = server.indexOf(HTTPS_PREFIX) !== 0 ? `${HTTPS_PREFIX}${server}` : server;
     const req = function ({ data }){
       //  store the token(s) in a hash
       tokens[server] = data.access_token;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "occ-instance-migrator",
-  "version": "2.1.1",
+  "version": "2.3.1",
   "description": "Tools to help with Oracle Commerce Cloud Solutions",
   "bin": {
     "oim": "./index.js"