Merge branch 'master' of https://github.com/codecombat/codecombat

bin/coco-client-test-runner

@@ -1,7 +1,14 @@
 #!/bin/bash
 
+# full script path include his name
+_script="$(readlink -f ${BASH_SOURCE[0]})"
+ 
+# Script location path (dir)
+_base="$(dirname $_script)"
+
 sleep 5
-cd ~/Desktop/coco
+cd $_base
+cd ../
 until node_modules/karma/bin/karma start; do
     echo "Karma crashed with exit code $?.  Respawning.." >&2
     sleep 1

bin/coco-server-test-runner

@@ -1,5 +1,11 @@
 #!/bin/bash
 
-#sleep 5
-cd ~/Desktop/coco
+# full script path include his name
+_script="$(readlink -f ${BASH_SOURCE[0]})"
+ 
+# Script location path (dir)
+_base="$(dirname $_script)"
+ 
+cd $_base
+cd ../
 node_modules/jasmine-node/bin/jasmine-node test/server/ --coffee --autotest --captureExceptions

bin/coco-test-server

@@ -1,4 +1,11 @@
 #!/bin/bash
 
-cd ~/Desktop/coco
+# full script path include his name
+_script="$(readlink -f ${BASH_SOURCE[0]})"
+ 
+# Script location path (dir)
+_base="$(dirname $_script)"
+
+cd $_base
+cd ../
 node_modules/.bin/nodemon . --ext ".coffee|.js" --watch server --watch server.coffee --unittest

scripts/devSetup/directoryController.py

@@ -39,7 +39,10 @@ class DirectoryController(object):
           raise errors.CoCoError(u"There was an error creating the directory structure, do you have correct permissions? Please remove all and start over.")
 
     def remove_directories(self):
-        shutil.rmtree(self.tmp_directory)
         shutil.rmtree(self.bin_directory + os.sep + "node",ignore_errors=True)
         shutil.rmtree(self.bin_directory + os.sep + "mongo",ignore_errors=True)
+    def remove_tmp_directory(self):
+        shutil.rmtree(self.tmp_directory)
+
+
 

scripts/devSetup/factories.py

@@ -63,7 +63,7 @@ class SetupFactory(object):
         print("3. ./coco-dev-server")
         print("Once brunch is done, visit http://localhost:3000!")
     def cleanup(self):
-        self.config.directory.remove_directories()
+        self.config.directory.remove_tmp_directory()
 
 class MacSetup(SetupFactory):
     def setup(self):