Merge pull request repejota#66 from repejota/phpspec

Phpspec

Author: repejota

.gitignore

@@ -1,7 +1,8 @@
 .contrib
+bin
 vendor
 cover
 *.phar
-composer.lock
+/composer.phar
 build
 .idea

Makefile

@@ -1,25 +1,29 @@
 lint:
 	find src -name *.php -exec php -l {} \;
-	find tests -name *.php -exec php -l {} \;
+	find test -name *.php -exec php -l {} \;
+	find spec -name *.php -exec php -l {} \;
 	find examples -name *.php -exec php -l {} \;
-	
+
 cs: lint
-	./vendor/bin/phpcbf --standard=PSR2 src tests examples
-	./vendor/bin/phpcs --standard=PSR2 --warning-severity=0 src tests examples
-	./vendor/bin/phpcs --standard=Squiz --sniffs=Squiz.Commenting.FunctionComment,Squiz.Commenting.FunctionCommentThrowTag,Squiz.Commenting.ClassComment,Squiz.Commenting.VariableComment src tests examples
+	./bin/phpcbf --standard=PSR2 src tests examples
+	./bin/phpcs --standard=PSR2 --warning-severity=0 src tests examples
+	./bin/phpcs --standard=Squiz --sniffs=Squiz.Commenting.FunctionComment,Squiz.Commenting.FunctionCommentThrowTag,Squiz.Commenting.ClassComment,Squiz.Commenting.VariableComment src tests examples
 
 test:
-	./vendor/bin/phpunit
+	./bin/phpunit test
 
-cover:
-	./vendor/bin/phpunit --coverage-html ./cover
+bdd:
+	./bin/phpspec run
 
+cover:
+	./bin/phpunit --coverage-html ./cover test
 deps:
 	wget -q https://getcomposer.org/composer.phar -O ./composer.phar
 	chmod +x composer.phar
 	php composer.phar install
 
 dist-clean:
+	rm -rf bin
 	rm -rf vendor
 	rm -f composer.phar
 	rm -f composer.lock

composer.json

@@ -10,7 +10,11 @@
     "require-dev": {
         "phpunit/phpunit": "4.7.*",
         "satooshi/php-coveralls": "dev-master",
-        "squizlabs/php_codesniffer": "~2.0"
+        "squizlabs/php_codesniffer": "~2.0",
+        "phpspec/phpspec": "~2.0"
+    },
+    "config": {
+        "bin-dir": "bin"
     },
     "authors": [
         {
@@ -38,13 +42,9 @@
         }
     ],
     "autoload": {
-        "psr-4": {
-            "Nats\\": "src"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "Tests\\Nats\\": "tests/Unit"
+        "psr-0": {
+            "Nats": "src",
+            "Nats\\Test": "src"
         }
     }
 }