Prepare workflow for testing and publishing

.travis.yml

@@ -1,12 +1,15 @@
+git:
+  depth: 1
+
 language: node_js
 
 node_js:
   - "4"
+  - "5"
 
 sudo: false
 
-script: "make test-travis"
-after_script: "npm install coveralls@2 && cat ./coverage/lcov.info | coveralls"
+script: "make test"
 
 notifications:
   slack:

Makefile

@@ -0,0 +1,11 @@
+MAKEFLAGS = -j1
+
+export NODE_ENV = test
+
+.PHONY: test
+
+lint:
+	./node_modules/.bin/xo
+
+test: lint
+	./scripts/test.sh

README.md

@@ -2,7 +2,6 @@
 
 [![npm version](https://img.shields.io/npm/v/strapi.svg)](https://www.npmjs.org/package/strapi)
 [![npm downloads](https://img.shields.io/npm/dm/strapi.svg)](https://www.npmjs.org/package/strapi)
-[![npm dependencies](https://david-dm.org/wistityhq/strapi.svg)](https://david-dm.org/wistityhq/strapi)
 [![Build status](https://travis-ci.org/wistityhq/strapi.svg?branch=master)](https://travis-ci.org/wistityhq/strapi)
 [![Slack status](http://strapi-slack.herokuapp.com/badge.svg)](http://slack.strapi.io)
 
@@ -51,19 +50,23 @@ Also, you can follow and ping the Strapi team on [Twitter](https://twitter.com/s
 
 ## Badge board
 
-| Package | Version | Dependencies | Build |
-|---------|---------|--------------|-------|
-| [strapi](https://github.com/wistityhq/strapi/tree/master/packages/strapi) | [![npm version](https://img.shields.io/npm/v/strapi.svg)](https://www.npmjs.org/package/strapi) | [![npm dependencies](https://david-dm.org/wistityhq/strapi.svg)](https://david-dm.org/wistityhq/strapi) | [![Build status](https://travis-ci.org/wistityhq/strapi.svg?branch=master)](https://travis-ci.org/wistityhq/strapi) |
-| [strapi-bookshelf](https://github.com/wistityhq/strapi/tree/master/packages/strapi-bookshelf) | [![npm version](https://img.shields.io/npm/v/strapi-bookshelf.svg)](https://www.npmjs.org/package/strapi-bookshelf) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-bookshelf.svg)](https://david-dm.org/wistityhq/strapi-bookshelf) | [![Build status](https://travis-ci.org/wistityhq/strapi-bookshelf.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-bookshelf) |
-| [strapi-cli](https://github.com/wistityhq/strapi/tree/master/packages/strapi-cli) | [![npm version](https://img.shields.io/npm/v/strapi-cli.svg)](https://www.npmjs.org/package/strapi-cli) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-cli.svg)](https://david-dm.org/wistityhq/strapi-cli) | [![Build status](https://travis-ci.org/wistityhq/strapi-cli.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-cli) |
-| [strapi-generate](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate) | [![npm version](https://img.shields.io/npm/v/strapi-generate.svg)](https://www.npmjs.org/package/strapi-generate) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate.svg)](https://david-dm.org/wistityhq/strapi-generate) | [![Build status](https://travis-ci.org/wistityhq/strapi-generate.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-generate) |
-| [strapi-generate-api](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-api) | [![npm version](https://img.shields.io/npm/v/strapi-generate-api.svg)](https://www.npmjs.org/package/strapi-generate-api) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-api.svg)](https://david-dm.org/wistityhq/strapi-generate-api) | [![Build status](https://travis-ci.org/wistityhq/strapi-generate-api.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-generate-api) |
-| [strapi-generate-migrations](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-migrations) | [![npm version](https://img.shields.io/npm/v/strapi-generate-migrations.svg)](https://www.npmjs.org/package/strapi-generate-migrations) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-migrations.svg)](https://david-dm.org/wistityhq/strapi-generate-migrations) | [![Build status](https://travis-ci.org/wistityhq/strapi-generate-migrations.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-generate-migrations) |
-| [strapi-generate-new](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-new) | [![npm version](https://img.shields.io/npm/v/strapi-generate-new.svg)](https://www.npmjs.org/package/strapi-generate-new) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-new.svg)](https://david-dm.org/wistityhq/strapi-generate-new) | [![Build status](https://travis-ci.org/wistityhq/strapi-generate-new.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-generate-new) |
-| [strapi-generate-policy](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-policy) | [![npm version](https://img.shields.io/npm/v/strapi-generate-policy.svg)](https://www.npmjs.org/package/strapi-generate-policy) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-policy.svg)](https://david-dm.org/wistityhq/strapi-generate-policy) | [![Build status](https://travis-ci.org/wistityhq/strapi-generate-policy.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-generate-policy) |
-| [strapi-generate-service](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-service) | [![npm version](https://img.shields.io/npm/v/strapi-generate-service.svg)](https://www.npmjs.org/package/strapi-generate-service) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-service.svg)](https://david-dm.org/wistityhq/strapi-generate-service) | [![Build status](https://travis-ci.org/wistityhq/strapi-generate-service.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-generate-service) |
-| [strapi-knex](https://github.com/wistityhq/strapi/tree/master/packages/strapi-knex) | [![npm version](https://img.shields.io/npm/v/strapi-knex.svg)](https://www.npmjs.org/package/strapi-knex) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-knex.svg)](https://david-dm.org/wistityhq/strapi-knex) | [![Build status](https://travis-ci.org/wistityhq/strapi-knex.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-knex) |
-| [strapi-utils](https://github.com/wistityhq/strapi/tree/master/packages/strapi-utils) | [![npm version](https://img.shields.io/npm/v/strapi-utils.svg)](https://www.npmjs.org/package/strapi-utils) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-utils.svg)](https://david-dm.org/wistityhq/strapi-utils) | [![Build status](https://travis-ci.org/wistityhq/strapi-utils.svg?branch=master)](https://travis-ci.org/wistityhq/strapi-utils) |
+| Package | Version | Dependencies |
+|---------|---------|--------------|
+| [strapi](https://github.com/wistityhq/strapi/tree/master/packages/strapi) | [![npm version](https://img.shields.io/npm/v/strapi.svg)](https://www.npmjs.org/package/strapi) | [![npm dependencies](https://david-dm.org/wistityhq/strapi.svg)](https://david-dm.org/wistityhq/strapi) |
+| [strapi-bookshelf](https://github.com/wistityhq/strapi/tree/master/packages/strapi-bookshelf) | [![npm version](https://img.shields.io/npm/v/strapi-bookshelf.svg)](https://www.npmjs.org/package/strapi-bookshelf) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-bookshelf.svg)](https://david-dm.org/wistityhq/strapi-bookshelf) |
+| [strapi-cli](https://github.com/wistityhq/strapi/tree/master/packages/strapi-cli) | [![npm version](https://img.shields.io/npm/v/strapi-cli.svg)](https://www.npmjs.org/package/strapi-cli) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-cli.svg)](https://david-dm.org/wistityhq/strapi-cli) |
+| [strapi-generate](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate) | [![npm version](https://img.shields.io/npm/v/strapi-generate.svg)](https://www.npmjs.org/package/strapi-generate) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate.svg)](https://david-dm.org/wistityhq/strapi-generate) |
+| [strapi-generate-api](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-api) | [![npm version](https://img.shields.io/npm/v/strapi-generate-api.svg)](https://www.npmjs.org/package/strapi-generate-api) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-api.svg)](https://david-dm.org/wistityhq/strapi-generate-api) |
+| [strapi-generate-controller](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-controller) | [![npm version](https://img.shields.io/npm/v/strapi-generate-controller.svg)](https://www.npmjs.org/package/strapi-generate-controller) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-controller.svg)](https://david-dm.org/wistityhq/strapi-generate-controller) |
+| [strapi-generate-generator](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-generator) | [![npm version](https://img.shields.io/npm/v/strapi-generate-generator.svg)](https://www.npmjs.org/package/strapi-generate-generator) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-generator.svg)](https://david-dm.org/wistityhq/strapi-generate-generator) |
+| [strapi-generate-hook](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-hook) | [![npm version](https://img.shields.io/npm/v/strapi-generate-hook.svg)](https://www.npmjs.org/package/strapi-generate-hook) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-hook.svg)](https://david-dm.org/wistityhq/strapi-generate-hook) |
+| [strapi-generate-migrations](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-migrations) | [![npm version](https://img.shields.io/npm/v/strapi-generate-migrations.svg)](https://www.npmjs.org/package/strapi-generate-migrations) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-migrations.svg)](https://david-dm.org/wistityhq/strapi-generate-migrations) |
+| [strapi-generate-model](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-model) | [![npm version](https://img.shields.io/npm/v/strapi-generate-model.svg)](https://www.npmjs.org/package/strapi-generate-model) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-model.svg)](https://david-dm.org/wistityhq/strapi-generate-model) |
+| [strapi-generate-new](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-new) | [![npm version](https://img.shields.io/npm/v/strapi-generate-new.svg)](https://www.npmjs.org/package/strapi-generate-new) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-new.svg)](https://david-dm.org/wistityhq/strapi-generate-new) |
+| [strapi-generate-policy](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-policy) | [![npm version](https://img.shields.io/npm/v/strapi-generate-policy.svg)](https://www.npmjs.org/package/strapi-generate-policy) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-policy.svg)](https://david-dm.org/wistityhq/strapi-generate-policy) |
+| [strapi-generate-service](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-service) | [![npm version](https://img.shields.io/npm/v/strapi-generate-service.svg)](https://www.npmjs.org/package/strapi-generate-service) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-generate-service.svg)](https://david-dm.org/wistityhq/strapi-generate-service) |
+| [strapi-knex](https://github.com/wistityhq/strapi/tree/master/packages/strapi-knex) | [![npm version](https://img.shields.io/npm/v/strapi-knex.svg)](https://www.npmjs.org/package/strapi-knex) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-knex.svg)](https://david-dm.org/wistityhq/strapi-knex) |
+| [strapi-utils](https://github.com/wistityhq/strapi/tree/master/packages/strapi-utils) | [![npm version](https://img.shields.io/npm/v/strapi-utils.svg)](https://www.npmjs.org/package/strapi-utils) | [![npm dependencies](https://david-dm.org/wistityhq/strapi-utils.svg)](https://david-dm.org/wistityhq/strapi-utils) |
 
 ## Resources
 

info/licenses.md

@@ -6,9 +6,8 @@ layout: no-sidebar
 The Strapi ecosystem is composed by many components offered by [Wistity](http://wistity.co) under the terms of open-source licenses, including:
 
 - [strapi](https://github.com/wistityhq/strapi/tree/master/packages/strapi) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi/LICENSE.md))
-- [strapi-cli](https://github.com/wistityhq/strapi/tree/master/packages/strapi-cli) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-cli/LICENSE.md))
-- [strapi-knex](https://github.com/wistityhq/strapi/tree/master/packages/strapi-knex) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-knex/LICENSE.md))
 - [strapi-bookshelf](https://github.com/wistityhq/strapi/tree/master/packages/strapi-bookshelf) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-bookshelf/LICENSE.md))
+- [strapi-cli](https://github.com/wistityhq/strapi/tree/master/packages/strapi-cli) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-cli/LICENSE.md))
 - [strapi-generate](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-generate/LICENSE.md))
 - [strapi-generate-api](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-api) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-generate-api/LICENSE.md))
 - [strapi-generate-controller](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-controller) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-generate-controller/LICENSE.md))
@@ -19,3 +18,5 @@ The Strapi ecosystem is composed by many components offered by [Wistity](http://
 - [strapi-generate-new](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-new) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-generate-new/LICENSE.md))
 - [strapi-generate-policy](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-policy) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-generate-policy/LICENSE.md))
 - [strapi-generate-service](https://github.com/wistityhq/strapi/tree/master/packages/strapi-generate-service) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-generate-service/LICENSE.md))
+- [strapi-knex](https://github.com/wistityhq/strapi/tree/master/packages/strapi-knex) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-knex/LICENSE.md))
+- [strapi-utils](https://github.com/wistityhq/strapi/tree/master/packages/strapi-utils) ([MIT license](https://github.com/wistityhq/strapi/blob/master/packages/strapi-utils/LICENSE.md))

package.json

@@ -0,0 +1,58 @@
+{
+  "private": true,
+  "version": "2.0.0",
+  "devDependencies": {
+    "expect.js": "~0.3.1",
+    "istanbul": "^0.4.2",
+    "mocha": "~2.4.5",
+    "pre-commit": "~1.1.2",
+    "request": "~2.69.0",
+    "should": "~8.3.0",
+    "xo": "~0.13.0"
+  },
+  "xo": {
+    "space": true,
+    "envs": [
+      "node"
+    ],
+    "globals": [
+      "strapi"
+    ],
+    "ignore": [
+      "packages/**/test/**"
+    ],
+    "rules": {
+      "no-unused-expressions": 0,
+      "padded-blocks": 0,
+      "prefer-template": 0,
+      "strict": 0
+    }
+  },
+  "scripts": {
+    "test": "make test"
+  },
+  "author": {
+    "email": "hack@wistity.co",
+    "name": "Wistity team",
+    "url": "http://wistity.co"
+  },
+  "maintainers": [
+    {
+      "name": "Wistity team",
+      "email": "hack@wistity.co",
+      "url": "http://wistity.co"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/wistityhq/strapi.git"
+  },
+  "bugs": {
+    "url": "https://github.com/wistityhq/strapi/issues"
+  },
+  "engines": {
+    "node": ">= 4.0.0",
+    "npm": ">= 3.0.0"
+  },
+  "license": "MIT"
+}

packages/strapi-bookshelf/package.json

@@ -21,30 +21,10 @@
     "pluralize": "~1.2.1",
     "strapi": "~2.0.0"
   },
-  "devDependencies": {
-    "pre-commit": "~1.1.2",
-    "xo": "~0.13.0"
-  },
   "strapi": {
     "isHook": true
   },
-  "xo": {
-    "space": true,
-    "envs": [
-      "node"
-    ],
-    "globals": [
-      "strapi"
-    ],
-    "rules": {
-      "no-case-declarations": 0,
-      "no-unused-vars": 0,
-      "padded-blocks": 0,
-      "strict": 0
-    }
-  },
   "scripts": {
-    "test": "xo",
     "prepublish": "npm prune"
   },
   "author": {

packages/strapi-cli/package.json

@@ -21,30 +21,18 @@
     "strapi-bookshelf": "~2.0.0",
     "strapi-generate": "~2.0.0",
     "strapi-generate-api": "~2.0.0",
+    "strapi-generate-controller": "~2.0.0",
+    "strapi-generate-generator": "~2.0.0",
+    "strapi-generate-hook": "~2.0.0",
     "strapi-generate-migrations": "~2.0.0",
+    "strapi-generate-model": "~2.0.0",
     "strapi-generate-new": "~2.0.0",
+    "strapi-generate-policy": "~2.0.0",
+    "strapi-generate-service": "~2.0.0",
     "strapi-knex": "~2.0.0",
     "strapi-utils": "~2.0.0"
   },
-  "devDependencies": {
-    "pre-commit": "~1.1.2",
-    "xo": "~0.13.0"
-  },
-  "xo": {
-    "space": true,
-    "envs": [
-      "node"
-    ],
-    "rules": {
-      "no-unused-expressions": 0,
-      "padded-blocks": 0,
-      "prefer-arrow-callback": 0,
-      "prefer-template": 0,
-      "strict": 0
-    }
-  },
   "scripts": {
-    "test": "xo",
     "prepublish": "npm prune"
   },
   "author": {

packages/strapi-generate-api/package.json

@@ -16,22 +16,7 @@
     "lodash": "~4.6.1",
     "pluralize": "~1.2.1"
   },
-  "devDependencies": {
-    "pre-commit": "~1.1.2",
-    "xo": "~0.13.0"
-  },
-  "xo": {
-    "space": true,
-    "envs": [
-      "node"
-    ],
-    "rules": {
-      "consistent-return": 0,
-      "strict": 0
-    }
-  },
   "scripts": {
-    "test": "xo",
     "prepublish": "npm prune"
   },
   "author": {

packages/strapi-generate-migrations/package.json

@@ -26,28 +26,7 @@
     "strapi-bookshelf": "~2.0.0",
     "strapi-utils": "~2.0.0"
   },
-  "devDependencies": {
-    "pre-commit": "~1.1.2",
-    "xo": "~0.13.0"
-  },
-  "xo": {
-    "space": true,
-    "envs": [
-      "node"
-    ],
-    "rules": {
-      "brace-style": 0,
-      "camelcase": 0,
-      "consistent-return": 0,
-      "no-else-return": 0,
-      "no-negated-condition": 0,
-      "no-warning-comments": 0,
-      "padded-blocks": 0,
-      "strict": 0
-    }
-  },
   "scripts": {
-    "test": "xo",
     "prepublish": "npm prune"
   },
   "author": {

packages/strapi-generate-new/package.json

@@ -17,29 +17,14 @@
     "lodash": "~4.6.1",
     "strapi-utils": "~2.0.0"
   },
-  "devDependencies": {
-    "pre-commit": "~1.1.2",
-    "xo": "~0.13.0"
+  "scripts": {
+    "prepublish": "npm prune"
   },
   "author": {
     "email": "hack@wistity.co",
     "name": "Wistity team",
     "url": "http://wistity.co"
   },
-  "xo": {
-    "space": true,
-    "envs": [
-      "node"
-    ],
-    "rules": {
-      "quote-props": 0,
-      "strict": 0
-    }
-  },
-  "scripts": {
-    "test": "xo",
-    "prepublish": "npm prune"
-  },
   "maintainers": [
     {
       "name": "Wistity team",

packages/strapi-generate-policy/package.json

@@ -16,22 +16,7 @@
   "dependencies": {
     "lodash": "~4.6.1"
   },
-  "devDependencies": {
-    "pre-commit": "~1.1.2",
-    "xo": "~0.13.0"
-  },
-  "xo": {
-    "space": true,
-    "envs": [
-      "node"
-    ],
-    "rules": {
-      "consistent-return": 0,
-      "strict": 0
-    }
-  },
   "scripts": {
-    "test": "xo",
     "prepublish": "npm prune"
   },
   "author": {

packages/strapi-generate-service/package.json

@@ -16,22 +16,7 @@
   "dependencies": {
     "lodash": "~4.6.1"
   },
-  "devDependencies": {
-    "pre-commit": "~1.1.2",
-    "xo": "~0.13.0"
-  },
-  "xo": {
-    "space": true,
-    "envs": [
-      "node"
-    ],
-    "rules": {
-      "consistent-return": 0,
-      "strict": 0
-    }
-  },
   "scripts": {
-    "test": "xo",
     "prepublish": "npm prune"
   },
   "author": {

packages/strapi-generate/package.json

@@ -19,28 +19,7 @@
     "reportback": "~0.1.9",
     "strapi-utils": "~2.0.0"
   },
-  "devDependencies": {
-    "pre-commit": "~1.1.2",
-    "xo": "~0.13.0"
-  },
-  "xo": {
-    "space": true,
-    "envs": [
-      "node"
-    ],
-    "rules": {
-      "consistent-return": 0,
-      "no-else-return": 0,
-      "no-implicit-coercion": 0,
-      "no-negated-condition": 0,
-      "no-unused-vars": 0,
-      "padded-blocks": 0,
-      "space-infix-ops": 0,
-      "strict": 0
-    }
-  },
   "scripts": {
-    "test": "xo",
     "prepublish": "npm prune"
   },
   "author": {