Merge branch 'master' of https://github.com/99xt/serverless-dynamodb-local

Conflicts:
	dynamodb/core.js
	dynamodb/installer.js
	index.js

Author: mjzone

dynamodb/core.js

@@ -3,7 +3,7 @@
 const _ = require('lodash'),
     BbPromise = require('bluebird'),
     tables = require('./tables/core'),
-    dynamodb = require('./dynamodb/core');
+    dynamodbLocal = require('dynamodb-localhost');
 
 module.exports = function(S) { // Always pass in the ServerlessPlugin Class
     const SCli = require(S.getServerlessPath('utils/cli'));
@@ -45,6 +45,12 @@ module.exports = function(S) { // Always pass in the ServerlessPlugin Class
                 context: 'dynamodb',
                 contextAction: 'remove'
             });
+            S.addAction(this.install.bind(this), {
+                handler: 'dynamodbInstall',
+                description: 'Install dynamodb local database. This is a single time operation.',
+                context: 'dynamodb',
+                contextAction: 'install'
+            });
             S.addAction(this.start.bind(this), {
                 handler: 'dynamodbStart',
                 description: 'Start dynamodb local database',
@@ -101,7 +107,15 @@ module.exports = function(S) { // Always pass in the ServerlessPlugin Class
          */
 
         remove() {
-            return dynamodb.remove();
+            return new BbPromise(function(resolve, reject) {
+                dynamodbLocal.remove(resolve);
+            });
+        }
+
+        install() {
+            return new BbPromise(function(resolve, reject) {
+                dynamodbLocal.install(resolve);
+            });
         }
 
         table(evt) {
@@ -132,18 +146,18 @@ module.exports = function(S) { // Always pass in the ServerlessPlugin Class
                     options = _.merge({
                             sharedDb: evt.options.sharedDb || true
                         },
-                        evt.options, { downloadFrom: config.downloadFrom },
+                        evt.options,
                         config && config.start
-                    ),
-                    _spinner = SCli.spinner();
+                    );
                 if (options.create) {
-                    dynamodb.start(options).then(function() {
-                        console.log(""); // seperator
-                        self.table(evt).then(resolve, reject);
-                    });
+                    dynamodbLocal.start(options);
+                    console.log(""); // seperator
+                    self.table(evt);
+                    resolve();
                 } else {
-                    _spinner.start();
-                    dynamodb.start(options, _spinner).then(resolve, reject);
+                    dynamodbLocal.start(options);
+                    console.log("");
+                    resolve();
                 }
             });
         }

dynamodb/installer.js

@@ -1,17 +1,17 @@
 {
-    "name": "serverless-dynamodb-local",
-    "version": "0.1.0",
-    "engines": {
-        "node": ">=4.0"
-    },
-    "description": "Serverless dynamodb local plugin",
-    "author": "99xtechnology.com",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/99xt/serverless-dynamodb-local"
-    },
-    "keywords": [
+  "name": "serverless-dynamodb-local",
+  "version": "0.1.0",
+  "engines": {
+    "node": ">=4.0"
+  },
+  "description": "Serverless dynamodb local plugin",
+  "author": "99xtechnology.com",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/99xt/serverless-dynamodb-local"
+  },
+  "keywords": [
     "serverless framework plugin",
     "serverless applications",
     "serverless plugins",
@@ -26,20 +26,21 @@
     "amazon web services",
     "serverless.com"
   ],
-    "main": "index.js",
-    "bin": {},
-    "scripts": {
-        "test": "echo \"Warning: no test specified\" && exit 0"
-    },
-    "devDependencies": {
-        "chai": "^3.2.0",
-        "mocha": "^2.2.5"
-    },
-    "dependencies": {
-        "aws-sdk": "^2.3.19",
-        "bluebird": "^3.0.6",
-        "lodash": "^4.13.1",
-        "mkdirp": "^0.5.0",
-        "tar": "^2.0.0"
-    }
+  "main": "index.js",
+  "bin": {},
+  "scripts": {
+    "test": "echo \"Warning: no test specified\" && exit 0"
+  },
+  "devDependencies": {
+    "chai": "^3.2.0",
+    "mocha": "^2.2.5"
+  },
+  "dependencies": {
+    "aws-sdk": "^2.3.19",
+    "bluebird": "^3.0.6",
+    "dynamodb-localhost": "0.0.2",
+    "lodash": "^4.13.1",
+    "mkdirp": "^0.5.0",
+    "tar": "^2.0.0"
+  }
 }