cocoapods 0.16.2 → 0.16.3

data/CHANGELOG.md

@@ -1,3 +1,35 @@
+## 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)
+
+###### Bug fixes
+
+- Only flatten tarballs, **not** zipballs, from HTTP sources. A zipball can
+  contain single directories in the root that should be preserved, for instance
+  a framework bundle. This reverts part of the change in 0.16.1.
+  **NOTE** This will break some podspecs that were changed after 0.16.1.
+  [#783](https://github.com/CocoaPods/CocoaPods/pull/783)
+  [#727](https://github.com/CocoaPods/CocoaPods/issues/727)
+- Never consider aggregate targets in the user’s project for integration.
+  [#729](https://github.com/CocoaPods/CocoaPods/issues/729)
+  [#784](https://github.com/CocoaPods/CocoaPods/issues/784)
+- Support comments on all build phases, groups and targets in Xcode projects.
+  [#51](https://github.com/CocoaPods/Xcodeproj/pull/51)
+- Ensure default Xcode project values are copied before being used.
+  [b43087c](https://github.com/CocoaPods/Xcodeproj/commit/b43087cb342d8d44b491e702faddf54a222b23c3)
+- Block assertions in Release builds.
+  [#53](https://github.com/CocoaPods/Xcodeproj/pull/53)
+  [#803](https://github.com/CocoaPods/CocoaPods/pull/803)
+  [#802](https://github.com/CocoaPods/CocoaPods/issues/802)
+
+
+###### Enhancements
+
+- Compile Core Data model files.
+  [#795](https://github.com/CocoaPods/CocoaPods/pull/795)
+- Add `Xcodeproj::Differ`, which shows differences between Xcode projects.
+  [308941e](https://github.com/CocoaPods/Xcodeproj/commit/308941eeaa3bca817742c774fd584cc5ab1c8f84)
+
+
 ## 0.16.2
 [CocoaPods](https://github.com/CocoaPods/CocoaPods/compare/0.16.1...0.16.2) • [Xcodeproj](https://github.com/CocoaPods/Xcodeproj/compare/0.4.1...0.4.3)
 

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.2'
+  VERSION = '0.16.3'
 
   class PlainInformative < StandardError
   end

data/lib/cocoapods/downloader/http.rb

@@ -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
 

data/lib/cocoapods/generator/copy_resources_script.rb

@@ -19,6 +19,10 @@ install_resource()
       echo "rsync -rp ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       rsync -rp "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
       ;;
+    *.xcdatamodeld)
+      echo "xcrun momc ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
+      xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xcdatamodeld`.momd"
+      ;;
     *)
       echo "cp -R ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
       cp -R "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -112,6 +112,14 @@ module Pod
           @user_project ||= Xcodeproj::Project.new(user_project_path)
         end
 
+        # @return [Array<PBXNativeTarget>] Returns the user’s targets,
+        #                                  excluding aggregate targets.
+        def native_targets
+          user_project.targets.reject do |target|
+            target.is_a? Xcodeproj::Project::Object::PBXAggregateTarget
+          end
+        end
+
         # This returns a list of the targets from the user’s project to which
         # this Pods static library should be linked. If no explicit target was
         # specified, then the first encountered target is assumed.
@@ -122,28 +130,40 @@ module Pod
         # @return [Array<PBXNativeTarget>]  Returns the list of targets that
         #                                   the Pods lib should be linked with.
         def targets
-          @targets ||= begin
-          if link_with = @target_definition.link_with
+          if @targets.nil?
+            targets = nil
             # Find explicitly linked targets.
-            user_project.targets.select do |target|
-              link_with.include? target.name
+            if link_with = @target_definition.link_with
+              targets = native_targets.select do |target|
+                link_with.include? target.name
+              end
+
+            # Otherwise try to find a target matching the name.
+            elsif @target_definition.name != :default
+              target = native_targets.find do |target|
+                target.name == @target_definition.name.to_s
+              end
+              unless target
+                raise Informative, "Unable to find a target named `#{@target_definition.name.to_s}'"
+              end
+              targets = [target]
+
+            # Default to the first target, which in a simple project is
+            # probably an app target.
+            else
+              targets = [native_targets.first]
             end
-          elsif @target_definition.name != :default
-            # Find the target with the matching name.
-            target = user_project.targets.find { |target| target.name == @target_definition.name.to_s }
-            raise Informative, "Unable to find a target named `#{@target_definition.name.to_s}'" unless target
-            [target]
-          else
-            # Default to the first, which in a simple project is probably an app target.
-            [user_project.targets.first]
-          end.reject do |target|
-            # Reject any target that already has this Pods library in one of its frameworks build phases
-            target.frameworks_build_phase.files.any? do |build_file|
-              file_ref = build_file.file_ref
-              !file_ref.proxy? && file_ref.display_name == @target_definition.lib_name
+
+            # Reject any target that already has this Pods library in one of
+            # its frameworks build phases
+            @targets = targets.reject do |target|
+              target.frameworks_build_phase.files.any? do |build_file|
+                file_ref = build_file.file_ref
+                !file_ref.proxy? && file_ref.display_name == @target_definition.lib_name
+              end
             end
           end
-         end
+          @targets
         end
 
         def add_xcconfig_base_configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xcodeproj
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement