admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

update: Don't report formulae that are moved within a tap but not renamed (#480)

Browse Source
This commit is contained in:
Josh Hagins 2016-07-16 01:18:30 -04:00 committed by Martin Afanasjew
parent 91d32e77ad
commit 4abdeb7b5e
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cmd/update-report.rb
View File

@ -209,8 +209,12 @@ class Reporter
end
@report[:M] << tap.formula_file_to_name(src)
when /^R\d{0,3}/
@report[:D] << tap.formula_file_to_name(src) if tap.formula_file?(src)
@report[:A] << tap.formula_file_to_name(dst) if tap.formula_file?(dst)
src_full_name = tap.formula_file_to_name(src)
dst_full_name = tap.formula_file_to_name(dst)
# Don't report formulae that are moved within a tap but not renamed
next if src_full_name == dst_full_name
@report[:D] << src_full_name
@report[:A] << dst_full_name
end
end

2
Library/Homebrew/test/fixtures/updater_fixture.yaml vendored
View File

@ -45,6 +45,8 @@ update_git_diff_output_with_formula_rename: |
update_git_diff_output_with_restructured_tap: |
R100 git.rb Formula/git.rb
R100 lua.rb Formula/lua.rb
update_git_diff_output_with_formula_rename_and_restructuring: |
R100 xchat.rb Formula/xchat2.rb
update_git_diff_simulate_homebrew_php_restructuring: |
R100 Formula/git.rb Abstract/git.rb
R100 Formula/lua.rb Abstract/lua.rb

20
Library/Homebrew/test/test_update_report.rb
View File

@ -85,8 +85,23 @@ class ReportTests < Homebrew::TestCase
tap.path.join("Formula").mkpath
perform_update("update_git_diff_output_with_restructured_tap")
assert_equal %w[foo/bar/git foo/bar/lua], @hub.select_formula(:A)
assert_empty @hub.select_formula(:A)
assert_empty @hub.select_formula(:D)
assert_empty @hub.select_formula(:R)
ensure
tap.path.parent.rmtree
end
def test_update_homebrew_with_formula_rename_and_restructuring
tap = Tap.new("foo", "bar")
@reporter = ReporterMock.new(tap)
tap.path.join("Formula").mkpath
tap.stubs(:formula_renames).returns("xchat" => "xchat2")
perform_update("update_git_diff_output_with_formula_rename_and_restructuring")
assert_empty @hub.select_formula(:A)
assert_empty @hub.select_formula(:D)
assert_equal [%w[foo/bar/xchat foo/bar/xchat2]], @hub.select_formula(:R)
ensure
tap.path.parent.rmtree
end
@ -98,7 +113,8 @@ class ReportTests < Homebrew::TestCase
perform_update("update_git_diff_simulate_homebrew_php_restructuring")
assert_empty @hub.select_formula(:A)
assert_equal %w[foo/bar/git foo/bar/lua], @hub.select_formula(:D)
assert_empty @hub.select_formula(:D)
assert_empty @hub.select_formula(:R)
ensure
tap.path.parent.rmtree
end