cocoapods 0.16.3 → 0.16.4

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.16.4
+[CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.3...0.16.4)
+
+###### Enhancements
+
+- Add explicit flattening option to `Downloader:Http`: `:flatten => true`.
+  [#814](https://github.com/CocoaPods/CocoaPods/pull/814)
+  [#812](https://github.com/CocoaPods/CocoaPods/issues/812)
+  [#1314](https://github.com/CocoaPods/Specs/pull/1314)
+
+###### Bug fixes
+
+- Explicitely require `date` in the gemspec for Ruby 2.0.0.
+  [34da3f7](https://github.com/CocoaPods/CocoaPods/commit/34da3f792b2a36fafacd4122e29025c9cf2ff38d)
+
 ## 0.16.3
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.2...0.16.3) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.3...0.5.0)
 

data/lib/cocoapods.rb

@@ -12,7 +12,7 @@ unless Gem::Version::Requirement.new('>= 1.4.0').satisfied_by?(Gem::Version.new(
 end
 
 module Pod
-  VERSION = '0.16.3'
+  VERSION = '0.16.4'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/downloader/http.rb

@@ -26,6 +26,16 @@ module Pod
         options[:type] || type_with_url(url)
       end
 
+      def should_flatten?
+        if options.has_key? :flatten
+          options[:flatten] # spec file can always override
+        elsif [:tgz, :tar, :tbz].include? type
+          true # those archives flatten by default
+        else
+          false # all others (actually only .zip) default not to flatten
+        end
+      end
+
       private
       def type_with_url(url)
         if url =~ /.zip$/
@@ -74,8 +84,7 @@ module Pod
           raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
         end
 
-        # 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
+        if should_flatten?
           contents = target_path.children
           contents.delete(full_filename)
           entry = contents.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.16.3
+  version: 0.16.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj