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
d230d8e3
Commit
d230d8e3
authored
May 29, 2012
by
Eloy Duran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix integration spec, which was trying to assign a source to subspecs.
parent
f72eedbd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
specification.rb
lib/cocoapods/specification.rb
+4
-0
integration_spec.rb
spec/integration_spec.rb
+10
-1
No files found.
lib/cocoapods/specification.rb
View file @
d230d8e3
...
@@ -270,6 +270,10 @@ module Pod
...
@@ -270,6 +270,10 @@ module Pod
@parent
?
@parent
.
top_level_parent
:
self
@parent
?
@parent
.
top_level_parent
:
self
end
end
def
subspec?
!
@parent
.
nil?
end
def
subspec
(
name
,
&
block
)
def
subspec
(
name
,
&
block
)
subspec
=
Specification
.
new
(
self
,
name
,
&
block
)
subspec
=
Specification
.
new
(
self
,
name
,
&
block
)
@subspecs
<<
subspec
@subspecs
<<
subspec
...
...
spec/integration_spec.rb
View file @
d230d8e3
...
@@ -9,6 +9,7 @@ module SpecHelper
...
@@ -9,6 +9,7 @@ module SpecHelper
def
specs_by_target
def
specs_by_target
@specs_by_target
||=
super
.
tap
do
|
hash
|
@specs_by_target
||=
super
.
tap
do
|
hash
|
hash
.
values
.
flatten
.
each
do
|
spec
|
hash
.
values
.
flatten
.
each
do
|
spec
|
next
if
spec
.
subspec?
source
=
spec
.
source
source
=
spec
.
source
source
[
:git
]
=
SpecHelper
.
fixture
(
"integration/
#{
spec
.
name
}
"
).
to_s
source
[
:git
]
=
SpecHelper
.
fixture
(
"integration/
#{
spec
.
name
}
"
).
to_s
spec
.
source
=
source
spec
.
source
=
source
...
@@ -167,8 +168,16 @@ else
...
@@ -167,8 +168,16 @@ else
installer
=
SpecHelper
::
Installer
.
new
(
podfile
)
installer
=
SpecHelper
::
Installer
.
new
(
podfile
)
installer
.
install!
installer
.
install!
# TODO might be nicer looking to not show the dependencies of the top level spec for each subspec (Reachability).
YAML
.
load
(
installer
.
lock_file
.
read
).
should
==
{
YAML
.
load
(
installer
.
lock_file
.
read
).
should
==
{
"PODS"
=>
[{
"ASIHTTPRequest (1.8.1)"
=>
[
"Reachability"
]
},
"JSONKit (1.4)"
,
"Reachability (3.0.0)"
],
"PODS"
=>
[{
"ASIHTTPRequest (1.8.1)"
=>
[
"ASIHTTPRequest/ASIWebPageRequest (= 1.8.1)"
,
"ASIHTTPRequest/CloudFiles (= 1.8.1)"
,
"ASIHTTPRequest/S3 (= 1.8.1)"
,
"Reachability"
]},
{
"ASIHTTPRequest/ASIWebPageRequest (1.8.1)"
=>
[
"Reachability"
]
},
{
"ASIHTTPRequest/CloudFiles (1.8.1)"
=>
[
"Reachability"
]
},
{
"ASIHTTPRequest/S3 (1.8.1)"
=>
[
"Reachability"
]
},
"JSONKit (1.4)"
,
"Reachability (3.0.0)"
],
"DEPENDENCIES"
=>
[
"ASIHTTPRequest"
,
"JSONKit (= 1.4)"
]
"DEPENDENCIES"
=>
[
"ASIHTTPRequest"
,
"JSONKit (= 1.4)"
]
}
}
...
...
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