cocoapods 1.7.5 → 1.8.0.beta.1

data/lib/cocoapods/target/pod_target.rb

@@ -58,6 +58,10 @@ module Pod
     #
     attr_accessor :app_dependent_targets_by_spec_name
 
+    # @return [Hash{String => (Specification,PodTarget)}] tuples of app specs and pod targets by test spec name.
+    #
+    attr_accessor :test_app_hosts_by_spec_name
+
     # @return [Hash{String => BuildSettings}] the test spec build settings for this target.
     #
     attr_reader :test_spec_build_settings
@@ -85,7 +89,6 @@ module Pod
       super(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, :build_type => build_type)
       raise "Can't initialize a PodTarget without specs!" if specs.nil? || specs.empty?
       raise "Can't initialize a PodTarget without TargetDefinition!" if target_definitions.nil? || target_definitions.empty?
-      raise "Can't initialize a PodTarget with only abstract TargetDefinitions!" if target_definitions.all?(&:abstract?)
       raise "Can't initialize a PodTarget with an empty string scope suffix!" if scope_suffix == ''
       @specs = specs.dup.freeze
       @target_definitions = target_definitions
@@ -99,6 +102,7 @@ module Pod
       @dependent_targets = []
       @test_dependent_targets_by_spec_name = {}
       @app_dependent_targets_by_spec_name = {}
+      @test_app_hosts_by_spec_name = {}
       @build_config_cache = {}
       @test_spec_build_settings = create_test_build_settings
       @app_spec_build_settings = create_app_build_settings
@@ -114,22 +118,27 @@ module Pod
     def scoped(cache = {})
       target_definitions.map do |target_definition|
         cache_key = [specs, target_definition]
-        if cache[cache_key]
-          cache[cache_key]
-        else
-          target_definitions = [target_definition]
-          target = PodTarget.new(sandbox, host_requires_frameworks, user_build_configurations, archs, platform, specs,
-                                 [target_definition], file_accessors, target_definition.label, :build_type => build_type)
-          target.dependent_targets = dependent_targets.flat_map { |pt| pt.scoped(cache) }.select do |pt|
-            pt.target_definitions == target_definitions
+        cache[cache_key] ||= begin
+          target = PodTarget.new(sandbox, host_requires_frameworks, user_build_configurations, archs, platform,
+                                 specs, [target_definition], file_accessors, target_definition.label,
+                                 :build_type => build_type)
+          scope_dependent_targets = ->(dependent_targets) do
+            dependent_targets.flat_map do |pod_target|
+              pod_target.scoped(cache).select { |pt| pt.target_definitions == [target_definition] }
+            end
           end
-          target.test_dependent_targets_by_spec_name = scope_dependent_pod_targets(cache,
-                                                                                   test_dependent_targets_by_spec_name,
-                                                                                   target_definitions)
-          target.app_dependent_targets_by_spec_name = scope_dependent_pod_targets(cache,
-                                                                                  app_dependent_targets_by_spec_name,
-                                                                                  target_definitions)
-          cache[cache_key] = target
+
+          target.dependent_targets = scope_dependent_targets[dependent_targets]
+          target.test_dependent_targets_by_spec_name = Hash[test_dependent_targets_by_spec_name.map do |spec_name, test_pod_targets|
+            [spec_name, scope_dependent_targets[test_pod_targets]]
+          end]
+          target.app_dependent_targets_by_spec_name = Hash[app_dependent_targets_by_spec_name.map do |spec_name, app_pod_targets|
+            [spec_name, scope_dependent_targets[app_pod_targets]]
+          end]
+          target.test_app_hosts_by_spec_name = Hash[test_app_hosts_by_spec_name.map do |spec_name, (app_host_spec, app_pod_target)|
+            [spec_name, [app_host_spec, app_pod_target.scoped(cache).find { |pt| pt.target_definitions == [target_definition] }]]
+          end]
+          target
         end
       end
     end
@@ -217,6 +226,16 @@ module Pod
       target_definitions.first.podfile
     end
 
+    # @return [String] the project name derived from the target definitions that integrate this pod. If none is
+    #         specified then the name of the pod is used by default.
+    #
+    # @note   The name is guaranteed to be the same across all target definitions and is validated by the target
+    #         validator during installation.
+    #
+    def project_name
+      target_definitions.map { |td| td.project_name_for_pod(pod_name) }.compact.first || pod_name
+    end
+
     # @return [String] The name to use for the source code module constructed
     #         for this target, and which will be used to import the module in
     #         implementation source files.
@@ -364,7 +383,7 @@ module Pod
                                 end
             FrameworkPaths.new(framework_source, dsym_source, bcsymbolmap_paths)
           end
-          if !file_accessor.spec.test_specification? && should_build? && build_as_dynamic_framework?
+          if file_accessor.spec.library_specification? && should_build? && build_as_dynamic_framework?
             frameworks << FrameworkPaths.new(build_product_path('${BUILT_PRODUCTS_DIR}'))
           end
           hash[file_accessor.spec.name] = frameworks
@@ -379,8 +398,13 @@ module Pod
     def resource_paths
       @resource_paths ||= begin
         file_accessors.each_with_object({}) do |file_accessor, hash|
-          resource_paths = file_accessor.resources.map { |res| "${PODS_ROOT}/#{res.relative_path_from(sandbox.project_path.dirname)}" }
-          resource_paths = [] if file_accessor.spec.non_library_specification? && build_as_framework?
+          resource_paths = if file_accessor.spec.non_library_specification? && build_as_framework?
+                             []
+                           else
+                             file_accessor.resources.map do |res|
+                               "${PODS_ROOT}/#{res.relative_path_from(sandbox.project_path.dirname)}"
+                             end
+                           end
           prefix = Pod::Target::BuildSettings::CONFIGURATION_BUILD_DIR_VARIABLE
           prefix = configuration_build_dir unless file_accessor.spec.test_specification?
           resource_bundle_paths = file_accessor.resource_bundles.keys.map { |name| "#{prefix}/#{name.shellescape}.bundle" }
@@ -389,6 +413,16 @@ module Pod
       end
     end
 
+    # @param [Specification] spec The non library spec to calculate the deployment target for.
+    #
+    # @return [String] The deployment target to use for the non library spec. If the spec provides one then that is the
+    #         one used otherwise the one for the whole target is used.
+    #
+    def deployment_target_for_non_library_spec(spec)
+      raise ArgumentError, 'Must be a non library spec.' unless spec.non_library_specification?
+      spec.deployment_target(platform.name)
+    end
+
     # Returns the corresponding native product type to use given the test type.
     # This is primarily used when creating the native targets in order to produce the correct test bundle target
     # based on the type of tests included.
@@ -402,6 +436,27 @@ module Pod
       case test_type
       when :unit
         :unit_test_bundle
+      when :ui
+        :ui_test_bundle
+      else
+        raise ArgumentError, "Unknown test type `#{test_type}`."
+      end
+    end
+
+    # Returns the label to use for the given test type.
+    # This is used to generate native target names for test specs.
+    #
+    # @param  [Symbol] test_type
+    #         The test type to map to provided by the test specification DSL.
+    #
+    # @return [String] The native product type to use.
+    #
+    def label_for_test_type(test_type)
+      case test_type
+      when :unit
+        'Unit'
+      when :ui
+        'UI'
       else
         raise ArgumentError, "Unknown test type `#{test_type}`."
       end
@@ -439,6 +494,12 @@ module Pod
       support_files_dir + "#{label}-prefix.pch"
     end
 
+    # @return [Hash] the additional entries to add to the generated Info.plist
+    #
+    def info_plist_entries
+      root_spec.info_plist
+    end
+
     # @param  [String] bundle_name
     #         The name of the bundle product, which is given by the +spec+.
     #
@@ -464,7 +525,7 @@ module Pod
     # @return [String] The derived name of the test target.
     #
     def test_target_label(test_spec)
-      "#{label}-#{test_spec.test_type.capitalize}-#{subspec_label(test_spec)}"
+      "#{label}-#{label_for_test_type(test_spec.test_type)}-#{subspec_label(test_spec)}"
     end
 
     # @param  [Specification] app_spec
@@ -476,6 +537,38 @@ module Pod
       "#{label}-#{subspec_label(app_spec)}"
     end
 
+    # @param  [Specification] test_spec
+    #         the test spec to use for producing the app host target label.
+    #
+    # @return [(String,String)] a tuple, where the first item is the PodTarget#label of the pod target that defines the
+    #         app host, and the second item is the target name of the app host
+    #
+    def app_host_target_label(test_spec)
+      app_spec, app_target = test_app_hosts_by_spec_name[test_spec.name]
+
+      if app_spec
+        [app_target.name, app_target.app_target_label(app_spec)]
+      elsif test_spec.consumer(platform).requires_app_host?
+        [name, "AppHost-#{label}-#{label_for_test_type(test_spec.test_type)}-Tests"]
+      end
+    end
+
+    # @param [Specification] spec
+    #        the spec to return app host dependencies for
+    #
+    # @return [Array<PodTarget>] the app host dependent targets for the given spec.
+    #
+    def app_host_dependent_targets_for_spec(spec)
+      return [] unless spec.test_specification? && spec.consumer(platform).test_type == :unit
+      app_host_info = test_app_hosts_by_spec_name[spec.name]
+      if app_host_info.nil?
+        []
+      else
+        app_spec, app_target = *app_host_info
+        app_target.dependent_targets_for_app_spec(app_spec)
+      end
+    end
+
     def non_library_spec_label(spec)
       case spec.spec_type
       when :test then test_target_label(spec)
@@ -677,7 +770,7 @@ module Pod
         whitelists.first
       else
         UI.warn "The pod `#{pod_name}` is linked to different targets " \
-          "(#{target_definitions.map { |td| "`#{td.label}`" }.to_sentence}), which contain different " \
+          "(#{target_definitions.map { |td| "`#{td.name}`" }.to_sentence}), which contain different " \
           'settings to inhibit warnings. CocoaPods does not currently ' \
           'support different settings and will fall back to your preference ' \
           'set in the root target definition.'
@@ -774,15 +867,6 @@ module Pod
 
     private
 
-    def scope_dependent_pod_targets(cache, dependent_targets, target_definitions)
-      Hash[dependent_targets.map do |spec_name, pod_targets|
-        scoped_pod_targets = pod_targets.flat_map do |pod_target|
-          pod_target.scoped(cache).select { |pt| pt.target_definitions == target_definitions }
-        end
-        [spec_name, scoped_pod_targets]
-      end]
-    end
-
     def create_build_settings
       BuildSettings::PodTargetSettings.new(self)
     end

data/lib/cocoapods/user_interface/error_report.rb

@@ -171,12 +171,16 @@ EOS
 
         def repo_information
           Config.instance.sources_manager.all.map do |source|
-            next unless source.type == 'file system'
             repo = source.repo
-            Dir.chdir(repo) do
-              url = `git config --get remote.origin.url 2>&1`.strip
-              sha = `git rev-parse HEAD 2>&1`.strip
-              "#{repo.basename} - #{url} @ #{sha}"
+            if source.is_a?(Pod::CDNSource)
+              "#{repo.basename} - CDN - #{source.url}"
+            elsif source.git?
+              Dir.chdir(repo) do
+                sha = `git rev-parse HEAD 2>&1`.strip
+                "#{repo.basename} - git - #{source.url} @ #{sha}"
+              end
+            else
+              "#{repo.basename} - #{source.type}"
             end
           end
         end

data/lib/cocoapods/validator.rb

@@ -35,7 +35,7 @@ module Pod
     # @param  [Array<String>] source_urls
     #         the Source URLs to use in creating a {Podfile}.
     #
-    # @param. [Array<String>] platforms
+    # @param  [Array<String>] platforms
     #         the platforms to lint.
     #
     def initialize(spec_or_path, source_urls, platforms = [])
@@ -239,6 +239,10 @@ module Pod
     #
     attr_accessor :skip_tests
 
+    # @return [Bool] Whether the validator should run Xcode Static Analysis.
+    #
+    attr_accessor :analyze
+
     # @return [Bool] Whether frameworks should be used for the installation.
     #
     attr_accessor :use_frameworks
@@ -411,13 +415,18 @@ module Pod
       end
     end
 
+    # @return [Consumer] the consumer for the current platform being validated
+    #
     attr_accessor :consumer
+
+    # @return [String, Nil] the name of the current subspec being validated, or nil if none
+    #
     attr_accessor :subspec_name
 
     # Performs validation of a URL
     #
-    def validate_url(url)
-      resp = Pod::HTTP.validate_url(url)
+    def validate_url(url, user_agent = nil)
+      resp = Pod::HTTP.validate_url(url, user_agent)
 
       if !resp
         warning('url', "There was a problem validating the URL #{url}.", true)
@@ -450,7 +459,7 @@ module Pod
     # Performs validations related to the `social_media_url` attribute.
     #
     def validate_social_media_url(spec)
-      validate_url(spec.social_media_url) if spec.social_media_url
+      validate_url(spec.social_media_url, 'CocoaPods') if spec.social_media_url
     end
 
     # Performs validations related to the `documentation_url` attribute.
@@ -527,10 +536,14 @@ module Pod
     end
 
     def tear_down_validation_environment
-      validation_dir.rmtree unless no_clean
+      clean! unless no_clean
       Config.instance = @original_config
     end
 
+    def clean!
+      validation_dir.rmtree
+    end
+
     def deployment_target
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
       if consumer.platform_name == :ios && use_frameworks
@@ -591,11 +604,15 @@ module Pod
          perform_post_install_actions).each { |m| @installer.send(m) }
 
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
-      configure_pod_targets(@installer.aggregate_targets, @installer.target_installation_results, deployment_target)
+      configure_pod_targets(@installer.target_installation_results)
+      validate_dynamic_framework_support(@installer.aggregate_targets, deployment_target)
       @installer.pods_project.save
     end
 
-    def configure_pod_targets(targets, target_installation_results, deployment_target)
+    # @param [Array<Hash{String, TargetInstallationResult}>] target_installation_results
+    #        The installation results to configure
+    #
+    def configure_pod_targets(target_installation_results)
       target_installation_results.first.values.each do |pod_target_installation_result|
         pod_target = pod_target_installation_result.target
         native_target = pod_target_installation_result.native_target
@@ -626,9 +643,21 @@ module Pod
           end
         end
       end
-      targets.each do |target|
-        if target.pod_targets.any?(&:uses_swift?) && consumer.platform_name == :ios &&
-            (deployment_target.nil? || Version.new(deployment_target).major < 8)
+    end
+
+    # Produces an error of dynamic frameworks were requested but are not supported by the deployment target
+    #
+    # @param [Array<AggregateTarget>] aggregate_targets
+    #        The aggregate targets installed by the installer
+    #
+    # @param [String,Version] deployment_target
+    #        The deployment target of the installation
+    #
+    def validate_dynamic_framework_support(aggregate_targets, deployment_target)
+      return unless consumer.platform_name == :ios
+      return unless deployment_target.nil? || Version.new(deployment_target).major < 8
+      aggregate_targets.each do |target|
+        if target.pod_targets.any?(&:uses_swift?)
           uses_xctest = target.spec_consumers.any? { |c| (c.frameworks + c.weak_frameworks).include? 'XCTest' }
           error('swift', 'Swift support uses dynamic frameworks and is therefore only supported on iOS > 8.') unless uses_xctest
         end
@@ -669,7 +698,18 @@ module Pod
           if scheme.nil?
             UI.warn "Skipping compilation with `xcodebuild` because target contains no sources.\n".yellow
           else
-            output = xcodebuild('build', scheme, 'Release')
+            if analyze
+              output = xcodebuild('analyze', scheme, 'Release')
+              find_output = Executable.execute_command('find', [validation_dir, '-name', '*.html'], false)
+              if find_output != ''
+                message = 'Static Analysis failed.'
+                message += ' You can use `--verbose` for more information.' unless config.verbose?
+                message += ' You can use `--no-clean` to save a reproducible buid environment.' unless no_clean
+                error('build_pod', message)
+              end
+            else
+              output = xcodebuild('build', scheme, 'Release')
+            end
             parsed_output = parse_xcodebuild_output(output)
             translate_output_to_linter_messages(parsed_output)
           end
@@ -1007,6 +1047,10 @@ module Pod
         command += Fourflusher::SimControl.new.destination(:oldest, 'tvOS', deployment_target)
       end
 
+      if analyze
+        command += %w(CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer)
+      end
+
       begin
         _xcodebuild(command, true)
       rescue => e

data/lib/cocoapods/version_metadata.rb

@@ -7,7 +7,20 @@ module Pod
     end
 
     def self.project_cache_version
-      "#{VersionMetadata.gem_version}.project-cache.#{CACHE_VERSION}"
+      [
+        gem_version,
+        cocoapods_sha,
+        'project-cache',
+        CACHE_VERSION,
+      ].compact.join('.')
     end
+
+    def self.cocoapods_sha
+      return unless gemspec = Gem.loaded_specs['cocoapods']
+      return unless source = gemspec.source
+      return unless source.respond_to?(:revision)
+      source.revision
+    end
+    private_class_method :cocoapods_sha
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.8.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocoapods-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.8.0.beta.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.8.0.beta.1
 - !ruby/object:Gem::Dependency
   name: claide
   requirement: !ruby/object:Gem::Requirement
@@ -207,7 +207,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -217,7 +217,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -430,7 +430,6 @@ files:
 - lib/cocoapods/command/spec/cat.rb
 - lib/cocoapods/command/spec/create.rb
 - lib/cocoapods/command/spec/edit.rb
-- lib/cocoapods/command/spec/env_spec.rb
 - lib/cocoapods/command/spec/lint.rb
 - lib/cocoapods/command/spec/which.rb
 - lib/cocoapods/command/update.rb