From 9bbd99a5cbbd19af67efa5671708ddb4ec512421 Mon Sep 17 00:00:00 2001
From: Ben Hoskings <ben@hoskings.net>
Date: Sun, 11 Nov 2012 21:01:14 +1100
Subject: [PATCH] Convert 'core software' deps to use 'bin' instead of
 'managed'.

---
 packages.rb  | 27 ++++++++++++---------------
 top level.rb |  6 +++---
 unicorn.rb   |  2 +-
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/packages.rb b/packages.rb
index b7303a0..2a8c0b7 100644
--- a/packages.rb
+++ b/packages.rb
@@ -30,7 +30,7 @@
 dep 'git-smart.gem' do
   provides %w[git-smart-log git-smart-merge git-smart-pull]
 end
-dep 'htop.managed'
+dep 'htop.bin'
 dep 'imagemagick.managed' do
   provides %w[compare animate convert composite conjure import identify stream display montage mogrify]
 end
@@ -38,14 +38,12 @@
   requires 'freeimage.managed'
   provides []
 end
-dep 'iotop.managed'
+dep 'iotop.bin'
 dep 'java.managed' do
   installs { via :apt, 'sun-java6-jre' }
   after { shell "set -Ux JAVA_HOME /usr/lib/jvm/java-6-sun" }
 end
-dep 'jnettop.managed' do
-  installs { via :apt, 'jnettop' }
-end
+dep 'jnettop.bin'
 dep 'readline headers.managed' do
   installs {
     on :lenny, 'libreadline5-dev'
@@ -85,7 +83,7 @@
   }
   provides []
 end
-dep 'lsof.managed'
+dep 'lsof.bin'
 dep 'memcached.managed'
 dep 'ncurses.managed' do
   installs {
@@ -94,7 +92,7 @@
   }
   provides []
 end
-dep 'nmap.managed'
+dep 'nmap.bin'
 dep 'oniguruma.managed'
 dep 'pcre.managed' do
   installs {
@@ -104,30 +102,29 @@
   }
   provides 'pcre-config'
 end
-dep 'pv.managed'
+dep 'pv.bin'
 dep 'rcconf.managed' do
   installs { via :apt, 'rcconf' }
 end
-dep 'sed.managed' do
+dep 'sed.bin' do
   installs {
     via :brew, 'gnu-sed'
   }
-  provides 'sed'
   after {
     cd pkg_manager.bin_path do
       shell "ln -s gsed sed", :sudo => pkg_manager.should_sudo?
     end
   }
 end
-dep 'sshd.managed' do
+dep 'sshd.bin' do
   installs {
     via :apt, 'openssh-server'
   }
 end
-dep 'tmux.managed'
-dep 'traceroute.managed'
-dep 'tree.managed'
-dep 'vim.managed'
+dep 'tmux.bin'
+dep 'traceroute.bin'
+dep 'tree.bin'
+dep 'vim.bin'
 dep 'wget.managed'
 dep 'yaml headers.managed' do
   installs {
diff --git a/top level.rb b/top level.rb
index 407a696..50962e6 100644
--- a/top level.rb	
+++ b/top level.rb	
@@ -53,8 +53,8 @@
 
 dep 'core software' do
   requires {
-    on :lenny, 'sudo.bin', 'lsof.managed', 'vim.managed', 'curl.bin', 'traceroute.managed', 'htop.managed', 'iotop.managed', 'jnettop.managed', 'nmap.managed', 'tree.managed', 'pv.managed'
-    on :linux, 'sudo.bin', 'lsof.managed', 'vim.managed', 'curl.bin', 'traceroute.managed', 'htop.managed', 'iotop.managed', 'jnettop.managed', 'tmux.managed', 'nmap.managed', 'tree.managed', 'pv.managed'
-    on :osx, 'nmap.managed', 'tree.managed', 'pv.managed'
+    on :lenny, 'sudo.bin', 'lsof.bin', 'vim.bin', 'curl.bin', 'traceroute.bin', 'htop.bin', 'iotop.bin', 'jnettop.bin', 'nmap.bin', 'tree.bin', 'pv.bin'
+    on :linux, 'sudo.bin', 'lsof.bin', 'vim.bin', 'curl.bin', 'traceroute.bin', 'htop.bin', 'iotop.bin', 'jnettop.bin', 'tmux.bin', 'nmap.bin', 'tree.bin', 'pv.bin'
+    on :osx, 'nmap.bin', 'tree.bin', 'pv.bin'
   }
 end
diff --git a/unicorn.rb b/unicorn.rb
index c44f4ff..5f1b958 100644
--- a/unicorn.rb
+++ b/unicorn.rb
@@ -24,7 +24,7 @@ def missing_paths
 
 dep 'unicorn running', :app_root, :env do
   app_root.default('~/current')
-  requires 'lsof.managed'
+  requires 'lsof.bin'
   met? {
     if !(app_root / 'config/unicorn.rb').exists?
       log "Not starting any unicorns because there's no unicorn config."