cocoapods 0.38.2 → 0.39.0.beta.1

data/lib/cocoapods/generator/xcconfig/xcconfig_helper.rb

@@ -71,7 +71,6 @@ module Pod
         #         The xcconfig to edit.
         #
         def self.add_spec_build_settings_to_xcconfig(consumer, xcconfig)
-          xcconfig.merge!(consumer.pod_target_xcconfig)
           xcconfig.libraries.merge(consumer.libraries)
           xcconfig.frameworks.merge(consumer.frameworks)
           xcconfig.weak_frameworks.merge(consumer.weak_frameworks)
@@ -117,7 +116,7 @@ module Pod
           dirname = '$(PODS_ROOT)/' + library_path.dirname.relative_path_from(sandbox_root).to_s
           build_settings = {
             'OTHER_LDFLAGS' => "-l#{name}",
-            'LIBRARY_SEARCH_PATHS' => quote([dirname]),
+            'LIBRARY_SEARCH_PATHS' => '$(inherited) ' + quote([dirname]),
           }
           xcconfig.merge!(build_settings)
         end

data/lib/cocoapods/installer.rb

@@ -29,18 +29,19 @@ module Pod
   # source control.
   #
   class Installer
-    autoload :AggregateTargetInstaller, 'cocoapods/installer/target_installer/aggregate_target_installer'
-    autoload :Analyzer,                 'cocoapods/installer/analyzer'
-    autoload :FileReferencesInstaller,  'cocoapods/installer/file_references_installer'
-    autoload :PostInstallHooksContext,  'cocoapods/installer/post_install_hooks_context'
-    autoload :PreInstallHooksContext,   'cocoapods/installer/pre_install_hooks_context'
-    autoload :Migrator,                 'cocoapods/installer/migrator'
-    autoload :PodfileValidator,         'cocoapods/installer/podfile_validator'
-    autoload :PodSourceInstaller,       'cocoapods/installer/pod_source_installer'
-    autoload :PodSourcePreparer,        'cocoapods/installer/pod_source_preparer'
-    autoload :PodTargetInstaller,       'cocoapods/installer/target_installer/pod_target_installer'
-    autoload :TargetInstaller,          'cocoapods/installer/target_installer'
-    autoload :UserProjectIntegrator,    'cocoapods/installer/user_project_integrator'
+    autoload :AggregateTargetInstaller,   'cocoapods/installer/target_installer/aggregate_target_installer'
+    autoload :Analyzer,                   'cocoapods/installer/analyzer'
+    autoload :FileReferencesInstaller,    'cocoapods/installer/file_references_installer'
+    autoload :PostInstallHooksContext,    'cocoapods/installer/post_install_hooks_context'
+    autoload :PreInstallHooksContext,     'cocoapods/installer/pre_install_hooks_context'
+    autoload :SourceProviderHooksContext, 'cocoapods/installer/source_provider_hooks_context'
+    autoload :Migrator,                   'cocoapods/installer/migrator'
+    autoload :PodfileValidator,           'cocoapods/installer/podfile_validator'
+    autoload :PodSourceInstaller,         'cocoapods/installer/pod_source_installer'
+    autoload :PodSourcePreparer,          'cocoapods/installer/pod_source_preparer'
+    autoload :PodTargetInstaller,         'cocoapods/installer/target_installer/pod_target_installer'
+    autoload :TargetInstaller,            'cocoapods/installer/target_installer'
+    autoload :UserProjectIntegrator,      'cocoapods/installer/user_project_integrator'
 
     include Config::Mixin
 
@@ -114,7 +115,6 @@ module Pod
 
     def prepare
       UI.message 'Preparing' do
-        FileUtils.chmod_R('+w', sandbox.root)
         sandbox.prepare
         ensure_plugins_are_installed!
         Migrator.migrate(sandbox)
@@ -125,6 +125,9 @@ module Pod
     def resolve_dependencies
       analyzer = create_analyzer
 
+      plugin_sources = run_source_provider_hooks
+      analyzer.sources.insert(0, *plugin_sources)
+
       UI.section 'Updating local specs repositories' do
         analyzer.update_repositories
       end unless config.skip_repo_update?
@@ -303,18 +306,14 @@ module Pod
             install_source_of_pod(spec.name)
           end
         else
-          UI.titled_section("Using #{spec}", title_options)
+          UI.titled_section("Using #{spec}", title_options) do
+            create_pod_installer(spec.name)
+          end
         end
       end
     end
 
-    # Install the Pods. If the resolver indicated that a Pod should be
-    # installed and it exits, it is removed an then reinstalled. In any case if
-    # the Pod doesn't exits it is installed.
-    #
-    # @return [void]
-    #
-    def install_source_of_pod(pod_name)
+    def create_pod_installer(pod_name)
       specs_by_platform = {}
       pod_targets.each do |pod_target|
         if pod_target.root_spec.name == pod_name
@@ -325,9 +324,20 @@ module Pod
 
       @pod_installers ||= []
       pod_installer = PodSourceInstaller.new(sandbox, specs_by_platform)
-      pod_installer.install!
       @pod_installers << pod_installer
-      @installed_specs.concat(specs_by_platform.values.flatten.uniq)
+      pod_installer
+    end
+
+    # Install the Pods. If the resolver indicated that a Pod should be
+    # installed and it exits, it is removed an then reinstalled. In any case if
+    # the Pod doesn't exits it is installed.
+    #
+    # @return [void]
+    #
+    def install_source_of_pod(pod_name)
+      pod_installer = create_pod_installer(pod_name)
+      pod_installer.install!
+      @installed_specs.concat(pod_installer.specs_by_platform.values.flatten.uniq)
     end
 
     # Cleans the sources of the Pods if the config instructs to do so.
@@ -340,6 +350,18 @@ module Pod
       @pod_installers.each(&:clean!)
     end
 
+    # Unlocks the sources of the Pods.
+    #
+    # @todo Why the @pod_installers might be empty?
+    #
+    def unlock_pod_sources
+      return unless @pod_installers
+      @pod_installers.each do |installer|
+        pod_target = pod_targets.find { |target| target.pod_name == installer.name }
+        installer.unlock_files!(pod_target.file_accessors)
+      end
+    end
+
     # Locks the sources of the Pods if the config instructs to do so.
     #
     # @todo Why the @pod_installers might be empty?
@@ -395,11 +417,7 @@ module Pod
           dependencies = pod_targets.select(&:should_build?).flat_map(&:dependencies)
           dependended_upon_targets = pod_targets.select { |t| dependencies.include?(t.pod_name) && !t.should_build? }
 
-          static_libs = dependended_upon_targets.flat_map(&:file_accessors).flat_map do |fa|
-            static_frameworks = fa.vendored_frameworks.reject { |fw| `file #{fw + fw.basename('.framework')} 2>&1` =~ /dynamically linked/ }
-            fa.vendored_libraries + static_frameworks
-          end
-
+          static_libs = dependended_upon_targets.flat_map(&:file_accessors).flat_map(&:vendored_static_artifacts)
           unless static_libs.empty?
             raise Informative, "The '#{aggregate_target.label}' target has " \
               "transitive dependencies that include static binaries: (#{static_libs.to_sentence})"
@@ -417,9 +435,8 @@ module Pod
 
           swift_pods = pod_targets.select(&:uses_swift?)
           unless swift_pods.empty?
-            raise Informative, 'Pods written in Swift can only be integrated as frameworks; this ' \
-              'feature is still in beta. Add `use_frameworks!` to your Podfile or target to opt ' \
-              'into using it. ' \
+            raise Informative, 'Pods written in Swift can only be integrated as frameworks; ' \
+              'add `use_frameworks!` to your Podfile or target to opt into using it. ' \
               "The Swift #{swift_pods.size == 1 ? 'Pod being used is' : 'Pods being used are'}: " +
               swift_pods.map(&:name).to_sentence
           end
@@ -441,6 +458,7 @@ module Pod
     # @return [void]
     #
     def perform_post_install_actions
+      unlock_pod_sources
       run_plugins_post_install_hooks
       warn_for_deprecations
       lock_pod_sources
@@ -453,6 +471,16 @@ module Pod
       HooksManager.run(:post_install, context, plugins)
     end
 
+    # Runs the registered callbacks for the source provider plugin hooks.
+    #
+    # @return [void]
+    #
+    def run_source_provider_hooks
+      context = SourceProviderHooksContext.generate
+      HooksManager.run(:source_provider, context, plugins)
+      context.sources
+    end
+
     # Ensures that all plugins specified in the {#podfile} are loaded.
     #
     # @return [void]
@@ -603,7 +631,7 @@ module Pod
       frameworks_group = pods_project.frameworks_group
       aggregate_targets.each do |aggregate_target|
         is_app_extension = !(aggregate_target.user_targets.map(&:symbol_type) &
-          [:app_extension, :watch_extension]).empty?
+          [:app_extension, :watch_extension, :watch2_extension]).empty?
 
         aggregate_target.pod_targets.each do |pod_target|
           configure_app_extension_api_only_for_target(aggregate_target) if is_app_extension

data/lib/cocoapods/installer/analyzer.rb

@@ -306,6 +306,7 @@ module Pod
           # transitive dependencies can't be deduplicated.
           pod_targets.flat_map do |target|
             dependent_targets = transitive_dependencies_for_pod_target(target, pod_targets)
+            target.dependent_targets = dependent_targets
             if dependent_targets.any?(&:scoped?)
               target.scoped
             else
@@ -397,6 +398,7 @@ module Pod
         else
           pods_to_update = result.podfile_state.changed + result.podfile_state.deleted
           pods_to_update += update[:pods] if update_mode == :selected
+          pods_to_update += podfile.dependencies.select(&:local?).map(&:name)
           LockingDependencyAnalyzer.generate_version_locking_dependencies(lockfile, pods_to_update)
         end
       end

data/lib/cocoapods/installer/file_references_installer.rb

@@ -128,17 +128,17 @@ module Pod
               end
 
               header_mappings(headers_sandbox, file_accessor, file_accessor.headers).each do |namespaced_path, files|
-                pod_target.build_headers.add_files(namespaced_path, files.reject { |f| f.to_path =~ framework_exp }, pod_target.platform)
+                pod_target.build_headers.add_files(namespaced_path, files.reject { |f| f.to_path =~ framework_exp })
               end
 
               unless pod_target.requires_frameworks? && pod_target.should_build?
                 header_mappings(headers_sandbox, file_accessor, file_accessor.public_headers).each do |namespaced_path, files|
-                  sandbox.public_headers.add_files(namespaced_path, files.reject { |f| f.to_path =~ framework_exp }, pod_target.platform)
+                  sandbox.public_headers.add_files(namespaced_path, files.reject { |f| f.to_path =~ framework_exp })
                 end
               end
 
               vendored_frameworks_header_mappings(headers_sandbox, file_accessor).each do |namespaced_path, files|
-                sandbox.public_headers.add_files(namespaced_path, files, pod_target.platform)
+                sandbox.public_headers.add_files(namespaced_path, files)
               end
             end
           end

data/lib/cocoapods/installer/pod_source_installer.rb

@@ -74,12 +74,22 @@ module Pod
       #
       def lock_files!(file_accessors)
         return if local?
+        each_source_file(file_accessors) do |source_file|
+          FileUtils.chmod('u-w', source_file)
+        end
+      end
 
-        file_accessors.each do |file_accessor|
-          file_accessor.source_files.each do |source_file|
-            next unless source_file.exist?
-            FileUtils.chmod('-w', source_file)
-          end
+      # Unlocks the source files if appropriate.
+      #
+      # @todo   As the pre install hooks need to run before cleaning this
+      #         method should be refactored.
+      #
+      # @return [void]
+      #
+      def unlock_files!(file_accessors)
+        return if local?
+        each_source_file(file_accessors) do |source_file|
+          FileUtils.chmod('u+w', source_file)
         end
       end
 
@@ -172,6 +182,15 @@ module Pod
         !local? && !head_pod? && !predownloaded? && sandbox.specification(root_spec.name) != root_spec
       end
 
+      def each_source_file(file_accessors, &blk)
+        file_accessors.each do |file_accessor|
+          file_accessor.source_files.each do |source_file|
+            next unless source_file.exist?
+            blk[source_file]
+          end
+        end
+      end
+
       #-----------------------------------------------------------------------#
     end
   end

data/lib/cocoapods/installer/source_provider_hooks_context.rb

@@ -0,0 +1,32 @@
+module Pod
+  class Installer
+    # Context object designed to be used with the HooksManager which describes
+    # the context of the installer before spec sources have been created
+    #
+    class SourceProviderHooksContext
+      # @return [Array<Source>] The source objects to send to the installer
+      #
+      attr_reader :sources
+
+      # @return [SourceProviderHooksContext] Convenience class method to generate the
+      #         static context.
+      #
+      def self.generate
+        result = new
+        result
+      end
+
+      def initialize
+        @sources = []
+      end
+
+      # @param [Source] Source object to be added to the installer
+      #
+      def add_source(source)
+        unless source.nil?
+          @sources << source
+        end
+      end
+    end
+  end
+end

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

@@ -18,8 +18,8 @@ module Pod
             create_info_plist_file
             create_module_map
             create_umbrella_header
-            create_embed_frameworks_script
           end
+          create_embed_frameworks_script
           create_bridge_support_file
           create_copy_resources_script
           create_acknowledgements
@@ -145,10 +145,12 @@ module Pod
         frameworks_by_config = {}
         target.user_build_configurations.keys.each do |config|
           relevant_pod_targets = target.pod_targets.select do |pod_target|
-            pod_target.include_in_build_config?(target_definition, config) && pod_target.should_build?
+            pod_target.include_in_build_config?(target_definition, config)
           end
-          frameworks_by_config[config] = relevant_pod_targets.map do |pod_target|
-            "#{target_definition.label}/#{pod_target.product_name}"
+          frameworks_by_config[config] = relevant_pod_targets.flat_map do |pod_target|
+            frameworks = pod_target.file_accessors.flat_map(&:vendored_dynamic_artifacts).map { |fw| "${PODS_ROOT}/#{fw.relative_path_from(sandbox.root)}" }
+            frameworks << "#{target_definition.label}/#{pod_target.product_name}" if pod_target.should_build? && pod_target.requires_frameworks?
+            frameworks
           end
         end
         generator = Generator::EmbedFrameworksScript.new(frameworks_by_config)

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

@@ -163,13 +163,8 @@ module Pod
       #
       def create_xcconfig_file
         path = target.xcconfig_path
-        public_gen = Generator::XCConfig::PublicPodXCConfig.new(target)
-        public_gen.save_as(path)
-        add_file_to_support_group(path)
-
-        path = target.xcconfig_private_path
-        private_gen = Generator::XCConfig::PrivatePodXCConfig.new(target, public_gen.xcconfig)
-        private_gen.save_as(path)
+        xcconfig_gen = Generator::XCConfig::PodXCConfig.new(target)
+        xcconfig_gen.save_as(path)
         xcconfig_file_ref = add_file_to_support_group(path)
 
         native_target.build_configurations.each do |c|

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

@@ -12,7 +12,11 @@ module Pod
         # @return [Array<Symbol>] the symbol types, which require that the pod
         # frameworks are embedded in the output directory / product bundle.
         #
-        EMBED_FRAMEWORK_TARGET_TYPES = [:application, :unit_test_bundle].freeze
+        EMBED_FRAMEWORK_TARGET_TYPES = [:application, :unit_test_bundle, :app_extension, :watch_extension, :watch2_extension].freeze
+
+        # @return [String] the name of the embed frameworks phase
+        #
+        EMBED_FRAMEWORK_PHASE_NAME = 'Embed Pods Frameworks'.freeze
 
         # @return [AggregateTarget] the target that should be integrated.
         #
@@ -38,10 +42,11 @@ module Pod
             project_is_dirty = [
               XCConfigIntegrator.integrate(target, native_targets),
               update_to_cocoapods_0_34,
-              remove_embed_frameworks_script_phases,
+              update_to_cocoapods_0_37_1,
+              update_to_cocoapods_0_39,
               unless native_targets_to_integrate.empty?
                 add_pods_library
-                add_embed_frameworks_script_phase if target.requires_frameworks?
+                add_embed_frameworks_script_phase
                 add_copy_resources_script_phase
                 add_check_manifest_lock_script_phase
                 true
@@ -100,6 +105,37 @@ module Pod
           changes
         end
 
+        # Removes the embed frameworks phase for target types.
+        #
+        # @return [Bool] whether any changes to the project were made.
+        #
+        # @todo   This can be removed for CocoaPods 1.0
+        #
+        def update_to_cocoapods_0_37_1
+          targets_to_embed = native_targets.select do |target|
+            EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
+          end
+          (native_targets - targets_to_embed).any? do |native_target|
+            remove_embed_frameworks_script_phase(native_target)
+          end
+        end
+
+        # Adds the embed frameworks script when integrating as a static library.
+        #
+        # @return [Bool] whether any changes to the project were made.
+        #
+        # @todo   This can be removed for CocoaPods 1.0
+        #
+        def update_to_cocoapods_0_39
+          requires_update = native_targets_to_embed_in.any? do |target|
+            !target.shell_script_build_phases.find { |bp| bp.name == 'Embed Pods Frameworks' }
+          end
+          if requires_update
+            add_embed_frameworks_script_phase
+            true
+          end
+        end
+
         # Adds spec product reference to the frameworks build phase of the
         # {TargetDefinition} integration libraries. Adds a file reference to
         # the frameworks group of the project and adds it to the frameworks
@@ -142,36 +178,24 @@ module Pod
         # @return [void]
         #
         def add_embed_frameworks_script_phase
-          targets_to_embed_in = native_targets_to_integrate.select do |target|
-            EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
-          end
-          targets_to_embed_in.each do |native_target|
-            phase = create_or_update_build_phase(native_target, 'Embed Pods Frameworks')
+          native_targets_to_embed_in.each do |native_target|
+            phase = create_or_update_build_phase(native_target, EMBED_FRAMEWORK_PHASE_NAME)
             script_path = target.embed_frameworks_script_relative_path
             phase.shell_script = %("#{script_path}"\n)
           end
         end
 
-        # Delete 'Embed Pods Frameworks' Build Phases, if they exist
-        # and are not needed anymore due to not integrating the
-        # dependencies by frameworks.
+        # Delete a 'Embed Pods Frameworks' Copy Files Build Phase if present
+        #
+        # @param [PBXNativeTarget] native_target
         #
         # @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
+        def remove_embed_frameworks_script_phase(native_target)
+          embed_build_phase = native_target.shell_script_build_phases.find { |bp| bp.name == EMBED_FRAMEWORK_PHASE_NAME }
+          return false unless embed_build_phase.present?
+          native_target.build_phases.delete(embed_build_phase)
+          true
         end
 
         # Adds a shell script build phase responsible to copy the resources
@@ -227,6 +251,16 @@ module Pod
           @native_targets ||= target.user_targets(user_project)
         end
 
+        # @return [Array<PBXNativeTarget>] The list of all the targets that
+        #         require that the pod frameworks are embedded in the output
+        #         directory / product bundle.
+        #
+        def native_targets_to_embed_in
+          native_targets_to_integrate.select do |target|
+            EMBED_FRAMEWORK_TARGET_TYPES.include?(target.symbol_type)
+          end
+        end
+
         # @return [Array<PBXNativeTarget>] The list of the targets
         #         that have not been integrated by past installations
         #         of