diff options
| author | Sean Wolfe | 2009-09-01 09:17:44 -0500 |
|---|---|---|
| committer | Max Howell | 2009-09-14 20:33:46 +0100 |
| commit | 80a54dc5b2145bf494655af1a0b1c17c0700be54 (patch) | |
| tree | 4b81e4f94007e11d19e86f2b0be4eb43578b8e2f | |
| parent | 46ac04e41018e51f19fc98eeb14a5074872c0ec2 (diff) | |
| download | brew-80a54dc5b2145bf494655af1a0b1c17c0700be54.tar.bz2 | |
Couchdb and dependency formulae
Signed-off-by: Max Howell <max@methylblue.com>
I squashed a number of commits here, and also replaced the use of nspr.prefix with HOMEBREW_PREFIX as in theory we are flexible with our requirement for dependencies, although with the limited build system that SpiderMonkey possesses this is difficult for us to achieve anyway…
| -rw-r--r-- | Library/Homebrew/pathname+yeast.rb | 2 | ||||
| -rwxr-xr-x | Library/Homebrew/unittest.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Library/Homebrew/pathname+yeast.rb b/Library/Homebrew/pathname+yeast.rb index 6bdd42334..cf068d0fa 100644 --- a/Library/Homebrew/pathname+yeast.rb +++ b/Library/Homebrew/pathname+yeast.rb @@ -118,7 +118,7 @@ class Pathname # eg. foobar-4.5.1-1 # eg. ruby-1.9.1-p243 - /-((\d+\.)*\d\.\d+-p?\d+)$/.match stem + /-((\d+\.)*\d\.\d+-(p|rc)?\d+)$/.match stem return $1 if $1 # eg. lame-398-1 diff --git a/Library/Homebrew/unittest.rb b/Library/Homebrew/unittest.rb index 0ef29f4f2..255b55601 100755 --- a/Library/Homebrew/unittest.rb +++ b/Library/Homebrew/unittest.rb @@ -477,4 +477,9 @@ class BeerTasting <Test::Unit::TestCase assert_equal Formula.class_s('pkg-config'), 'PkgConfig' assert_equal Formula.class_s('foo_bar'), 'FooBar' end + + def test_version_style_rc + f=MockFormula.new 'http://ftp.mozilla.org/pub/mozilla.org/js/js-1.8.0-rc1.tar.gz' + assert_equal '1.8.0-rc1', f.version + end end |