Merge pull request #257 from trailsjs/2.0-rc

2.0 rc

.codeclimate.yml

@@ -0,0 +1,5 @@
+engines:
+  eslint:
+    enabled: true
+  duplication:
+    enabled: false

.travis.yml

@@ -8,6 +8,7 @@ node_js:
   - 4
   - 5
   - 6
+  - 7
 compiler:
   - gcc
 env:
@@ -41,6 +42,10 @@ script:
 - npm test
 - npm run ci
 
+after_script:
+  - npm install -g codeclimate-test-reporter
+  - codeclimate-test-reporter < coverage/lcov.info
+
 notifications:
   email: false
   webhooks:

README.md

@@ -63,13 +63,14 @@ capabilities and allow developers to leverage existing ecosystem tools through a
 simple and well-defined API. New features, behavior, APIs, and other functionality
 can be added to the Trails framework through Trailpacks.
 
-Out of the box, Trails includes a small suite of trailpacks:
+Many Trails installations will include some of the following Trailpacks:
 
-- [core](https://github.com/trailsjs/trailpack-core)
 - [router](https://github.com/trailsjs/trailpack-router)
 - [repl](https://github.com/trailsjs/trailpack-repl)
 - [hapi](https://github.com/trailsjs/trailpack-hapi)
+- [express](https://github.com/trailsjs/trailpack-express)
 - [waterline](https://github.com/trailsjs/trailpack-waterline)
+- [knex](https://github.com/trailsjs/trailpack-knex)
 
 ## Compatibility
 
@@ -86,7 +87,9 @@ Out of the box, Trails includes a small suite of trailpacks:
 - [Getting Started with Trails.js](https://www.youtube.com/watch?v=AbSp8jqFDAY)
 
 #### Support
-- [Gitter chat room](https://gitter.im/trailsjs/trails)
+- [Stackoverflow](http://stackoverflow.com/questions/tagged/trailsjs)
+- [Live Gitter Chat](https://gitter.im/trailsjs/trails)
+- [Twitter](https://twitter.com/trailsjs)
 
 ## FAQ
 

archetype/api/services/DefaultService.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Service = require('trails-service')
+const Service = require('trails/service')
 
 /**
  * @module DefaultService

archetype/config/i18n.js

@@ -5,9 +5,7 @@
  * If your app will touch people from all over the world, i18n (or internationalization)
  * may be an important part of your international strategy.
  *
- *
  * @see http://trailsjs.io/doc/config/i18n
- *
  */
 
 'use strict'

archetype/config/main.js

@@ -16,7 +16,6 @@ module.exports = {
    * requirements.
    */
   packs: [
-    require('trailpack-core'),
     require('trailpack-repl'),
     require('trailpack-router'),
     require('<%- trailpacks %>')

archetype/package.json

@@ -6,19 +6,14 @@
   ],
   "main": "index.js",
   "dependencies": {
-    "trailpack-core": "^1.0.1",
-    "trailpack-repl": "^1.1.0",
-    "trailpack-router": "^1.0.8",
-    "trails": "^1.1.0",
-    "trails-controller": "^1.0.0-beta-2",
-    "trails-model": "^1.0.0-beta-2",
-    "trails-policy": "^1.0.1",
-    "trails-service": "1.0.0-beta-2",
-    "winston": "^2.2"
+    "trailpack-repl": "v2-latest",
+    "trailpack-router": "v2-latest",
+    "trails": "v2-latest",
+    "winston": "^2.3"
   },
   "devDependencies": {
     "eslint": "^2.11",
-    "eslint-config-trails": "latest",
+    "eslint-config-trails": "^2",
     "mocha": "^2.5",
     "supertest": "^1.2"
   },

archetype/server.js

@@ -6,8 +6,8 @@
 
 'use strict'
 
-const app = require('./')
 const TrailsApp = require('trails')
+const app = require('./')
 const server = new TrailsApp(app)
 
 server.start().catch(err => server.stop(err))

controller.js

@@ -0,0 +1 @@
+module.exports = require('trails-controller')