Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Upgrade Hombrew and Use `brew` definition directly

* Remove brew_install completely
* Latest homebrew was needed to get solr,svn & zsh recipes to work
  • Loading branch information...
commit bad1683d0f0fad0d4343aab64ef2e0d61f9a51c3 1 parent 22678bd
@hiremaga hiremaga authored
Showing with 57 additions and 108 deletions.
  1. +1 −1  attributes/versions.rb
  2. +0 −19 libraries/brew.rb
  3. +1 −1  recipes/ack.rb
  4. +1 −1  recipes/activemq.rb
  5. +1 −2  recipes/bash4.rb
  6. +1 −2  recipes/bash_completion.rb
  7. +1 −2  recipes/coreutils.rb
  8. +1 −3 recipes/csshx.rb
  9. +1 −1  recipes/ec2_api_tools.rb
  10. +1 −1  recipes/erlang.rb
  11. +1 −2  recipes/findutils.rb
  12. +1 −3 recipes/git.rb
  13. +1 −2  recipes/gnu-tar.rb
  14. +1 −1  recipes/heroku_toolbelt.rb
  15. +1 −1  recipes/hub.rb
  16. +1 −3 recipes/imagemagick.rb
  17. +1 −3 recipes/joe.rb
  18. +1 −2  recipes/jpegoptim.rb
  19. +1 −3 recipes/memcached.rb
  20. +1 −3 recipes/mongodb.rb
  21. +1 −1  recipes/mysql.rb
  22. +1 −1  recipes/nginx.rb
  23. +1 −1  recipes/node_js.rb
  24. +1 −2  recipes/optipng.rb
  25. +11 −11 recipes/php54.rb
  26. +2 −2 recipes/postgres.rb
  27. +1 −2  recipes/pwgen.rb
  28. +1 −2  recipes/qt.rb
  29. +1 −1  recipes/rabbitmq.rb
  30. +2 −2 recipes/rbenv.rb
  31. +1 −1  recipes/redis.rb
  32. +1 −3 recipes/selenium_webdriver.rb
  33. +1 −2  recipes/siege.rb
  34. +1 −1  recipes/solr.rb
  35. +1 −3 recipes/ssh_copy_id.rb
  36. +1 −1  recipes/svn.rb
  37. +1 −3 recipes/tmux.rb
  38. +5 −6 recipes/unix_essentials.rb
  39. +1 −2  recipes/watch.rb
  40. +1 −2  recipes/wget.rb
  41. +1 −2  recipes/xmlstarlet.rb
  42. +1 −1  recipes/zsh.rb
View
2  attributes/versions.rb
@@ -1,5 +1,5 @@
node.default['versions']= {
- "homebrew" => "afa5150fabd2fb5247e32bcef7ed561635191143",
+ "homebrew" => "57ae9c7ace04fb1b54bd1d863fd3f701afc62f46",
"bash_it" => "5cb0ecc1c813bc5619e0f708b8015a4596a37d6c",
"rvm" => "88ca5e086e01e9e29bdeb494cb6a3ccda4c7e256"
}
View
19 libraries/brew.rb
@@ -1,11 +1,4 @@
class Chef::Recipe
- def brew_install(package, opts={})
- brew package do
- action :install
- options opts[:brew_args]
- end
- end
-
def brew_installed?(package)
include_recipe "pivotal_workstation::homebrew"
installed=(system("brew list #{package} > /dev/null 2>&1") || brew_has_multiple_versions_installed?(package))
@@ -18,16 +11,4 @@ def brew_has_multiple_versions_installed?(package)
Chef::Log.debug("brew package #{package} " + (multiple ? "HAS" : "does NOT HAVE") + " multiple versions.")
multiple
end
-
- def brew_remove(package)
- brew package do
- action :remove
- end
- end
-
- def brew_update
- brew do
- action :update
- end
- end
end
View
2  recipes/ack.rb
@@ -1 +1 @@
-brew_install "ack"
+brew "ack"
View
2  recipes/activemq.rb
@@ -1 +1 @@
-brew_install("activemq")
+brew "activemq"
View
3  recipes/bash4.rb
@@ -1,6 +1,5 @@
if node["platform"] != "mac_os_x"
package "bash"
else
- include_recipe "pivotal_workstation::homebrew"
- brew_install "bash"
+ brew "bash"
end
View
3  recipes/bash_completion.rb
@@ -2,6 +2,5 @@
if node["platform"] != "mac_os_x"
package "bash-completion"
else
- include_recipe "pivotal_workstation::homebrew"
- brew_install "bash-completion"
+ brew "bash-completion"
end
View
3  recipes/coreutils.rb
@@ -1,6 +1,5 @@
if node["platform"] != "mac_os_x"
package "coreutils"
else
- include_recipe "pivotal_workstation::homebrew"
- brew_install "coreutils"
+ brew "coreutils"
end
View
4 recipes/csshx.rb
@@ -1,3 +1 @@
-include_recipe "pivotal_workstation::homebrew"
-
-brew_install "csshx"
+brew "csshx"
View
2  recipes/ec2_api_tools.rb
@@ -1,3 +1,3 @@
-brew_install "ec2-api-tools"
+brew "ec2-api-tools"
pivotal_workstation_bash_it_custom_plugin "ec2_tools-export_paths_and_credentials.bash"
View
2  recipes/erlang.rb
@@ -1 +1 @@
-brew_install "erlang"
+brew "erlang"
View
3  recipes/findutils.rb
@@ -1,6 +1,5 @@
if node["platform"] != "mac_os_x"
package "findutils"
else
- include_recipe "pivotal_workstation::homebrew"
- brew_install "findutils"
+ brew "findutils"
end
View
4 recipes/git.rb
@@ -1,7 +1,5 @@
-include_recipe "pivotal_workstation::homebrew"
-
if node["platform"] != "mac_os_x"
package "git"
else
- brew_install "git"
+ brew "git"
end
View
3  recipes/gnu-tar.rb
@@ -1,6 +1,5 @@
if node["platform"] == "mac_os_x"
- include_recipe "pivotal_workstation::homebrew"
- brew_install "gnu-tar"
+ brew "gnu-tar"
link "/usr/bin/tar" do
to "/usr/local/bin/gtar"
end
View
2  recipes/heroku_toolbelt.rb
@@ -1 +1 @@
-brew_install "heroku-toolbelt"
+brew "heroku-toolbelt"
View
2  recipes/hub.rb
@@ -1,4 +1,4 @@
-brew_install "hub"
+brew "hub"
# homebrew recipe for hub automatically installs the following as well:
# Bash completion has been installed to:
View
4 recipes/imagemagick.rb
@@ -1,3 +1 @@
-include_recipe "pivotal_workstation::homebrew"
-
-brew_install "imagemagick"
+brew "imagemagick"
View
4 recipes/joe.rb
@@ -1,3 +1 @@
-include_recipe "pivotal_workstation::homebrew"
-
-brew_install "joe"
+brew "joe"
View
3  recipes/jpegoptim.rb
@@ -1,4 +1,3 @@
if node["platform"] == "mac_os_x"
- include_recipe "pivotal_workstation::homebrew"
- brew_install "jpegoptim"
+ brew "jpegoptim"
end
View
4 recipes/memcached.rb
@@ -1,7 +1,5 @@
-include_recipe "pivotal_workstation::homebrew"
-
unless brew_installed? "memcached"
- brew_install "memcached"
+ brew "memcached"
directory "/Users/#{WS_USER}/Library/LaunchAgents" do
owner WS_USER
View
4 recipes/mongodb.rb
@@ -1,7 +1,5 @@
-include_recipe "pivotal_workstation::homebrew"
-
unless brew_installed? "mongodb"
- brew_install "mongodb"
+ brew "mongodb"
directory "/Users/#{WS_USER}/Library/LaunchAgents" do
owner WS_USER
View
2  recipes/mysql.rb
@@ -17,7 +17,7 @@
end
end
-brew_install("mysql")
+brew "mysql"
ruby_block "copy mysql plist to ~/Library/LaunchAgents" do
block do
View
2  recipes/nginx.rb
@@ -8,7 +8,7 @@
command "sudo brew remove nginx"
end
- brew_install "nginx"
+ brew "nginx"
plist_path = File.expand_path('org.nginx.nginx.plist', File.join('~', 'Library', 'LaunchAgents'))
if File.exists?(plist_path)
View
2  recipes/node_js.rb
@@ -1 +1 @@
-brew_install "node"
+brew "node"
View
3  recipes/optipng.rb
@@ -1,4 +1,3 @@
if node["platform"] == "mac_os_x"
- include_recipe "pivotal_workstation::homebrew"
- brew_install "optipng"
+ brew "optipng"
end
View
22 recipes/php54.rb
@@ -10,15 +10,15 @@
not_if { system("brew tap | grep 'dupes' > /dev/null 2>&1") }
end
-brew_install "php54", {:brew_args => "--with-mysql --with-pgsql"}
+brew "php54", {:brew_args => "--with-mysql --with-pgsql"}
-brew_install "php54-apc"
-brew_install "php54-memcached"
-brew_install "php54-inclued"
-brew_install "php54-http"
-brew_install "php54-xdebug"
-brew_install "php54-intl"
-brew_install "php54-yaml"
-brew_install "php54-imagick"
-brew_install "php54-solr"
-brew_install "php54-twig"
+brew "php54-apc"
+brew "php54-memcached"
+brew "php54-inclued"
+brew "php54-http"
+brew "php54-xdebug"
+brew "php54-intl"
+brew "php54-yaml"
+brew "php54-imagick"
+brew "php54-solr"
+brew "php54-twig"
View
4 recipes/postgres.rb
@@ -22,7 +22,7 @@
recursive true
end
- brew_install "postgresql"
+ brew "postgresql"
execute "create the database" do
command "/usr/local/bin/initdb -U postgres --encoding=utf8 --locale=en_US /usr/local/var/postgres"
@@ -71,7 +71,7 @@
end
ruby_block "test to see if postgres is running" do
-block do
+ block do
require 'socket'
postgres_port = 5432
begin
View
3  recipes/pwgen.rb
@@ -1,6 +1,5 @@
if node["platform"] != "mac_os_x"
package "pwgen"
else
- include_recipe "pivotal_workstation::homebrew"
- brew_install "pwgen"
+ brew "pwgen"
end
View
3  recipes/qt.rb
@@ -1,4 +1,3 @@
-include_recipe "pivotal_workstation::homebrew"
include_recipe "pivotal_workstation::xquartz"
-brew_install "qt"
+brew "qt"
View
2  recipes/rabbitmq.rb
@@ -1 +1 @@
-brew_install "rabbitmq"
+brew "rabbitmq"
View
4 recipes/rbenv.rb
@@ -3,8 +3,8 @@
::RBENV_HOME = "#{WS_HOME}/.rbenv"
::RBENV_COMMAND = "/usr/local/bin/rbenv"
-brew_install("rbenv")
-brew_install("ruby-build")
+brew "rbenv"
+brew "ruby-build"
pivotal_workstation_bash_it_enable_feature "plugins/rbenv"
View
2  recipes/redis.rb
@@ -1,7 +1,7 @@
include_recipe "pivotal_workstation::homebrew"
unless brew_installed? "redis"
- brew_install "redis"
+ brew "redis"
directory "/Users/#{WS_USER}/Library/LaunchAgents" do
owner WS_USER
View
4 recipes/selenium_webdriver.rb
@@ -1,3 +1 @@
-include_recipe "pivotal_workstation::homebrew"
-
-brew_install "chromedriver"
+brew "chromedriver"
View
3  recipes/siege.rb
@@ -1,6 +1,5 @@
if node["platform"] != "mac_os_x"
package "siege"
else
- include_recipe "pivotal_workstation::homebrew"
- brew_install "siege"
+ brew "siege"
end
View
2  recipes/solr.rb
@@ -1 +1 @@
-brew_install "solr"
+brew "solr"
View
4 recipes/ssh_copy_id.rb
@@ -1,3 +1 @@
-include_recipe "pivotal_workstation::homebrew"
-
-brew_install "ssh-copy-id"
+brew "ssh-copy-id"
View
2  recipes/svn.rb
@@ -1 +1 @@
-brew_install "svn"
+brew "svn"
View
4 recipes/tmux.rb
@@ -1,9 +1,7 @@
-include_recipe "pivotal_workstation::homebrew"
include_recipe "pivotal_workstation::git"
-brew_install "tmux"
+brew "tmux"
remote_file "#{WS_HOME}/.tmux.conf" do
source node["tmux_conf_file_url"]
mode "0644"
end
-
View
11 recipes/unix_essentials.rb
@@ -1,10 +1,9 @@
-include_recipe "pivotal_workstation::homebrew"
include_recipe "pivotal_workstation::ack"
include_recipe "pivotal_workstation::tmux"
include_recipe "pivotal_workstation::xquartz"
-brew_install "watch"
-brew_install "ssh-copy-id"
-brew_install "pstree"
-brew_install "tree"
-brew_install "wget"
+brew "watch"
+brew "ssh-copy-id"
+brew "pstree"
+brew "tree"
+brew "wget"
View
3  recipes/watch.rb
@@ -1,4 +1,3 @@
if node["platform"] == "mac_os_x"
- include_recipe "pivotal_workstation::homebrew"
- brew_install "watch"
+ brew "watch"
end
View
3  recipes/wget.rb
@@ -1,6 +1,5 @@
if node["platform"] != "mac_os_x"
package "wget"
else
- include_recipe "pivotal_workstation::homebrew"
- brew_install "wget"
+ brew "wget"
end
View
3  recipes/xmlstarlet.rb
@@ -1,8 +1,7 @@
if node["platform"] != "mac_os_x"
package "xmlstarlet"
else
- include_recipe "pivotal_workstation::homebrew"
- brew_install "xmlstarlet"
+ brew "xmlstarlet"
link "/usr/local/bin/xmlstarlet" do
to "/usr/local/bin/xml"
end
View
2  recipes/zsh.rb
@@ -1 +1 @@
-brew_install "zsh"
+brew "zsh"
Please sign in to comment.
Something went wrong with that request. Please try again.