Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
cocoapods
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gengmeiios
cocoapods
Commits
df587bcd
Commit
df587bcd
authored
Feb 22, 2013
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[UI] Minor Improvements
parent
4a37f7ee
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
14 additions
and
13 deletions
+14
-13
installer.rb
lib/cocoapods/installer.rb
+1
-1
user_interface.rb
lib/cocoapods/user_interface.rb
+1
-1
execution_output.txt
spec/integration/install_add_pod/after/execution_output.txt
+1
-1
execution_output.txt
...ration/install_external_source/after/execution_output.txt
+1
-1
execution_output.txt
...tegration/install_local_source/after/execution_output.txt
+1
-1
execution_output.txt
...ation/install_multiple_targets/after/execution_output.txt
+1
-1
execution_output.txt
spec/integration/install_new/after/execution_output.txt
+1
-1
execution_output.txt
...tion/install_podfile_callbacks/after/execution_output.txt
+1
-1
execution_output.txt
spec/integration/install_podspec/after/execution_output.txt
+1
-1
execution_output.txt
...integration/install_remove_pod/after/execution_output.txt
+1
-1
execution_output.txt
...gration/install_spec_callbacks/after/execution_output.txt
+1
-1
execution_output.txt
spec/integration/install_subspecs/after/execution_output.txt
+1
-1
execution_output.txt
spec/integration/update/after/execution_output.txt
+1
-1
installer_spec.rb
spec/unit/installer_spec.rb
+1
-0
No files found.
lib/cocoapods/installer.rb
View file @
df587bcd
...
@@ -357,7 +357,7 @@ module Pod
...
@@ -357,7 +357,7 @@ module Pod
# information in the lockfile.
# information in the lockfile.
#
#
def
integrate_user_project
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
installation_root
=
config
.
installation_root
integrator
=
UserProjectIntegrator
.
new
(
podfile
,
sandbox
,
installation_root
,
libraries
)
integrator
=
UserProjectIntegrator
.
new
(
podfile
,
sandbox
,
installation_root
,
libraries
)
integrator
.
integrate!
integrator
.
integrate!
...
...
lib/cocoapods/user_interface.rb
View file @
df587bcd
...
@@ -37,7 +37,7 @@ module Pod
...
@@ -37,7 +37,7 @@ module Pod
def
section
(
title
,
verbose_prefix
=
''
,
relative_indentation
=
0
)
def
section
(
title
,
verbose_prefix
=
''
,
relative_indentation
=
0
)
if
config
.
verbose?
if
config
.
verbose?
title
(
title
,
verbose_prefix
,
relative_indentation
)
title
(
title
,
verbose_prefix
,
relative_indentation
)
elsif
title_level
<
2
elsif
title_level
<
1
puts
title
puts
title
end
end
...
...
spec/integration/install_add_pod/after/execution_output.txt
View file @
df587bcd
...
@@ -54,4 +54,4 @@ Generating Pods project
...
@@ -54,4 +54,4 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
spec/integration/install_external_source/after/execution_output.txt
View file @
df587bcd
...
@@ -42,7 +42,7 @@ Generating Pods project
...
@@ -42,7 +42,7 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
[!] From now on use `SampleApp.xcworkspace`.
[!] From now on use `SampleApp.xcworkspace`.
...
...
spec/integration/install_local_source/after/execution_output.txt
View file @
df587bcd
...
@@ -36,7 +36,7 @@ Generating Pods project
...
@@ -36,7 +36,7 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
[!] From now on use `SampleApp.xcworkspace`.
[!] From now on use `SampleApp.xcworkspace`.
...
...
spec/integration/install_multiple_targets/after/execution_output.txt
View file @
df587bcd
...
@@ -90,7 +90,7 @@ Generating Pods project
...
@@ -90,7 +90,7 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
[!] From now on use `SampleApp.xcworkspace`.
[!] From now on use `SampleApp.xcworkspace`.
...
...
spec/integration/install_new/after/execution_output.txt
View file @
df587bcd
...
@@ -51,7 +51,7 @@ Generating Pods project
...
@@ -51,7 +51,7 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
[!] From now on use `SampleApp.xcworkspace`.
[!] From now on use `SampleApp.xcworkspace`.
...
...
spec/integration/install_podfile_callbacks/after/execution_output.txt
View file @
df587bcd
...
@@ -53,7 +53,7 @@ Generating Pods project
...
@@ -53,7 +53,7 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
[!] From now on use `SampleApp.xcworkspace`.
[!] From now on use `SampleApp.xcworkspace`.
...
...
spec/integration/install_podspec/after/execution_output.txt
View file @
df587bcd
...
@@ -54,7 +54,7 @@ Generating Pods project
...
@@ -54,7 +54,7 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
[!] From now on use `SampleApp.xcworkspace`.
[!] From now on use `SampleApp.xcworkspace`.
...
...
spec/integration/install_remove_pod/after/execution_output.txt
View file @
df587bcd
...
@@ -40,4 +40,4 @@ Generating Pods project
...
@@ -40,4 +40,4 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
spec/integration/install_spec_callbacks/after/execution_output.txt
View file @
df587bcd
...
@@ -56,7 +56,7 @@ Generating Pods project
...
@@ -56,7 +56,7 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
[!] From now on use `SampleApp.xcworkspace`.
[!] From now on use `SampleApp.xcworkspace`.
...
...
spec/integration/install_subspecs/after/execution_output.txt
View file @
df587bcd
...
@@ -57,7 +57,7 @@ Generating Pods project
...
@@ -57,7 +57,7 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
[!] From now on use `SampleApp.xcworkspace`.
[!] From now on use `SampleApp.xcworkspace`.
...
...
spec/integration/update/after/execution_output.txt
View file @
df587bcd
...
@@ -54,4 +54,4 @@ Generating Pods project
...
@@ -54,4 +54,4 @@ Generating Pods project
- Writing Lockfile in `Podfile.lock`
- Writing Lockfile in `Podfile.lock`
- Writing Manifest in `Pods/Manifest.lock`
- Writing Manifest in `Pods/Manifest.lock`
Integrating client project
s
Integrating client project
spec/unit/installer_spec.rb
View file @
df587bcd
...
@@ -333,6 +333,7 @@ module Pod
...
@@ -333,6 +333,7 @@ module Pod
describe
"Integrating client projects"
do
describe
"Integrating client projects"
do
it
"integrates the client projects"
do
it
"integrates the client projects"
do
@installer
.
stubs
(
:libraries
).
returns
([
Library
.
new
(
nil
)])
Installer
::
UserProjectIntegrator
.
any_instance
.
expects
(
:integrate!
)
Installer
::
UserProjectIntegrator
.
any_instance
.
expects
(
:integrate!
)
@installer
.
send
(
:integrate_user_project
)
@installer
.
send
(
:integrate_user_project
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment