Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
miya0001 committed Jun 5, 2016
2 parents 2992754 + 65cf6bc commit 5259724
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Vagrant.configure(2) do |config|
:listen_ports => ['80', '443']
},
:php => {
:packages => %w(php php-cli php-devel php-mbstring php-gd php-xml php-mysql php-pecl-xdebug),
:packages => %w(php php-cli php-devel php-mbstring php-gd php-xml php-mysql php-pecl-xdebug php-mcrypt),
:directives => {
'default_charset' => 'UTF-8',
'mbstring.language' => 'neutral',
Expand Down
1 change: 1 addition & 0 deletions provision/site-cookbooks/vccw/attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
default[:vccw][:phpcs][:alias] = 'wpcs'

default[:vccw][:phpdoc][:composer] = "phpdocumentor/phpdocumentor=2.*"
default[:vccw][:phpmd][:composer] = "phpmd/phpmd=*"

default[:vccw][:wordmove][:movefile] = '/vagrant/Movefile'
default[:vccw][:wordmove][:url] = 'http://wordpress.local'
Expand Down
9 changes: 9 additions & 0 deletions provision/site-cookbooks/vccw/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,15 @@
EOH
end

execute "phpmd-install" do
user node[:vccw][:user]
group node[:vccw][:group]
environment ({'COMPOSER_HOME' => node[:vccw][:composer_home]})
command <<-EOH
#{node[:vccw][:composer][:link]} global require #{Shellwords.shellescape(node[:vccw][:phpmd][:composer])}
EOH
end

# Generate Movefile
template node[:vccw][:wordmove][:movefile] do
source "Movefile.erb"
Expand Down

0 comments on commit 5259724

Please sign in to comment.