Update cookbooks and add wordpress cookbook

cookbooks/homebrew/providers/cask.rb

@@ -1,34 +1,45 @@
-require 'chef/mixin/shell_out'
-include Chef::Mixin::ShellOut
+#
+# Cookbook Name:: homebrew
+# Providers:: cask
+#
+# 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.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 include ::Homebrew::Mixin
 
-use_inline_resources if defined?(:use_inline_resources)
+use_inline_resources
 
 def whyrun_supported?
   true
 end
 
-def load_current_resource
-  @cask = Chef::Resource::HomebrewCask.new(new_resource.name)
-  Chef::Log.debug("Checking whether #{new_resource.name} is installed")
-  @cask.casked shell_out("/usr/local/bin/brew cask list | grep #{new_resource.name}").exitstatus == 0
-end
-
 action :install do
-  unless @cask.casked
-    execute "installing cask #{new_resource.name}" do
-      command "/usr/local/bin/brew cask install #{new_resource.name}"
-      user homebrew_owner
-    end
+  execute "installing cask #{new_resource.name}" do
+    command "/usr/local/bin/brew cask install #{new_resource.name} #{new_resource.options}"
+    user homebrew_owner
+    environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
+    not_if { new_resource.casked? }
   end
 end
 
 action :uninstall do
-  if @cask.casked
-    execute "uninstalling cask #{new_resource.name}" do
-      command "/usr/local/bin/brew cask uninstall #{new_resource.name}"
-      user homebrew_owner
-    end
+  execute "uninstalling cask #{new_resource.name}" do
+    command "/usr/local/bin/brew cask uninstall #{new_resource.name}"
+    user homebrew_owner
+    environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
+    only_if { new_resource.casked? }
   end
 end
 

cookbooks/homebrew/providers/tap.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
 # Providers:: tap
 #
-# 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.
@@ -21,6 +21,8 @@
 
 include ::Homebrew::Mixin
 
+use_inline_resources
+
 def load_current_resource
   @tap = Chef::Resource::HomebrewTap.new(new_resource.name)
   tap_dir = @tap.name.gsub('/', '/homebrew-')
@@ -37,6 +39,7 @@ action :tap do
   unless @tap.tapped
     execute "tapping #{new_resource.name}" do
       command "/usr/local/bin/brew tap #{new_resource.name}"
+      environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
       not_if "/usr/local/bin/brew tap | grep #{new_resource.name}"
       user homebrew_owner
     end
@@ -47,6 +50,7 @@ action :untap do
   if @tap.tapped
     execute "untapping #{new_resource.name}" do
       command "/usr/local/bin/brew untap #{new_resource.name}"
+      environment lazy { { 'HOME' => ::Dir.home(homebrew_owner), 'USER' => homebrew_owner } }
       only_if "/usr/local/bin/brew tap | grep #{new_resource.name}"
       user homebrew_owner
     end