diff options
| author | Jack Nagel | 2014-07-03 14:54:14 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-07-03 15:00:41 -0500 |
| commit | e62dcaa5d481aad92a3d9f8a268968dcfdc6b602 (patch) | |
| tree | 245fcd5e58b26c999b7dce25d294a3f223074f58 /Library | |
| parent | dac7f88703ad3b4bf1777bc5ef58d9cc1c340963 (diff) | |
| download | homebrew-e62dcaa5d481aad92a3d9f8a268968dcfdc6b602.tar.bz2 | |
Fix Formula#<=> on trunk Ruby
Arguably this method shouldn't exist and sort_by(&:name) used instead.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/formula.rb | 7 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_formula.rb | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 64f329a7e..09dee3cbe 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -301,9 +301,12 @@ class Formula def hash name.hash end - def <=> b - name <=> b.name + + def <=>(other) + return unless Formula === other + name <=> other.name end + def to_s name end diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb index 900d7272c..9a509f3bf 100644 --- a/Library/Homebrew/test/test_formula.rb +++ b/Library/Homebrew/test/test_formula.rb @@ -139,6 +139,10 @@ class FormulaTests < Homebrew::TestCase refute_equal TestBall.new, Object.new end + def test_sort_operator + assert_nil TestBall.new <=> Object.new + end + def test_class_naming assert_equal 'ShellFm', Formulary.class_s('shell.fm') assert_equal 'Fooxx', Formulary.class_s('foo++') |
