Merge pull request #40 from maschmann/sf3-compatibility

Sf3 compatibility

Author: maschmann

.travis.yml

@@ -23,22 +23,22 @@ install:
 
 script:
   # Check the role/playbook's syntax.
-  - "ansible-playbook -i tests/inventory tests/test_2_1.yml --syntax-check"
-  - "ansible-playbook -i tests/inventory tests/test_2_2.yml --syntax-check"
-  - "ansible-playbook -i tests/inventory tests/test_2_3.yml --syntax-check"
-  - "ansible-playbook -i tests/inventory tests/test_2_4.yml --syntax-check"
+  #- "ansible-playbook -i tests/inventory tests/test_2_1.yml --syntax-check"
+  #- "ansible-playbook -i tests/inventory tests/test_2_2.yml --syntax-check"
+  #- "ansible-playbook -i tests/inventory tests/test_2_3.yml --syntax-check"
+  #- "ansible-playbook -i tests/inventory tests/test_2_4.yml --syntax-check"
   - "ansible-playbook -i tests/inventory tests/test_2_5.yml --syntax-check"
   - "ansible-playbook -i tests/inventory tests/test_2_6.yml --syntax-check"
-  #- "ansible-playbook -i tests/inventory tests/test_2_7.yml --syntax-check"
-  #- "ansible-playbook -i tests/inventory tests/test_2_8.yml --syntax-check"
-  #- "ansible-playbook -i tests/inventory tests/test_3_0.yml --syntax-check"
+  - "ansible-playbook -i tests/inventory tests/test_2_7.yml --syntax-check"
+  - "ansible-playbook -i tests/inventory tests/test_2_8.yml --syntax-check"
+  - "ansible-playbook -i tests/inventory tests/test_3_0.yml --syntax-check"
   # Run playbooks
-  - "ansible-playbook -i tests/inventory tests/test_2_1.yml --connection=local"
-  - "ansible-playbook -i tests/inventory tests/test_2_2.yml --connection=local"
-  - "ansible-playbook -i tests/inventory tests/test_2_3.yml --connection=local"
-  - "ansible-playbook -i tests/inventory tests/test_2_4.yml --connection=local"
+  #- "ansible-playbook -i tests/inventory tests/test_2_1.yml --connection=local"
+  #- "ansible-playbook -i tests/inventory tests/test_2_2.yml --connection=local"
+  #- "ansible-playbook -i tests/inventory tests/test_2_3.yml --connection=local"
+  #- "ansible-playbook -i tests/inventory tests/test_2_4.yml --connection=local"
   - "ansible-playbook -i tests/inventory tests/test_2_5.yml --connection=local"
   - "ansible-playbook -i tests/inventory tests/test_2_6.yml --connection=local"
-  #- "ansible-playbook -i tests/inventory tests/test_2_7.yml --connection=local"
-  #- "ansible-playbook -i tests/inventory tests/test_2_8.yml --connection=local"
+  - "ansible-playbook -i tests/inventory tests/test_2_7.yml --connection=local"
+  - "ansible-playbook -i tests/inventory tests/test_2_8.yml --connection=local"
   #- "ansible-playbook -i tests/inventory tests/test_3_0.yml --connection=local"

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## v2.1
+
+* refactoring to have more control over folders when deploying
+* more tests for current symfony versions
+* compatibility with new symfony folder and command structure
+
+## v2.0
+
+* bugfixes for folders
+* stability release
+
 ## v2.0.1-alpha
 
 * bugfixes for parameters file

README.md

@@ -92,9 +92,10 @@ These are the possible role variables - you only need to have a small set define
     symfony_project_php_path: php
     symfony_project_keep_releases: 5
     symfony_project_git_clone_depth: 1 # uses git shallow copy
-    symfony_project_github_oauth_token: Auth token for github rate limits
+    symfony_project_github_token: Auth token for github rate limits
     symfony_project_console_opts: ''
     symfony_project_console_command: 'app/console' # sf >= 3.0 bin/console
+    symfony_project_config_dir: 'app/config' # symfony configuration dir
     symfony_project_parameters_file: parameters.yml # optional fixed parameters file in shared
     symfony_project_cache_command: cache:warmup
 
@@ -106,6 +107,12 @@ These are the possible role variables - you only need to have a small set define
     symfony_project_fire_schema_update: False # rund mongodb schema update if installed
     symfony_project_fire_migrations: run doctrine migrations, if installed
     symfony_project_symlink_assets: run assets:create with symlink options
+
+    symfony_project_shared_folders: # folders to be linked from shared directory to release dir
+      - {name: logs, src: app/logs, path: app/logs}
+
+    symfony_project_managed_folders: # folderst to be created/checked in release dir
+      - {name: cache, path: app/cache}
 ```
 
 ### Role variable defaults
@@ -185,6 +192,14 @@ Create ```<your deployment>/hooks/post_folder_creation.yml```:
 - name: hook | Symlink to release.
   file: state=link src="{{symfony_shared_dir}}/web/uploads" path="{{symfony_current_release_dir}}/web/uploads"
 ```
+As an alternative to managing folders via hooks, you can also configure either the shared folders or the creation of folders in your release directory in your confguration:
+
+```yaml
+---
+symfony_project_shared_folders: # folders to be linked from shared directory to release dir
+  - {name: logs, src: app/logs, path: app/logs}
+  - {name: uploads, src: web/uploads, path: web/uploads}
+```
 
 ## Dependencies
 

defaults/main.yml

@@ -20,6 +20,7 @@ symfony_project_git_clone_depth: 1
 symfony_project_github_token: ~
 symfony_project_console_opts: ''
 symfony_project_console_command: 'app/console'
+symfony_project_config_dir: 'app/config'
 symfony_project_parameters_file: parameters.yml
 symfony_project_cache_command: cache:warmup
 
@@ -31,3 +32,11 @@ symfony_project_enable_cache_warmup: True
 symfony_project_fire_schema_update: False
 symfony_project_fire_migrations: False
 symfony_project_symlink_assets: True
+
+# ensured to be absent in release and linked from shared
+symfony_project_shared_folders:
+  - {name: logs, src: app/logs, path: app/logs}
+
+# ensured to be present
+symfony_project_managed_folders:
+  - {name: cache, path: app/cache}

tasks/00-facts.yml

@@ -2,17 +2,17 @@
 # simplify folder and command vars
 
 - name: Check/define release name.
-  set_fact: symfony_project_release={{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}
+  set_fact: symfony_project_release="{{ lookup('pipe', 'date +%Y%m%d%H%M%S') }}"
   when: symfony_project_release == None
 
 - name: Set symfony_current_release.
-  set_fact: symfony_current_release={{symfony_project_release}}_{{symfony_project_branch}}
+  set_fact: symfony_current_release="{{symfony_project_release}}_{{symfony_project_branch}}"
 
 - name: Set symfony_current_release_dir.
-  set_fact: symfony_current_release_dir={{symfony_project_root}}/releases/{{symfony_current_release}}
+  set_fact: symfony_current_release_dir="{{symfony_project_root}}/releases/{{symfony_current_release}}"
 
 - name: Set symfony_shared_dir.
-  set_fact: symfony_shared_dir={{symfony_project_root}}/shared
+  set_fact: symfony_shared_dir="{{symfony_project_root}}/shared"
 
 - name: Set symfony_console.
-  set_fact: symfony_console="{{symfony_current_release_dir}}/{{symfony_project_console_command}} --env={{symfony_project_env}}"
+  set_fact: symfony_console="{{symfony_current_release_dir}}/{{symfony_project_console_command}} --env={{symfony_project_env}}"

tasks/10-config.yml

@@ -1,16 +1,22 @@
 ---
 - name: Check if config dir exists.
-  stat: path={{symfony_current_release_dir}}/app/config
+  stat: path={{symfony_current_release_dir}}/{{symfony_project_config_dir}}
   register: config_dir
 
+- name: Set shared config dir.
+  set_fact: symfony_shared_config_dir={{symfony_shared_dir}}/{{symfony_project_config_dir}}
+
+- name: Set config dir.
+  set_fact: symfony_config_dir={{symfony_current_release_dir}}/{{symfony_project_config_dir}}
+
 - name: Link configs dir if not yet exists.
-  file: state=link src={{symfony_shared_dir}}/app/config path={{symfony_current_release_dir}}/app/config
+  file: state=link src={{symfony_shared_config_dir}} path={{symfony_config_dir}}
   when: config_dir.stat.exists == false
 
 - name: Check if parameters file exists.
-  stat: path={{symfony_shared_dir}}/app/config/{{symfony_project_parameters_file}}
+  stat: path={{symfony_shared_config_dir}}/{{symfony_project_parameters_file}}
   register: symfony_parameters
 
 - name: Create symlink for parameters file from shared directory.
-  file: state=link src={{symfony_project_root}}/shared/app/config/{{symfony_project_parameters_file}} path={{symfony_current_release_dir}}/app/config/{{symfony_project_parameters_file}}
+  file: state=link src={{symfony_shared_config_dir}}/{{symfony_project_parameters_file}} path={{symfony_config_dir}}/{{symfony_project_parameters_file}}
   when: symfony_parameters.stat.exists

tasks/main.yml

@@ -2,38 +2,42 @@
 # tasks file for symfony2
 - include: 00-facts.yml
 
-- name: Create/prepare necessary directories for release and shared data.
+- name: Create base deployment directories.
   file: state=directory path={{item.path}}
   with_items:
     - { path: "{{symfony_current_release_dir}}" }
     - { path: "{{symfony_shared_dir}}" }
-    - { path: "{{symfony_shared_dir}}/app/config" }
-    - { path: "{{symfony_shared_dir}}/app/logs" }
+
+- name: Create managed shared directories.
+  file: state=directory path="{{symfony_shared_dir}}/{{item.path}}"
+  with_items: "{{symfony_project_shared_folders}}"
 
 - name: Pull sources from the repository.
   git: repo={{symfony_project_repo}} dest={{symfony_current_release_dir}} version={{symfony_project_branch}} accept_hostkey=yes depth={{symfony_project_git_clone_depth}}
 
-# will be replaced with symlink
-- name: Ensure logs directory is not present.
-  file: state=absent path="{{symfony_current_release_dir}}/app/logs"
+- name: Ensure shared folders are absent in release.
+  file: state=absent path="{{symfony_current_release_dir}}/{{item.path}}"
+  with_items: "{{symfony_project_shared_folders}}"
+
+- name: Ensure managed folders are present.
+  file: state=directory path="{{symfony_current_release_dir}}/{{item.path}}"
+  with_items: "{{symfony_project_managed_folders}}"
 
-# read project's composer.json and store output
 - name: Read composer.json
   shell: cat {{symfony_current_release_dir}}/composer.json
   register: composer_content
 
-- include: "{{ symfony_project_post_folder_creation_tasks | default('empty.yml') }}"
+- include: "{{symfony_project_post_folder_creation_tasks | default('empty.yml')}}"
 
 - name: Create symlinks to shared directories.
-  file: state=link src="{{symfony_shared_dir}}{{item.src}}" path="{{symfony_current_release_dir}}{{item.path}}"
-  with_items:
-    - { src: "/app/logs", path: "/app/logs" }
+  file: state=link src="{{symfony_shared_dir}}/{{item.src}}" path="{{symfony_current_release_dir}}/{{item.path}}"
+  with_items: "{{symfony_project_shared_folders}}"
 
 - include: 10-config.yml
 
 - include: 20-composer.yml
 
-- include: "{{ symfony_project_pre_cache_warmup_tasks | default('empty.yml') }}"
+- include: "{{symfony_project_pre_cache_warmup_tasks | default('empty.yml')}}"
 
 - include: 30-cache.yml
 
@@ -44,11 +48,11 @@
 - name: Create release file.
   copy: content="{{symfony_current_release}}" dest="{{symfony_current_release_dir}}/RELEASE" mode=644
 
-- include: "{{ symfony_project_pre_live_switch_tasks | default('empty.yml') }}"
+- include: "{{symfony_project_pre_live_switch_tasks | default('empty.yml')}}"
 
 - name: Create symlink for release.
   file: state=link src="{{symfony_current_release_dir}}" path="{{symfony_project_root}}/current"
 
-- include: "{{ symfony_project_post_live_switch_tasks | default('empty.yml') }}"
+- include: "{{symfony_project_post_live_switch_tasks | default('empty.yml')}}"
 
 - include: 60-clean_releases.yml

tests/test_3_0.yml

@@ -17,16 +17,24 @@
     symfony_project_console_opts: '--no-debug'
 
     symfony_project_release: ~
-    symfony_project_branch: "3.0"
+    symfony_project_branch: "3.0.2"
     symfony_project_php_path: php
     symfony_project_keep_releases: 5
     symfony_project_git_clone_depth: 1
 
     symfony_project_manage_composer: True
-    symfony_project_composer_opts: '--no-dev --optimize-autoloader --no-interaction'
+    symfony_project_composer_opts: '--no-dev -o --no-interaction'
 
     symfony_project_parameters_file: parameters.yml
 
     symfony_project_enable_post_cmd: True
     symfony_project_fire_schema_update: True
     symfony_project_fire_migrations: True
+
+    symfony_project_console_command: 'bin/console'
+
+    symfony_project_shared_folders:
+      - {name: logs, src: var/logs, path: var/logs}
+
+    symfony_project_managed_folders:
+      - {name: cache, path: var/cache}