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
16d018e6
Commit
16d018e6
authored
Feb 07, 2013
by
Eloy Durán
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #783 from kbok/master
Do not flatten the zip files downloaded via http
parents
0be241d8
1599c295
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
http.rb
lib/cocoapods/downloader/http.rb
+8
-6
downloader_spec.rb
spec/functional/downloader_spec.rb
+2
-2
No files found.
lib/cocoapods/downloader/http.rb
View file @
16d018e6
...
...
@@ -74,12 +74,14 @@ module Pod
raise
UnsupportedFileTypeError
.
new
"Unsupported file type:
#{
type
}
"
end
# If the archive only contained a folder, move its contents to the target (#727)
contents
=
target_path
.
children
contents
.
delete
(
full_filename
)
entry
=
contents
.
first
if
contents
.
count
==
1
&&
entry
.
directory?
FileUtils
.
move
(
entry
.
children
,
target_path
)
# If the archive is a tarball and it only contained a folder, move its contents to the target (#727)
if
[
:tgz
,
:tar
,
:tbz
].
include?
type
contents
=
target_path
.
children
contents
.
delete
(
full_filename
)
entry
=
contents
.
first
if
contents
.
count
==
1
&&
entry
.
directory?
FileUtils
.
move
(
entry
.
children
,
target_path
)
end
end
end
...
...
spec/functional/downloader_spec.rb
View file @
16d018e6
...
...
@@ -74,8 +74,8 @@ module Pod
downloader
=
Downloader
.
for_pod
(
@pod
)
VCR
.
use_cassette
(
'tarballs'
,
:record
=>
:new_episodes
)
{
downloader
.
download
}
(
@pod
.
root
+
'GADSearchRequest.h'
).
should
.
exist
(
@pod
.
root
+
'GADSearchRequest.h'
).
read
.
strip
.
should
=~
/Google Search Ads iOS SDK/
(
@pod
.
root
+
'G
oogleAdMobSearchAdsSDK/G
ADSearchRequest.h'
).
should
.
exist
(
@pod
.
root
+
'G
oogleAdMobSearchAdsSDK/G
ADSearchRequest.h'
).
read
.
strip
.
should
=~
/Google Search Ads iOS SDK/
end
it
"raises if it fails to download"
do
...
...
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