From 283160b1e757a7acb514ea3d61b73d084800a045 Mon Sep 17 00:00:00 2001 From: Roland Walker Date: Mon, 20 Jan 2014 00:02:12 -0500 Subject: [PATCH] search.rb cleanups - whitespace - variable names: in particular, "casks" is a poor name for a variable that does not hold instances of Cask --- lib/cask/cli/search.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/cask/cli/search.rb b/lib/cask/cli/search.rb index b1e481bdd..62617bfa8 100644 --- a/lib/cask/cli/search.rb +++ b/lib/cask/cli/search.rb @@ -1,18 +1,18 @@ class Cask::CLI::Search def self.run(*arguments) search_term, *rest = *arguments - casks = {} + cask_names = {} if search_term =~ %r{^/(.*)/$} search_regexp = $1 - casks = Cask.all_titles.grep(/#{search_regexp}/i) + cask_names = Cask.all_titles.grep(/#{search_regexp}/i) else all_titles = Cask.all_titles - no_hyphens_titles = all_titles.map {|t|t.gsub('-', '')} - no_hyphens_search_term = search_term.gsub('-', '') - casks = no_hyphens_titles.grep(/#{no_hyphens_search_term}/i) {|t| all_titles[no_hyphens_titles.index(t)]} + simplified_titles = all_titles.map { |t| t.gsub('-', '') } + simplified_search_term = search_term.gsub('-', '') + cask_names = simplified_titles.grep(/#{simplified_search_term}/i) { |t| all_titles[simplified_titles.index(t)] } end - unless casks.empty? - puts_columns Cask::CLI.nice_listing casks + unless cask_names.empty? + puts_columns Cask::CLI.nice_listing cask_names else puts "No cask found for \"#{search_term}\"." end