Update cookbooks and add wordpress cookbook

cookbooks/homebrew/recipes/cask.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: homebrew
 # Recipes:: cask
 #
-# Copyright 2014, Chef Software, Inc <legal@getchef.com>
+# Copyright 2014-2015, Chef Software, Inc <legal@chef.io>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,20 +20,19 @@ Chef::Resource.send(:include, Homebrew::Mixin)
 
 homebrew_tap 'caskroom/cask'
 
-package 'brew-cask'
-
-execute 'update homebrew cask from github' do
-  user node['homebrew']['owner'] || homebrew_owner
-  command '/usr/local/bin/brew upgrade brew-cask && /usr/local/bin/brew cask cleanup || true'
-  only_if { node['homebrew']['auto-update'] }
+directory '/Library/Caches/Homebrew/Casks' do
+  owner homebrew_owner
+  mode 00775
+  only_if { ::Dir.exist?('/Library/Caches/Homebrew') }
 end
 
 directory '/opt/homebrew-cask' do
-  owner node['homebrew']['owner'] || homebrew_owner
+  owner homebrew_owner
   mode 00775
+  recursive true
 end
 
 directory '/opt/homebrew-cask/Caskroom' do
-  owner node['homebrew']['owner'] || homebrew_owner
+  owner homebrew_owner
   mode 00775
 end

cookbooks/homebrew/recipes/default.rb

@@ -1,10 +1,10 @@
 #
-# Author:: Joshua Timberman (<jtimberman@opscode.com>)
+# Author:: Joshua Timberman (<jtimberman@chef.io>)
 # Author:: Graeme Mathieson (<mathie@woss.name>)
 # Cookbook Name:: homebrew
-# Recipes:: default
+# Recipe:: default
 #
-# Copyright 2011-2013, Opscode, Inc.
+# Copyright 2011-2015, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -33,7 +33,8 @@ end
 
 execute 'install homebrew' do
   command homebrew_go
-  user node['homebrew']['owner'] || homebrew_owner
+  environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
+  user homebrew_owner
   not_if { ::File.exist? '/usr/local/bin/brew' }
 end
 
@@ -43,6 +44,7 @@ if node['homebrew']['auto-update']
   end
 
   execute 'update homebrew from github' do
+    environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
     user homebrew_owner
     command '/usr/local/bin/brew update || true'
   end

cookbooks/homebrew/recipes/install_casks.rb

@@ -1,8 +1,8 @@
 #
 # Cookbook Name:: homebrew
-# Recipes:: install_casks
+# Recipe:: install_casks
 #
-# Copyright 2014, Chef Software, Inc <legal@getchef.com>
+# Copyright 2014-2015, Chef Software, Inc <legal@chef.io>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cookbooks/homebrew/recipes/install_formulas.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: homebrew
 # Recipes:: install_casks
 #
-# Copyright 2014, Chef Software, Inc <legal@getchef.com>
+# Copyright 2014-2015, Chef Software, Inc <legal@chef.io>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,5 +20,12 @@
 include_recipe 'homebrew'
 
 node['homebrew']['formulas'].each do |formula|
-  package formula
+  if formula.class == Chef::Node::ImmutableMash
+    package formula.fetch(:name) do
+      options '--HEAD' if formula.fetch(:head, false)
+      version formula['version'] if formula.fetch(:version, false)
+    end
+  else
+    package formula
+  end
 end

cookbooks/homebrew/recipes/install_taps.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: homebrew
 # Recipes:: install_taps
 #
-# Copyright 2015, Chef Software, Inc <legal@getchef.com>
+# Copyright 2015, Chef Software, Inc <legal@chef.io>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.