cocoapods 0.35.0 → 0.36.0.beta.1

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

@@ -12,8 +12,14 @@ module Pod
         UI.message "- Installing target `#{target.name}` #{target.platform}" do
           add_target
           create_support_files_dir
-          create_suport_files_group
+          create_support_files_group
           create_xcconfig_file
+          if target.requires_frameworks?
+            create_info_plist_file
+            create_module_map
+            create_umbrella_header
+            create_embed_frameworks_script
+          end
           create_target_environment_header
           create_bridge_support_file
           create_copy_resources_script
@@ -26,12 +32,25 @@ module Pod
 
       private
 
+      # Ensure that vendored static frameworks and libraries are not linked
+      # twice to the aggregate target, which shares the xcconfig of the user
+      # target.
+      #
+      def custom_build_settings
+        settings = {
+          'OTHER_LDFLAGS'      => '',
+          'OTHER_LIBTOOLFLAGS' => '',
+          'PODS_ROOT'          => '$(SRCROOT)',
+        }
+        super.merge(settings)
+      end
+
       # Creates the group that holds the references to the support files
       # generated by this installer.
       #
       # @return [void]
       #
-      def create_suport_files_group
+      def create_support_files_group
         parent = project.support_files_group
         name = target.name
         dir = target.support_files_dir
@@ -92,9 +111,12 @@ module Pod
       #
       def create_copy_resources_script
         path = target.copy_resources_script_path
-        file_accessors = target.pod_targets.map(&:file_accessors).flatten
-        resource_paths = file_accessors.map { |accessor| accessor.resources.flatten.map { |res| res.relative_path_from(project.path.dirname) } }.flatten
-        resource_bundles = file_accessors.map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name}.bundle" } }.flatten
+        library_targets = target.pod_targets.reject do |pod_target|
+          pod_target.should_build? && pod_target.requires_frameworks?
+        end
+        file_accessors = library_targets.flat_map(&:file_accessors)
+        resource_paths = file_accessors.flat_map { |accessor| accessor.resources.flat_map { |res| res.relative_path_from(project.path.dirname) } }
+        resource_bundles = file_accessors.flat_map { |accessor| accessor.resource_bundles.keys.map { |name| "${BUILT_PRODUCTS_DIR}/#{name}.bundle" } }
         resources = []
         resources.concat(resource_paths)
         resources.concat(resource_bundles)
@@ -104,6 +126,28 @@ module Pod
         add_file_to_support_group(path)
       end
 
+      # Creates a script that embeds the frameworks to the bundle of the client
+      # target.
+      #
+      # @note   We can't use Xcode default copy bundle resource phase, because
+      #         we need to ensure that we only copy the resources, which are
+      #         relevant for the current build configuration.
+      #
+      # @return [void]
+      #
+      def create_embed_frameworks_script
+        path = target.embed_frameworks_script_path
+        frameworks_by_config = {}
+        target.user_build_configurations.keys.each do |config|
+          frameworks_by_config[config] = target.pod_targets.select do |pod_target|
+            pod_target.include_in_build_config?(config) && pod_target.should_build?
+          end.map(&:product_name)
+        end
+        generator = Generator::EmbedFrameworksScript.new(target_definition, frameworks_by_config)
+        generator.save_as(path)
+        add_file_to_support_group(path)
+      end
+
       # Generates the acknowledgement files (markdown and plist) for the target.
       #
       # @return [void]

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

@@ -9,12 +9,24 @@ module Pod
       # @return [void]
       #
       def install!
+        unless target.should_build?
+          add_resources_bundle_targets
+          return
+        end
+
         UI.message "- Installing target `#{target.name}` #{target.platform}" do
           add_target
           create_support_files_dir
-          add_files_to_build_phases
           add_resources_bundle_targets
+          add_files_to_build_phases
           create_xcconfig_file
+          if target.requires_frameworks?
+            create_info_plist_file
+            create_module_map
+            create_umbrella_header do |generator|
+              generator.imports += target.file_accessors.flat_map(&:public_headers).map(&:basename)
+            end
+          end
           create_prefix_header
           create_dummy_source
         end
@@ -36,20 +48,41 @@ module Pod
         target.file_accessors.each do |file_accessor|
           consumer = file_accessor.spec_consumer
 
+          headers = file_accessor.headers
+          public_headers = file_accessor.public_headers
           other_source_files = file_accessor.source_files.select { |sf| sf.extname == '.d' }
 
           {
             true => file_accessor.arc_source_files,
             false => file_accessor.non_arc_source_files,
           }.each do |arc, files|
-            files = files - other_source_files
+            files = files - headers - other_source_files
             flags = compiler_flags_for_consumer(consumer, arc)
             regular_file_refs = files.map { |sf| project.reference_for_path(sf) }
             native_target.add_file_references(regular_file_refs, flags)
           end
 
+          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?
+              if public_headers.include?(build_file.file_ref.real_path)
+                build_file.settings ||= {}
+                build_file.settings['ATTRIBUTES'] = ['Public']
+              end
+            end
+          end
+
           other_file_refs = other_source_files.map { |sf| project.reference_for_path(sf) }
           native_target.add_file_references(other_file_refs, nil)
+
+          next unless target.requires_frameworks?
+
+          resource_refs = file_accessor.resources.flatten.map do |res|
+            project.reference_for_path(res)
+          end
+
+          native_target.add_resources(resource_refs)
         end
       end
 
@@ -63,20 +96,35 @@ module Pod
       def add_resources_bundle_targets
         target.file_accessors.each do |file_accessor|
           file_accessor.resource_bundles.each do |bundle_name, paths|
-            # Add a dependency on an existing Resource Bundle target if possible
-            if bundle_target = project.targets.find { |target| target.name == bundle_name }
-              native_target.add_dependency(bundle_target)
-              next
-            end
             file_references = paths.map { |sf| project.reference_for_path(sf) }
-            bundle_target = project.new_resources_bundle(bundle_name, file_accessor.spec_consumer.platform_name)
+            label = target.resources_bundle_target_label(bundle_name)
+            bundle_target = project.new_resources_bundle(label, file_accessor.spec_consumer.platform_name)
+            bundle_target.product_reference.tap do |bundle_product|
+              bundle_file_name = "#{bundle_name}.bundle"
+              bundle_product.name = bundle_file_name
+              bundle_product.path = bundle_file_name
+            end
             bundle_target.add_resources(file_references)
 
             target.user_build_configurations.each do |bc_name, type|
               bundle_target.add_build_configuration(bc_name, type)
             end
 
-            native_target.add_dependency(bundle_target)
+            target.resource_bundle_targets << bundle_target
+
+            if target.should_build?
+              native_target.add_dependency(bundle_target)
+              if target.requires_frameworks?
+                native_target.add_resources([bundle_target.product_reference])
+              end
+            end
+
+            bundle_target.build_configurations.each do |c|
+              c.build_settings['PRODUCT_NAME'] = bundle_name
+              if target.requires_frameworks?
+                c.build_settings['CONFIGURATION_BUILD_DIR'] = target.configuration_build_dir
+              end
+            end
           end
         end
       end

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -132,7 +132,8 @@ module Pod
         end
       end
 
-      INHERITED_FLAGS = ['$(inherited)', '${inherited}']
+      IGNORED_KEYS = %w(CODE_SIGN_IDENTITY).freeze
+      INHERITED_FLAGS = %w($(inherited) ${inherited}).freeze
 
       # Checks whether the settings of the CocoaPods generated xcconfig are
       # overridden by the build configuration of a target and prints a
@@ -144,7 +145,7 @@ module Pod
             user_target.build_configurations.each do |config|
               xcconfig = aggregate_target.xcconfigs[config.name]
               if xcconfig
-                xcconfig.to_hash.keys.each do |key|
+                (xcconfig.to_hash.keys - IGNORED_KEYS).each do |key|
                   target_values = config.build_settings[key]
                   if target_values &&
                       !INHERITED_FLAGS.any? { |flag| target_values.include?(flag) }

data/lib/cocoapods/installer/user_project_integrator/target_integrator.rb

@@ -31,8 +31,10 @@ module Pod
             project_is_dirty = [
               XCConfigIntegrator.integrate(target, native_targets),
               update_to_cocoapods_0_34,
+              remove_embed_frameworks_script_phases,
               unless native_targets_to_integrate.empty?
                 add_pods_library
+                add_embed_frameworks_script_phase if target.requires_frameworks?
                 add_copy_resources_script_phase
                 add_check_manifest_lock_script_phase
                 true
@@ -91,9 +93,9 @@ module Pod
           changes
         end
 
-        # Adds spec libraries to the frameworks build phase of the
+        # Adds spec product reference to the frameworks build phase of the
         # {TargetDefinition} integration libraries. Adds a file reference to
-        # the library of the {TargetDefinition} and adds it to the frameworks
+        # the frameworks group of the project and adds it to the frameworks
         # build phase of the targets.
         #
         # @return [void]
@@ -101,12 +103,71 @@ module Pod
         def add_pods_library
           frameworks = user_project.frameworks_group
           native_targets_to_integrate.each do |native_target|
-            library = frameworks.files.select { |f| f.path == target.product_name }.first ||
-              frameworks.new_product_ref_for_target(target.name, :static_library)
-            unless native_target.frameworks_build_phase.files_references.include?(library)
-              native_target.frameworks_build_phase.add_file_reference(library)
+            build_phase = native_target.frameworks_build_phase
+
+            # Find and delete possible reference for the other product type
+            old_product_name = target.requires_frameworks? ? target.static_library_name : target.framework_name
+            old_product_ref = frameworks.files.find { |f| f.path == old_product_name }
+            if old_product_ref.present?
+              UI.message("Removing old Pod product reference #{old_product_name} from project.")
+              build_phase.remove_file_reference(old_product_ref)
+              frameworks.remove_reference(old_product_ref)
+            end
+
+            # Find or create and add a reference for the current product type
+            target_basename = target.product_basename
+            new_product_ref = frameworks.files.find { |f| f.path == target.product_name } ||
+              frameworks.new_product_ref_for_target(target_basename, target.product_type)
+            build_file = build_phase.build_file(new_product_ref) ||
+              build_phase.add_file_reference(new_product_ref)
+            if target.requires_frameworks?
+              # Weak link the aggregate target's product, because as it contains
+              # no symbols, it isn't copied into the app bundle. dyld will so
+              # never try to find the missing executable at runtime.
+              build_file.settings ||= {}
+              build_file.settings['ATTRIBUTES'] = ['Weak']
+            end
+          end
+        end
+
+        # Find or create a 'Embed Pods Frameworks' Copy Files Build Phase
+        #
+        # @return [void]
+        #
+        def add_embed_frameworks_script_phase
+          phase_name = 'Embed Pods Frameworks'
+          native_targets_to_integrate.each do |native_target|
+            embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name == phase_name }
+            unless embed_build_phase.present?
+              UI.message("Adding Build Phase '#{phase_name}' to project.")
+              embed_build_phase = native_target.new_shell_script_build_phase(phase_name)
             end
+            script_path = target.embed_frameworks_script_relative_path
+            embed_build_phase.shell_script = %("#{script_path}"\n)
+            embed_build_phase.show_env_vars_in_log = '0'
+          end
+        end
+
+        # Delete 'Embed Pods Frameworks' Build Phases, if they exist
+        # and are not needed anymore due to not integrating the
+        # dependencies by frameworks.
+        #
+        # @return [Bool] whether any changes to the project were made.
+        #
+        def remove_embed_frameworks_script_phases
+          return false if target.requires_frameworks?
+
+          phase_name = 'Embed Pods Frameworks'
+          result = false
+
+          native_targets.each do |native_target|
+            embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name == phase_name }
+            next unless embed_build_phase.present?
+            native_target.build_phases.delete(embed_build_phase)
+            result = true
           end
+
+          result
         end
 
         # Adds a shell script build phase responsible to copy the resources

data/lib/cocoapods/project.rb

@@ -59,6 +59,7 @@ module Pod
 
       parent_group = development ? development_pods : pods
       source_tree = absolute ? :absolute : :group
+
       group = parent_group.new_group(pod_name, path, source_tree)
       group
     end
@@ -144,13 +145,28 @@ module Pod
     # @param  [PBXGroup] group
     #         The group for the new file reference.
     #
+    # @param  [Bool] reflect_file_system_structure
+    #         Wether group structure should reflect the file system structure.
+    #         If yes, where needed, intermediate groups are created, similar to
+    #         how mkdir -p operates.
+    #
     # @return [PBXFileReference] The new file reference.
     #
-    def add_file_reference(absolute_path, group)
-      unless Pathname.new(absolute_path).absolute?
+    def add_file_reference(absolute_path, group, reflect_file_system_structure = false)
+      file_path_name = Pathname.new(absolute_path)
+      unless file_path_name.absolute?
         raise ArgumentError, "Paths must be absolute #{absolute_path}"
       end
 
+      if reflect_file_system_structure
+        relative_path = file_path_name.relative_path_from(group.real_path)
+        relative_dir = relative_path.dirname
+        relative_dir.each_filename do|name|
+          next if name == '.'
+          group = group[name] || group.new_group(name, name)
+        end
+      end
+
       if ref = reference_for_path(absolute_path)
         ref
       else

data/lib/cocoapods/resolver.rb

@@ -50,7 +50,7 @@ module Pod
     #         definition.
     #
     def resolve
-      dependencies = @podfile.target_definition_list.map(&:dependencies).flatten
+      dependencies = podfile.target_definition_list.map(&:dependencies).flatten
       @cached_sets = {}
       @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
       specs_by_target
@@ -78,7 +78,6 @@ module Pod
             uniq.
             sort_by(&:name).
             each do |spec|
-              validate_platform(spec, target)
               sandbox.store_head_pod(spec.name) if spec.version.head?
             end
         end
@@ -408,6 +407,7 @@ module Pod
     #         dependencies for `target`.
     #
     def valid_dependencies_for_target_from_node(target, node)
+      validate_platform(node.payload, target)
       dependency_nodes = node.outgoing_edges.select do |edge|
         edge_is_valid_for_target?(edge, target)
       end.map(&:destination)

data/lib/cocoapods/sandbox/file_accessor.rb

@@ -12,7 +12,7 @@ module Pod
       GLOB_PATTERNS = {
         :readme              => 'readme{*,.*}'.freeze,
         :license             => 'licen{c,s}e{*,.*}'.freeze,
-        :source_files        => '*.{h,hpp,hh,m,mm,c,cpp}'.freeze,
+        :source_files        => '*.{h,hpp,hh,m,mm,c,cpp,swift}'.freeze,
         :public_header_files => "*{#{HEADER_EXTENSIONS.join(',')}}".freeze,
       }.freeze
 
@@ -113,8 +113,8 @@ module Pod
       # @return [Array<Pathname>] the public headers of the specification.
       #
       def public_headers(include_frameworks = false)
-        public_headers = paths_for_attribute(:public_header_files)
-        private_headers = paths_for_attribute(:private_header_files)
+        public_headers = public_header_files
+        private_headers = private_header_files
         if public_headers.nil? || public_headers.empty?
           header_files = headers
         else
@@ -210,6 +210,26 @@ module Pod
 
       private
 
+      # @!group Private paths
+
+      # @return [Array<Pathname>] The paths of the user-specified public header
+      #         files.
+      #
+      def public_header_files
+        paths_for_attribute(:public_header_files)
+      end
+
+      # @return [Array<Pathname>] The paths of the user-specified public header
+      #         files.
+      #
+      def private_header_files
+        paths_for_attribute(:private_header_files)
+      end
+
+      #-----------------------------------------------------------------------#
+
+      private
+
       # @!group Private helpers
 
       # Returns the list of the paths founds in the file system for the

data/lib/cocoapods/sandbox/headers_store.rb

@@ -26,6 +26,10 @@ module Pod
         @search_paths  = []
       end
 
+      # @param  [Platform] platform
+      #         the platform for which the header search paths should be
+      #         returned
+      #
       # @return [Array<String>] All the search paths of the header directory in
       #         xcconfig format. The paths are specified relative to the pods
       #         root with the `${PODS_ROOT}` variable.

data/lib/cocoapods/sources_manager.rb

@@ -9,6 +9,7 @@ module Pod
       #         known Pods.
       #
       def aggregate
+        return Source::Aggregate.new([]) unless config.repos_dir.exist?
         dirs = config.repos_dir.children.select(&:directory?)
         Source::Aggregate.new(dirs)
       end
@@ -60,6 +61,7 @@ module Pod
       #         installation of CocoaPods.
       #
       def all
+        return [] unless config.repos_dir.exist?
         dirs = config.repos_dir.children.select(&:directory?)
         dirs.map { |repo| Source.new(repo) }
       end
@@ -393,7 +395,9 @@ module Pod
       #
       def source_with_url(url)
         url = url.downcase.gsub(/.git$/, '')
-        aggregate.sources.find { |s| s.url.downcase.gsub(/.git$/, '') == url }
+        aggregate.sources.find do |source|
+          source.url && source.url.downcase.gsub(/.git$/, '') == url
+        end
       end
 
       # Returns a suitable repository name for `url`.