Fixed autoloader

Author: jubianchi

CHANGELOG.md

@@ -1,5 +1,5 @@
-# dev-master
-
+# 1.0.1 - 2015-02-21
 
+* Fixed autoloader
 
 # 1.0.0 - 2015-02-21

autoloader.php

@@ -4,19 +4,28 @@
 
 use mageekguy\atoum;
 
-require_once __DIR__ . '/vendor/hoa/core/Core.php';
+$vendorDirectory = __DIR__ . '/vendor';
+
+if (is_dir($vendorDirectory) === false)
+{
+	$vendorDirectory = __DIR__ . '/../..';
+}
+
+if (is_file($vendorAutoloader = $vendorDirectory . '/hoa/core/Core.php')) {
+	require_once $vendorDirectory . '/hoa/core/Core.php';
+}
 
 atoum\autoloader::get()
 	->addNamespaceAlias('atoum\ruler', __NAMESPACE__)
-	->addDirectory(__NAMESPACE__, __DIR__ . DIRECTORY_SEPARATOR . 'classes')
-	->addDirectory('Hoa\Core', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/core')
-	->addDirectory('Hoa\Compiler', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/compiler')
-	->addDirectory('Hoa\File', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/file')
-	->addDirectory('Hoa\Iterator', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/iterator')
-	->addDirectory('Hoa\Math', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/math')
-	->addDirectory('Hoa\Regex', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/regex')
-	->addDirectory('Hoa\Ruler', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/ruler')
-	->addDirectory('Hoa\Stream', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/stream')
-	->addDirectory('Hoa\String', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/string')
-	->addDirectory('Hoa\Visitor', __DIR__ . DIRECTORY_SEPARATOR . 'vendor/hoa/visitor')
+	->addDirectory(__NAMESPACE__, __DIR__ . '/classes')
+	->addDirectory('Hoa\Core', $vendorDirectory . '/hoa/core')
+	->addDirectory('Hoa\Compiler', $vendorDirectory . '/hoa/compiler')
+	->addDirectory('Hoa\File', $vendorDirectory . '/hoa/file')
+	->addDirectory('Hoa\Iterator', $vendorDirectory . '/hoa/iterator')
+	->addDirectory('Hoa\Math', $vendorDirectory . '/hoa/math')
+	->addDirectory('Hoa\Regex', $vendorDirectory . '/hoa/regex')
+	->addDirectory('Hoa\Ruler', $vendorDirectory . '/hoa/ruler')
+	->addDirectory('Hoa\Stream', $vendorDirectory . '/hoa/stream')
+	->addDirectory('Hoa\String', $vendorDirectory . '/hoa/string')
+	->addDirectory('Hoa\Visitor', $vendorDirectory . '/hoa/visitor')
 ;