From 9db0e68eb60b7634eb26f9b734e7b1e47cc3f2ba Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sun, 7 Apr 2013 00:49:56 -0500 Subject: [PATCH] Unify indentation of access modifiers These are class method calls, not some special keyword, and should be indented as such (also all standard Ruby indenters do this). --- Library/Homebrew/cmd/list.rb | 2 +- Library/Homebrew/dependency_collector.rb | 2 +- Library/Homebrew/download_strategy.rb | 6 ++++-- Library/Homebrew/formula.rb | 8 ++++---- Library/Homebrew/keg.rb | 3 ++- Library/Homebrew/metafiles.rb | 2 +- Library/Homebrew/patches.rb | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb index 1586ca6810..c40246a811 100644 --- a/Library/Homebrew/cmd/list.rb +++ b/Library/Homebrew/cmd/list.rb @@ -23,7 +23,7 @@ module Homebrew extend self end end -private + private def list_unbrewed dirs = HOMEBREW_PREFIX.children.select{ |pn| pn.directory? }.map{ |pn| pn.basename.to_s } diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index cfbb066954..0c423cd09f 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -45,7 +45,7 @@ class DependencyCollector parse_spec(spec, tag) end -private + private def parse_spec spec, tag case spec diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index f693945a14..0a09045623 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -122,7 +122,8 @@ class CurlDownloadStrategy < AbstractDownloadStrategy end end -private + private + def chdir entries=Dir['*'] case entries.length @@ -493,7 +494,8 @@ class CVSDownloadStrategy < AbstractDownloadStrategy end end -private + private + def split_url(in_url) parts=in_url.sub(%r[^cvs://], '').split(/:/) mod=parts.pop diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 16fbbce508..c994202e3e 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -528,7 +528,7 @@ class Formula end -protected + protected # Pretty titles the command and buffers stdout/stderr # Throws if there's an error @@ -593,7 +593,7 @@ protected end if removed_ENV_variables end -public + public # For brew-fetch and others. def fetch @@ -621,7 +621,7 @@ public not self.class.instance_variable_get(:@test_defined).nil? end -private + private def stage fetched, downloader = fetch @@ -807,7 +807,7 @@ private @test = block end - private + private def post_depends_on(dep) # Generate with- or without- options for optional and recommended diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index eef9e1e0d7..acdd564ba6 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -171,7 +171,8 @@ class Keg < Pathname from.make_relative_symlink(self) end -protected + protected + def resolve_any_conflicts dst # if it isn't a directory then a severe conflict is about to happen. Let # it, and the exception that is generated will message to the user about diff --git a/Library/Homebrew/metafiles.rb b/Library/Homebrew/metafiles.rb index 06da9fdb3f..e01ca2f151 100644 --- a/Library/Homebrew/metafiles.rb +++ b/Library/Homebrew/metafiles.rb @@ -20,7 +20,7 @@ class Metafiles not include? file end -private + private def include? p p = p.to_s # Might be a pathname diff --git a/Library/Homebrew/patches.rb b/Library/Homebrew/patches.rb index 4dbc3c1cd3..ccae94facc 100644 --- a/Library/Homebrew/patches.rb +++ b/Library/Homebrew/patches.rb @@ -39,7 +39,7 @@ class Patches external_patches.each{|p| p.stage!} end -private + private def external_patches @patches.select{|p| p.external?} @@ -112,7 +112,7 @@ class Patch [@url, '-o', @patch_filename] end -private + private # Detect compression type from the downloaded patch. def detect_compression!