Change downloadDirectory to downloadFrom

Author: mjzone

dynamodb/core.js

@@ -32,7 +32,7 @@ let runningProcesses = {},
             return new BbPromise(function(resolve, reject) {
                 /* Dynamodb local documentation http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/DynamoDBLocal.html */
                 let additionalArgs = [],
-                    downloadDirectory = options.downloadDirectory || DB_PATH;
+                    downloadFrom = options.downloadFrom || DB_PATH;
                 options.port = options.port || 8000;
 
                 if (options.dbPath) { 
@@ -55,14 +55,14 @@ let runningProcesses = {},
                 if (options.help) {
                     additionalArgs.push('-help');
                 }
-                installer.setup(downloadDirectory, DOWNLOAD_PATH, JAR, spinner)
+                installer.setup(downloadFrom, DOWNLOAD_PATH, JAR, spinner)
                     .then(function() {
                         let args = [
-                            '-Djava.library.path=' + downloadDirectory + '/DynamoDBLocal_lib', '-jar', JAR, '-port', options.port
+                            '-Djava.library.path=' + downloadFrom + '/DynamoDBLocal_lib', '-jar', JAR, '-port', options.port
                         ];
                         args = args.concat(additionalArgs);
                         let child = spawn('java', args, {
-                            cwd: downloadDirectory,
+                            cwd: downloadFrom,
                             env: process.env,
                             stdio: ['pipe', 'pipe', process.stderr]
                         });
@@ -83,7 +83,7 @@ let runningProcesses = {},
                         console.log('Started: Dynamodb local(pid=' + child.pid + ') ', 'via java', args.join(' '));
                         console.log('Visit: http://localhost:' + options.port + '/shell');
                         writeFile(DB_PATH + '/options.json', options).then(resolve, reject);
-                        writeFile(DB_PATH + '/path.json', downloadDirectory);
+                        writeFile(DB_PATH + '/path.json', downloadFrom);
                     });
             });
         },
@@ -98,9 +98,9 @@ let runningProcesses = {},
             this.start(port, db);
         },
         remove: function() {
-            let downloadedDirectory = JSON.parse(fs.readFileSync(DB_PATH + '/path.json', 'utf8'));
-            console.log("removing dynamodb from ", downloadedDirectory);
-            installer.remove(downloadedDirectory);
+            let downloadedFrom = JSON.parse(fs.readFileSync(DB_PATH + '/path.json', 'utf8'));
+            console.log("removing dynamodb from ", downloadedFrom);
+            installer.remove(downloadedFrom);
         }
     };
 

index.js

@@ -83,7 +83,7 @@ module.exports = function(S) { // Always pass in the ServerlessPlugin Class
                     shortcut: 'c',
                     description: 'After starting dynamodb local, create dynamodb tables and run seeds'
                 }, {
-                    option: 'downloadDirectory',
+                    option: 'downloadFrom',
                     shortcut: 'D',
                     description: 'Specify the path where you want to download dynamodb. Default path is serverless-dynamodb-local/dynamodb/bin'
                 }]
@@ -132,7 +132,7 @@ module.exports = function(S) { // Always pass in the ServerlessPlugin Class
                     options = _.merge({
                             sharedDb: evt.options.sharedDb || true
                         },
-                        evt.options,
+                        evt.options, { downloadFrom: config.downloadFrom },
                         config && config.start
                     ),
                     _spinner = SCli.spinner();