Fixes for v0.2, added tests and .travis.yml

fixed merge errors
fixed deployment issues with config if already exists in project
fixed issue with missing SYMFONY_ENV while composer install
fixed composer path variable missing
added tests directory and travis.yml for testing

Author: maschmann

.travis.yml

@@ -0,0 +1,19 @@
+---
+language: python
+python: "2.7"
+
+before_install:
+  # Make sure everything's up to date.
+  - sudo apt-get update -qq
+
+install:
+  # Install Ansible.
+  - pip install ansible
+
+  # Add ansible.cfg to pick up roles path.
+  - "printf '[defaults]\nroles_path = ../' > ansible.cfg"
+
+script:
+  # Check the role/playbook's syntax.
+  - "ansible-playbook -i tests/inventory tests/test.yml --syntax-check"
+  - "ansible-playbook -i tests/inventory tests/test.yml --connection=local --sudo"

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.2
+* fixed merge errors
+* fixed deployment issues with config if already exists in project
+* fixed issue with missing SYMFONY_ENV while composer install
+* fixed composer path variable missing
+* added tests directory and travis.yml for testing
+
 ## v0.1
 
 * structural refactoring (creating files, directories, ...)

README.md

@@ -34,18 +34,16 @@ Role Variables
 - vars:
     symfony2_project_root: Path where application will be deployed on server.
     symfony2_project_name: Name of project.
+    symfony2_project_composer_path: path where composer.phar will be stored (e.g. project_root/shared)
     symfony2_project_repo: URL of git repository.
     symfony2_project_release: Release number, can be numeric, we recommend to set it to release date/time, 20140327100911
     symfony2_project_branch: git branch to deploy.
     symfony2_project_php_path: /usr/local/php54/bin/php
     symfony2_project_env: prod
     symfony2_project_console_opts: ''
     symfony2_project_composer_opts: '--no-dev --optimize-autoloader'
-<<<<<<< HEAD
     symfony2_project_keep_releases: 5
-=======
     symfony2_project_clean_versioning: true
->>>>>>> 86069b4780bce7951c4324a6312b1d99b37fa6e8
 ```
 
 Dependencies

defaults/main.yml

@@ -4,8 +4,5 @@
 symfony2_project_release: 1
 symfony2_project_branch: master
 symfony2_project_php_path: php
-<<<<<<< HEAD
 symfony2_project_keep_releases: 5
-=======
-symfony2_project_clean_versioning: true
->>>>>>> 86069b4780bce7951c4324a6312b1d99b37fa6e8
+symfony2_project_clean_versioning: true

meta/main.yml

@@ -3,13 +3,6 @@ galaxy_info:
   author: servergrove
   description: 
   company: ServerGrove
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
   license: MIT
   min_ansible_version: 1.2
   #
@@ -118,5 +111,4 @@ dependencies: []
   # List your role dependencies here, one per line. Only
   # dependencies available via galaxy should be listed here.
   # Be sure to remove the '[]' above if you add dependencies
-  # to this list.
-  
+  # to this list.

tasks/main.yml

@@ -6,8 +6,8 @@
     - { path: "{{symfony2_project_root}}/releases/{{symfony2_project_release}}" }
     - { path: "{{symfony2_project_root}}/shared" }
     - { path: "{{symfony2_project_root}}/shared/app/config" }
-    - { path: "{{symfony2_project_root}}/shared/app/uploads" }
     - { path: "{{symfony2_project_root}}/shared/app/logs" }
+    - { path: "{{symfony2_project_root}}/shared/web/uploads" }
 
 - name: Pull sources from the repository.
   git: repo={{symfony2_project_repo}} dest={{symfony2_project_root}}/releases/{{symfony2_project_release}} version={{symfony2_project_branch}} accept_hostkey=yes
@@ -16,11 +16,23 @@
   file: state=absent path={{symfony2_project_root}}/releases/{{symfony2_project_release}}/.git
   when: symfony2_project_clean_versioning == true
 
+# will be replaced with symlink
+- name: Ensure logs directory is not present.
+  file: state=absent path={{symfony2_project_root}}/releases/{{symfony2_project_release}}/app/logs
+
 - name: Create symlinks to shared directories.
   file: state=link src={{item.src}} path={{item.path}}
   with_items:
-    - { src: "{{symfony2_project_root}}/shared/web/uploads", path: "{{symfony2_project_root}}/releases/{{symfony2_project_release}}/uploads" }
-    - { src: "{{symfony2_project_root}}/shared/app/logs", path: "{{symfony2_project_root}}/releases/{{symfony2_project_release}}/logs" }
+    - { src: "{{symfony2_project_root}}/shared/app/logs", path: "{{symfony2_project_root}}/releases/{{symfony2_project_release}}/app/logs" }
+    - { src: "{{symfony2_project_root}}/shared/web/uploads", path: "{{symfony2_project_root}}/releases/{{symfony2_project_release}}/web/uploads" }
+
+- name: Check if config dir exists.
+  stat: path={{symfony2_project_root}}/releases/{{symfony2_project_release}}/app/config
+  register: config_dir
+
+- name: Link configs dir if not yet exists.
+  file: state=link src={{symfony2_project_root}}/shared/app/config path={{symfony2_project_root}}/releases/{{symfony2_project_release}}/app/config
+  when: config_dir.stat.exists == false
 
 - name: Check if shared/app/config/parameters.ini exists.
   stat: path={{symfony2_project_root}}/shared/app/config/parameters.ini
@@ -31,19 +43,19 @@
   when: parameters_ini.stat.exists
 
 - name: Check if composer exists.
-  stat: path={{symfony2_project_composer_path}}
+  stat: path={{symfony2_project_composer_path}}/composer.phar
   register: composer_file
 
 - name: Install composer.
   get_url: url=https://getcomposer.org/composer.phar dest={{symfony2_project_composer_path}} mode=0755 validate_certs=no
   when: composer_file.stat.exists == false
 
 - name: Update composer if already exists.
-  shell: "{{symfony2_project_composer_path}} selfupdate"
+  shell: "{{symfony2_project_composer_path}}/composer.phar selfupdate"
   when: composer_file.stat.exists == true
 
 - name: Run composer install.
-  shell: cd {{symfony2_project_root}}/releases/{{symfony2_project_release}} && {{symfony2_project_php_path}} {{symfony2_project_root}}/composer.phar install {{symfony2_project_composer_opts}}
+  shell: cd {{symfony2_project_root}}/releases/{{symfony2_project_release}} && export SYMFONY_ENV={{symfony2_project_env}} && {{symfony2_project_php_path}} {{symfony2_project_composer_path}}/composer.phar install {{symfony2_project_composer_opts}}
 
 - name: Dump assets.
   shell: cd {{symfony2_project_root}}/releases/{{symfony2_project_release}} && {{symfony2_project_php_path}} app/console assetic:dump --env={{symfony2_project_env}} {{symfony2_project_console_opts}}

tests/inventory

@@ -0,0 +1 @@
+localhost

tests/test.yml

@@ -0,0 +1,19 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - ansible-symfony2
+
+  vars:
+    symfony2_project_root: ~/test_app
+    symfony2_project_name: travis-test
+    symfony2_project_composer_path: ~/test_app/shared
+    symfony2_project_repo: [email protected]:symfony/symfony-standard.git
+    symfony2_project_release: 1
+    symfony2_project_branch: "2.6"
+    symfony2_project_php_path: /usr/bin/php
+    symfony2_project_env: prod
+    symfony2_project_console_opts: '--no-debug'
+    symfony2_project_composer_opts: '--no-dev --optimize-autoloader'
+    symfony2_project_keep_releases: 5
+    symfony2_project_clean_versioning: true