From c3285f69b0bf82b53c10e7e84c85edcf2a7ef37e Mon Sep 17 00:00:00 2001
From: Misty De Meo
Date: Sun, 17 Jun 2012 18:44:35 -0500
Subject: ARGV: add .dry_run? method

Add an ARGV.dry_run? helper method for '--dry-run'/'-n' now that
'-n' is being used as a git-style dry-run in two commands.

Closes #12898.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
---
 Library/Homebrew/cmd/cleanup.rb | 6 +++---
 Library/Homebrew/cmd/link.rb    | 9 +++------
 Library/Homebrew/extend/ARGV.rb | 3 +++
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cmd/cleanup.rb b/Library/Homebrew/cmd/cleanup.rb
index 40fc2f845..e82e11d6e 100644
--- a/Library/Homebrew/cmd/cleanup.rb
+++ b/Library/Homebrew/cmd/cleanup.rb
@@ -16,7 +16,7 @@ module Homebrew extend self
       end
       clean_cache
       # seems like a good time to do some additional cleanup
-      Homebrew.prune unless ARGV.switch? 'n'
+      Homebrew.prune unless ARGV.dry_run?
     else
       ARGV.formulae.each do |f|
         cleanup_formula f
@@ -39,7 +39,7 @@ module Homebrew extend self
       f.rack.children.each do |keg|
         if f.installed_prefix != keg
           puts "Removing #{keg}..."
-          rm_rf keg unless ARGV.switch? 'n'
+          rm_rf keg unless ARGV.dry_run?
         end
       end
     elsif f.rack.children.length > 1
@@ -59,7 +59,7 @@ module Homebrew extend self
         old_bottle = bottle_file_outdated? f, pn
         if not f or (f.version != version or ARGV.switch? "s" and not f.installed?) or old_bottle
           puts "Removing #{pn}..."
-          rm pn unless ARGV.switch? 'n'
+          rm pn unless ARGV.dry_run?
         end
       end
     end
diff --git a/Library/Homebrew/cmd/link.rb b/Library/Homebrew/cmd/link.rb
index c5e34fe2c..604c12e0f 100644
--- a/Library/Homebrew/cmd/link.rb
+++ b/Library/Homebrew/cmd/link.rb
@@ -9,12 +9,9 @@ module Homebrew extend self
       abort "Cowardly refusing to `sudo brew link'"
     end
 
-    if ARGV.force?
-      mode = :force
-    elsif ARGV.include?("--dry-run") || ARGV.include?("-n")
-      mode = :dryrun
-    else
-      mode = nil
+    if ARGV.force? then mode = :force
+    elsif ARGV.dry_run? then mode = :dryrun
+    else mode = nil
     end
 
     ARGV.kegs.each do |keg|
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index 8d5ad3199..70d8f6daa 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -87,6 +87,9 @@ module HomebrewArgvExtension
   def one?
     flag? '--1'
   end
+  def dry_run?
+    include?('--dry-run') || switch?('n')
+  end
 
   def build_head?
     include? '--HEAD'
-- 
cgit v1.2.3