[UI] Minor Improvements

CocoaPods · Feb 22, 2013 · df587bc · df587bc
1 parent 4a37f7e
commit df587bc
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 13 deletions.
diff --git a/lib/cocoapods/installer.rb b/lib/cocoapods/installer.rb
@@ -357,7 +357,7 @@ def write_lockfiles
     #         information in the lockfile.
     #
     def integrate_user_project
-      UI.section "Integrating client projects" do
+      UI.section "Integrating client #{'project'.pluralize(libraries.map(&:user_project_path).uniq.count) }" do
         installation_root = config.installation_root
         integrator = UserProjectIntegrator.new(podfile, sandbox, installation_root, libraries)
         integrator.integrate!

diff --git a/lib/cocoapods/user_interface.rb b/lib/cocoapods/user_interface.rb
@@ -37,7 +37,7 @@ class << self
       def section(title, verbose_prefix = '', relative_indentation = 0)
         if config.verbose?
           title(title, verbose_prefix, relative_indentation)
-        elsif title_level < 2
+        elsif title_level < 1
           puts title
         end
 

diff --git a/spec/integration/install_add_pod/after/execution_output.txt b/spec/integration/install_add_pod/after/execution_output.txt
@@ -54,4 +54,4 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
diff --git a/spec/integration/install_external_source/after/execution_output.txt b/spec/integration/install_external_source/after/execution_output.txt
@@ -42,7 +42,7 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
 
 [!] From now on use `SampleApp.xcworkspace`.
 

diff --git a/spec/integration/install_local_source/after/execution_output.txt b/spec/integration/install_local_source/after/execution_output.txt
@@ -36,7 +36,7 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
 
 [!] From now on use `SampleApp.xcworkspace`.
 

diff --git a/spec/integration/install_multiple_targets/after/execution_output.txt b/spec/integration/install_multiple_targets/after/execution_output.txt
@@ -90,7 +90,7 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
 
 [!] From now on use `SampleApp.xcworkspace`.
 

diff --git a/spec/integration/install_new/after/execution_output.txt b/spec/integration/install_new/after/execution_output.txt
@@ -51,7 +51,7 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
 
 [!] From now on use `SampleApp.xcworkspace`.
 

diff --git a/spec/integration/install_podfile_callbacks/after/execution_output.txt b/spec/integration/install_podfile_callbacks/after/execution_output.txt
@@ -53,7 +53,7 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
 
 [!] From now on use `SampleApp.xcworkspace`.
 

diff --git a/spec/integration/install_podspec/after/execution_output.txt b/spec/integration/install_podspec/after/execution_output.txt
@@ -54,7 +54,7 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
 
 [!] From now on use `SampleApp.xcworkspace`.
 

diff --git a/spec/integration/install_remove_pod/after/execution_output.txt b/spec/integration/install_remove_pod/after/execution_output.txt
@@ -40,4 +40,4 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
diff --git a/spec/integration/install_spec_callbacks/after/execution_output.txt b/spec/integration/install_spec_callbacks/after/execution_output.txt
@@ -56,7 +56,7 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
 
 [!] From now on use `SampleApp.xcworkspace`.
 

diff --git a/spec/integration/install_subspecs/after/execution_output.txt b/spec/integration/install_subspecs/after/execution_output.txt
@@ -57,7 +57,7 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
 
 [!] From now on use `SampleApp.xcworkspace`.
 

diff --git a/spec/integration/update/after/execution_output.txt b/spec/integration/update/after/execution_output.txt
@@ -54,4 +54,4 @@ Generating Pods project
   - Writing Lockfile in `Podfile.lock`
   - Writing Manifest in `Pods/Manifest.lock`
 
-Integrating client projects
+Integrating client project
diff --git a/spec/unit/installer_spec.rb b/spec/unit/installer_spec.rb
@@ -333,6 +333,7 @@ def @installer.write_pod_project
     describe "Integrating client projects" do
 
       it "integrates the client projects" do
+        @installer.stubs(:libraries).returns([Library.new(nil)])
         Installer::UserProjectIntegrator.any_instance.expects(:integrate!)
         @installer.send(:integrate_user_project)
       end