Revert .git behaviour and refactoring

lib/cocoapods/command/search.rb

@@ -2,7 +2,7 @@ module Pod
   class Command
     class Search < Command
       def self.banner
-%{Search pods:
+        %{Search pods:
 
     $ pod search [QUERY]
 
@@ -13,7 +13,7 @@ module Pod
 
       def self.options
         "    --extended  Show details that require network access (like GitHub stats)\n" +
-        "    --full      Search by name, summary, and description\n" +
+        "    --full      Search by name, summary, and description\n"
         super
       end
 
@@ -25,31 +25,46 @@ module Pod
         end
       end
 
-      def wrap_text(txt, col = 80)
-        txt.gsub(/(.{1,#{col}})( +|$\n?)|(.{1,#{col}})/,"\\1\\3\n    ")
-      end
-
       def run
         Source.search_by_name(@query.strip, @full_text_search).each do |set|
           puts "\e[32m--> #{set.name} (#{set.versions.reverse.join(", ")})\e[0m"
-          puts "    #{wrap_text(set.specification.summary).strip}"
-          puts "    - Homepage: #{set.specification.homepage}"
-
-          if @extended && (source = set.specification.source)
-            url = source[:git] || source[:hg] || source[:svn] || source[:local]
-            puts "    - Source:   #{url}" if url
-            if  url =~ /github.com/
-              original_url, username, reponame = *(url.match(/[:\/](\w+)\/(\w+)(.git)?/).to_a)
+
+          puts_wrapped_text(set.specification.summary)
+          puts_detail('Homepage', set.specification.homepage)
+          print_extended_info(set.specification.source) if @extended
+
+          puts
+        end
+      end
+
+      # adapted from http://blog.macromates.com/2006/wrapping-text-with-regular-expressions/
+      def puts_wrapped_text(txt, col = 80, indentation = 4)
+        indent = ' ' * indentation
+        puts txt.strip.gsub(/(.{1,#{col}})( +|$)\n?|(.{#{col}})/, indent + "\\1\\3\n")
+      end
+
+      def puts_detail(title,string)
+        return if !string
+        number_of_spaces = ((8 - title.length) > 0) ? (8 - title.length) : 0
+        spaces = ' ' * number_of_spaces
+        puts "    - #{title}: #{spaces + string}"
+      end
+
+      def print_extended_info(source)
+        source_url = source[:git] || source[:hg] || source[:svn] || source[:local]
+        puts_detail('Source', source_url)
+        print_github_info(source_url) if source_url =~ /github.com/
+      end
+
+      def print_github_info(url)
+        original_url, username, reponame = *(url.match(/[:\/]([\w\-]+)\/([\w\-]+)\.git/).to_a)
+
         if original_url
           repo_info = `curl -s -m 2 http://github.com/api/v2/json/repos/show/#{username}/#{reponame}`
           watchers = repo_info.match(/\"watchers\"\W*:\W*([0-9]+)/).to_a[1]
           forks = repo_info.match(/\"forks\"\W*:\W*([0-9]+)/).to_a[1]
-                puts "    - Watchers: " + watchers if watchers
-                puts "    - Forks:    " + forks if forks
-              end
-            end
-          end
-          puts
+          puts_detail('Watchers', watchers)
+          puts_detail('Forks', forks)
         end
       end
     end