Merge pull request #108 from boxen/puppet-homebrew/deprecate-bottle-h…

…ooks Deprecate `BoxenBottles` and Homebrew hooks
boxen · Nov 26, 2017 · ea3f0ca · ea3f0ca
2 parents 02d6b3f + 506108c
commit ea3f0ca
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 111 deletions.
diff --git a/files/boxen-bottle-hooks.rb b/files/boxen-bottle-hooks.rb
diff --git a/files/brew-boxen-install.rb b/files/brew-boxen-install.rb
@@ -1,4 +1,3 @@
-require File.expand_path("#{File.dirname(__FILE__)}/boxen-bottle-hooks")
 require "cmd/install"
 
 # A custom Homebrew command that loads our bottle hooks.

diff --git a/files/brew-boxen-latest.rb b/files/brew-boxen-latest.rb
@@ -1,5 +1,3 @@
-require File.expand_path("#{File.dirname(__FILE__)}/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
 # of loading Homebrew Ruby code in the Puppet process.

diff --git a/lib/facter/homebrew_bottle_url.rb b/lib/facter/homebrew_bottle_url.rb
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -96,9 +96,6 @@
     ]:
       ensure => 'directory' ;
 
-    # shim for bottle hooks
-    "${brewsdir}/cmd/boxen-bottle-hooks.rb":
-      source  => 'puppet:///modules/homebrew/boxen-bottle-hooks.rb' ;
     "${brewsdir}/cmd/brew-boxen-latest.rb":
       source  => 'puppet:///modules/homebrew/brew-boxen-latest.rb' ;
     "${brewsdir}/cmd/brew-boxen-install.rb":

diff --git a/spec/classes/homebrew_spec.rb b/spec/classes/homebrew_spec.rb
@@ -20,9 +20,6 @@
 
     should contain_boxen__env_script("homebrew")
 
-    should contain_file("#{cmddir}/boxen-bottle-hooks.rb").
-      with_source("puppet:///modules/homebrew/boxen-bottle-hooks.rb")
-
     ["latest", "install"].each do |cmd|
       should contain_file("#{cmddir}/brew-boxen-#{cmd}.rb").
         with_source("puppet:///modules/homebrew/brew-boxen-#{cmd}.rb")

diff --git a/templates/env.sh.erb b/templates/env.sh.erb
@@ -1,8 +1,6 @@
 export HOMEBREW_ROOT=<%= @installdir %>
 export HOMEBREW_CACHE=<%= @cachedir %>
 
-export BOXEN_HOMEBREW_BOTTLE_URL=<%= scope.lookupvar("::homebrew_bottle_url") %>
-
 <% if @set_cflags %>
 export CFLAGS="-I$HOMEBREW_ROOT/include"
 <% end %>