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
e2d59610
Commit
e2d59610
authored
Aug 29, 2012
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Installer] Fix incorrect name for Pods with preferred subspecs.
See #485
parent
80797fcf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
9 deletions
+4
-9
installer.rb
lib/cocoapods/installer.rb
+2
-8
specification.rb
lib/cocoapods/specification.rb
+2
-1
No files found.
lib/cocoapods/installer.rb
View file @
e2d59610
...
...
@@ -48,17 +48,11 @@ module Pod
#
def
install_dependencies!
pods
.
sort_by
{
|
pod
|
pod
.
top_specification
.
name
.
downcase
}.
each
do
|
pod
|
name
=
pod
.
top_specification
.
name
should_install
=
@resolver
.
should_install?
(
name
)
||
!
pod
.
exists?
should_install
=
@resolver
.
should_install?
(
pod
.
top_specification
.
name
)
||
!
pod
.
exists?
unless
config
.
silent?
marker
=
config
.
verbose
?
"
\n
-> "
.
green
:
''
if
subspec_name
=
pod
.
top_specification
.
preferred_dependency
name
=
"
#{
pod
.
top_specification
.
name
}
/
#{
subspec_name
}
(
#{
pod
.
top_specification
.
version
}
)"
else
name
=
pod
.
to_s
end
puts
marker
<<
(
should_install
?
"Installing
#{
name
}
"
.
green
:
"Using
#{
name
}
"
)
puts
marker
<<
(
should_install
?
"Installing
#{
pod
}
"
.
green
:
"Using
#{
pod
}
"
)
end
if
should_install
...
...
lib/cocoapods/specification.rb
View file @
e2d59610
...
...
@@ -458,7 +458,8 @@ module Pod
end
def
to_s
"
#{
name
}
(
#{
version
}
)"
display_name
=
preferred_dependency
.
nil?
?
name
:
"
#{
name
}
/
#{
preferred_dependency
}
"
"
#{
display_name
}
(
#{
version
}
)"
end
def
inspect
...
...
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