From 36aea431b580928829bd4f3be95007c36315f960 Mon Sep 17 00:00:00 2001 From: Nick Sieger Date: Tue, 11 Oct 2016 09:08:04 -0500 Subject: [PATCH] Use homebrew prefix instead of /usr/local Fixes #33. --- lib/brew/gem/formula.rb.erb | 2 +- spec/brew/gem/cli_spec.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/brew/gem/formula.rb.erb b/lib/brew/gem/formula.rb.erb index 61c708f..34c5498 100644 --- a/lib/brew/gem/formula.rb.erb +++ b/lib/brew/gem/formula.rb.erb @@ -37,7 +37,7 @@ class <%= klass %> < Formula ENV['GEM_HOME']="#{prefix}" ENV['GEM_PATH']="#{prefix}" - rubybindir = '<%= use_homebrew_ruby ? "/usr/local/bin" : "/usr/bin" %>' + rubybindir = '<%= use_homebrew_ruby ? "#{HOMEBREW_PREFIX}/bin" : "/usr/bin" %>' gem_path = "#{rubybindir}/gem" ruby_path = "#{rubybindir}/ruby" system gem_path, "install", cached_download, diff --git a/spec/brew/gem/cli_spec.rb b/spec/brew/gem/cli_spec.rb index a1458bc..4708f39 100644 --- a/spec/brew/gem/cli_spec.rb +++ b/spec/brew/gem/cli_spec.rb @@ -16,6 +16,7 @@ it { is_expected.to match("rubybindir = '/usr/bin'") } context "homebrew-ruby" do + before { stub_const 'HOMEBREW_PREFIX', '/usr/local' } subject(:formula) { described_class.expand_formula("foo-bar", "1.2.3", true) } it { is_expected.to match("rubybindir = '/usr/local/bin'") } end