Merge pull request #4 from codebendercc/travis

Fixing whatever make Travis buils fail

Author: fpapadopou

.travis.yml

@@ -9,15 +9,21 @@ php:
 
 env:
   global:
-    - secure: "ghxjxZnqzsr2dnyAMMv7OK1hgJJaUmkM7dYZst5FxdmUQweXy9DYxyhLl4ewQs0H7vNt7oyIGjWbKlzS02aeOeD5FeA/3CRbDbw3r1iboWm9vzXiNpeLAoBNhJ8pFKv+r2EWikdSeU5FWDb8t4O58VQFzIXXuY+xZPlbzIGNPUE="
-    - secure: "LDq5UcA6AA0OJtt4Z97Kig/AGcg/b3STF+d6DAMoI2FfPGSIItc4oHTM4chhG9KK2ybGHkCKTBCWOwBJAW3YciMygiNG9QsI7y6v11ptLxPVf0YO2lercCaHq8C5xCXbEpqt84JkSawjTXAqFOHTnrQufzqbve5eDXZpnS2giXM="
+    # eratosthenes library management system url (encrypted)
+    - secure: "ZYn4o229W7hq1uzj/Tii9h/a3iJlr9Li4TBaTNFXm6JY2H49lA57L1DIFUaTleTUx2Ibs2+kUrV3NFQ9Mo/ThO67gV5Q1XEMjxgFzAKt4AuWJ5TNbHxs3GBTjYc+129QCKSd0WdzrRDqEC2nZ9GjI+j7lS39DrjAMGg4wEp9b0U="
+    # codebender compiler url (encrypted)
+    - secure: "XRsqGDqdu5uhdj2lF4SZ6qv6Y0PdcRPcvE13XvVGnIYRZaITelP3eJNSvLPO+Q5k4mBmKCz8t+ws/OVRRwSAXYaKe0Z8ZXgEcNyo1nEwGekC35mTuG1FFfB/pbuBp5/OWjw6bgz2tEHhKuFIbHytpT9zJQYy+D07rzOYeUsZjOY="
 
 before_script:
   - sudo chmod +x scripts/install.sh
   - scripts/install.sh
   - cd /opt/codebender/builder/Symfony
   - sudo chmod -R 777 app/cache app/logs
   - echo 'error_reporting =  E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - cd /opt/codebender/builder
+  - sudo chmod +x scripts/apache_install.sh
+  - scripts/apache_install.sh
+  - cd /opt/codebender/builder/Symfony
 
 script:
   - mkdir -p build/logs
@@ -28,9 +34,6 @@ script:
 after_script:
   - php composer.phar install --dev
   - php bin/coveralls -v
-  - cd /opt/codebender/builder
-  - sudo chmod +x scripts/apache_install.sh
-  - scripts/apache_install.sh
 
 notifications:
   irc: "chat.freenode.net#codebender.cc"

README.md

@@ -1,4 +1,7 @@
-lib-compiler-service
+[![Build Status](https://travis-ci.org/codebendercc/builder.svg?branch=master)](https://travis-ci.org/codebendercc/builder)
+[![Coverage Status](https://coveralls.io/repos/codebendercc/builder/badge.svg)](https://coveralls.io/r/codebendercc/builder)
+
+codebender's builder
 ====================
 
 A service that handles library fetching and compilation requests.

Symfony/app/phpunit.xml.dist

@@ -8,9 +8,14 @@
          bootstrap="bootstrap.php.cache"
 >
     <testsuites>
-        <testsuite name="Project Test Suite">
-            <directory>../src/*/*Bundle/Tests</directory>
-            <directory>../src/*/Bundle/*Bundle/Tests</directory>
+        <testsuite name="Unit Test Suite">
+            <directory suffix="UnitTest.php">../src/*/*Bundle/Tests</directory>
+            <directory suffix="UnitTest.php">../src/*/Bundle/*Bundle/Tests</directory>
+        </testsuite>
+
+        <testsuite name="Functional Test Suite">
+            <directory suffix="FunctionalTest.php">../src/*/*Bundle/Tests</directory>
+            <directory suffix="FunctionalTest.php">../src/*/Bundle/*Bundle/Tests</directory>
         </testsuite>
     </testsuites>
 

Symfony/src/Codebender/BuilderBundle/Controller/DefaultController.php

@@ -74,6 +74,8 @@ public function handleRequestAction($authKey, $version)
      *
      * @param $contents
      * @return Response
+     *
+     * @SuppressWarnings(PHPMD.LongVariable)
      */
     protected function compile($contents)
     {

Symfony/src/Codebender/BuilderBundle/Tests/Controller/DefaultControllerFunctionalTest.php

@@ -24,21 +24,22 @@ public function testStatusAction() {
     public function testHandleRequestGet() {
         $client = static::createClient();
 
-        /*
-         * Using the same auth key and version like the ones in the dist parameter file
-         */
-        $client->request('GET', '/authKey/v1');
+        $authorizationKey = $client->getContainer()->getParameter('auth_key');
+        $apiVersion = $client->getContainer()->getParameter('version');
+        $client->request('GET', "/{$authorizationKey}/{$apiVersion}/");
 
         $this->assertEquals($client->getResponse()->getStatusCode(), 405);
     }
 
     public function testHandleRequestCompile() {
         $client = static::createClient();
 
+        $authorizationKey = $client->getContainer()->getParameter('auth_key');
+        $apiVersion = $client->getContainer()->getParameter('version');
         $client
             ->request(
                 'POST',
-                'authenticationekey/version',
+                "/{$authorizationKey}/{$apiVersion}/",
                 $parameters = array(),
                 $files = array(),
                 $server = array(),
@@ -54,10 +55,12 @@ public function testHandleRequestCompile() {
     public function testHandleRequestLibraryFetching() {
         $client = static::createClient();
 
+        $authorizationKey = $client->getContainer()->getParameter('auth_key');
+        $apiVersion = $client->getContainer()->getParameter('version');
         $client
             ->request(
                 'POST',
-                'authenticationekey/version',
+                "/{$authorizationKey}/{$apiVersion}/",
                 $parameters = array(),
                 $files = array(),
                 $server = array(),
@@ -74,10 +77,12 @@ public function testHandleRequestLibraryFetching() {
     public function testHandleRequestLibraryKeywords() {
         $client = static::createClient();
 
+        $authorizationKey = $client->getContainer()->getParameter('auth_key');
+        $apiVersion = $client->getContainer()->getParameter('version');
         $client
             ->request(
                 'POST',
-                'authenticationekey/version',
+                "/{$authorizationKey}/{$apiVersion}/",
                 $parameters = array(),
                 $files = array(),
                 $server = array(),

scripts/install.sh

@@ -6,11 +6,11 @@ PACKAGENAME=builder
 
 if [[ "$OSTYPE" == "linux-gnu" ]]; then
 	echo "Configuring environment for Linux"
+	# Make sure we have up-to-date stuff
+    sudo apt-get update
 	if [[ ! $TRAVIS ]]; then
 		# Ubuntu Server (on AWS?) lacks UTF-8 for some reason. Give it that
 		sudo locale-gen en_US.UTF-8
-		# Make sure we have up-to-date stuff
-		sudo apt-get update
 		sudo apt-get install -y php5-intl
 	fi
 	# Install dependencies