Merge remote-tracking branch 'codecombat/master'

.gitignore

@@ -35,6 +35,9 @@ Thumbs.db
 node_modules/
 bower_components/
 
+# Vagrant
+.vagrant/
+
 # Some other random stuff
 always-ignore extensions
 *.diff
@@ -74,7 +77,6 @@ coverage/
 FLOOBITS_README.md
 
 # mongodb
-db/
 bin/node/
 bin/mongo/
 
@@ -88,6 +90,11 @@ login.coffee
 # debugging
 *.heapsnapshot
 
+npm-debug.log*
+
 temp/
+Dockerfile
 ### If you add something here, copy it to the end of .npmignore, too. ###
 
+# Visual Studio Code
+.vscode/

.npmignore

@@ -59,6 +59,9 @@ Thumbs.db
 # NPM packages folder.
 node_modules/
 
+# Vagrant
+.vagrant/
+
 # Some other random stuff
 always-ignore extensions
 *.diff
@@ -100,7 +103,11 @@ temp/
 
 # local settings
 login.coffee
+Dockerfile
 
 # debugging
 *.heapsnapshot
 
+npm-debug.log*
+
+temp/

.travis.yml

@@ -1,25 +1,32 @@
+sudo: false
+
 language: node_js
+
 node_js:
-  - 0.10
+  - 5.1.1
+
+addons:
+  apt:
+    sources:
+      - mongodb-upstart
+    packages:
+      - mongodb-org-server
+
+cache:
+  directories:
+    - node_modules
+    - bower_components
 
 before_install:
-  - "sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10"
-  - "echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list"
-  - "sudo apt-get update"
-  - "sudo apt-get install mongodb-org-server"
-  
+  - export COCO_TRAVIS_TEST=1
+  - npm install -g npm@latest
+
 before_script:
-  - "npm install"
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-  - "./node_modules/.bin/bower install"
-  - "gem install sass"
-  - "./node_modules/.bin/brunch b"
-  - "mkdir mongo"
-  - "mongod --dbpath=./mongo --fork --logpath ./mongodb.log"
   - "node index.js --unittest &"
-  - "sleep 10" # to give node a chance to start
+  - "sleep 15" # to give node a chance to start
 
 script:
-  - "./node_modules/jasmine-node/bin/jasmine-node test/server/ --coffee --captureExceptions"
-  - "./node_modules/karma/bin/karma start --browsers Firefox --single-run"
+  - "./node_modules/karma/bin/karma start --browsers Firefox --single-run --reporters progress"
+  - "npm run jasmine"

CONTRIBUTING.md

@@ -1,7 +1,20 @@
-### Please sign our Contributor License Agreement
+##Contributing to CodeCombat
 
-**[http://codecombat.com/cla](http://codecombat.com/cla)**
+There are many ways in which to contribute to CodeCombat, these include becoming a(n):
+
+ - **[Archmage](https://codecombat.com/contribute/archmage)** (Coder)
+ - **[Artisan](https://codecombat.com/contribute/artisan)** (Level Builder) 
+ - **[Adventurer](https://codecombat.com/contribute/adventurer)** (Level Playtester)
+ - **[Scribe](https://codecombat.com/contribute/scribe)** (Article Editor)
+ - **[Diplomat](https://codecombat.com/contribute/diplomat)** (Translator)
+ - **[Ambassador](https://codecombat.com/contribute/ambassador)** (Support)
+
+###The CLA
+
+If you do decide to contribute, we require you to sign a CLA (Contributor License Agreement).  You can see it:
+
+**[https://codecombat.com/cla](https://codecombat.com/cla)**
 
 It just grants us a non-exclusive license to use your contribution and certifies you have the right to contribute the code you submit. For both our sakes, we need this before we can accept a pull request. Don't worry, it's super easy.
 
-For more info, see [http://codecombat.com/legal](http://codecombat.com/legal).
+For more info on the legal side of contributing to CodeCombat, see [https://codecombat.com/legal](https://codecombat.com/legal).

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 CodeCombat Inc. and other contributors
+Copyright (c) 2015 CodeCombat Inc. and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -1,20 +1,22 @@
-CodeCombat
-==========
+#CodeCombat
 
-![](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/readme_00.png)
+<div style="text-align:center"><a href="http://codecombat.com/"><img src ="https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/readme_00.png" /></a></div>
 [![Build Status](https://travis-ci.org/codecombat/codecombat.png?branch=master)](https://travis-ci.org/codecombat/codecombat)
 
-CodeCombat is a multiplayer programming game for learning how to code. **See the [Archmage developer wiki](https://github.com/codecombat/codecombat/wiki/Archmage-Home) for a dev setup guide, extensive documentation, and much more.**
+CodeCombat is a multiplayer programming game for learning how to code. **See the [Archmage (coder) developer wiki](https://github.com/codecombat/codecombat/wiki/Archmage-Home) for a dev setup guide, extensive documentation, and much more. Every new person that wants to start contributing the project coding should start there.**
 
 It's both a startup and a community project, completely open source under the [MIT and Creative Commons licenses](http://codecombat.com/legal). It's the largest open source [CoffeeScript](http://coffeescript.org/) project by lines of code, and since it's a game (with [really cool tech](https://github.com/codecombat/codecombat/wiki/Third-party-software-and-services)), it's really fun to hack on. Join us in teaching the world to code! Your contribution will go on to show millions of players how cool programming can be.
 
-### [Getting Started](https://github.com/codecombat/codecombat/wiki/Developer-environment)
+### [Getting Started](https://github.com/codecombat/codecombat/wiki/Dev-Setup:-General-Information)
 
-We've made it easy to fork the project, run a simple script that'll install all the dependencies, and get a local copy of CodeCombat running right away on Mac, Linux, or Windows. See [the docs for details](https://github.com/codecombat/codecombat/wiki/Developer-environment).
+We've made it easy to fork the project, run a simple script that'll install all the dependencies, and get a local copy of CodeCombat running right away on [Mac](https://github.com/codecombat/codecombat/wiki/Dev-Setup:-Mac), [Linux](https://github.com/codecombat/codecombat/wiki/Dev-Setup:-Linux), [Windows](https://github.com/codecombat/codecombat/wiki/Dev-Setup:-Windows), or
+[Vagrant](https://github.com/codecombat/codecombat/wiki/Dev-Setup:-Vagrant). See [the docs for details](https://github.com/codecombat/codecombat/wiki/Dev-Setup:-General-Information).
 
 ### [Getting In Touch](https://github.com/codecombat/codecombat/wiki/Developer-organization)
 
-Whether you're novice or pro, the CodeCombat team is ready to help you implement your ideas. Reach out on our forum, our issue tracker, or our developer chat room, or see the docs for [more on how to contribute](https://github.com/codecombat/codecombat/wiki/Developer-organization).
+Whether you're novice or pro, the CodeCombat team is ready to help you implement your ideas. Reach out on our [forum](http://discourse.codecombat.com), our [issue tracker](https://github.com/codecombat/codecombat/issues), or [our developer chat room on Slack](https://coco-slack-invite.herokuapp.com/), or see the docs for [more on how to contribute](https://github.com/codecombat/codecombat/wiki/Developer-organization).
+
+[![Slack Status](https://coco-slack-invite.herokuapp.com/badge.svg)](https://coco-slack-invite.herokuapp.com/)
 
 ### [License](https://github.com/codecombat/codecombat/blob/master/LICENSE)
 
@@ -22,34 +24,61 @@ Whether you're novice or pro, the CodeCombat team is ready to help you implement
 
 ### [Join Us!](http://blog.codecombat.com/why-you-should-open-source-your-startup)
 
+![Nick Winter](http://codecombat.com/images/pages/about/nick_small.png)
 ![George Saines](http://codecombat.com/images/pages/about/george_small.png)
 ![Scott Erickson](http://codecombat.com/images/pages/about/scott_small.png)
-![Nick Winter](http://codecombat.com/images/pages/about/nick_small.png)
+![Matt Lott](http://codecombat.com/images/pages/about/matt_small.png)
+![Catherine Weresow](http://codecombat.com/images/pages/about/cat_small.png)
+![Maka Gradin](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Maka%20Gradin/maka_gradin_100.png)
+![Rob Blanckaert](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Rob%20Blanckaert/rob_blanckaert_100.png)
+![Josh Callebaut](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Josh%20Callebaut/josh_callebaut_100.png)
 ![Michael Schmatz](http://codecombat.com/images/pages/about/michael_small.png)
-![Jeremy Arns](http://codecombat.com/images/pages/about/jeremy_small.png)
-![Glen De Cauwsemaecker](http://codecombat.com/images/pages/about/glen_small.png)
-![Tom Steinbrecher](http://codecombat.com/images/pages/contribute/archmage/tom_small.png)
-![Sébastien Moratinos](http://codecombat.com/images/pages/contribute/archmage/sebastien_small.png)
-![deepak1556](http://codecombat.com/images/pages/contribute/archmage/deepak_small.png)
-![Ronnie Cheng](http://codecombat.com/images/pages/contribute/archmage/ronald_small.png)
-![Chloe Fan](http://codecombat.com/images/pages/contribute/archmage/chloe_small.png)
-![Rachel Xiang](http://codecombat.com/images/pages/contribute/archmage/rachel_small.png)
-![Dan Ristic](http://codecombat.com/images/pages/contribute/archmage/dan_small.png)
-![Brad Dickason](http://codecombat.com/images/pages/contribute/archmage/brad_small.png)
-![Rebecca Saines](http://codecombat.com/images/pages/contribute/archmage/becca_small.png)
-![Laura Watiker](http://codecombat.com/images/pages/contribute/archmage/laura_small.png)
-![Shiying Zheng](http://codecombat.com/images/pages/contribute/archmage/shiying_small.png)
-![Mischa Lewis-Norelle](http://codecombat.com/images/pages/contribute/archmage/mischa_small.png)
-![Paul Buser](http://codecombat.com/images/pages/contribute/archmage/paul_small.png)
-![Benjamin Stern](http://codecombat.com/images/pages/contribute/archmage/ben_small.png)
-![Alex Cotsarelis](http://codecombat.com/images/pages/contribute/archmage/alex_small.png)
-![Ken Stanley](http://codecombat.com/images/pages/contribute/archmage/ken_small.png)
-![Robert Moreton](http://codecombat.com/images/pages/contribute/artisan/rob_small.png)
-![Andrew Witcher](http://codecombat.com/images/pages/contribute/artisan/andrew_small.png)
-![Axandre Oge](http://codecombat.com/images/pages/contribute/artisan/axandre_small.png)
-![Katharine Chan](http://codecombat.com/images/pages/contribute/artisan/katharine_small.png)
-![Derek Wong](http://codecombat.com/images/pages/contribute/artisan/derek_small.png)
-
-----------
-
-[![](http://1-ps.googleusercontent.com/x/s.google-melange.appspot.com/www.google-melange.com/soc/content/2-1-20140225/images/gsoc/logo/920x156xbanner-gsoc2014.png.pagespeed.ic.gdr4t3Igca.png)](http://www.google-melange.com/gsoc/homepage/google/gsoc2014)
+![Josh Lee](http://codecombat.com/images/pages/about/josh_small.png)
+![Alex Cotsarelis](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Alex%20Cotsarelis/alex_100.png)
+![Alex Crooks](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Alex%20Crooks/alex_100.png)
+![Alexandru Caciulescu](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Alexandru%20Caciulescu/alexandru_100.png)
+![Andreas Linn](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Andreas%20Linn/andreas_100.png)
+![Andrew Witcher](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Andrew%20Witcher/andrew_100.png)
+![Axandre Oge](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Axandre%20Oge/axandre_100.png)
+![Bang Honam](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Bang%20Honam/bang_100.png)
+![Benjamin Stern](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Benjamin%20Stern/benjamin_100.png)
+![Brad Dickason](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Brad%20Dickason/brad_100.png)
+![Carlos Maia](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Carlos%20Maia/carlos_maia_100.png)
+![Chloe Fan](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Chloe%20Fan/chloe_100.png)
+![Dan Ristic](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Dan%20Ristic/dan_100.png)
+![Danny Whittaker](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Danny%20Whittaker/danny_100.png)
+![David Liu](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/David%20Liu/david_liu_100.png)
+![David Pendray](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/David%20Pendray/david_100.png)
+![Deepak1556](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Deepak1556/deepak_100.png)
+![Derek Wong](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Derek%20Wong/derek_100.png)
+![Dominik Kundel](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Dominik%20Kundel/dominik_k_100.png)
+![Glen De Cauwsemaecker](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Glen%20de%20Cauwsemaecker/glen_100.png)
+![Ian Li](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Ian%20Li/ian_100.png)
+![Jeremy Arns](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Jeremy%20Arns/jeremy_100.png)
+![Joachim Brehmer](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Joachim%20Brehmer/joachim_100.png)
+![Jose Antonini](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Jose%20Antonini/jose_antonini_100.png)
+![Katharine Chan](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Katharine%20Chan/katharine_100.png)
+![Ken Stanley](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Ken%20Stanley/ken_100.png)
+![Kevin Holland](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Kevin%20Holland/kevin_100.png)
+![Laura Watiker](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Laura%20Watiker/laura_100.png)
+![Michael Heasell](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Michael%20Heasell/michael_100.png)
+![Michael Polyak](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Michael%20Polyak/michael_100.png)
+![Mischa Lewis-Norelle](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Mischa%20Lewis-Norelle/mischa_100.png)
+![Nathan Gosset](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Nathan%20Gosset/nathan_100.png)
+![Oleg Ulyanicky](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Oleg%20Ulyanickiy/oleg_100.png)
+![Paul Buser](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Paul%20Buser/paul_100.png)
+![Pavel Konstantynov](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Pavel%20Konstantinov/pavel_100.png)
+![Popey Gilbert](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Popey%20Gilbert/popey_100.png)
+![Prabhsimran Baweja](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Prabhsimran%20Baweja/prabhsimran_100.png)
+![Rachel Xiang](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Rachel%20Xiang/rachel_100.png)
+![Rebecca Saines](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Rebecca%20Saines/rebecca_100.png)
+![Robert Moreton](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Robert%20Moreton/robert_100.png)
+![Ronnie Cheng](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Ronnie%20Cheng/ronnie_100.png)
+![Ruben Vereecken](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Ruben%20Vereecken/ruben_100.png)
+![Russ Fan](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Russ%20Fan/russ_100.png)
+![Shiying Zheng](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Shying%20Zheng/shiyeng_100.png)
+![Sébastien Moratinos](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Tom%20Steinbrecher/tom_100.png)
+![Thanish Muhammed](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Thanish%20Muhammed/thanish_100.png)
+![Tom Steinbrecher](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Tom%20Steinbrecher/tom_100.png)
+![Yang Shun Tay](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Yang%20Shun%20Tay/yang_shun_tay_100.png)
+![Zach Martin](https://dl.dropboxusercontent.com/u/138899/GitHub%20Wikis/avatars/Zach%20Martin/zack_100.png)

Vagrantfile

@@ -0,0 +1,32 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Original content copyright (c) 2014 dpen2000 licensed under the MIT license
+
+VAGRANTFILE_API_VERSION = "2"
+Vagrant.require_version ">= 1.5.0"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+
+  # Ubuntu 14.04 compatible with both VirtualBox and VMWare Fusion
+  # see https://github.com/phusion/open-vagrant-boxes#readme
+  config.vm.box = "phusion/ubuntu-14.04-amd64"
+
+  config.vm.hostname = "coco-dev"
+
+  config.vm.network "forwarded_port", guest: 3000, host: 3000
+  config.vm.network "forwarded_port", guest: 9485, host: 9485
+
+  config.vm.provision "shell", path: "scripts/vagrant/provision.sh", privileged: false
+
+  config.vm.provider "virtualbox" do |v|
+    v.memory = 2048
+    v.cpus = 2
+  end
+
+  config.vm.provider "vmware_fusion" do |v|
+    v.vmx["memsize"] = "2048"
+    v.vmx["numvcpus"] = 2
+  end
+
+end