From 68bbfd8622eda99c1f40ccebaaa77653b69cf98e Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 24 Jan 2017 14:26:10 +0100
Subject: [PATCH] Coding standard and optional timeout for composer download
---
tasks/auth_json.yml | 4 ++--
tasks/configure.yml | 28 ++++++++++++++++++----------
tasks/install.yml | 9 +++++----
tasks/test.yml | 8 ++++----
tasks/update.yml | 16 +++++++++-------
5 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/tasks/auth_json.yml b/tasks/auth_json.yml
index a78bf29..196ef2a 100644
--- a/tasks/auth_json.yml
+++ b/tasks/auth_json.yml
@@ -2,8 +2,8 @@
- name: "Ensure Composer Home for root"
file:
- path='/root/.composer'
- state='directory'
+ path: '/root/.composer'
+ state: 'directory'
- name: "Configure github oauth token"
template:
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 7fc762d..7c6bd8f 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -1,18 +1,26 @@
---
-- name: Create composer home path
- file: path={{ composer_home_path }} state=directory owner={{ composer_home_owner }} group={{ composer_home_group }}
+- name: "Create composer home path"
+ file:
+ path: '{{ composer_home_path }}'
+ state: 'directory'
+ owner: '{{ composer_home_owner }}'
+ group: '{{ composer_home_group }}'
-- name: Configure composer home path
- copy: dest=/etc/profile.d/composer-home.sh mode='755'
- content="export COMPOSER_HOME={{ composer_home_path}}\n"
+- name: "Configure composer home path"
+ copy:
+ dest: '/etc/profile.d/composer-home.sh'
+ mode: '755'
+ content: "export COMPOSER_HOME={{ composer_home_path}}\n"
when: composer_home_path is defined
-- name: Configure composer path environment
- copy: dest=/etc/profile.d/composer-path.sh mode='755'
- content="export PATH=${PATH}:{{ composer_home_path }}/vendor/bin\n"
+- name: "Configure composer path environment"
+ copy:
+ dest: '/etc/profile.d/composer-path.sh'
+ mode: '755'
+ content: "export PATH=${PATH}:{{ composer_home_path }}/vendor/bin\n"
-- name: Global require packages
+- name: "Global require packages"
shell: COMPOSER_HOME={{ composer_home_path }}
composer global require {{ item.key }}:{{ item.value }} --no-progress
creates={{ composer_home_path }}/vendor/{{ item.key }}
@@ -20,6 +28,6 @@
when: composer_global_packages|combine(composer_global_packages_base)|length > 0
tags: 'update'
-- name: Disable XDebug for CLI
+- name: "Disable XDebug for CLI"
command: '{{ (php_version|default("5.5") == "7") | ternary("phpdismod", "php5dismod") }} -s cli xdebug'
tags: 'update'
diff --git a/tasks/install.yml b/tasks/install.yml
index 8e82048..70950c5 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,7 +1,8 @@
---
-- name: Download and install Composer into the target directory.
+- name: "Download and install Composer into the target directory."
get_url:
- url=https://getcomposer.org/composer.phar
- dest={{ composer_path }}
- mode='755'
+ url: 'https://getcomposer.org/composer.phar'
+ timeout: '{{ composer_get_timeout|default(omit) }}'
+ dest: '{{ composer_path }}'
+ mode: '755'
diff --git a/tasks/test.yml b/tasks/test.yml
index f29bfa9..6855003 100644
--- a/tasks/test.yml
+++ b/tasks/test.yml
@@ -1,11 +1,11 @@
---
-- name: Get stat of composer file
+- name: "Get stat of composer file"
stat:
- path="{{ composer_path }}"
+ path: "{{ composer_path }}"
register: composer_stat
-- name: Test if composer file exist
+- name: "Test if composer file exist"
fail:
- msg="{{ composer_path }} isn't exist"
+ msg: "{{ composer_path }} doesn't exist"
when: composer_stat.stat.exists == false
diff --git a/tasks/update.yml b/tasks/update.yml
index 39febd2..640df02 100644
--- a/tasks/update.yml
+++ b/tasks/update.yml
@@ -1,16 +1,18 @@
---
-- name: Get date for composer update
- shell:
- date --date='{{ composer_update_day }} days ago' +'%s'
+- name: "Get date for composer update"
+ shell: "date --date='{{ composer_update_day }} days ago' +'%s'"
register: composer_date
changed_when: False
-- name: Update composer if necessary
- shell:
- "{{ composer_path }} selfupdate"
+- name: "Update composer if necessary"
+ shell: "{{ composer_path }} selfupdate"
when: composer_date.stdout|int > composer_stat.stat.mtime|int
-- name: Update Composer Packages
+- name: "Update Composer Packages"
shell: COMPOSER_HOME={{ composer_home_path }}
composer global update
+
+
+composer config --global repo.packagist composer https://packagist.org
+composer global update --verbose -vvv --profile
--
GitLab