diff --git a/.travis.yml b/.travis.yml index 7b02c6fa7e..7b718b3c23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,8 @@ matrix: allow_failures: - env: DB=pg before_install: - - git submodule update --init - - gem update --system - - gem install sass bourbon + - rvm use 1.9.3 + - gem install bundler - npm install -g grunt-cli - git clone git://github.com/n1k0/casperjs.git ~/casperjs - cd ~/casperjs @@ -23,4 +22,3 @@ before_install: before_script: - phantomjs --version - casperjs --version - - grunt init diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 33be5f1639..54e95d80cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -192,8 +192,6 @@ developing Ghost. 1. Check you have the pre-requisites listed above! 1. Clone the git repo 1. cd into the project folder -1. Run `git submodule update --init` -1. Run `bundle install` 1. Run `npm install -g grunt-cli` 1. Run `npm install`. * If the install fails with errors to do with "node-gyp rebuild" or "SQLite3", follow the SQLite3 install diff --git a/package.json b/package.json index da067e0fd1..b4625a47e5 100644 --- a/package.json +++ b/package.json @@ -1,87 +1,89 @@ -{ - "name" : "ghost", - "version" : "0.4.1", - "description" : "Just a blogging platform.", - "author" : "Ghost Foundation", - "homepage" : "http://ghost.org", - "keywords" : [ - "ghost", - "blog", - "cms" - ], - "repository" : { - "type": "git", - "url": "git://github.com/TryGhost/Ghost.git" - }, - "bugs" : "https://github.com/TryGhost/Ghost/issues", - "contributors": "https://github.com/TryGhost/Ghost/graphs/contributors", - "private" : true, - "licenses" : [ - { - "type": "MIT", - "url": "https://raw.github.com/TryGhost/Ghost/master/LICENSE" - } - ], - "main": "./core/index", - "scripts": { - "start": "node index", - "test": "grunt validate --verbose" - }, - "engines": { - "node": "~0.10.0" - }, - "engineStrict": true, - "dependencies": { - "bcryptjs": "0.7.10", - "bookshelf": "0.6.1", - "busboy": "0.0.12", - "colors": "0.6.2", - "connect-slashes": "1.2.0", - "downsize": "0.0.5", - "express": "3.4.6", - "express-hbs": "0.7.6", - "fs-extra": "0.8.1", - "knex": "0.5.0", - "moment": "2.4.0", - "node-polyglot": "0.3.0", - "node-uuid": "1.4.1", - "nodemailer": "0.5.13", - "rss": "0.2.1", - "semver": "2.2.1", - "showdown": "0.3.1", - "sqlite3": "2.2.0", - "lodash": "2.4.1", - "unidecode": "0.1.3", - "validator": "1.4.0", - "when": "2.7.0" - }, - "optionalDependencies": { - "mysql": "2.0.0-alpha9" - }, - "devDependencies": { - "blanket": "~1.1.5", - "grunt": "~0.4.1", - "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-compress": "~0.5.2", - "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-copy": "~0.4.1", - "grunt-contrib-handlebars": "~0.6.0", - "grunt-contrib-sass": "~0.5.0", - "grunt-contrib-uglify": "~0.2.5", - "grunt-contrib-watch": "~0.5.3", - "grunt-express-server": "~0.4.11", - "grunt-groc": "~0.4.0", - "grunt-jslint": "~1.1.1", - "grunt-mocha-cli": "~1.4.0", - "grunt-shell": "~0.6.1", - "grunt-update-submodules": "~0.2.1", - "matchdep": "~0.3.0", - "mocha": "~1.15.1", - "rewire": "~2.0.0", - "request": "~2.29.0", - "require-dir": "~0.1.0", - "should": "~2.1.1", - "sinon": "~1.7.3", - "supertest": "~0.8.2" - } -} +{ + "name" : "ghost", + "version" : "0.4.1", + "description" : "Just a blogging platform.", + "author" : "Ghost Foundation", + "homepage" : "http://ghost.org", + "keywords" : [ + "ghost", + "blog", + "cms" + ], + "repository" : { + "type": "git", + "url": "git://github.com/TryGhost/Ghost.git" + }, + "bugs" : "https://github.com/TryGhost/Ghost/issues", + "contributors": "https://github.com/TryGhost/Ghost/graphs/contributors", + "private" : true, + "licenses" : [ + { + "type": "MIT", + "url": "https://raw.github.com/TryGhost/Ghost/master/LICENSE" + } + ], + "main": "./core/index", + "scripts": { + "start": "node index", + "test": "./node_modules/.bin/grunt validate --verbose", + "install": "git submodule update --init && bundle install && ./node_modules/.bin/grunt init" + }, + "engines": { + "node": "~0.10.0" + }, + "engineStrict": true, + "dependencies": { + "bcryptjs": "0.7.10", + "bookshelf": "0.6.1", + "busboy": "0.0.12", + "colors": "0.6.2", + "connect-slashes": "1.2.0", + "downsize": "0.0.5", + "express": "3.4.6", + "express-hbs": "0.7.6", + "fs-extra": "0.8.1", + "knex": "0.5.0", + "moment": "2.4.0", + "node-polyglot": "0.3.0", + "node-uuid": "1.4.1", + "nodemailer": "0.5.13", + "rss": "0.2.1", + "semver": "2.2.1", + "showdown": "0.3.1", + "sqlite3": "2.2.0", + "lodash": "2.4.1", + "unidecode": "0.1.3", + "validator": "1.4.0", + "when": "2.7.0" + }, + "optionalDependencies": { + "mysql": "2.0.0-alpha9" + }, + "devDependencies": { + "blanket": "~1.1.5", + "grunt": "~0.4.1", + "grunt-cli": "~0.1.13", + "grunt-contrib-clean": "~0.5.0", + "grunt-contrib-compress": "~0.5.2", + "grunt-contrib-concat": "~0.3.0", + "grunt-contrib-copy": "~0.4.1", + "grunt-contrib-handlebars": "~0.6.0", + "grunt-contrib-sass": "~0.5.0", + "grunt-contrib-uglify": "~0.2.5", + "grunt-contrib-watch": "~0.5.3", + "grunt-express-server": "~0.4.11", + "grunt-groc": "~0.4.0", + "grunt-jslint": "~1.1.1", + "grunt-mocha-cli": "~1.4.0", + "grunt-shell": "~0.6.1", + "grunt-update-submodules": "~0.2.1", + "matchdep": "~0.3.0", + "mocha": "~1.15.1", + "rewire": "~2.0.0", + "request": "~2.29.0", + "require-dir": "~0.1.0", + "should": "~2.1.1", + "sinon": "~1.7.3", + "supertest": "~0.8.2" + } +}