From 3987478e7bc5f08f32ad1b8611b53b72e13249d8 Mon Sep 17 00:00:00 2001 From: Takayuki Miyauchi Date: Wed, 8 Nov 2017 07:25:26 +0900 Subject: [PATCH] Add browse command (#289) --- .gitignore | 3 +- bin/run-docker.sh | 2 ++ provision/playbooks/commands.yml | 31 ++++++++++++----- .../playbooks/templates/browse-command.php | 34 +++++++++++++++++++ provision/playbooks/templates/wp-cli.yml | 2 ++ 5 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 provision/playbooks/templates/browse-command.php diff --git a/.gitignore b/.gitignore index dabb3de..616e87e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,7 @@ /_site /npm-debug.log /package.box -/playbook.retry +/provision/playbook.retry /provision-post.sh /provision-pre.sh /site.yml @@ -15,3 +15,4 @@ /vendor /wp-cli.yml /wordpress +/wp-cli diff --git a/bin/run-docker.sh b/bin/run-docker.sh index 0f642ee..4c2477a 100644 --- a/bin/run-docker.sh +++ b/bin/run-docker.sh @@ -44,6 +44,8 @@ vccw/vccw-xenial64:latest \ docker exec --tty ${VCCW_HOSTNAME} env TERM=xterm chown ubuntu:ubuntu ${VM_DIR} docker exec --tty ${VCCW_HOSTNAME} env TERM=xterm chmod 777 ${VM_DIR} +docker exec --tty ${VCCW_HOSTNAME} env TERM=xterm mkdir ${VM_DIR}/wp-cli +docker exec --tty ${VCCW_HOSTNAME} env TERM=xterm chmod 777 ${VM_DIR}/wp-cli docker exec --user ubuntu --tty ${VCCW_HOSTNAME} \ env TERM=xterm ansible-playbook ${VM_DIR}/provision/playbook.yml -e "$(ruby $RUBY)" diff --git a/provision/playbooks/commands.yml b/provision/playbooks/commands.yml index 70217f2..6aef4c8 100644 --- a/provision/playbooks/commands.yml +++ b/provision/playbooks/commands.yml @@ -63,14 +63,6 @@ file: path: "{{ ansible_env.HOME }}/.wp-cli/" state: directory - - name: Create a `~/.wp-cli/config.yml` on the Guest - template: - src: templates/guest-wp-cli-config.yml - dest: "{{ ansible_env.HOME }}/.wp-cli/config.yml" - - name: Create a `wp-cli.yml` to the host - template: - src: templates/wp-cli.yml - dest: "{{ vccw.vagrant_dir }}/wp-cli.yml" - name: Install WP-CLI packages become: no shell: /bin/bash -lc "wp package install '{{ item }}'" @@ -81,6 +73,18 @@ url: https://raw.githubusercontent.com/wp-cli/wp-cli/master/utils/wp-completion.bash dest: "{{ ansible_env.HOME }}/.bash.d/wp-completion.sh" force: yes + - name: Create `wp-cli` dir + become: yes + file: + path: "{{ vccw.vagrant_dir }}/wp-cli" + state: directory + - name: Place a `wp browse` command. + template: + src: templates/browse-command.php + dest: "{{ vccw.vagrant_dir }}/wp-cli/browse-command.php" + notify: + - wp-cli-config + - wp-cli-local-config # Install Ruby gems - name: Place a ~/.gemrc @@ -143,3 +147,14 @@ state: absent with_items: - .wget-hsts + + handlers: + - name: wp-cli-config + template: + src: templates/guest-wp-cli-config.yml + dest: "{{ ansible_env.HOME }}/.wp-cli/config.yml" + - name: wp-cli-local-config + template: + src: templates/wp-cli.yml + dest: "{{ vccw.vagrant_dir }}/wp-cli.yml" + force: no diff --git a/provision/playbooks/templates/browse-command.php b/provision/playbooks/templates/browse-command.php new file mode 100644 index 0000000..8ae4ce0 --- /dev/null +++ b/provision/playbooks/templates/browse-command.php @@ -0,0 +1,34 @@ +