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
a24b4ba3
Commit
a24b4ba3
authored
Jul 12, 2012
by
Fabio Pelosin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better support for bleeding mode with subspecs.
parent
d57bb9ff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
11 deletions
+17
-11
installer.rb
lib/cocoapods/installer.rb
+6
-1
resolver.rb
lib/cocoapods/resolver.rb
+2
-2
specification.rb
lib/cocoapods/specification.rb
+9
-8
No files found.
lib/cocoapods/installer.rb
View file @
a24b4ba3
...
@@ -48,7 +48,12 @@ module Pod
...
@@ -48,7 +48,12 @@ module Pod
pods
.
each
do
|
pod
|
pods
.
each
do
|
pod
|
unless
config
.
silent?
unless
config
.
silent?
marker
=
config
.
verbose
?
"
\n
-> "
.
green
:
''
marker
=
config
.
verbose
?
"
\n
-> "
.
green
:
''
name
=
pod
.
top_specification
.
preferred_dependency
?
"
#{
pod
.
top_specification
.
name
}
/
#{
pod
.
top_specification
.
preferred_dependency
}
(
#{
pod
.
top_specification
.
version
}
)"
:
pod
.
to_s
if
pod
.
top_specification
.
preferred_dependency
name
=
"
#{
pod
.
top_specification
.
name
}
/
#{
pod
.
top_specification
.
preferred_dependency
}
(
#{
pod
.
top_specification
.
version
}
)"
name
<<
"[BLEEDING]"
if
pod
.
top_specification
.
bleeding?
else
name
=
pod
.
to_s
end
puts
marker
<<
(
pod
.
exists?
?
"Using
#{
name
}
"
:
"Installing
#{
name
}
"
.
green
)
puts
marker
<<
(
pod
.
exists?
?
"Using
#{
name
}
"
:
"Installing
#{
name
}
"
.
green
)
end
end
...
...
lib/cocoapods/resolver.rb
View file @
a24b4ba3
...
@@ -61,11 +61,11 @@ module Pod
...
@@ -61,11 +61,11 @@ module Pod
set
.
required_by
(
dependent_specification
)
set
.
required_by
(
dependent_specification
)
# Ensure we don't resolve the same spec twice for one target
# Ensure we don't resolve the same spec twice for one target
unless
@loaded_specs
.
include?
(
dependency
.
name
)
unless
@loaded_specs
.
include?
(
dependency
.
name
)
spec
=
set
.
specification_by_name
(
dependency
.
name
)
spec
=
set
.
specification_by_name
(
dependency
.
name
)
@loaded_specs
<<
spec
.
name
@loaded_specs
<<
spec
.
name
@specs
[
spec
.
name
]
=
spec
@specs
[
spec
.
name
]
=
spec
spec
.
activate_platform
(
target_definition
.
platform
)
spec
.
activate_platform
(
target_definition
.
platform
)
spec
.
top_level_parent
.
bleeding
=
dependency
.
bleeding?
spec
.
bleeding
=
dependency
.
bleeding?
# And recursively load the dependencies of the spec.
# And recursively load the dependencies of the spec.
find_dependency_specs
(
spec
,
spec
.
dependencies
,
target_definition
)
if
spec
.
dependencies
find_dependency_specs
(
spec
,
spec
.
dependencies
,
target_definition
)
if
spec
.
dependencies
end
end
...
...
lib/cocoapods/specification.rb
View file @
a24b4ba3
...
@@ -180,20 +180,21 @@ module Pod
...
@@ -180,20 +180,21 @@ module Pod
@platform
=
Platform
.
new
(
*
platform
)
@platform
=
Platform
.
new
(
*
platform
)
end
end
# If not platform is specified all the platforms are returned.
def
available_platforms
platform
.
nil?
?
@define_for_platforms
.
map
{
|
platform
|
Platform
.
new
(
platform
,
deployment_target
(
platform
))
}
:
[
platform
]
end
### Top level attributes. These attributes represent the unique features of pod and can't be specified by subspecs.
# @!method bleeding
# @!method bleeding
#
#
# @return [BOOL] returns wheter the specification is in bleeding mode.
# @return [BOOL] returns wheter the specification is in bleeding mode.
#
#
top_
attr_accessor
:bleeding
attr_accessor
:bleeding
alias_method
:bleeding?
,
:bleeding
alias_method
:bleeding?
,
:bleeding
# If not platform is specified all the platforms are returned.
def
available_platforms
platform
.
nil?
?
@define_for_platforms
.
map
{
|
platform
|
Platform
.
new
(
platform
,
deployment_target
(
platform
))
}
:
[
platform
]
end
### Top level attributes. These attributes represent the unique features of pod and can't be specified by subspecs.
top_attr_accessor
:defined_in_file
top_attr_accessor
:defined_in_file
top_attr_accessor
:homepage
top_attr_accessor
:homepage
top_attr_accessor
:summary
top_attr_accessor
:summary
...
@@ -463,7 +464,7 @@ module Pod
...
@@ -463,7 +464,7 @@ module Pod
def
to_s
def
to_s
result
=
"
#{
name
}
(
#{
version
}
)"
result
=
"
#{
name
}
(
#{
version
}
)"
result
<<
" [BLEEDING]"
if
top_level_parent
.
bleeding?
result
<<
" [BLEEDING]"
if
bleeding?
result
result
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