Merge pull request #14 from thewilkybarkid/autoload

Use PSR-0 autoloading

Author: MarcelloDuarte

composer.json

@@ -10,7 +10,10 @@
          }
     ],
     "autoload": {
-        "files": ["expect.php"]
+        "files": ["expect.php"],
+        "psr-0": {
+            "Bossa\\PhpSpec\\Expect\\": ""
+        }
     },
     "require": {
         "phpspec/phpspec": ">=2.0.0-RC3"

expect.php

@@ -1,19 +1,5 @@
 <?php
 
-if (is_dir($vendor = __DIR__ . '/../vendor')) {
-    require_once($vendor . '/autoload.php');
-} elseif (is_dir($vendor = __DIR__ . '/../../../vendor')) {
-    require_once($vendor . '/autoload.php');
-} elseif (is_dir($vendor = __DIR__ . '/vendor')) {
-    require_once($vendor . '/autoload.php');
-} else {
-    die(
-        'You must set up the project dependencies, run the following commands:' . PHP_EOL .
-            'curl -s http://getcomposer.org/installer | php' . PHP_EOL .
-            'php composer.phar install' . PHP_EOL
-    );
-}
-
 use Bossa\PhpSpec\Expect\Subject;
 use Bossa\PhpSpec\Expect\Wrapper;
 use PhpSpec\Exception\ExceptionFactory;
@@ -43,9 +29,6 @@
 use PhpSpec\Wrapper\Unwrapper;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 
-require_once 'Bossa/PhpSpec/Expect/Subject.php';
-require_once 'Bossa/PhpSpec/Expect/Wrapper.php';
-
 if (!function_exists('expect')) {
     function expect($sus)
     {