Upgrade to version 2.0 of Javascript SDK.

.gitignore

@@ -1 +1,3 @@
 .idea
+/node_modules
+.DS_Store

.travis.yml

@@ -0,0 +1,6 @@
+language: node_js
+node_js:
+  - "6.1"
+before_script:
+  - npm install grunt-cli -g
+

Gruntfile.js

@@ -1,31 +1,20 @@
 module.exports = function(grunt) {
 	var files = [
-        "lib/modules/util/Event.js",
-        "lib/modules/util/Logger.js",
         "lib/modules/util/Promise.js",
-        "lib/modules/util/Ajax.js",
+        "lib/modules/util/lodash.js",
+        "lib/modules/UsergridEnums.js",
+        "lib/modules/util/UsergridHelpers.js",
+        "lib/modules/UsergridClient.js",
         "lib/Usergrid.js",
-		"lib/modules/Client.js",
-		"lib/modules/Entity.js",
-		"lib/modules/Collection.js",
-		"lib/modules/Group.js",
-		"lib/modules/Counter.js",
-		"lib/modules/Folder.js",
-		"lib/modules/Asset.js",
-		"lib/modules/Error.js"
-	];
-	var tests = ["tests/mocha/index.html", "tests/mocha/test_*.html"];
-	// Project configuration.
-	grunt.initConfig({
-        //pkg: grunt.file.readJSON('package.json'),
-        "meta": {
-            "package": grunt.file.readJSON("package.json")
-        },
-        "clean": ["usergrid.js", "usergrid.min.js"],
-        "uglify": {
-            "unminified": {
-                "options": {
-                    "banner": "/*! \n\
+        "lib/modules/UsergridQuery.js",
+        "lib/modules/UsergridRequest.js",
+        "lib/modules/UsergridAuth.js",
+        "lib/modules/UsergridEntity.js",
+        "lib/modules/UsergridUser.js",
+        "lib/modules/UsergridResponse.js",
+        "lib/modules/UsergridAsset.js"
+    ];
+    var banner = "/*! \n\
  *Licensed to the Apache Software Foundation (ASF) under one\n\
  *or more contributor license agreements.  See the NOTICE file\n\
  *distributed with this work for additional information\n\
@@ -45,50 +34,32 @@ module.exports = function(grunt) {
  * \n\
  * \n\
  * <%= meta.package.name %>@<%= meta.package.version %> <%= grunt.template.today('yyyy-mm-dd') %> \n\
- */\n",
+ */\n";
+
+	// Project configuration.
+	grunt.initConfig({
+        "meta": { "package": grunt.file.readJSON("package.json") },
+        "clean": ["usergrid.js", "usergrid.min.js"],
+        "uglify": {
+            "unminified": {
+                "options": {
+                    "banner": banner,
                     "mangle": false,
-                    "compress": false,
                     "beautify": true,
-                    "preserveComments": function(node, comment){
-                        //console.log((node.parent_scope!==undefined&&comment.value.indexOf('*Licensed to the Apache Software Foundation')===-1)?"has parent":comment.value);
-                        return comment.type==='comment2'&&comment.value.indexOf('*Licensed to the Apache Software Foundation')===-1;
-                    }
+                    "compress": false,
+                    "preserveComments": "some"
                 },
-                "files": {
-                    "usergrid.js": files
-                }
+                "files": { "usergrid.js": files }
             },
             "minified": {
                 "options": {
-                    "banner": "/*! \n\
- *Licensed to the Apache Software Foundation (ASF) under one\n\
- *or more contributor license agreements.  See the NOTICE file\n\
- *distributed with this work for additional information\n\
- *regarding copyright ownership.  The ASF licenses this file\n\
- *to you under the Apache License, Version 2.0 (the\n\
- *\"License\"); you may not use this file except in compliance\n\
- *with the License.  You may obtain a copy of the License at\n\
- *\n\
- *  http://www.apache.org/licenses/LICENSE-2.0\n\
- * \n\
- *Unless required by applicable law or agreed to in writing,\n\
- *software distributed under the License is distributed on an\n\
- *\"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n\
- *KIND, either express or implied.  See the License for the\n\
- *specific language governing permissions and limitations\n\
- *under the License.\n\
- * \n\
- * \n\
- * <%= meta.package.name %>@<%= meta.package.version %> <%= grunt.template.today('yyyy-mm-dd') %> \n\
- */\n",
+                    "banner": banner,
                     "mangle": false,
-                    "compress": true,
                     "beautify": false,
+                    "compress": {},
                     "preserveComments": "some"
                 },
-                "files": {
-                    "usergrid.min.js": files
-                }
+                "files": { "usergrid.min.js": files }
             }
         },
         "connect": {
@@ -109,21 +80,23 @@ module.exports = function(grunt) {
             "files": [files, 'Gruntfile.js'],
             "tasks": ["default"]
         },
-        "blanket_mocha": {
-            //"all": tests,
-            urls: [ 'http://localhost:8000/tests/mocha/index.html' ],
-            "options": {
-                "dest": "report/coverage.html",
-                "reporter": "Spec",
-                "threshold": 70
+        "mocha": {
+            "test": {
+                "options": {
+                    "urls": [ 'http://localhost:<%= connect.test.options.port %>/tests/mocha/index.html' ],
+                    "reporter": "Spec",
+                    "threshold": 70,
+                    "run":true
+                }
             }
         }
     });
+    grunt.loadNpmTasks("grunt-mocha");
 	grunt.loadNpmTasks("grunt-contrib-clean");
 	grunt.loadNpmTasks("grunt-contrib-uglify");
 	grunt.loadNpmTasks("grunt-contrib-watch");
 	grunt.loadNpmTasks("grunt-contrib-connect");
-	grunt.loadNpmTasks("grunt-blanket-mocha");
+    grunt.loadNpmTasks("should");
 	grunt.registerTask("default", [
 		"clean",
 		"uglify"
@@ -134,6 +107,6 @@ module.exports = function(grunt) {
 	]);
 	grunt.registerTask("test", [
 		"connect:test",
-		"blanket_mocha"
+		"mocha:test"
 	]);
 };