From 8d12684efe43e20b62d4f20836c673051107246e Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Mon, 23 Jun 2014 18:41:50 -0500 Subject: [PATCH] Pass repository path into the updater --- Library/Homebrew/cmd/update.rb | 12 ++++++++---- Library/Homebrew/test/test_updater.rb | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 21e119d0c3..d243799e88 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -25,7 +25,7 @@ module Homebrew unlink_tap_formula(tapped_formulae) report = Report.new - master_updater = Updater.new + master_updater = Updater.new(HOMEBREW_REPOSITORY) begin master_updater.pull! ensure @@ -39,7 +39,7 @@ module Homebrew each_tap do |user, repo| repo.cd do - updater = Updater.new + updater = Updater.new(repo) begin updater.pull! @@ -135,7 +135,11 @@ module Homebrew end class Updater - attr_reader :initial_revision, :current_revision + attr_reader :initial_revision, :current_revision, :repository + + def initialize(repository) + @repository = repository + end def pull! safe_system "git", "checkout", "-q", "master" @@ -178,7 +182,7 @@ class Updater when :R then $3 else $2 end - map[status] << Pathname.pwd.join(path) + map[status] << repository.join(path) end end diff --git a/Library/Homebrew/test/test_updater.rb b/Library/Homebrew/test/test_updater.rb index db08a79fae..81e60822aa 100644 --- a/Library/Homebrew/test/test_updater.rb +++ b/Library/Homebrew/test/test_updater.rb @@ -4,7 +4,7 @@ require 'yaml' class UpdaterTests < Homebrew::TestCase class UpdaterMock < ::Updater - def initialize(*args) + def initialize(*) super @outputs = Hash.new { |h, k| h[k] = [] } @expected = [] @@ -42,7 +42,7 @@ class UpdaterTests < Homebrew::TestCase end def setup - @updater = UpdaterMock.new + @updater = UpdaterMock.new(HOMEBREW_REPOSITORY) @report = Report.new end