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
59a198e2
Commit
59a198e2
authored
Aug 15, 2014
by
Kyle Fuller
Committed by
Fabio Pelosin
Aug 21, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ExternalSource] Fix issue with JSON podspecs
Closes #2320
parent
cb854fa9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
1 deletion
+25
-1
abstract_external_source.rb
lib/cocoapods/external_sources/abstract_external_source.rb
+9
-1
abstract_external_source_spec.rb
spec/unit/external_sources/abstract_external_source_spec.rb
+16
-0
No files found.
lib/cocoapods/external_sources/abstract_external_source.rb
View file @
59a198e2
...
...
@@ -101,7 +101,15 @@ module Pod
target
.
rmtree
if
target
.
exist?
downloader
=
Downloader
.
for_target
(
target
,
params
)
downloader
.
download
store_podspec
(
sandbox
,
target
+
"
#{
name
}
.podspec"
)
podspec_path
=
target
+
"
#{
name
}
.podspec"
json
=
false
unless
Pathname
(
podspec_path
).
exist?
podspec_path
=
target
+
"
#{
name
}
.podspec.json"
json
=
true
end
store_podspec
(
sandbox
,
target
+
podspec_path
,
json
)
sandbox
.
store_pre_downloaded_pod
(
name
)
if
downloader
.
options_specific?
source
=
params
...
...
spec/unit/external_sources/abstract_external_source_spec.rb
View file @
59a198e2
...
...
@@ -47,6 +47,22 @@ module Pod
},
}
end
it
"pre-downloads the Pod with a JSON podspec and stores the relevant information in the sandbox"
do
dependency
=
Dependency
.
new
(
"Reachability"
,
:git
=>
fixture
(
'integration/Reachability'
),
:branch
=>
'json_podspec'
)
source
=
ExternalSources
.
from_dependency
(
dependency
,
nil
)
sandbox
=
config
.
sandbox
source
.
send
(
:pre_download
,
sandbox
)
path
=
config
.
sandbox
.
root
+
'Local Podspecs/Reachability.podspec'
path
.
should
.
exist?
sandbox
.
predownloaded_pods
.
should
==
[
"Reachability"
]
sandbox
.
checkout_sources
.
should
==
{
"Reachability"
=>
{
:git
=>
fixture
(
'integration/Reachability'
),
:commit
=>
"4ec575e4b074dcc87c44018cce656672a979b34a"
}
}
end
end
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