Merge branch 'ember-addon'

Convert to an EmberAddon and Update Ember version

.editorconfig

@@ -0,0 +1,34 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.hbs]
+insert_final_newline = false
+indent_style = space
+indent_size = 2
+
+[*.css]
+indent_style = space
+indent_size = 2
+
+[*.html]
+indent_style = space
+indent_size = 2
+
+[*.{diff,md}]
+trim_trailing_whitespace = false

.ember-cli

@@ -0,0 +1,9 @@
+{
+  /**
+    Ember CLI sends analytics information by default. The data is completely
+    anonymous, but there are times when you might want to disable this behavior.
+
+    Setting `disableAnalytics` to true will prevent any data from being sent.
+  */
+  "disableAnalytics": false
+}

.jshintrc

@@ -1,20 +1,12 @@
 {
-  "predef": {
-    "document": true,
-    "window": true,
-    "Ember": true,
-    "Em": true,
-    "$": true,
-    "define": true,
-    "require": true,
-    "requirejs": true,
-    "requireModule": true,
-    "module": true
-  },
-  "node" : false,
-  "browser" : true,
-  "boss" : true,
-  "curly": false,
+  "predef": [
+    "document",
+    "window",
+    "-Promise"
+  ],
+  "browser": true,
+  "boss": true,
+  "curly": true,
   "debug": false,
   "devel": true,
   "eqeqeq": true,
@@ -31,11 +23,10 @@
   "plusplus": false,
   "regexp": false,
   "undef": true,
-  "unused": true,
   "sub": true,
   "strict": false,
   "white": false,
   "eqnull": true,
-  "esnext": true,
-  "jasmine": true
+  "esversion": 6,
+  "unused": true
 }

.travis.yml

@@ -1,16 +1,24 @@
+---
 language: node_js
+node_js:
+  - "4"
+
 sudo: false
-branches: 
-  only: 
-    - master
-    - pre
-node_js: 
-  - "0.12"
-  - "0.11"
-  - "0.10"
-  - "iojs"
+
+cache:
+  directories:
+    - node_modules
+
 before_install:
-  - npm install -g grunt-cli
-  - npm install -g testem
+  - npm config set spin false
   - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+
+install:
+  - npm install
   - bower install
+
+script:
+  - npm test

.watchmanconfig

@@ -0,0 +1,3 @@
+{
+  "ignore_dirs": ["tmp", "dist"]
+}

CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog Ember-OAuth2
 
+## v2.0.0-beta
+  -- Converted to EmberAddon and turned EmberOAuth2 into a service 
+  -- Updated testing to use Ember-Qunit
+  -- Update project README
 ## v1.1.0
   -- Add verifyToken method to handle mitigation of the confused deputy
   -- fix bug with checking of state 
+
 ## v1.0.1
   -- Update getState function to not take a param argument and use the configure statePrefix to find the state from localStorage.
   -- This makes getState and getToken perform the same way and avoids confusion with the api