aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Vandenberg2013-02-11 20:24:06 -0800
committerAdam Vandenberg2013-02-11 21:33:43 -0800
commiteb36bb89e4e96f502cd79fd294e7481afc85e866 (patch)
tree74f39cc35ecc0b3b2cf2265826c73f0e8f457deb
parent36b9a0809147b91911d5b2a61537d31a46a2bc18 (diff)
downloadhomebrew-eb36bb89e4e96f502cd79fd294e7481afc85e866.tar.bz2
formula: cinch up formatting
-rw-r--r--Library/Homebrew/formula.rb17
1 files changed, 6 insertions, 11 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index b068436ee..04ea1f29d 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -149,9 +149,8 @@ class Formula
def plist_manual; self.class.plist_manual end
def plist_startup; self.class.plist_startup end
- def build
- self.class.build
- end
+ # Defined and active build-time options.
+ def build; self.class.build; end
def opt_prefix; HOMEBREW_PREFIX/:opt/name end
@@ -168,9 +167,7 @@ class Formula
# Can be overridden to selectively disable bottles from formulae.
# Defaults to true so overridden version does not have to check if bottles
# are supported.
- def pour_bottle?
- true
- end
+ def pour_bottle?; true end
# tell the user about any caveats regarding this package, return a string
def caveats; nil end
@@ -183,8 +180,7 @@ class Formula
# return a Hash eg.
# {
# :p0 => ['http://foo.com/patch1', 'http://foo.com/patch2'],
- # :p1 => 'http://bar.com/patch2',
- # :p2 => ['http://moo.com/patch5', 'http://moo.com/patch6']
+ # :p1 => 'http://bar.com/patch2'
# }
# The final option is to return DATA, then put a diff after __END__. You
# can still return a Hash with DATA as the value for a patch level key.
@@ -284,7 +280,7 @@ class Formula
end
def self.class_s name
- #remove invalid characters and then camelcase it
+ # remove invalid characters and then camelcase it
name.capitalize.gsub(/[-_.\s]([a-zA-Z0-9])/) { $1.upcase } \
.gsub('+', 'x')
end
@@ -589,7 +585,6 @@ public
def fetch
# Ensure the cache exists
HOMEBREW_CACHE.mkpath
-
return @downloader.fetch, @downloader
end
@@ -806,7 +801,7 @@ private
@test = block
end
- private
+ private
def post_depends_on(dep)
# Generate with- or without- options for optional and recommended