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

pretty_duration: fixed for int arguments

Browse Source 
Without this the returned string is not as accurate if the method is
called with an int larger than 120.

Closes Homebrew/homebrew#47002.

Signed-off-by: Baptiste Fontaine <batifon@yahoo.fr>
This commit is contained in:
Baptiste Fontaine 2015-12-14 14:57:17 +01:00
parent 9127ee1928
commit f1ac9b5776
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/test/test_utils.rb
View File

@ -48,6 +48,14 @@ class UtilTests < Homebrew::TestCase
assert_predicate $?, :success?
end
def test_pretty_duration
assert_equal "2 seconds", pretty_duration(1)
assert_equal "2 seconds", pretty_duration(2.5)
assert_equal "42 seconds", pretty_duration(42)
assert_equal "4.2 minutes", pretty_duration(252)
assert_equal "4.2 minutes", pretty_duration(252.45)
end
def test_plural
assert_equal "", plural(1)
assert_equal "s", plural(0)

2
Library/Homebrew/utils.rb
View File

@ -140,7 +140,7 @@ end
def pretty_duration(s)
return "2 seconds" if s < 3 # avoids the plural problem ;)
return "#{s.to_i} seconds" if s < 120
"%.1f minutes" % (s/60)
"%.1f minutes" % (s/60.0)
end
def plural(n, s = "s")