FEAT: Ensure it now also can install wp-cli on Windows and that the wp command works to update option blogname on a WordPress installation on Windows.

FEAT: Added new parameters php_executable_path, bin_path, executable_filename to the wp class. These now have default values both for Linux and Windows. BUG: On Windows I set the exec user that is used to run the wp-cli command to undef so prevent this bug from happening https://tickets.puppetlabs.com/browse/ENTERPRISE-13. On Windows you can't run an exec as another user. The wp-cli client doesn't complain about this when I tested to run it as the SYSTEM user in Windows, which is the Puppet default. MISC: Respected tab indenting in cli.pp, command.pp, init.pp, params.pp.

Author: JohnEricson

files/wp

@@ -4,50 +4,48 @@
 $install_path = '/usr/local/src/wp-cli',
 $version = 'dev-master',
 
-) {
- if $::osfamily == 'Windows' {
- Package { provider => 'chocolatey' }
- }
-
-include wp
+) inherits wp {
+if $::osfamily == 'Windows' {
+Package { provider => 'chocolatey' }
+}
 
 if 'installed' == $ensure or 'present' == $ensure {
 # Create the install path
 file { [ $install_path, "${install_path}/bin" ]:
 ensure => directory,
 }
 
- archive { 'wp-cli download':
- ensure => present,
- source => 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
- path => "${install_path}/bin/wp-cli.phar",
- }
+archive { 'wp-cli download':
+ensure => present,
+source => 'https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar',
+path => "${install_path}/bin/wp-cli.phar",
+}
 
 if $::kernel == 'Linux' {
- file { "${install_path}/bin/wp":
- ensure => 'present',
- source => 'puppet:///modules/wp/wp',
- mode => 'a+x',
- require => Archive[ 'wp-cli download' ]
- }
+file { "${install_path}/bin/${wp::executable_filename}":
+ensure => 'present',
+content => template('wp/wp.sh.erb'),
+mode => 'a+x',
+require => Archive[ 'wp-cli download' ]
+}
 
- # Symlink it across
- file { "${wp::params::bin_path}/wp":
- ensure => link,
- target => "${install_path}/bin/wp",
- require => File[ "${install_path}/bin/wp" ],
- }
- } else {
- 
- file { "${install_path}/bin/wp.bat":
- ensure => 'present',
- source => 'puppet:///modules/wp/wp.bat',
- require => Archive[ 'wp-cli download' ]
- }
- }
+# Symlink it across
+file { "${wp::bin_path}/${wp::executable_filename}":
+ensure => link,
+target => "${install_path}/bin/${wp::executable_filename}",
+require => File[ "${install_path}/bin/wp" ],
+}
+} else {
+
+file { "${install_path}/bin/${wp::executable_filename}":
+ensure => 'present',
+content => template('wp/wp.bat.erb'),
+require => Archive[ 'wp-cli download' ]
+}
+}
 }
 elsif 'absent' == $ensure {
-file { "${wp::params::bin_path}/wp":
+file { "${wp::bin_path}/":
 ensure => absent,
 }
 file { '/usr/local/src/wp-cli':

files/wp.bat

@@ -4,12 +4,12 @@
 $command,
 $user = $::wp::user,
 $unless = undef,
-$onlyif = "${wp::params::bin_path}/wp is-installed",
+$onlyif = "${wp::bin_path}/${wp::executable_filename} core is-installed",
 ) {
 include wp::cli
 
 exec {"${location} wp ${command}":
-command => "${wp::params::bin_path}/wp ${command}",
+command => "${wp::bin_path}/${wp::executable_filename} ${command}",
 cwd => $location,
 user => $user,
 require => [ Class['wp::cli'] ],

manifests/cli.pp

@@ -2,6 +2,9 @@
 class wp (
 $user = $::wp::params::user,
 $php_package = $::wp::params::php_package,
+$php_executable_path = $::wp::params::php_executable_path,
+$bin_path = $::wp::params::bin_path,
+$executable_filename = $::wp::params::executable_filename,
 ) inherits wp::params {
 # ...
 }

manifests/command.pp

@@ -1,10 +1,21 @@
 # A class for parameters we might need to use.
 class wp::params {
-$user = 'www-data'
-$bin_path = '/usr/local/bin'
+$user = $::operatingsystem ? {
+/^windows$/ => undef,
+default => 'www-data',
+}
+$bin_path = '/usr/local/bin'
+$executable_filename = $::operatingsystem ? {
+/^windows$/ => 'wp.bat',
+default => 'wp',
+} 
 $php_package = $::operatingsystem ? {
 /^(Debian|Ubuntu)$/ => 'php5-cli',
 /^windows$/ => 'php',
- default => 'php-cli',
+default => 'php-cli',
+}
+$php_executable_path = $::operatingsystem ? {
+'windows' => 'C:/tools/php80/php.exe',
+default => '/usr/bin/php',
 }
 }

manifests/init.pp

@@ -0,0 +1,3 @@
+@ECHO OFF
+<%= @php_executable_path %> "%~dp0/wp-cli.phar" %*
+

manifests/params.pp

@@ -0,0 +1,3 @@
+#!/bin/sh
+<%= @php_executable_path %> "$(dirname $0)/wp-cli.phar" $@
+