From da1d0e5361b5d8b000acbd87485c9ec495f7d0c4 Mon Sep 17 00:00:00 2001 From: Darredevil Date: Mon, 9 Jun 2014 22:29:02 +0300 Subject: [PATCH 1/5] Added new level Added a new prime-sieve level --- app/views/play_view.coffee | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/views/play_view.coffee b/app/views/play_view.coffee index 8662ecef4..ec6444fb0 100644 --- a/app/views/play_view.coffee +++ b/app/views/play_view.coffee @@ -211,14 +211,21 @@ module.exports = class PlayView extends View difficulty: 3 id: 'bubble-sort-bootcamp-battle' image: '/file/db/level/525ef8ef06e1ab0962000003/commanding_followers_icon.png' - description: "Write a bubble sort to organize your soldiers. - by Alexandru" + description: "Write a bubble sort to organize your soldiers. - by Alexandru Caciulescu" } { name: 'Ogres of Hanoi' difficulty: 3 id: 'ogres-of-hanoi' image: '/file/db/level/526fd3043c637ece50001bb2/the_herd_icon.png' - description: "Transfer a stack of ogres while preserving their honor. - by Alexandru" + description: "Transfer a stack of ogres while preserving their honor. - by Alexandru Caciulescu" + } + { + name: 'Danger! Minefield' + difficulty: 3 + id: 'danger!-minefield' + image: '/file/db/level/526ae95c1e5cd30000000008/zone_of_danger_icon.png' + description: "Learn how to find prime numbers while defusing mines ! - by Alexandru Caciulescu" } { name: 'Find the Spy' @@ -234,6 +241,7 @@ module.exports = class PlayView extends View image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png' description: "Collect a hundred mushrooms in just five lines of code - by Nathan Gossett" } + #{ # name: 'Enemy Artillery' From 82f33a35de1b7d2c79dd5e3b50e066cf336ff950 Mon Sep 17 00:00:00 2001 From: Darredevil Date: Mon, 9 Jun 2014 22:37:34 +0300 Subject: [PATCH 2/5] Fixed id --- app/views/play_view.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/play_view.coffee b/app/views/play_view.coffee index ec6444fb0..cb357fc8f 100644 --- a/app/views/play_view.coffee +++ b/app/views/play_view.coffee @@ -223,7 +223,7 @@ module.exports = class PlayView extends View { name: 'Danger! Minefield' difficulty: 3 - id: 'danger!-minefield' + id: 'danger-minefield' image: '/file/db/level/526ae95c1e5cd30000000008/zone_of_danger_icon.png' description: "Learn how to find prime numbers while defusing mines ! - by Alexandru Caciulescu" } From 3a8b01b05868d9d557af50d13a30ff29b3e33f4d Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Mon, 9 Jun 2014 15:07:39 -0700 Subject: [PATCH 3/5] Attempting to get TravisCI set up to run server tests. --- .travis.yml | 4 +++- bin/coco-mongodb | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 10c619e33..ba917971f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,9 @@ before_script: - "./node_modules/.bin/bower install" - "gem install sass" - "./node_modules/.bin/brunch b" + - "./bin/coco-mongodb fork" + - "node index.js --unittest &" script: + - "./node_modules/jasmine-node/bin/jasmine-node test/server/ --coffee --captureExceptions" - "./node_modules/karma/bin/karma start --browsers Firefox --single-run" - diff --git a/bin/coco-mongodb b/bin/coco-mongodb index 55b60e90e..df6e3b7ad 100755 --- a/bin/coco-mongodb +++ b/bin/coco-mongodb @@ -88,5 +88,8 @@ mongo_db_path = os.path.abspath(os.path.join(current_directory,os.pardir)) + os. if not os.path.exists(mongo_db_path): os.mkdir(mongo_db_path) mongo_arguments = [mongo_executable + u" --setParameter textSearchEnabled=true --dbpath=" + mongo_db_path] + +if 'fork' in sys.argv: mongo_arguments[0] += " --fork --logpath ./mongodb.log" + call(mongo_arguments,shell=True) From 7211a82d2ce5f07b03a21a259c6ea22254f6f871 Mon Sep 17 00:00:00 2001 From: Scott Erickson Date: Mon, 9 Jun 2014 17:04:51 -0700 Subject: [PATCH 4/5] Attempting to get TravisCI set up to run server tests by having it install mongodb. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index ba917971f..8c984ccd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,12 @@ language: node_js node_js: - 0.10 +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" + before_script: - "npm install" - export DISPLAY=:99.0 From dd2c7fab6051a4bc37a15c1f1e62643130f5b6c3 Mon Sep 17 00:00:00 2001 From: Nick Winter Date: Mon, 9 Jun 2014 21:11:59 -0700 Subject: [PATCH 5/5] Updated Danger Minefield icon. --- app/views/play_view.coffee | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/app/views/play_view.coffee b/app/views/play_view.coffee index cb357fc8f..6997dc83c 100644 --- a/app/views/play_view.coffee +++ b/app/views/play_view.coffee @@ -224,8 +224,8 @@ module.exports = class PlayView extends View name: 'Danger! Minefield' difficulty: 3 id: 'danger-minefield' - image: '/file/db/level/526ae95c1e5cd30000000008/zone_of_danger_icon.png' - description: "Learn how to find prime numbers while defusing mines ! - by Alexandru Caciulescu" + image: '/file/db/level/526bda3fe79aefde2a003e36/mobile_artillery_icon.png' + description: "Learn how to find prime numbers while defusing mines! - by Alexandru Caciulescu" } { name: 'Find the Spy' @@ -241,16 +241,6 @@ module.exports = class PlayView extends View image: '/file/db/level/529662dfe0df8f0000000007/grab_the_mushroom_icon.png' description: "Collect a hundred mushrooms in just five lines of code - by Nathan Gossett" } - - - #{ - # name: 'Enemy Artillery' - # difficulty: 1 - # id: 'enemy-artillery' - # image: '/file/db/level/526dba94a188322044000a40/mobile_artillery_icon.png' - # description: "Take cover while shells fly, then strike! - by mcdavid1991" - # disabled: true - #} ] context.campaigns = [