cocoapods 1.5.2 → 1.6.1

data/lib/cocoapods/target.rb

@@ -1,3 +1,5 @@
+require 'cocoapods/target/build_settings'
+
 module Pod
   # Model class which describes a Pods target.
   #
@@ -7,6 +9,8 @@ module Pod
   #
   class Target
     DEFAULT_VERSION = '1.0.0'.freeze
+    DEFAULT_NAME = 'Default'.freeze
+    DEFAULT_BUILD_CONFIGURATIONS = { 'Release' => :release, 'Debug' => :debug }.freeze
 
     # @return [Sandbox] The sandbox where the Pods should be installed.
     #
@@ -15,13 +19,43 @@ module Pod
     # @return [Boolean] Whether the target needs to be implemented as a framework.
     #         Computed by analyzer.
     #
-    attr_accessor :host_requires_frameworks
+    attr_reader :host_requires_frameworks
     alias_method :host_requires_frameworks?, :host_requires_frameworks
 
+    # @return [Hash{String=>Symbol}] A hash representing the user build
+    #         configurations where each key corresponds to the name of a
+    #         configuration and its value to its type (`:debug` or `:release`).
+    #
+    attr_reader :user_build_configurations
+
+    # @return [Array<String>] The value for the ARCHS build setting.
+    #
+    attr_reader :archs
+
+    # @return [Platform] the platform of this target.
+    #
+    attr_reader :platform
+
+    # @return [BuildSettings] the build settings for this target.
+    #
+    attr_reader :build_settings
+
     # Initialize a new target
     #
-    def initialize
-      @archs = []
+    # @param [Sandbox] sandbox @see #sandbox
+    # @param [Boolean] host_requires_frameworks @see #host_requires_frameworks
+    # @param [Hash{String=>Symbol}] user_build_configurations @see #user_build_configurations
+    # @param [Array<String>] archs @see #archs
+    # @param [Platform] platform @see #platform
+    #
+    def initialize(sandbox, host_requires_frameworks, user_build_configurations, archs, platform)
+      @sandbox = sandbox
+      @host_requires_frameworks = host_requires_frameworks
+      @user_build_configurations = user_build_configurations
+      @archs = archs
+      @platform = platform
+
+      @build_settings = create_build_settings
     end
 
     # @return [String] the name of the library.
@@ -30,6 +64,40 @@ module Pod
       label
     end
 
+    alias to_s name
+
+    # @return [String] the label for the target.
+    #
+    def label
+      DEFAULT_NAME
+    end
+
+    # @return [String] The version associated with this target
+    #
+    def version
+      DEFAULT_VERSION
+    end
+
+    # @return [Boolean] Whether the target uses Swift code
+    #
+    def uses_swift?
+      false
+    end
+
+    # @return [Boolean] Whether the target should build a static framework.
+    #
+    def static_framework?
+      false
+    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.
+    #
+    def product_module_name
+      c99ext_identifier(label)
+    end
+
     # @return [String] the name of the product.
     #
     def product_name
@@ -85,6 +153,8 @@ module Pod
 
     #-------------------------------------------------------------------------#
 
+    # @!group Framework support
+
     # @return [Boolean] whether the generated target needs to be implemented
     #         as a framework
     #
@@ -92,33 +162,6 @@ module Pod
       host_requires_frameworks? || false
     end
 
-    # @return [Boolean] Whether the target should build a static framework.
-    #
-    def static_framework?
-      return if is_a?(Pod::AggregateTarget)
-      return if specs.empty?
-      specs.all? { |spec| spec.root.static_framework }
-    end
-
-    #-------------------------------------------------------------------------#
-
-    # @!group Information storage
-
-    # @return [Hash{String=>Symbol}] A hash representing the user build
-    #         configurations where each key corresponds to the name of a
-    #         configuration and its value to its type (`:debug` or `:release`).
-    #
-    attr_accessor :user_build_configurations
-
-    # @return [PBXNativeTarget] the target generated in the Pods project for
-    #         this library.
-    #
-    attr_accessor :native_target
-
-    # @return [Array<String>] The value for the ARCHS build setting.
-    #
-    attr_accessor :archs
-
     #-------------------------------------------------------------------------#
 
     # @!group Support files
@@ -153,10 +196,24 @@ module Pod
       module_map_path.parent + "#{label}-umbrella.h"
     end
 
+    def umbrella_header_path_to_write
+      module_map_path_to_write.parent + "#{label}-umbrella.h"
+    end
+
     # @return [Pathname] the absolute path of the LLVM module map file that
     #         defines the module structure for the compiler.
     #
     def module_map_path
+      module_map_path_to_write
+    end
+
+    # @!private
+    #
+    # @return [Pathname] the absolute path of the module map file that
+    #         CocoaPods writes. This can be different from `module_map_path`
+    #         if the module map gets symlinked.
+    #
+    def module_map_path_to_write
       basename = "#{label}.modulemap"
       support_files_dir + basename
     end
@@ -170,7 +227,7 @@ module Pod
     # @return [Pathname] the absolute path of the Info.plist file.
     #
     def info_plist_path
-      support_files_dir + 'Info.plist'
+      support_files_dir + "#{label}-Info.plist"
     end
 
     # @return [Pathname] the path of the dummy source generated by CocoaPods
@@ -179,12 +236,6 @@ module Pod
       support_files_dir + "#{label}-dummy.m"
     end
 
-    # @return [String] The version associated with this target
-    #
-    def version
-      DEFAULT_VERSION
-    end
-
     #-------------------------------------------------------------------------#
 
     private
@@ -202,5 +253,9 @@ module Pod
     def c99ext_identifier(name)
       name.gsub(/^([0-9])/, '_\1').gsub(/[^a-zA-Z0-9_]/, '_')
     end
+
+    def create_build_settings
+      BuildSettings.new(self)
+    end
   end
 end

data/lib/cocoapods/user_interface.rb

@@ -62,6 +62,7 @@ module Pod
         self.indentation_level += relative_indentation
         self.title_level += 1
         yield if block_given?
+      ensure
         self.indentation_level -= relative_indentation
         self.title_level -= 1
       end
@@ -83,6 +84,7 @@ module Pod
         self.indentation_level += relative_indentation
         self.title_level += 1
         yield if block_given?
+      ensure
         self.indentation_level -= relative_indentation
         self.title_level -= 1
       end
@@ -114,6 +116,7 @@ module Pod
         self.indentation_level += relative_indentation
         self.title_level += 1
         yield if block_given?
+      ensure
         self.indentation_level -= relative_indentation
         self.title_level -= 1
       end
@@ -140,6 +143,7 @@ module Pod
 
         self.indentation_level += relative_indentation
         yield if block_given?
+      ensure
         self.indentation_level -= relative_indentation
       end
 
@@ -160,6 +164,7 @@ module Pod
         self.indentation_level += 2
         @treat_titles_as_messages = true
         yield if block_given?
+      ensure
         @treat_titles_as_messages = false
         self.indentation_level -= 2
       end

data/lib/cocoapods/validator.rb

@@ -18,6 +18,10 @@ module Pod
     #
     DEFAULT_SWIFT_VERSION = '3.2'.freeze
 
+    # The valid platforms for linting
+    #
+    VALID_PLATFORMS = Platform.all.freeze
+
     # @return [Specification::Linter] the linter instance from CocoaPods
     #         Core.
     #
@@ -31,13 +35,28 @@ module Pod
     # @param  [Array<String>] source_urls
     #         the Source URLs to use in creating a {Podfile}.
     #
-    def initialize(spec_or_path, source_urls)
+    # @param. [Array<String>] platforms
+    #         the platforms to lint.
+    #
+    def initialize(spec_or_path, source_urls, platforms = [])
       @linter = Specification::Linter.new(spec_or_path)
       @source_urls = if @linter.spec && @linter.spec.dependencies.empty? && @linter.spec.recursive_subspecs.all? { |s| s.dependencies.empty? }
                        []
                      else
                        source_urls.map { |url| config.sources_manager.source_with_name_or_url(url) }.map(&:url)
                      end
+
+      @platforms = platforms.map do |platform|
+        result =  case platform.to_s.downcase
+                  # Platform doesn't recognize 'macos' as being the same as 'osx' when initializing
+                  when 'macos' then Platform.macos
+                  else Platform.new(platform, nil)
+                  end
+        unless valid_platform?(result)
+          raise Informative, "Unrecognized platform `#{platform}`. Valid platforms: #{VALID_PLATFORMS.join(', ')}"
+        end
+        result
+      end
     end
 
     #-------------------------------------------------------------------------#
@@ -55,6 +74,28 @@ module Pod
       @linter.file
     end
 
+    # Returns a list of platforms to lint for a given Specification
+    #
+    # @param [Specification] spec
+    #         The specification to lint
+    #
+    # @return [Array<Platform>] platforms to lint for the given specification
+    #
+    def platforms_to_lint(spec)
+      return spec.available_platforms if @platforms.empty?
+
+      # Validate that the platforms specified are actually supported by the spec
+      results = @platforms.map do |platform|
+        matching_platform = spec.available_platforms.find { |p| p.name == platform.name }
+        unless matching_platform
+          raise Informative, "Platform `#{platform}` is not supported by specification `#{spec}`."
+        end
+        matching_platform
+      end.uniq
+
+      results
+    end
+
     # @return [Sandbox::FileAccessor] the file accessor for the spec.
     #
     attr_accessor :file_accessor
@@ -202,6 +243,10 @@ module Pod
     #
     attr_accessor :use_frameworks
 
+    # @return [Boolean] Whether modular headers should be used for the installation.
+    #
+    attr_accessor :use_modular_headers
+
     # @return [Boolean] Whether attributes that affect only public sources
     #         Bool be skipped.
     #
@@ -309,7 +354,9 @@ module Pod
       validate_documentation_url(spec)
       validate_source_url(spec)
 
-      valid = spec.available_platforms.send(fail_fast ? :all? : :each) do |platform|
+      platforms = platforms_to_lint(spec)
+
+      valid = platforms.send(fail_fast ? :all? : :each) do |platform|
         UI.message "\n\n#{spec} - Analyzing on #{platform} platform.".green.reversed
         @consumer = spec.consumer(platform)
         setup_validation_environment
@@ -464,7 +511,8 @@ module Pod
     end
 
     def download_pod
-      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks, consumer.spec.test_specs.map(&:name))
+      test_spec_names = consumer.spec.test_specs.select { |ts| ts.supported_on_platform?(consumer.platform_name) }.map(&:name)
+      podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks, test_spec_names, use_modular_headers)
       sandbox = Sandbox.new(config.sandbox_root)
       @installer = Installer.new(sandbox, podfile)
       @installer.use_default_plugins = false
@@ -475,7 +523,8 @@ module Pod
 
     def create_app_project
       app_project = Xcodeproj::Project.new(validation_dir + 'App.xcodeproj')
-      Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target)
+      app_target = Pod::Generator::AppTargetHelper.add_app_target(app_project, consumer.platform_name, deployment_target)
+      Pod::Generator::AppTargetHelper.add_swift_version(app_target, swift_version)
       app_project.save
       app_project.recreate_user_schemes
     end
@@ -484,9 +533,9 @@ module Pod
       app_project = Xcodeproj::Project.open(validation_dir + 'App.xcodeproj')
       app_target = app_project.targets.first
       pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
-      Pod::Generator::AppTargetHelper.add_app_project_import(app_project, app_target, pod_target, consumer.platform_name, use_frameworks)
-      Pod::Generator::AppTargetHelper.add_swift_version(app_target, swift_version)
+      Pod::Generator::AppTargetHelper.add_app_project_import(app_project, app_target, pod_target, consumer.platform_name)
       Pod::Generator::AppTargetHelper.add_xctest_search_paths(app_target) if @installer.pod_targets.any? { |pt| pt.spec_consumers.any? { |c| c.frameworks.include?('XCTest') } }
+      Pod::Generator::AppTargetHelper.add_empty_swift_file(app_project, app_target) if @installer.pod_targets.any?(&:uses_swift?)
       app_project.save
       Xcodeproj::XCScheme.share_scheme(app_project.path, 'App')
       # Share the pods xcscheme only if it exists. For pre-built vendored pods there is no xcscheme generated.
@@ -501,43 +550,33 @@ 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, deployment_target)
+      configure_pod_targets(@installer.aggregate_targets, @installer.target_installation_results, deployment_target)
       @installer.pods_project.save
     end
 
-    def configure_pod_targets(targets, deployment_target)
-      test_only_pod_targets = @installer.pod_targets - targets.flat_map(&:pod_targets)
-      targets.each do |target|
-        target.pod_targets.each do |pod_target|
-          update_pod_target_build_settings(pod_target)
-          if pod_target.uses_swift?
-            pod_target.test_native_targets.each do |test_native_target|
-              test_native_target.build_configuration_list.build_configurations.each do |build_configuration|
-                build_configuration.build_settings['SWIFT_VERSION'] = swift_version
-              end
+    def configure_pod_targets(targets, target_installation_results, deployment_target)
+      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
+        native_target.build_configuration_list.build_configurations.each do |build_configuration|
+          (build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella'
+          build_configuration.build_settings['SWIFT_VERSION'] = (pod_target.swift_version || swift_version) if pod_target.uses_swift?
+        end
+        pod_target_installation_result.test_specs_by_native_target.each do |test_native_target, test_specs|
+          if pod_target.uses_swift_for_test_spec?(test_specs.first)
+            test_native_target.build_configuration_list.build_configurations.each do |build_configuration|
+              build_configuration.build_settings['SWIFT_VERSION'] = swift_version
             end
           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)
           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
       end
-      # Wire up Swift version to pod targets used only by tests.
-      test_only_pod_targets.each do |test_pod_target|
-        update_pod_target_build_settings(test_pod_target)
-      end
-    end
-
-    def update_pod_target_build_settings(pod_target)
-      native_target = pod_target.native_target
-      unless native_target.nil?
-        native_target.build_configuration_list.build_configurations.each do |build_configuration|
-          (build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella'
-          build_configuration.build_settings['SWIFT_VERSION'] = (pod_target.swift_version || swift_version) if pod_target.uses_swift?
-        end
-      end
     end
 
     def validate_vendored_dynamic_frameworks
@@ -597,10 +636,14 @@ module Pod
         UI.message "\nTesting with `xcodebuild`.\n".yellow do
           pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
           consumer.spec.test_specs.each do |test_spec|
-            scheme = pod_target.native_target_for_spec(test_spec)
-            output = xcodebuild('test', scheme, 'Debug')
-            parsed_output = parse_xcodebuild_output(output)
-            translate_output_to_linter_messages(parsed_output)
+            if !test_spec.supported_on_platform?(consumer.platform_name)
+              UI.warn "Skipping test spec `#{test_spec.name}` on platform `#{consumer.platform_name}` since it is not supported.\n".yellow
+            else
+              scheme = @installer.target_installation_results.first[pod_target.name].native_target_for_spec(test_spec)
+              output = xcodebuild('test', scheme, 'Debug')
+              parsed_output = parse_xcodebuild_output(output)
+              translate_output_to_linter_messages(parsed_output)
+            end
           end
         end
       end
@@ -624,10 +667,8 @@ module Pod
       FILE_PATTERNS.each do |attr_name|
         if respond_to?("_validate_#{attr_name}", true)
           send("_validate_#{attr_name}")
-        end
-
-        if !file_accessor.spec_consumer.send(attr_name).empty? && file_accessor.send(attr_name).empty?
-          error('file patterns', "The `#{attr_name}` pattern did not match any file.")
+        else
+          validate_nonempty_patterns(attr_name, :error)
         end
       end
 
@@ -638,12 +679,26 @@ module Pod
       end
     end
 
+    # Validates that the file patterns in `attr_name` match at least 1 file.
+    #
+    # @param [String,Symbol] attr_name the name of the attribute to check (ex. :public_header_files)
+    #
+    # @param [String,Symbol] message_type the type of message to send if the patterns are empty (ex. :error)
+    #
+    def validate_nonempty_patterns(attr_name, message_type)
+      return unless !file_accessor.spec_consumer.send(attr_name).empty? && file_accessor.send(attr_name).empty?
+
+      add_result(message_type, 'file patterns', "The `#{attr_name}` pattern did not match any file.")
+    end
+
     def _validate_private_header_files
       _validate_header_files(:private_header_files)
+      validate_nonempty_patterns(:private_header_files, :warning)
     end
 
     def _validate_public_header_files
       _validate_header_files(:public_header_files)
+      validate_nonempty_patterns(:public_header_files, :warning)
     end
 
     def _validate_license
@@ -801,27 +856,30 @@ module Pod
     # @note   The generated podfile takes into account whether the linter is
     #         in local mode.
     #
-    def podfile_from_spec(platform_name, deployment_target, use_frameworks = true, test_spec_names = [])
+    def podfile_from_spec(platform_name, deployment_target, use_frameworks = true, test_spec_names = [], use_modular_headers = false)
       name     = subspec_name || spec.name
       podspec  = file.realpath
       local    = local?
       urls     = source_urls
       Pod::Podfile.new do
         install! 'cocoapods', :deterministic_uuids => false
+        # By default inhibit warnings for all pods, except the one being validated.
+        inhibit_all_warnings!
         urls.each { |u| source(u) }
         target 'App' do
           use_frameworks!(use_frameworks)
+          use_modular_headers! if use_modular_headers
           platform(platform_name, deployment_target)
           if local
-            pod name, :path => podspec.dirname.to_s
+            pod name, :path => podspec.dirname.to_s, :inhibit_warnings => false
           else
-            pod name, :podspec => podspec.to_s
+            pod name, :podspec => podspec.to_s, :inhibit_warnings => false
           end
           test_spec_names.each do |test_spec_name|
             if local
-              pod test_spec_name, :path => podspec.dirname.to_s
+              pod test_spec_name, :path => podspec.dirname.to_s, :inhibit_warnings => false
             else
-              pod test_spec_name, :podspec => podspec.to_s
+              pod test_spec_name, :podspec => podspec.to_s, :inhibit_warnings => false
             end
           end
         end
@@ -863,6 +921,14 @@ module Pod
       when :ios
         command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
         command += Fourflusher::SimControl.new.destination(:oldest, 'iOS', deployment_target)
+        xcconfig = consumer.pod_target_xcconfig
+        if xcconfig
+          archs = xcconfig['VALID_ARCHS']
+          if archs && (archs.include? 'armv7') && !(archs.include? 'i386') && (archs.include? 'x86_64')
+            # Prevent Xcodebuild from testing the non-existent i386 simulator if armv7 is specified without i386
+            command += %w(ARCHS=x86_64)
+          end
+        end
       when :watchos
         command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
         command += Fourflusher::SimControl.new.destination(:oldest, 'watchOS', deployment_target)
@@ -889,6 +955,45 @@ module Pod
       Executable.execute_command('xcodebuild', command, raise_on_failure)
     end
 
+    # Whether the platform with the specified name is valid
+    #
+    # @param  [Platform] platform
+    #         The platform to check
+    #
+    # @return [Bool] True if the platform is valid
+    #
+    def valid_platform?(platform)
+      VALID_PLATFORMS.any? { |p| p.name == platform.name }
+    end
+
+    # Whether the platform is supported by the specification
+    #
+    # @param  [Platform] platform
+    #         The platform to check
+    #
+    # @param  [Specification] specification
+    #         The specification which must support the provided platform
+    #
+    # @return [Bool] Whether the platform is supported by the specification
+    #
+    def supported_platform?(platform, spec)
+      available_platforms = spec.available_platforms
+
+      available_platforms.any? { |p| p.name == platform.name }
+    end
+
+    # Whether the provided name matches the platform
+    #
+    # @param  [Platform] platform
+    #         The platform
+    #
+    # @param  [String] name
+    #         The name to check against the provided platform
+    #
+    def platform_name_match?(platform, name)
+      [platform.name, platform.string_name].any? { |n| n.casecmp(name) == 0 }
+    end
+
     #-------------------------------------------------------------------------#
   end
 end

data/lib/cocoapods.rb

@@ -66,7 +66,6 @@ module Pod
     autoload :ModuleMap,               'cocoapods/generator/module_map'
     autoload :PrefixHeader,            'cocoapods/generator/prefix_header'
     autoload :UmbrellaHeader,          'cocoapods/generator/umbrella_header'
-    autoload :XCConfig,                'cocoapods/generator/xcconfig'
     autoload :AppTargetHelper,         'cocoapods/generator/app_target_helper'
   end