cocoapods 0.20.2 → 0.21.0.rc1

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

@@ -0,0 +1,132 @@
+module Pod
+  class Installer
+
+    # Creates the targets which aggregate the Pods libraries in the Pods
+    # project and the relative support files.
+    #
+    class AggregateTargetInstaller < TargetInstaller
+
+      # Creates the target in the Pods project and the relative support files.
+      #
+      # @return [void]
+      #
+      def install!
+        UI.message "- Installing target `#{library.name}` #{library.platform}" do
+          add_target
+          create_suport_files_group
+          create_xcconfig_file
+          create_target_environment_header
+          create_bridge_support_file
+          create_copy_resources_script
+          create_acknowledgements
+          create_dummy_source
+        end
+      end
+
+      #-----------------------------------------------------------------------#
+
+      private
+
+      # Generates the contents of the xcconfig file and saves it to disk.
+      #
+      # @note   The `ALWAYS_SEARCH_USER_PATHS` flag is enabled to support
+      #         libraries like `EmbedReader`.
+      #
+      # @return [void]
+      #
+      def create_xcconfig_file
+        path = library.xcconfig_path
+        UI.message "- Generating xcconfig file at #{UI.path(path)}" do
+          gen = Generator::AggregateXCConfig.new(library)
+          gen.save_as(path)
+          library.xcconfig = gen.xcconfig
+          xcconfig_file_ref = add_file_to_support_group(path)
+
+          target.build_configurations.each do |c|
+            c.base_configuration_reference = xcconfig_file_ref
+          end
+        end
+      end
+
+      # Generates a header which allows to inspect at compile time the installed
+      # pods and the installed specifications of a pod.
+      #
+      def create_target_environment_header
+        path = library.target_environment_header_path
+        UI.message "- Generating target environment header at #{UI.path(path)}" do
+          generator = Generator::TargetEnvironmentHeader.new(library.pod_targets.map { |l| l.specs }.flatten)
+          generator.save_as(path)
+          add_file_to_support_group(path)
+        end
+      end
+
+      # Generates the bridge support metadata if requested by the {Podfile}.
+      #
+      # @note   The bridge support metadata is added to the resources of the
+      #         library because it is needed for environments interpreted at
+      #         runtime.
+      #
+      # @return [void]
+      #
+      def create_bridge_support_file
+        if target_definition.podfile.generate_bridge_support?
+          path = library.bridge_support_path
+          UI.message "- Generating BridgeSupport metadata at #{UI.path(path)}" do
+            headers = target.headers_build_phase.files.map { |bf| sandbox.root + bf.file_ref.path }
+            generator = Generator::BridgeSupport.new(headers)
+            generator.save_as(path)
+            add_file_to_support_group(path)
+            @bridge_support_file = path.relative_path_from(sandbox.root)
+          end
+        end
+      end
+
+      # Creates a script that copies the resources to the bundle of the client
+      # target.
+      #
+      # @note   The bridge support file needs to be created before the prefix
+      #         header, otherwise it will not be added to the resources script.
+      #
+      # @return [void]
+      #
+      def create_copy_resources_script
+        path = library.copy_resources_script_path
+        UI.message "- Generating copy resources script at #{UI.path(path)}" do
+          file_accessors = library.pod_targets.map(&:file_accessors).flatten
+          resources = file_accessors.map { |accessor| accessor.resources.flatten.map {|res| project.relativize(res)} }.flatten
+          resources << bridge_support_file if bridge_support_file
+          generator = Generator::CopyResourcesScript.new(resources, library.platform)
+          generator.save_as(path)
+          add_file_to_support_group(path)
+        end
+      end
+
+      # Generates the acknowledgement files (markdown and plist) for the target.
+      #
+      # @return [void]
+      #
+      def create_acknowledgements
+        basepath = library.acknowledgements_basepath
+        Generator::Acknowledgements.generators.each do |generator_class|
+          path = generator_class.path_from_basepath(basepath)
+          UI.message "- Generating acknowledgements at #{UI.path(path)}" do
+            file_accessors = library.pod_targets.map(&:file_accessors).flatten
+            generator = generator_class.new(file_accessors)
+            generator.save_as(path)
+            add_file_to_support_group(path)
+          end
+        end
+      end
+
+      # @return [Pathname] the path of the bridge support file relative to the
+      #         sandbox.
+      #
+      # @return [Nil] if no bridge support file was generated.
+      #
+      attr_reader :bridge_support_file
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

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

@@ -0,0 +1,160 @@
+module Pod
+  class Installer
+
+    # Creates the target for the Pods libraries in the Pods project and the
+    # relative support files.
+    #
+    class PodTargetInstaller < TargetInstaller
+
+      # Creates the target in the Pods project and the relative support files.
+      #
+      # @return [void]
+      #
+      def install!
+        UI.message "- Installing target `#{library.name}` #{library.platform}" do
+          add_target
+          add_files_to_build_phases
+          create_suport_files_group
+          create_xcconfig_file
+          create_prefix_header
+          create_dummy_source
+        end
+      end
+
+      #-----------------------------------------------------------------------#
+
+      private
+
+      # Adds the build files of the pods to the target and adds a reference to
+      # the frameworks of the Pods.
+      #
+      # @note   The Frameworks are used only for presentation purposes as the
+      #         xcconfig is the authoritative source about their information.
+      #
+      # @return [void]
+      #
+      def add_files_to_build_phases
+        UI.message "- Adding Build files" do
+          library.file_accessors.each do |file_accessor|
+            consumer = file_accessor.spec_consumer
+            flags = compiler_flags_for_consumer(consumer)
+            source_files = file_accessor.source_files
+            file_refs = source_files.map { |sf| project.file_reference(sf) }
+            target.add_file_references(file_refs, flags)
+
+            file_accessor.spec_consumer.frameworks.each do |framework|
+              project.add_system_framework(framework, target)
+            end
+          end
+        end
+      end
+
+      # Generates the contents of the xcconfig file and saves it to disk.
+      #
+      # @note   The `ALWAYS_SEARCH_USER_PATHS` flag is enabled to support
+      #         libraries like `EmbedReader`.
+      #
+      # @return [void]
+      #
+      def create_xcconfig_file
+        path = library.xcconfig_path
+        UI.message "- Generating public xcconfig file at #{UI.path(path)}" do
+          gen = Generator::PublicPodXCConfig.new(library)
+          gen.save_as(path)
+          add_file_to_support_group(path)
+        end
+
+        path = library.xcconfig_private_path
+        UI.message "- Generating private xcconfig file at #{UI.path(path)}" do
+          gen = Generator::PrivatePodXCConfig.new(library)
+          gen.save_as(path)
+          xcconfig_file_ref = add_file_to_support_group(path)
+
+          target.build_configurations.each do |c|
+            c.base_configuration_reference = xcconfig_file_ref
+          end
+        end
+      end
+
+      # Creates a prefix header file which imports `UIKit` or `Cocoa` according
+      # to the platform of the target. This file also include any prefix header
+      # content reported by the specification of the pods.
+      #
+      # @return [void]
+      #
+      def create_prefix_header
+        path = library.prefix_header_path
+        UI.message "- Generating prefix header at #{UI.path(path)}" do
+          generator = Generator::PrefixHeader.new(library.file_accessors, library.platform)
+          generator.imports << library.target_environment_header_path.basename
+          generator.save_as(path)
+          add_file_to_support_group(path)
+
+          target.build_configurations.each do |c|
+            relative_path = path.relative_path_from(sandbox.root)
+            c.build_settings['GCC_PREFIX_HEADER'] = relative_path.to_s
+          end
+        end
+      end
+
+      ENABLE_OBJECT_USE_OBJC_FROM = {
+        :ios => Version.new('6'),
+        :osx => Version.new('10.8')
+      }
+
+      # Returns the compiler flags for the source files of the given specification.
+      #
+      # The following behavior is regarding the `OS_OBJECT_USE_OBJC` flag. When
+      # set to `0`, it will allow code to use `dispatch_release()` on >= iOS 6.0
+      # and OS X 10.8.
+      #
+      # * New libraries that do *not* require ARC don’t need to care about this
+      #   issue at all.
+      #
+      # * New libraries that *do* require ARC _and_ have a deployment target of
+      #   >= iOS 6.0 or OS X 10.8:
+      #
+      #   These no longer use `dispatch_release()` and should *not* have the
+      #   `OS_OBJECT_USE_OBJC` flag set to `0`.
+      #
+      #   **Note:** this means that these libraries *have* to specify the
+      #             deployment target in order to function well.
+      #
+      # * New libraries that *do* require ARC, but have a deployment target of
+      #   < iOS 6.0 or OS X 10.8:
+      #
+      #   These contain `dispatch_release()` calls and as such need the
+      #   `OS_OBJECT_USE_OBJC` flag set to `1`.
+      #
+      #   **Note:** libraries that do *not* specify a platform version are
+      #             assumed to have a deployment target of < iOS 6.0 or OS X 10.8.
+      #
+      #  For more information, see: http://opensource.apple.com/source/libdispatch/libdispatch-228.18/os/object.h
+      #
+      # @param  [Specification::Consumer] consumer
+      #         The consumer for the specification for which the compiler flags
+      #         are needed.
+      #
+      # @return [String] The compiler flags.
+      #
+      def compiler_flags_for_consumer(consumer)
+        flags = consumer.compiler_flags.dup
+        if consumer.requires_arc
+          flags << '-fobjc-arc'
+          platform_name = consumer.platform_name
+          spec_deployment_target = consumer.spec.deployment_target(platform_name)
+          if spec_deployment_target.nil? || Version.new(spec_deployment_target) < ENABLE_OBJECT_USE_OBJC_FROM[platform_name]
+            flags << '-DOS_OBJECT_USE_OBJC=0'
+          end
+        end
+        if target_definition.inhibits_warnings_for_pod?(consumer.spec.root.name)
+          flags << '-w -Xanalyzer -analyzer-disable-checker'
+        end
+        flags * " "
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

data/lib/cocoapods/installer/user_project_integrator.rb

@@ -35,9 +35,9 @@ module Pod
       #
       attr_reader :installation_root
 
-      # @return [Library] the libraries generated by the installer.
+      # @return [Array<Target>] the targets represented in the Podfile.
       #
-      attr_reader :libraries
+      attr_reader :targets
 
       # @param  [Podfile]  podfile @see #podfile
       # @param  [Sandbox]  sandbox @see #sandbox
@@ -46,11 +46,11 @@ module Pod
       #
       # @todo   Too many initialization arguments
       #
-      def initialize(podfile, sandbox, installation_root, libraries)
+      def initialize(podfile, sandbox, installation_root, targets)
         @podfile = podfile
         @sandbox = sandbox
         @installation_root = installation_root
-        @libraries = libraries
+        @targets = targets
       end
 
       # Integrates the user projects associated with the {TargetDefinitions}
@@ -110,8 +110,8 @@ module Pod
       # @return [void]
       #
       def integrate_user_targets
-        libraries_to_integrate.sort_by(&:name).each do |lib|
-          TargetIntegrator.new(lib).integrate!
+        targets_to_integrate.sort_by(&:name).each do |target|
+          TargetIntegrator.new(target).integrate!
         end
       end
 
@@ -128,7 +128,7 @@ module Pod
       #
       def warn_about_empty_podfile
         if podfile.target_definitions.values.all?{ |td| td.empty? }
-          UI.warn "[!] The Podfile does not contain any dependency."
+          UI.warn "[!] The Podfile does not contain any dependencies."
         end
       end
 
@@ -163,14 +163,14 @@ module Pod
       # @note   Empty target definitions are ignored.
       #
       def user_project_paths
-        libraries.map do |lib|
-          lib.user_project_path
+        targets.map do |target|
+          target.user_project_path
         end.compact.uniq
       end
 
 
-      def libraries_to_integrate
-        libraries.reject { |lib| lib.target_definition.empty? }
+      def targets_to_integrate
+        targets.reject { |target| target.target_definition.empty? }
       end
 
       #-----------------------------------------------------------------------#

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

@@ -9,14 +9,14 @@ module Pod
       #
       class TargetIntegrator
 
-        # @return [Library] the library that should be integrated.
+        # @return [Target] the target that should be integrated.
         #
-        attr_reader :library
+        attr_reader :target
 
-        # @param  [Library] library @see #target_definition
+        # @param  [Target] target @see #target_definition
         #
-        def initialize(library)
-          @library = library
+        def initialize(target)
+          @target = target
         end
 
         # Integrates the user project targets. Only the targets that do **not**
@@ -26,7 +26,7 @@ module Pod
         # @return [void]
         #
         def integrate!
-          return if targets.empty?
+          return if native_targets.empty?
           UI.section(integration_message) do
             add_xcconfig_base_configuration
             add_pods_library
@@ -36,46 +36,50 @@ module Pod
           end
         end
 
-        # @return [Array<PBXNativeTarget>] the list of targets that the Pods
-        #         lib that need to be integrated.
+        # @return [Array<PBXNativeTarget>] the user targets for integration.
         #
-        # @note   A target is considered integrated if it already references
-        #
-        def targets
-          unless @targets
-            target_uuids = library.user_target_uuids
-            targets = target_uuids.map do |uuid|
-              target = user_project.objects_by_uuid[uuid]
-              unless target
+        def native_targets
+          unless @native_targets
+            target_uuids = target.user_target_uuids
+            native_targets = target_uuids.map do |uuid|
+              native_target = user_project.objects_by_uuid[uuid]
+              unless native_target
                 raise Informative, "[Bug] Unable to find the target with " \
-                  "the `#{uuid}` UUID for the `#{library}` library"
+                  "the `#{uuid}` UUID for the `#{target}` integration library"
               end
-              target
+              native_target
             end
-            non_integrated = targets.reject do |target|
-              target.frameworks_build_phase.files.any? do |build_file|
+            non_integrated = native_targets.reject do |native_target|
+              native_target.frameworks_build_phase.files.any? do |build_file|
                 file_ref = build_file.file_ref
                 file_ref &&
                   file_ref.isa == 'PBXFileReference' &&
-                  file_ref.display_name == library.product_name
+                  file_ref.display_name == target.product_name
               end
             end
-            @targets = non_integrated
+            @native_targets = non_integrated
           end
-          @targets
+          @native_targets
         end
 
         # Read the project from the disk to ensure that it is up to date as
         # other TargetIntegrators might have modified it.
         #
         def user_project
-          @user_project ||= Xcodeproj::Project.new(library.user_project_path)
+          @user_project ||= Xcodeproj::Project.new(target.user_project_path)
+        end
+
+        # Read the pods project from the disk to ensure that it is up to date as
+        # other TargetIntegrators might have modified it.
+        #
+        def pods_project
+          @pods_project ||= Xcodeproj::Project.new(target.sandbox.project_path)
         end
 
         # @return [String] a string representation suitable for debugging.
         #
         def inspect
-          "#<#{self.class} for target `#{target_definition.label}'>"
+          "#<#{self.class} for target `#{target.label}'>"
         end
 
         #---------------------------------------------------------------------#
@@ -84,6 +88,12 @@ module Pod
 
         private
 
+        # @return [Specification::Consumer] the consumer for the specifications.
+        #
+        def spec_consumers
+          @spec_consumers ||= target.pod_targets.map(&:file_accessors).flatten.map(&:spec_consumer)
+        end
+
         # Adds the `xcconfig` configurations files generated for the current
         # {TargetDefinition} to the build configurations of the targets that
         # should be integrated.
@@ -98,25 +108,31 @@ module Pod
         # @return [void]
         #
         def add_xcconfig_base_configuration
-          xcconfig = user_project.new_file(library.xcconfig_relative_path)
-          targets.each do |target|
-            check_overridden_build_settings(library.xcconfig, target)
-            target.build_configurations.each do |config|
+          xcconfig = user_project.files.select { |f| f.path == target.xcconfig_relative_path }.first ||
+                     user_project.new_file(target.xcconfig_relative_path)
+          native_targets.each do |native_target|
+            check_overridden_build_settings(target.xcconfig, native_target)
+            native_target.build_configurations.each do |config|
               config.base_configuration_reference = xcconfig
             end
           end
         end
 
-        # Adds a file reference to the library of the {TargetDefinition} and
-        # adds it to the frameworks build phase of the targets.
+        # Adds spec libraries 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
+        # build phase of the targets.
         #
         # @return [void]
         #
         def add_pods_library
           frameworks = user_project.frameworks_group
-          pods_library = frameworks.new_static_library(library.label)
-          targets.each do |target|
-            target.frameworks_build_phase.add_file_reference(pods_library)
+          native_targets.each do |native_target|
+            library = frameworks.files.select { |f| f.path == target.product_name }.first ||
+                      frameworks.new_static_library(target.name)
+            unless native_target.frameworks_build_phase.files_references.include?(library)
+                   native_target.frameworks_build_phase.add_file_reference(library)
+            end
           end
         end
 
@@ -127,9 +143,11 @@ module Pod
         # @return [void]
         #
         def add_copy_resources_script_phase
-          targets.each do |target|
-            phase = target.new_shell_script_build_phase('Copy Pods Resources')
-            path  = library.copy_resources_script_relative_path
+          phase_name = "Copy Pods Resources"
+          native_targets.each do |native_target|
+            phase = native_target.shell_script_build_phases.select { |bp| bp.name == phase_name }.first ||
+                    native_target.new_shell_script_build_phase(phase_name)
+            path  = target.copy_resources_script_relative_path
             phase.shell_script = %{"#{path}"\n}
           end
         end
@@ -144,10 +162,12 @@ module Pod
         # @return [void]
         #
         def add_check_manifest_lock_script_phase
-          targets.each do |target|
-            phase = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
-            target.build_phases.unshift(phase)
-            phase.name = 'Check Pods Manifest.lock'
+          phase_name = 'Check Pods Manifest.lock'
+          native_targets.each do |native_target|
+            next if native_target.shell_script_build_phases.any? { |phase| phase.name == phase_name }
+            phase = native_target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+            native_target.build_phases.unshift(phase)
+            phase.name = phase_name
             phase.shell_script = <<-EOS.strip_heredoc
               diff "${PODS_ROOT}/../Podfile.lock" "${PODS_ROOT}/Manifest.lock" > /dev/null
               if [[ $? != 0 ]] ; then
@@ -165,7 +185,7 @@ module Pod
         # @return [void]
         #
         def save_user_project
-          user_project.save_as(library.user_project_path)
+          user_project.save_as(target.user_project_path)
         end
 
         #---------------------------------------------------------------------#
@@ -179,11 +199,11 @@ module Pod
         #
         # @return [void]
         #
-        def check_overridden_build_settings(xcconfig, target)
+        def check_overridden_build_settings(xcconfig, native_target)
           return unless xcconfig
 
           configs_by_overridden_key = {}
-          target.build_configurations.each do |config|
+          native_target.build_configurations.each do |config|
             xcconfig.attributes.keys.each do |key|
               target_value = config.build_settings[key]
 
@@ -194,13 +214,13 @@ module Pod
             end
 
             configs_by_overridden_key.each do |key, config_names|
-              name    = "#{target.name} [#{config_names.join(' - ')}]"
+              name    = "#{native_target.name} [#{config_names.join(' - ')}]"
               actions = [
                 "Use the `$(inherited)` flag, or",
                 "Remove the build settings from the target."
               ]
               UI.warn("The target `#{name}` overrides the `#{key}` build " \
-                      "setting defined in `#{library.xcconfig_relative_path}'.",
+                      "setting defined in `#{target.xcconfig_relative_path}'.",
                       actions)
             end
           end
@@ -210,10 +230,10 @@ module Pod
         #         integration.
         #
         def integration_message
-          "Integrating `#{library.product_name}` into " \
-            "#{'target'.pluralize(targets.size)} "  \
-            "`#{targets.map(&:name).to_sentence}` " \
-            "of project #{UI.path library.user_project_path}."
+          "Integrating Pod #{'target'.pluralize(target.pod_targets.size)} " \
+            "`#{target.pod_targets.map(&:name).to_sentence}` " \
+            "into aggregate target #{target.name} " \
+            "of project #{UI.path target.user_project_path}."
         end
 
         #---------------------------------------------------------------------#