Skip to content
This repository was archived by the owner on Dec 2, 2020. It is now read-only.

Commit 506108c

Browse files
committed
Deprecate BoxenBottles and Homebrew hooks
Vendored S3 Homebrew binaries were from a time when Homebrew was less reliable and shouldn't be a required practice anymore. This cleans up the shims and `BoxenBottles` related code. Closes #105
1 parent 10d13f4 commit 506108c

File tree

7 files changed

+0
-111
lines changed

7 files changed

+0
-111
lines changed

files/boxen-bottle-hooks.rb

Lines changed: 0 additions & 93 deletions
This file was deleted.

files/brew-boxen-install.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require File.expand_path("#{File.dirname(__FILE__)}/boxen-bottle-hooks")
21
require "cmd/install"
32

43
# A custom Homebrew command that loads our bottle hooks.

files/brew-boxen-latest.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
require File.expand_path("#{File.dirname(__FILE__)}/boxen-bottle-hooks")
2-
31
# A custom Homebrew command that gives us the latest available version
42
# for a given formula. This allows us to avoid the terrifying prospect
53
# of loading Homebrew Ruby code in the Puppet process.

lib/facter/homebrew_bottle_url.rb

Lines changed: 0 additions & 7 deletions
This file was deleted.

manifests/init.pp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@
9696
]:
9797
ensure => 'directory' ;
9898

99-
# shim for bottle hooks
100-
"${brewsdir}/cmd/boxen-bottle-hooks.rb":
101-
source => 'puppet:///modules/homebrew/boxen-bottle-hooks.rb' ;
10299
"${brewsdir}/cmd/brew-boxen-latest.rb":
103100
source => 'puppet:///modules/homebrew/brew-boxen-latest.rb' ;
104101
"${brewsdir}/cmd/brew-boxen-install.rb":

spec/classes/homebrew_spec.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@
2020

2121
should contain_boxen__env_script("homebrew")
2222

23-
should contain_file("#{cmddir}/boxen-bottle-hooks.rb").
24-
with_source("puppet:///modules/homebrew/boxen-bottle-hooks.rb")
25-
2623
["latest", "install"].each do |cmd|
2724
should contain_file("#{cmddir}/brew-boxen-#{cmd}.rb").
2825
with_source("puppet:///modules/homebrew/brew-boxen-#{cmd}.rb")

templates/env.sh.erb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
export HOMEBREW_ROOT=<%= @installdir %>
22
export HOMEBREW_CACHE=<%= @cachedir %>
33

4-
export BOXEN_HOMEBREW_BOTTLE_URL=<%= scope.lookupvar("::homebrew_bottle_url") %>
5-
64
<% if @set_cflags %>
75
export CFLAGS="-I$HOMEBREW_ROOT/include"
86
<% end %>

0 commit comments

Comments
 (0)