From 710a160b8f78fb672855eb495e5d927421e8ced7 Mon Sep 17 00:00:00 2001 From: Max Howell Date: Thu, 17 Sep 2009 18:39:47 +0100 Subject: Rename refresh_brew.rb to update.rb I didn't change the class name, it's clear from the context where it is used what it does. However when just looking at files to figure out the nature of Homebrew I believe in clear naming. Otherwise funny names earn you points.--- Library/Homebrew/refresh_brew.rb | 56 ---------------------------------------- Library/Homebrew/unittest.rb | 4 +-- Library/Homebrew/update.rb | 56 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 58 deletions(-) delete mode 100644 Library/Homebrew/refresh_brew.rb create mode 100644 Library/Homebrew/update.rb (limited to 'Library') diff --git a/Library/Homebrew/refresh_brew.rb b/Library/Homebrew/refresh_brew.rb deleted file mode 100644 index 0f036d42a..000000000 --- a/Library/Homebrew/refresh_brew.rb +++ /dev/null @@ -1,56 +0,0 @@ -class RefreshBrew - CHECKOUT_COMMAND = 'git checkout masterbrew' - UPDATE_COMMAND = 'git pull origin masterbrew' - REVISION_COMMAND = 'git log -l -1 --pretty=format:%H' - GIT_UP_TO_DATE = 'Already up-to-date.' - UPDATED_FORMULA = %r{^\s+Library/Formula/(.+?)\.rb\s} - - attr_reader :updated_formulae - - def initialize - @updated_formulae = [] - end - - # Performs an update of the homebrew source. Returns +true+ if a newer - # version was available, +false+ if already up-to-date. - def update_from_masterbrew! - git_checkout_masterbrew! - output = git_pull! - output.split("\n").each do |line| - @updated_formulae << $1 if line =~ UPDATED_FORMULA - end - output.strip != GIT_UP_TO_DATE - end - - def pending_formulae_changes? - !@updated_formulae.empty? - end - - def current_revision - in_prefix { execute(REVISION_COMMAND).strip } - end - - private - - def in_prefix - Dir.chdir(HOMEBREW_PREFIX) { yield } - end - - def execute(cmd) - out = `#{cmd}` - unless $?.success? - puts out - raise "Failed while executing #{cmd}" - end - ohai(cmd, out) if ARGV.verbose? - out - end - - def git_checkout_masterbrew! - in_prefix { execute CHECKOUT_COMMAND } - end - - def git_pull! - in_prefix { execute UPDATE_COMMAND } - end -end \ No newline at end of file diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb index fb9ac0cc9..0a9c497d3 100755 --- a/Library/Homebrew/unittest.rb +++ b/Library/Homebrew/unittest.rb @@ -12,8 +12,8 @@ require 'download_strategy' require 'keg' require 'utils' require 'brew.h' -require 'hardware.rb' -require 'refresh_brew' +require 'hardware' +require 'update' # these are defined in global.rb, but we don't want to break our actual # homebrew tree, and we do want to test everything :) diff --git a/Library/Homebrew/update.rb b/Library/Homebrew/update.rb new file mode 100644 index 000000000..0f036d42a --- /dev/null +++ b/Library/Homebrew/update.rb @@ -0,0 +1,56 @@ +class RefreshBrew + CHECKOUT_COMMAND = 'git checkout masterbrew' + UPDATE_COMMAND = 'git pull origin masterbrew' + REVISION_COMMAND = 'git log -l -1 --pretty=format:%H' + GIT_UP_TO_DATE = 'Already up-to-date.' + UPDATED_FORMULA = %r{^\s+Library/Formula/(.+?)\.rb\s} + + attr_reader :updated_formulae + + def initialize + @updated_formulae = [] + end + + # Performs an update of the homebrew source. Returns +true+ if a newer + # version was available, +false+ if already up-to-date. + def update_from_masterbrew! + git_checkout_masterbrew! + output = git_pull! + output.split("\n").each do |line| + @updated_formulae << $1 if line =~ UPDATED_FORMULA + end + output.strip != GIT_UP_TO_DATE + end + + def pending_formulae_changes? + !@updated_formulae.empty? + end + + def current_revision + in_prefix { execute(REVISION_COMMAND).strip } + end + + private + + def in_prefix + Dir.chdir(HOMEBREW_PREFIX) { yield } + end + + def execute(cmd) + out = `#{cmd}` + unless $?.success? + puts out + raise "Failed while executing #{cmd}" + end + ohai(cmd, out) if ARGV.verbose? + out + end + + def git_checkout_masterbrew! + in_prefix { execute CHECKOUT_COMMAND } + end + + def git_pull! + in_prefix { execute UPDATE_COMMAND } + end +end \ No newline at end of file -- cgit v1.2.3