Merge pull request repejota#98 from repejota/feature/better_makefile

Feature/better makefile

Author: repejota

.travis.yml

@@ -13,7 +13,9 @@ cache:
 before_install:
   - docker run -d -p 4222:4222 --name nats nats
 before_script:
+  - make dist-clean
   - make deps
+  - make dev-deps
 script:
   - mkdir -p build/logs
   - make lint

Makefile

@@ -1,21 +1,32 @@
+PHPCS_PHAR = https://squizlabs.github.io/PHP_CodeSniffer/phpcs.phar
+COMPOSER_PHAR = https://getcomposer.org/composer.phar
+PHPDOCUMENTOR_PHAR_URL = https://github.com/phpDocumentor/phpDocumentor2/releases/download/v2.9.0/phpDocumentor.phar
+CLEAN_FILES = composer.phar composer.lock phpDocumentor.phar phpcs.phar phpcbf.phar
+CLEAN_FOLDERS = bin build cover vendor docs/api
+CLEAN_PATHS = $(CLEAN_FILES) $(CLEAN_FOLDERS)
+SOURCE_CODE_PATHS = src test examples
+API_DOCS_PATH = ./docs/api
+COVERAGE_PATH = ./cover
+
+define require_phar
+	@[ -f ./$(1) ] || wget -q $(2) -O ./$(1) && chmod +x $(1);
+endef
+
 lint: lint-php lint-psr2 lint-squiz
 
 .PHONY: lint-php
 lint-php:
-	find src -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 {} \;
+	find $(SOURCE_CODE_PATHS) spec -name *.php -exec php -l {} \;
 
 .PHONY: lint-psr2
 lint-psr2:
-	#./vendor/bin/phpcbf --standard=PSR2 src test examples
-	./vendor/bin/phpcs --standard=PSR2 --colors -w -s --warning-severity=0 src test examples
+	$(call require_phar,phpcs.phar,$(PHPCS_PHAR))
+	./phpcs.phar --standard=PSR2 --colors -w -s --warning-severity=0 $(SOURCE_CODE_PATHS)
 
 .PHONY: lint-squiz
 lint-squiz:
-	# ./vendor/bin/phpcbf --standard=Squiz,./ruleset.xml src test examples
-	./vendor/bin/phpcs --standard=Squiz,./ruleset.xml --colors -w -s --warning-severity=0 src test examples
+	$(call require_phar,phpcs.phar,$(PHPCS_PHAR))
+	./phpcs.phar --standard=Squiz,./ruleset.xml --colors -w -s --warning-severity=0 $(SOURCE_CODE_PATHS)
 
 
 test: test-tdd test-bdd
@@ -29,28 +40,25 @@ test-bdd:
 	./vendor/bin/phpspec run --format=pretty -v
 
 cover:
-	./vendor/bin/phpunit --coverage-html ./cover test
+	./vendor/bin/phpunit --coverage-html $(COVERAGE_PATH) test
 
 deps:
-	wget -q https://getcomposer.org/composer.phar -O ./composer.phar
-	chmod +x composer.phar
-	php composer.phar install
+	$(call require_phar,composer.phar,$(COMPOSER_PHAR))
+	./composer.phar install --no-dev
+
+dev-deps:
+	$(call require_phar,composer.phar,$(COMPOSER_PHAR))
+	./composer.phar install
 
 dist-clean:
-	rm -rf bin
-	rm -rf vendor
-	rm -f composer.phar
-	rm -f composer.lock
-	rm -f phpDocumentor.phar
-	rm -rf docs/api
+	rm -rf $(CLEAN_PATHS)
 
 docker-nats:
 	docker run --rm -p 8222:8222 -p 4222:4222 -d --name nats-main nats
 
 phpdoc:
-	wget -q https://github.com/phpDocumentor/phpDocumentor2/releases/download/v2.9.0/phpDocumentor.phar -O ./phpDocumentor.phar
-	chmod +x phpDocumentor.phar
-	./phpDocumentor.phar -d ./src/ -t ./docs/api --template=checkstyle --template=responsive-twig
+	$(call require_phar,phpdoc.phar,$(PHPDOCUMENTOR_PHAR_URL))
+	./phpdoc.phar -d ./src/ -t $(API_DOCS_PATH) --template=checkstyle --template=responsive-twig
 
 serve-phpdoc:
-	cd docs/api && php -S localhost:8000 && cd ../..
+	cd $(API_DOCS_PATH) && php -S localhost:8000 && cd ../..

composer.json

@@ -5,13 +5,12 @@
     "minimum-stability": "dev",
     "license": "MIT",
     "require": {
-        "ircmaxell/random-lib": "^1.1"
+        "ircmaxell/random-lib": "^1.2"
     },
     "require-dev": {
         "phpunit/phpunit": "5.*",
-        "satooshi/php-coveralls": "dev-master",
-        "squizlabs/php_codesniffer": "~2.0",
-        "phpspec/phpspec": "~2.0"
+        "phpspec/phpspec": "^3.0",
+        "satooshi/php-coveralls": "dev-master"
     },
     "authors": [
         {