cocoapods 0.39.0.beta.3 → 0.39.0.beta.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a708764d6c5f315e9c453f8386d109dec54ee4
-  data.tar.gz: 1936127f87ea08571188fef241c7731bf7e4702b
+  metadata.gz: b37d2db8457fdd54c70e37273ccf0cd2f2f4848a
+  data.tar.gz: 9a545fa271be99539ae2a47aca529a550b4627d1
 SHA512:
-  metadata.gz: 9be3b9920cb0fcffbe85a58e589ea8ea39f584c77f48bf4bbf45ba4781b663e1d121332ac9891eaf1d36ba3cb029e1ce5bd359260e5292bb1bd16e2961361eb5
-  data.tar.gz: 19fa3a906892b62bcc3ea12b92f7bd578b448f8a2b69ff4e3bc6acb6fd16f8b29bd6b0da8a93c1f4ac83d1f42ddf91f483b956d32612dbc235a88d58a886acda
+  metadata.gz: 1c2e3a8e261f3d6c0cd0ba5987de648703168b67021a9a6ae75dc6e5364c6d0929d91fcad2defd9aced52088e5bc948e4b3fd633c3bf8bfd981be3bcef482b7c
+  data.tar.gz: edec194b42c0a81e7fa1b8af59c3c6d8508ee95cf1641d41261a1d17bf6c224f329e311051f431a02030bc4a1a8d6c64ea21e74a4a0b49dabfad40b7b5633fc7

data/CHANGELOG.md

@@ -4,6 +4,30 @@ To install or update CocoaPods see this [guide](http://docs.cocoapods.org/guides
 
 To install release candidates run `[sudo] gem install cocoapods --pre`
 
+## 0.39.0.beta.4 (2015-09-02)
+
+##### Bug Fixes
+
+* Using vendored frameworks without a `Headers` directory will no longer cause a
+  crash.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#3967](https://github.com/CocoaPods/CocoaPods/issues/3967)
+
+* Computing the set of transitive dependencies for a pod target,
+  even if the target is scoped, will no longer smash the stack.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4092](https://github.com/CocoaPods/CocoaPods/issues/4092)
+
+* Take into account a specification's `exclude_files` when constructing resource
+  bundles.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4065](https://github.com/CocoaPods/CocoaPods/issues/4065)
+
+* Fix resolving to platform-compatible versions of transitive dependencies.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#4084](https://github.com/CocoaPods/CocoaPods/issues/4084)
+
+
 ## 0.39.0.beta.3 (2015-08-28)
 
 ##### Bug Fixes

data/lib/cocoapods/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods command line tool.
   #
-  VERSION = '0.39.0.beta.3' unless defined? Pod::VERSION
+  VERSION = '0.39.0.beta.4' unless defined? Pod::VERSION
 end

data/lib/cocoapods/installer.rb

@@ -680,7 +680,9 @@ module Pod
         pods_project.development_pods.remove_from_project if pods_project.development_pods.empty?
         pods_project.sort(:groups_position => :below)
         pods_project.recreate_user_schemes(false)
-        pods_project.predictabilize_uuids if config.deterministic_uuids?
+        if config.deterministic_uuids?
+          UI.message('- Generating deterministic UUIDs') { pods_project.predictabilize_uuids }
+        end
         pods_project.save
       end
     end

data/lib/cocoapods/installer/analyzer.rb

@@ -314,12 +314,15 @@ module Pod
             end
           end
         else
-          specs_by_target.flat_map do |target_definition, specs|
+          pod_targets = specs_by_target.flat_map do |target_definition, specs|
             grouped_specs = specs.group_by.group_by(&:root).values.uniq
             grouped_specs.flat_map do |pod_specs|
               generate_pod_target([target_definition], pod_specs, :scoped => true)
             end
           end
+          pod_targets.each do |target|
+            target.dependent_targets = transitive_dependencies_for_pod_target(target, pod_targets)
+          end
         end
       end
 
@@ -340,12 +343,14 @@ module Pod
       def transitive_dependencies_for_pod_target(pod_target, targets)
         if targets.any?
           dependent_targets = pod_target.dependencies.flat_map do |dep|
+            next [] if pod_target.pod_name == dep
             targets.select { |t| t.pod_name == dep }
           end
           remaining_targets = targets - dependent_targets
-          dependent_targets + dependent_targets.flat_map do |target|
+          dependent_targets += dependent_targets.flat_map do |target|
             transitive_dependencies_for_pod_target(target, remaining_targets)
           end
+          dependent_targets.uniq
         else
           []
         end
@@ -532,7 +537,7 @@ module Pod
         end
 
         specs_by_target = nil
-        UI.section "Resolving dependencies of #{UI.path podfile.defined_in_file}" do
+        UI.section "Resolving dependencies of #{UI.path(podfile.defined_in_file) || 'Podfile'}" do
           resolver = Resolver.new(sandbox, podfile, locked_dependencies, sources)
           specs_by_target = resolver.resolve
           specs_by_target.values.flatten(1).each(&:validate_cocoapods_version)

data/lib/cocoapods/installer/target_installer/pod_target_installer.rb

@@ -89,15 +89,13 @@ module Pod
           header_file_refs = headers.map { |sf| project.reference_for_path(sf) }
           native_target.add_file_references(header_file_refs) do |build_file|
             # Set added headers as public if needed
-            if target.requires_frameworks?
-              build_file.settings ||= {}
-              if public_headers.include?(build_file.file_ref.real_path)
-                build_file.settings['ATTRIBUTES'] = ['Public']
-              elsif private_headers.include?(build_file.file_ref.real_path)
-                build_file.settings['ATTRIBUTES'] = ['Private']
-              else
-                build_file.settings['ATTRIBUTES'] = ['Project']
-              end
+            build_file.settings ||= {}
+            if public_headers.include?(build_file.file_ref.real_path)
+              build_file.settings['ATTRIBUTES'] = ['Public']
+            elsif private_headers.include?(build_file.file_ref.real_path)
+              build_file.settings['ATTRIBUTES'] = ['Private']
+            else
+              build_file.settings['ATTRIBUTES'] = ['Project']
             end
           end
 

data/lib/cocoapods/resolver.rb

@@ -38,6 +38,7 @@ module Pod
       @locked_dependencies = locked_dependencies
       @sources = Array(sources)
       @platforms_by_dependency = Hash.new { |h, k| h[k] = [] }
+      @cached_sets = {}
     end
 
     #-------------------------------------------------------------------------#
@@ -58,7 +59,6 @@ module Pod
           @platforms_by_dependency[dep].push(target.platform).uniq!
         end
       end
-      @cached_sets = {}
       @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
       specs_by_target.tap do |specs_by_target|
         specs_by_target.values.flatten.each do |spec|
@@ -409,10 +409,10 @@ module Pod
     def spec_is_platform_compatible?(dependency_graph, dependency, spec)
       all_predecessors = ->(vertex) do
         pred = vertex.predecessors
-        pred + pred.map(&all_predecessors).reduce(Set.new, &:&) << vertex
+        pred + pred.map(&all_predecessors).reduce(Set.new, &:|) << vertex
       end
       vertex = dependency_graph.vertex_named(dependency.name)
-      predecessors = all_predecessors[vertex].reject { |v| v.explicit_requirements.empty? }
+      predecessors = all_predecessors[vertex].reject { |v| !dependency_graph.root_vertex_named(v.name) }
       platforms_to_satisfy = predecessors.flat_map(&:explicit_requirements).flat_map { |r| @platforms_by_dependency[r] }
 
       platforms_to_satisfy.all? do |platform_to_satisfy|

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -174,7 +174,8 @@ module Pod
       #         vendored framework.
       #
       def self.vendored_frameworks_headers_dir(framework)
-        (framework + 'Headers').realpath
+        dir = framework + 'Headers'
+        dir.directory? ? dir.realpath : dir
       end
 
       # @param  [Pathname] framework
@@ -240,7 +241,9 @@ module Pod
       def resource_bundles
         result = {}
         spec_consumer.resource_bundles.each do |name, file_patterns|
-          paths = expanded_paths(file_patterns, :include_dirs => true)
+          paths = expanded_paths(file_patterns,
+                                 :exclude_patterns => spec_consumer.exclude_files,
+                                 :include_dirs => true)
           result[name] = paths
         end
         result

data/lib/cocoapods/target/pod_target.rb

@@ -66,7 +66,7 @@ module Pod
           target.user_build_configurations = user_build_configurations
           target.native_target = native_target
           target.archs = archs
-          target.dependent_targets = dependent_targets.map(&:scoped)
+          target.dependent_targets = dependent_targets.flat_map(&:scoped)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 0.39.0.beta.3
+  version: 0.39.0.beta.4
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0.beta.3
+        version: 0.39.0.beta.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0.beta.3
+        version: 0.39.0.beta.4
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.27.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: 0.27.2
 - !ruby/object:Gem::Dependency
   name: cocoapods-downloader
   requirement: !ruby/object:Gem::Requirement
@@ -117,14 +117,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: molinillo
   requirement: !ruby/object:Gem::Requirement