Merge pull request #141 from JohnEricson/master

Author: BronsonQuick

.fixtures.yml

@@ -0,0 +1,3 @@
+fixtures:
+ repositories:
+ archive: "git://github.com/voxpupuli/puppet-archive"

Gemfile

@@ -11,3 +11,5 @@ gem 'puppet-lint'
 gem 'rspec-puppet'
 gem 'syck'
 gem 'puppet', puppetversion
+gem "puppetlabs_spec_helper", "2.10.0"
+

Rakefile

@@ -1,8 +1,2 @@
-require "rake"
-require "rspec/core/rake_task"
+require 'puppetlabs_spec_helper/rake_tasks'
 
-RSpec::Core::RakeTask.new(:spec) do |t|
- t.pattern = Dir.glob("spec/**/*_spec.rb")
-end
-
-task default: :spec

manifests/cli.pp

@@ -4,58 +4,68 @@
 $install_path = '/usr/local/src/wp-cli',
 $version = 'dev-master',
 
-) {
-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,
 }
 
-# Clone the Git repo
-exec { 'wp-cli download':
-command => "/usr/bin/curl -o ${install_path}/bin/wp -L https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar",
-require => [ Package[ 'curl' ], File[ $install_path ] ],
-creates => "${install_path}/bin/wp"
+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",
 }
 
-# Ensure we can run wp-cli
-file { "${install_path}/bin/wp":
-ensure => 'present',
-mode => 'a+x',
-require => Exec[ 'wp-cli download' ]
-}
+if $::kernel == 'Linux' {
+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::bin_path}/${wp::executable_filename}":
+ensure => link,
+target => "${install_path}/bin/${wp::executable_filename}",
+require => File[ "${install_path}/bin/wp" ],
+}
+} else {
 
-# Symlink it across
-file { "${wp::params::bin_path}/wp":
-ensure => link,
-target => "${install_path}/bin/wp",
-require => File[ "${install_path}/bin/wp" ],
+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}/${wp::executable_filename}":
 ensure => absent,
 }
 file { '/usr/local/src/wp-cli':
 ensure => absent,
 }
 }
 
-if ! defined( Package[ $::wp::php_package ] ) {
+if $::wp::manage_php_package and ! defined( Package[ $::wp::php_package ] ) {
 package { $::wp::php_package:
 ensure => installed,
 }
 }
 
-if ! defined(Package['curl']) {
+if $::wp::manage_curl_package and ! defined(Package['curl']) {
 package { 'curl':
 ensure => installed,
 }
 }
 
-if ! defined(Package['git']) {
+if $::wp::manage_git_package and ! defined(Package['git']) {
 package { 'git':
 ensure => installed,
 }

manifests/command.pp

@@ -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/init.pp

@@ -2,6 +2,12 @@
 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,
+$manage_php_package = $::wp::params::manage_php_package,
+$manage_curl_package = $::wp::params::manage_curl_package,
+$manage_git_package = $::wp::params::manage_git_package,
 ) inherits wp::params {
 # ...
 }

manifests/params.pp

@@ -1,9 +1,24 @@
 # 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',
 }
+$php_executable_path = $::operatingsystem ? {
+'windows' => 'C:/tools/php80/php.exe',
+default => '/usr/bin/php',
+}
+$manage_php_package = true
+$manage_curl_package = true
+$manage_git_package = true
 }

spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet'
 
 fixture_path = File.join(File.dirname(File.expand_path(__FILE__)), 'fixtures')

templates/wp.bat.erb

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

templates/wp.sh.erb

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