Merge branch 'develop'

.travis.yml

@@ -4,6 +4,10 @@ sudo: yes
 
 matrix:
   include:
+    - python: 2.7
+      env: TOXENV=py27-ansible23
+    - python: 2.7
+      env: TOXENV=py27-ansible22
     - python: 2.7
       env: TOXENV=py27-ansible21
     - python: 2.7

defaults/main.yml

@@ -14,7 +14,7 @@ wkhtmltopdf_mm_version: "{{ '.'.join(wkhtmltopdf_version.split('.')[0:2]) }}"
 ## package
 
 wkhtmltopdf_package: "wkhtmltox-{{ wkhtmltopdf_version }}_linux-{{ ansible_distribution_release }}-{{ (ansible_architecture == 'x86_64') | ternary('amd64', 'i386') }}.deb"
-wkhtmltopdf_package_download_url: "http://download.gna.org/wkhtmltopdf/{{ wkhtmltopdf_mm_version }}/{{ wkhtmltopdf_version }}/{{ wkhtmltopdf_package }}"
+wkhtmltopdf_package_download_url: "https://downloads.wkhtmltopdf.org/{{ wkhtmltopdf_mm_version }}/{{ wkhtmltopdf_version }}/{{ wkhtmltopdf_package }}"
 
 
 ## source
@@ -48,4 +48,4 @@ wkhtmltopdf_runtime_dependencies:
 wkhtmltopdf_slug: wkhtmltopdf/wkhtmltopdf
 
 wkhtmltopdf_tarball: "wkhtmltox-{{ wkhtmltopdf_version }}.tar.bz2"
-wkhtmltopdf_tarball_download_url: "http://download.gna.org/wkhtmltopdf/{{ wkhtmltopdf_mm_version }}/{{ wkhtmltopdf_version }}/{{ wkhtmltopdf_tarball }}"
+wkhtmltopdf_tarball_download_url: "https://downloads.wkhtmltopdf.org/{{ wkhtmltopdf_mm_version }}/{{ wkhtmltopdf_version }}/{{ wkhtmltopdf_tarball }}"

tasks/debug.yml

@@ -7,7 +7,7 @@
 - name: debug
   debug:
     var="{{ item }}"
-  when: "{{ item }} is defined"
+  when: item is defined
   with_items:
     - wkhtmltopdf_installation
     - wkhtmltopdf_mm_version

tasks/main.yml

@@ -19,12 +19,12 @@
 
 - name: desired version is installed? => task_already_installed
   shell: "wkhtmltopdf --version | grep 'wkhtmltopdf {{ wkhtmltopdf_version }} (with patched qt)'"
-  when: (task_installed is defined and task_installed.rc == 0)
+  when: task_installed is defined and task_installed|failed
   register: task_already_installed
   changed_when: no
   failed_when: no
 
 - include: "{{ wkhtmltopdf_installation }}/main.yml"
-  when: (task_installed is defined and task_installed.rc != 0) or
-        (task_already_installed is defined and task_already_installed.rc != 0)
+  when: (task_installed is defined and task_installed|failed) or
+        (task_already_installed is defined and task_already_installed|failed)
   tags: installation

tasks/package/debug.yml

@@ -7,7 +7,7 @@
 - name: debug package variables
   debug:
     var="{{ item }}"
-  when: "{{ item }} is defined"
+  when: item is defined
   with_items:
     - wkhtmltopdf_package
     - wkhtmltopdf_package_download_url

tasks/source/debug.yml

@@ -7,7 +7,7 @@
 - name: debug build variables
   debug:
     var="{{ item }}"
-  when: "{{ item }} is defined"
+  when: item is defined
   with_items:
     - wkhtmltopdf_architecture
     - wkhtmltopdf_build

tasks/source/main.yml

@@ -11,19 +11,18 @@
 - include: validation.yml
   tags: validation
 
+- name: build | install runtime dependencies
+  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
+  become: yes
+  when: (task_version_installed is defined and task_version_installed.rc != 0)
+  with_items: "{{ wkhtmltopdf_runtime_dependencies }}"
+
 - name: build | is this desired version installed? => task_version_installed
   shell: "test -e {{ wkhtmltopdf_dir_install }}/wkhtmltopdf-{{ wkhtmltopdf_version }}"
   register: task_version_installed
   changed_when: no
   failed_when: no
 
-- name: build | install build dependencies
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  become: yes
-  when: (task_version_installed is defined and task_version_installed.rc != 0)
-  with_items:
-    - "{{ wkhtmltopdf_runtime_dependencies }}"
-
 - name: build | download and install source (using tarball or git)
   include: "{{ wkhtmltopdf_build }}.yml"
   when: (task_version_installed is defined and task_version_installed.rc != 0)

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    {py27}-ansible{21,20}
+    {py27}-ansible{23,22,21,20}
 
 skipsdist = True
 
@@ -9,6 +9,8 @@ skipsdist = True
 changedir = tests
 
 deps =
+    ansible23: ansible>=2.3,<2.4
+    ansible22: ansible>=2.2,<2.3
     ansible21: ansible>=2.1,<2.2
     ansible20: ansible>=2.0,<2.1