Merge pull request #783 from kbok/master

Do not flatten the zip files downloaded via http

lib/cocoapods/downloader/http.rb

@@ -74,7 +74,8 @@ module Pod
           raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
         end
 
-        # If the archive only contained a folder, move its contents to the target (#727)
+        # 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
@@ -82,6 +83,7 @@ module Pod
             FileUtils.move(entry.children, target_path)
           end
         end
+      end
 
     end
   end

spec/functional/downloader_spec.rb

@@ -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 + 'GoogleAdMobSearchAdsSDK/GADSearchRequest.h').should.exist
+        (@pod.root + 'GoogleAdMobSearchAdsSDK/GADSearchRequest.h').read.strip.should =~ /Google Search Ads iOS SDK/
       end
 
       it "raises if it fails to download" do