[UI] Refine previous implementation.

lib/cocoapods/command.rb

@@ -145,24 +145,9 @@ module Pod
 
     def update_spec_repos_if_necessary!
       if @update_repo
-        print_title 'Updating Spec Repositories', true
-        Repo.new(ARGV.new(["update"])).run
-      end
-    end
-
-    def print_title(title, only_verbose = true)
-      if config.verbose?
-        puts "\n" + title.yellow
-      elsif !config.silent? && !only_verbose
-        puts title
-      end
-    end
-
-    def print_subtitle(title, only_verbose = false)
-      if config.verbose?
-        puts "\n" + title.green
-      elsif !config.silent? && !only_verbose
-        puts title
+        UI.title 'Updating Spec Repositories' do
+          Repo.new(ARGV.new(["update"])).run
+        end
       end
     end
   end

lib/cocoapods/command/repo.rb

@@ -56,23 +56,25 @@ module Pod
       end
 
       def add
-        print_subtitle "Cloning spec repo `#{@name}' from `#{@url}'#{" (branch `#{@branch}')" if @branch}"
-        config.repos_dir.mkpath
-        Dir.chdir(config.repos_dir) { git!("clone '#{@url}' #{@name}") }
-        Dir.chdir(dir) { git!("checkout #{@branch}") } if @branch
-        check_versions(dir)
+        UI.title ("Cloning spec repo `#{@name}' from `#{@url}'#{" (branch `#{@branch}')" if @branch}") do
+          config.repos_dir.mkpath
+          Dir.chdir(config.repos_dir) { git!("clone '#{@url}' #{@name}") }
+          Dir.chdir(dir) { git!("checkout #{@branch}") } if @branch
+          check_versions(dir)
+        end
       end
 
       def update
         dirs = @name ? [dir] : config.repos_dir.children.select {|c| c.directory?}
         dirs.each do |dir|
-          print_subtitle "Updating spec repo `#{dir.basename}'"
-          Dir.chdir(dir) do
-            `git rev-parse  >/dev/null 2>&1`
-            if $?.exitstatus.zero?
-              git!("pull")
-            else
-              puts("   Not a git repository") if config.verbose?
+          UI.title "Updating spec repo `#{dir.basename}'" do
+            Dir.chdir(dir) do
+              `git rev-parse  >/dev/null 2>&1`
+              if $?.exitstatus.zero?
+                git!("pull")
+              else
+                UI.message "Not a git repository"
+              end
             end
           end
           check_versions(dir)

lib/cocoapods/command/setup.rb

@@ -89,21 +89,22 @@ module Pod
       end
 
       def run
-        print_title "Setting up CocoaPods master repo"
-        if dir.exist?
-          set_master_repo_url
-          set_master_repo_branch
-          update_master_repo
-        else
-          add_master_repo
-        end
-        # Mainly so the specs run with submodule repos
-        if (dir + '.git/hooks').exist?
-          hook = dir + '.git/hooks/pre-commit'
-          hook.open('w') { |f| f << "#!/bin/sh\nrake lint" }
-          `chmod +x '#{hook}'`
+        UI.title "Setting up CocoaPods master repo" do
+          if dir.exist?
+            set_master_repo_url
+            set_master_repo_branch
+            update_master_repo
+          else
+            add_master_repo
+          end
+          # Mainly so the specs run with submodule repos
+          if (dir + '.git/hooks').exist?
+            hook = dir + '.git/hooks/pre-commit'
+            hook.open('w') { |f| f << "#!/bin/sh\nrake lint" }
+            `chmod +x '#{hook}'`
+          end
         end
-        print_subtitle "Setup completed (#{push? ? "push" : "read-only"} access)"
+        UI.title "Setup completed (#{push? ? "push" : "read-only"} access)"
       end
     end
   end

lib/cocoapods/installer.rb

@@ -119,12 +119,12 @@ module Pod
         install_dependencies!
       end
 
-      UI.title("Generating support files", '', 2) do
+      UI.title "Generating support files" do
         UI.message "- Running pre install hooks" do
           run_pre_install_hooks
         end
 
-        UI.message("- Installing targets", '', 2) do
+        UI.message"- Installing targets" do
           generate_target_support_files
         end
 

lib/cocoapods/resolver.rb

@@ -69,7 +69,7 @@ module Pod
 
       if @lockfile
         @pods_by_state = @lockfile.detect_changes_with_podfile(podfile)
-        UI.title("Finding added, modified or removed dependencies:", '', 2) do
+        UI.title "Finding added, modified or removed dependencies:" do
           marks = {:added => "A".green, :changed => "M".yellow, :removed => "R".red, :unchanged => "-" }
           @pods_by_state.each do |symbol, pod_names|
             pod_names.each do |pod_name|
@@ -81,7 +81,7 @@ module Pod
       end
 
       @podfile.target_definitions.values.each do |target_definition|
-        UI.title("Resolving dependencies for target `#{target_definition.name}' (#{target_definition.platform}):", '', 2) do
+        UI.title "Resolving dependencies for target `#{target_definition.name}' (#{target_definition.platform}):" do
           @loaded_specs = []
           find_dependency_specs(@podfile, target_definition.dependencies, target_definition)
           @specs_by_target[target_definition] = @cached_specs.values_at(*@loaded_specs).sort_by(&:name)

lib/cocoapods/user_interface.rb

@@ -9,7 +9,7 @@ module Pod
 
       attr_accessor :indentation_level, :title_level
 
-      def title(title, verbose_prefix = '', relative_indentation = 0)
+      def title(title, verbose_prefix = '', relative_indentation = 2)
         if config.verbose?
           title = verbose_prefix + title if config.verbose?
           title = "\n#{title}" if @title_level < 2
@@ -28,7 +28,7 @@ module Pod
         self.title_level -= 1
       end
 
-      def message(message,  verbose_prefix = '', relative_indentation = 0)
+      def message(message,  verbose_prefix = '', relative_indentation = 2)
         message = verbose_prefix + message if config.verbose?
         puts_indented message if config.verbose?