Merge pull request #39 from mikemcquaid/homebrew-monkeypatching-cleanup

Cleanup monkeypatching bottles.

Author: dgoodlad

files/boxen-bottle-hooks.rb

@@ -0,0 +1,65 @@
+# Bottle hooks for Homebrew.
+require "hooks/bottles"
+require "utils"
+require "net/http"
+require "uri"
+
+# This monkeypatching sidesteps Homebrew's normal bottle support and uses our,
+# uh, homebrewed S3 binaries. This support is patched in instead of handled in
+# Puppet so that manual installs and indirect dependencies are also supported.
+module BoxenBottles
+  def self.file(formula)
+    "#{formula.name}-#{formula.version}.tar.bz2"
+  end
+
+  def self.url(formula)
+    os     = MacOS.version
+    file   = self.file(formula)
+    host   = ENV['BOXEN_S3_HOST'] || 's3.amazonaws.com'
+    bucket = ENV['BOXEN_S3_BUCKET'] || 'boxen-downloads'
+
+    "http://#{host}/#{bucket}/homebrew/#{os}/#{file}"
+  end
+
+  def self.bottled?(formula)
+    url = URI.parse self.url(formula)
+
+    Net::HTTP.start url.host do |http|
+      http.open_timeout = 1
+      http.read_timeout = 1
+
+      return Net::HTTPOK === http.head(url.path)
+    end
+
+    false
+  rescue
+    false
+  end
+
+  def self.pour(formula)
+    url = self.url(formula)
+    name = formula.name
+
+    boxen_cache = (HOMEBREW_CACHE/"boxen")
+    boxen_cache.mkpath
+    file = self.file(formula)
+    cache_file = boxen_cache/file
+
+    ohai "Boxen: Downloading #{url}"
+    success = system "curl", "--fail", "--progress-bar", "--output", cache_file, url
+    raise "Boxen: Failed to download resource \"#{name}\"" unless success
+
+    ohai "Boxen: Pouring #{file}"
+    system "tar", "-xf", cache_file, "-C", HOMEBREW_CELLAR
+
+    true
+  end
+end
+
+Homebrew::Hooks::Bottles.setup_formula_has_bottle do |formula|
+  BoxenBottles.bottled?(formula)
+end
+
+Homebrew::Hooks::Bottles.setup_pour_formula_bottle do |formula|
+  BoxenBottles.pour(formula)
+end

files/boxen-install.rb

@@ -1,7 +1,7 @@
-require "boxen-monkeypatches"
+require "boxen-bottle-hooks"
 require "cmd/install"
 
-# A custom Homebrew command that loads our monkeypatches.
+# A custom Homebrew command that loads our bottle hooks.
 
 module Homebrew
   def self.boxen_install

files/boxen-latest.rb

@@ -1,4 +1,4 @@
-require "boxen-monkeypatches"
+require "boxen-bottle-hooks"
 
 # A custom Homebrew command that gives us the latest available version
 # for a given formula. This allows us to avoid the terrifying prospect

files/boxen-monkeypatches.rb

@@ -1,7 +1,7 @@
-require "boxen-monkeypatches"
+require "boxen-bottle-hooks"
 require "cmd/upgrade"
 
-# A custom Homebrew command that loads our monkeypatches.
+# A custom Homebrew command that loads our bottle hooks.
 
 module Homebrew
   def self.boxen_upgrade

files/boxen-upgrade.rb

@@ -27,13 +27,19 @@
     require => Repository[$installdir]
   }
 
+  # Remove the old monkey patches, from pre #39
+  file {
+    "${installdir}/Library/Homebrew/boxen-monkeypatches.rb":
+      ensure => 'absent',
+  }
+
   file {
     [$cachedir, $tapsdir, $cmddir, $libdir]:
       ensure => 'directory' ;
 
-    # shim for monkeypatches
-    "${installdir}/Library/Homebrew/boxen-monkeypatches.rb":
-      source  => 'puppet:///modules/homebrew/boxen-monkeypatches.rb' ;
+    # shim for bottle hooks
+    "${installdir}/Library/Homebrew/boxen-bottle-hooks.rb":
+      source  => 'puppet:///modules/homebrew/boxen-bottle-hooks.rb' ;
     "${cmddir}/boxen-latest.rb":
       source  => 'puppet:///modules/homebrew/boxen-latest.rb' ;
     "${cmddir}/boxen-install.rb":

manifests/init.pp

@@ -19,8 +19,8 @@
 
     should contain_boxen__env_script("homebrew")
 
-    should contain_file("#{dir}/Library/Homebrew/boxen-monkeypatches.rb").
-      with_source("puppet:///modules/homebrew/boxen-monkeypatches.rb")
+    should contain_file("#{dir}/Library/Homebrew/boxen-bottle-hooks.rb").
+      with_source("puppet:///modules/homebrew/boxen-bottle-hooks.rb")
 
     ["latest", "install", "upgrade"].each do |cmd|
       should contain_file("#{cmddir}/boxen-#{cmd}.rb").