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
9ca5e278
Commit
9ca5e278
authored
Nov 19, 2014
by
Eloy Durán
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2844 from CocoaPods/fix/2603
Fixing #2603 formatting issue
parents
ffb2a0bf
67f0e118
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
7 deletions
+17
-7
CHANGELOG.md
CHANGELOG.md
+5
-0
user_interface.rb
lib/cocoapods/user_interface.rb
+12
-7
No files found.
CHANGELOG.md
View file @
9ca5e278
...
...
@@ -16,6 +16,11 @@ To install release candidates run `[sudo] gem install cocoapods --pre`
##### Bug Fixes
*
Fix an output formatting issue with various commands like
`pod search`
and
`pod trunk`
.
[
Olivier Halligon
](
https://github.com/AliSoftware
)
[
#2603
](
https://github.com/CocoaPods/CocoaPods/issues/2603
)
*
Show a helpful error message if the old resolver incorrectly activated a
pre-release version that now leads to a version conflict.
[
Samuel Giddins
](
https://github.com/segiddins
)
...
...
lib/cocoapods/user_interface.rb
View file @
9ca5e278
...
...
@@ -191,17 +191,22 @@ module Pod
# Prints a message with a label.
#
def
labeled
(
label
,
value
,
justification
=
1
6
)
def
labeled
(
label
,
value
,
justification
=
1
2
)
if
value
''
.
tap
do
|
t
|
t
<<
" -
#{
label
}
:"
.
ljust
(
justification
)
title
=
"-
#{
label
}
:"
.
ljust
(
justification
)
output
=
begin
if
value
.
is_a?
(
Array
)
separator
=
"
\n
- "
puts_indented
t
<<
separator
<<
value
.
join
(
separator
)
else
puts_indented
t
<<
value
.
to_s
<<
"
\n
"
lines
=
[
wrap_string
(
title
,
self
.
indentation_level
)]
value
.
each
do
|
v
|
lines
<<
wrap_string
(
"-
#{
v
}
"
,
self
.
indentation_level
+
2
)
end
lines
.
join
(
"
\n
"
)
else
wrap_string
(
title
+
"
#{
value
}
"
,
self
.
indentation_level
)
end
+
"
\n
"
end
puts
output
output
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