From ea15442b9a9d594f8e62923473ff738f921b46bc Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 2 Feb 2013 11:24:55 -0600 Subject: [PATCH] Move ruby methods to FileUtils extension --- Library/Homebrew/extend/fileutils.rb | 9 +++++++++ Library/Homebrew/formula.rb | 12 ------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/extend/fileutils.rb b/Library/Homebrew/extend/fileutils.rb index 8792c23b5b..a7a1ae41c2 100644 --- a/Library/Homebrew/extend/fileutils.rb +++ b/Library/Homebrew/extend/fileutils.rb @@ -81,4 +81,13 @@ module FileUtils extend self end end + RUBY_BIN = '/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin' + + def rake *args + system "#{RUBY_BIN}/rake", *args + end + + def ruby *args + system "#{RUBY_BIN}/ruby", *args + end end diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 29b9f9daa9..33e3ea93e7 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -289,18 +289,6 @@ class Formula ] end - def ruby_bin - '/System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin' - end - - def rake *args - system "#{ruby_bin}/rake", *args - end - - def ruby *args - system "#{ruby_bin}/ruby", *args - end - def self.class_s name #remove invalid characters and then camelcase it name.capitalize.gsub(/[-_.\s]([a-zA-Z0-9])/) { $1.upcase } \