Merge pull request #8 from fryntiz/dev

raupulus · web-flow · commit 3620ecf63003 · 2018-06-20T11:50:45.000+02:00
Mejoras en Makefile
diff --git a/.gitignore b/.gitignore
@@ -18,9 +18,16 @@ Thumbs.db
 # composer itself is not needed
 composer.phar
 
+# Módulos de NodeJS con npm
+/node_modules
+
 # Mac DS_Store Files
 .DS_Store
 
+# Papelera de Linux
+.trash
+.Trash
+
 # phpunit itself is not needed
 phpunit.phar
 # local phpunit config
@@ -39,5 +46,37 @@ tests/chromedriver
 # local environment variables
 .env
 
-
+# Atom editor archivos de proyectos
 /.ropeproject
+
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
+node_modules
+
+## File-based project format
+*.ipr
+*.iws
diff --git a/CITATION.txt b/CITATION.txt
@@ -3,7 +3,7 @@ below:
 
 @Misc{,
   author       = {Raúl caro pastorino},
-  organization = {toblerity.org},
+  organization = {http://fryntiz.es},
   title        = {plantilla: descripción},
   year         = {2018},
   url          = "https://github.com/fryntiz/plantilla"
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: all test tests cs codecept pre_codecept post_codecept run_codecept \
 	fastcs fast phpcs docs api doc-src guide guia doc-src install db psql \
-	clean permisos perm p requeriments req
+	clean permisos perm p requeriments req dbfull dbh dbheroku
 
 all: requeriments install db permisos
 
@@ -43,9 +43,16 @@ install:
 	composer run-script post-create-project-cmd
 
 db:
+	db/load.sh
+
+dbfull:
 	db/create.sh
 	db/load.sh
 
+dbh dbheroku:
+	heroku psql < db/plantilla.sql
+	heroku psql < db/plantilla_datos.sql
+
 psql:
 	db/psql.sh
 
@@ -60,7 +67,7 @@ permisos perm p:
 	sudo chmod -R 777 runtime
 	sudo chmod -R 775 web
 	sudo chmod -R 777 web/assets
-	bash -c 'yo=$(shell whoami) && sudo chown -R $${yo}:www-data . && echo $${yo}'
+	bash -c 'yo=$(shell whoami) && sudo chown -R $${yo}:www-data .'
 
 requeriments req:
 	echo 'Instalando dependencias'
diff --git a/setup.sh b/setup.sh
@@ -12,7 +12,7 @@ PROYECT_NAME="$(echo $DIR | tr '[:upper:]' '[:lower:]' \
                           | tr -cs '[:alnum:]' '_')"
 
 sed -i s/plantilla/$PROYECT_NAME/g db/* config/* apache.conf codeception.yml \
-    CITATION.txt README.md LICENSE
+    Makefile CITATION.txt README.md LICENSE
 
 mv 'apache.conf' "$PROYECT_NAME.conf"
 mv 'db/plantilla.sql' "db/$PROYECT_NAME.sql"
