cocoapods 0.39.0 → 1.0.0.beta.1

data/lib/cocoapods/target/aggregate_target.rb

@@ -17,6 +17,7 @@ module Pod
       @target_definition = target_definition
       @sandbox = sandbox
       @pod_targets = []
+      @search_paths_aggregate_targets = []
       @file_accessors = []
       @xcconfigs = {}
     end
@@ -54,13 +55,17 @@ module Pod
     #
     attr_accessor :client_root
 
-    # @return [Pathname] the path of the user project that this target will
+    # @return [Xcodeproj::Project] the user project that this target will
     #         integrate as identified by the analyzer.
     #
-    # @note   The project instance is not stored to prevent editing different
-    #         instances.
+    attr_accessor :user_project
+
+    # @return [Pathname] the path of the user project that this target will
+    #         integrate as identified by the analyzer.
     #
-    attr_accessor :user_project_path
+    def user_project_path
+      user_project.path if user_project
+    end
 
     # @return [Array<String>] the list of the UUIDs of the user targets that
     #         will be integrated by this target as identified by the analyzer.
@@ -72,16 +77,12 @@ module Pod
 
     # List all user targets that will be integrated by this #target.
     #
-    # @param  [Xcodeproj::Project] project
-    #         The project to search for the user targets
-    #
     # @return [Array<PBXNativeTarget>]
     #
-    def user_targets(project = nil)
-      return [] unless user_project_path
-      project ||= Xcodeproj::Project.open(user_project_path)
+    def user_targets
+      return [] unless user_project
       user_target_uuids.map do |uuid|
-        native_target = project.objects_by_uuid[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 `#{self}` integration library"
@@ -103,6 +104,11 @@ module Pod
     #
     attr_accessor :pod_targets
 
+    # @return [Array<AggregateTarget>] The aggregate targets whose pods this
+    #         target must be able to import, but will not directly link against.
+    #
+    attr_accessor :search_paths_aggregate_targets
+
     # @param  [String] build_configuration The build configuration for which the
     #         the pod targets should be returned.
     #

data/lib/cocoapods/target/pod_target.rb

@@ -57,16 +57,23 @@ module Pod
       @dependent_targets = []
     end
 
+    # @param [Hash{Array => PodTarget}] cache
+    #        the cached PodTarget for a previously scoped (specs, target_definition)
     # @return [Array<PodTarget>] a scoped copy for each target definition.
     #
-    def scoped
+    def scoped(cache = {})
       target_definitions.map do |target_definition|
-        PodTarget.new(specs, [target_definition], sandbox, true).tap do |target|
+        cache_key = [specs, target_definition]
+        if cache[cache_key]
+          cache[cache_key]
+        else
+          target = PodTarget.new(specs, [target_definition], sandbox, true)
           target.file_accessors = file_accessors
           target.user_build_configurations = user_build_configurations
           target.native_target = native_target
           target.archs = archs
-          target.dependent_targets = dependent_targets.flat_map(&:scoped).select { |pt| pt.target_definitions == [target_definition] }
+          target.dependent_targets = dependent_targets.flat_map { |pt| pt.scoped(cache) }.select { |pt| pt.target_definitions == [target_definition] }
+          cache[cache_key] = target
         end
       end
     end
@@ -81,12 +88,32 @@ module Pod
       end
     end
 
+    # @note   The deployment target for the pod target is the maximum of all
+    #         the deployment targets for the current platform of the target
+    #         (or the minimum required to support the current installation
+    #         strategy, if higher).
+    #
     # @return [Platform] the platform for this target.
     #
     def platform
-      @platform ||= target_definitions.first.platform
+      @platform ||= begin
+        platform_name = target_definitions.first.platform.name
+        default = Podfile::TargetDefinition::PLATFORM_DEFAULTS[platform_name]
+        deployment_target = specs.map do |spec|
+          Version.new(spec.deployment_target(platform_name) || default)
+        end.max
+        if platform_name == :ios && requires_frameworks?
+          minimum = Version.new('8.0')
+          deployment_target = [deployment_target, minimum].max
+        end
+        Platform.new(platform_name, deployment_target)
+      end
     end
 
+    # @visibility private
+    #
+    attr_writer :platform
+
     # @return [Podfile] The podfile which declares the dependency.
     #
     def podfile

data/lib/cocoapods/user_interface.rb

@@ -20,6 +20,10 @@ module Pod
       attr_accessor :title_level
       attr_accessor :warnings
 
+      # @return [IO] IO object to which UI output will be directed.
+      #
+      attr_accessor :output_io
+
       # @return [Bool] Whether the wrapping of the strings to the width of the
       #         terminal should be disabled.
       #
@@ -203,7 +207,7 @@ module Pod
           puts_indented "#{set.name} #{set.versions.first.version}"
         else
           pod = Specification::Set::Presenter.new(set)
-          title = "\n-> #{pod.name} (#{pod.version})"
+          title = "-> #{pod.name} (#{pod.version})"
           if pod.spec.deprecated?
             title += " #{pod.deprecation_description}"
             colored_title = title.red
@@ -322,7 +326,12 @@ module Pod
       #        The message to print.
       #
       def puts(message = '')
-        STDOUT.puts(message) unless config.silent?
+        return if config.silent?
+        begin
+          (output_io || STDOUT).puts(message)
+        rescue Errno::EPIPE
+          exit 0
+        end
       end
 
       # prints a message followed by a new line unless config is silent.
@@ -331,7 +340,12 @@ module Pod
       #        The message to print.
       #
       def print(message)
-        STDOUT.print(message) unless config.silent?
+        return if config.silent?
+        begin
+          (output_io || STDOUT).print(message)
+        rescue Errno::EPIPE
+          exit 0
+        end
       end
 
       # gets input from $stdin
@@ -354,6 +368,21 @@ module Pod
         warnings << { :message => message, :actions => actions, :verbose_only => verbose_only }
       end
 
+      # Pipes all output inside given block to a pager.
+      #
+      # @yield Code block in which inputs to {#puts} and {#print} methods will be printed to the piper.
+      #
+      def with_pager
+        prev_handler = Signal.trap('INT', 'IGNORE')
+        IO.popen((ENV['PAGER'] || 'less -R'), 'w') do |io|
+          UI.output_io = io
+          yield
+        end
+      ensure
+        Signal.trap('INT', prev_handler)
+        UI.output_io = nil
+      end
+
       private
 
       # @!group Helpers

data/lib/cocoapods/user_interface/error_report.rb

@@ -18,28 +18,9 @@ module Pod
 #{original_command}
 ```
 
-### Report
-
-* What did you do?
-
-* What did you expect to happen?
-
-* What happened instead?
-
-
-### Stack
-
-```
-   CocoaPods : #{Pod::VERSION}
-        Ruby : #{RUBY_DESCRIPTION}
-    RubyGems : #{Gem::VERSION}
-        Host : #{host_information}
-       Xcode : #{xcode_information}
-         Git : #{git_information}
-Ruby lib dir : #{RbConfig::CONFIG['libdir']}
-Repositories : #{repo_information.join("\n               ")}
-```
+#{report_instructions}
 
+#{stack}
 ### Plugins
 
 ```
@@ -71,16 +52,41 @@ Don't forget to anonymize any private data!
 EOS
         end
 
-        private
+        def report_instructions
+          <<-EOS
+### Report
 
-        def `(other)
-          super
-        rescue Errno::ENOENT => e
-          "Unable to find an executable (#{e})"
+* What did you do?
+
+* What did you expect to happen?
+
+* What happened instead?
+EOS
         end
 
-        def pathless_exception_message(message)
-          message.gsub(/- \(.*\):/, '-')
+        def stack
+          <<-EOS
+### Stack
+
+```
+   CocoaPods : #{Pod::VERSION}
+        Ruby : #{RUBY_DESCRIPTION}
+    RubyGems : #{Gem::VERSION}
+        Host : #{host_information}
+       Xcode : #{xcode_information}
+         Git : #{git_information}
+Ruby lib dir : #{RbConfig::CONFIG['libdir']}
+Repositories : #{repo_information.join("\n               ")}
+```
+EOS
+        end
+
+        def plugins_string
+          plugins = installed_plugins
+          max_name_length = plugins.keys.map(&:length).max
+          plugins.map do |name, version|
+            "#{name.ljust(max_name_length)} : #{version}"
+          end.sort.join("\n")
         end
 
         def markdown_podfile
@@ -95,6 +101,18 @@ EOS
 EOS
         end
 
+        private
+
+        def `(other)
+          super
+        rescue Errno::ENOENT => e
+          "Unable to find an executable (#{e})"
+        end
+
+        def pathless_exception_message(message)
+          message.gsub(/- \(.*\):/, '-')
+        end
+
         def error_from_podfile(error)
           if error.message =~ /Podfile:(\d*)/
             "\nIt appears to have originated from your Podfile at line #{Regexp.last_match[1]}.\n"
@@ -130,14 +148,6 @@ EOS
             reduce({}) { |hash, s| hash.tap { |h| h[s.name] = s.version.to_s } }
         end
 
-        def plugins_string
-          plugins = installed_plugins
-          max_name_length = plugins.keys.map(&:length).max
-          plugins.map do |name, version|
-            "#{name.ljust(max_name_length)} : #{version}"
-          end.sort.join("\n")
-        end
-
         def repo_information
           SourcesManager.all.map do |source|
             next unless source.type == 'file system'

data/lib/cocoapods/validator.rb

@@ -1,6 +1,8 @@
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/string/inflections'
 
+autoload :Fourflusher, 'fourflusher'
+
 module Pod
   # Validates a Specification.
   #
@@ -67,7 +69,8 @@ module Pod
       # Replace default spec with a subspec if asked for
       a_spec = spec
       if spec && @only_subspec
-        a_spec = spec.subspec_by_name(@only_subspec)
+        subspec_name = @only_subspec.start_with?(spec.root.name) ? @only_subspec : "#{spec.root.name}/#{@only_subspec}"
+        a_spec = spec.subspec_by_name(subspec_name)
         @subspec_name = a_spec.name
       end
 
@@ -87,6 +90,11 @@ module Pod
     # @return [void]
     #
     def print_results
+      UI.puts results_message
+    end
+
+    def results_message
+      message = ''
       results.each do |result|
         if result.platforms == [:ios]
           platform_message = '[iOS] '
@@ -113,9 +121,9 @@ module Pod
         when :warning then type = 'WARN'
         when :note    then type = 'NOTE'
         else raise "#{result.type}" end
-        UI.puts "    - #{type.ljust(5)} | #{platform_message}#{subspecs_message}#{result.attribute_name}: #{result.message}"
+        message << "    - #{type.ljust(5)} | #{platform_message}#{subspecs_message}#{result.attribute_name}: #{result.message}\n"
       end
-      UI.puts
+      message << "\n"
     end
 
     def failure_reason
@@ -133,8 +141,8 @@ module Pod
         reasons << reason
       end
       if results.all?(&:public_only)
-        reasons << 'All results apply only to public specs, but you can use ' \
-                   '`--private` to ignore them if linting the specification for a private pod.'
+        reasons << 'all results apply only to public specs, but you can use ' \
+                   '`--private` to ignore them if linting the specification for a private pod'
       end
       reasons.to_sentence
     end
@@ -251,24 +259,30 @@ module Pod
       validate_screenshots(spec)
       validate_social_media_url(spec)
       validate_documentation_url(spec)
-      validate_docset_url(spec)
 
       valid = spec.available_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
-        download_pod
-        check_file_patterns
-        install_pod
-        validate_vendored_dynamic_frameworks
-        build_pod
-        tear_down_validation_environment
+        begin
+          create_app_project
+          download_pod
+          check_file_patterns
+          install_pod
+          add_app_project_import
+          validate_vendored_dynamic_frameworks
+          build_pod
+        ensure
+          tear_down_validation_environment
+        end
         validated?
       end
       return false if fail_fast && !valid
       perform_extensive_subspec_analysis(spec) unless @no_subspecs
     rescue => e
-      error('unknown', "Encountered an unknown error (#{e}) during validation.")
+      message = e.to_s
+      message << "\n" << e.backtrace.join("\n") << "\n" if config.verbose?
+      error('unknown', "Encountered an unknown error (#{message}) during validation.")
       false
     end
 
@@ -329,21 +343,13 @@ module Pod
       validate_url(spec.documentation_url) if spec.documentation_url
     end
 
-    # Performs validations related to the `docset_url` attribute.
-    #
-    def validate_docset_url(spec)
-      validate_url(spec.docset_url) if spec.docset_url
-    end
-
     def setup_validation_environment
       validation_dir.rmtree if validation_dir.exist?
       validation_dir.mkpath
       @original_config = Config.instance.clone
-      config.installation_root = validation_dir
-      config.sandbox_root      = validation_dir + 'Pods'
-      config.silent            = !config.verbose
-      config.integrate_targets = false
-      config.skip_repo_update  = true
+      config.installation_root   = validation_dir
+      config.silent              = !config.verbose
+      config.skip_repo_update    = true
     end
 
     def tear_down_validation_environment
@@ -351,8 +357,16 @@ module Pod
       Config.instance = @original_config
     end
 
-    def download_pod
+    def deployment_target
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
+      if consumer.platform_name == :ios && use_frameworks
+        minimum = Version.new('8.0')
+        deployment_target = [Version.new(deployment_target), minimum].max.to_s
+      end
+      deployment_target
+    end
+
+    def download_pod
       podfile = podfile_from_spec(consumer.platform_name, deployment_target, use_frameworks)
       sandbox = Sandbox.new(config.sandbox_root)
       @installer = Installer.new(sandbox, podfile)
@@ -361,23 +375,79 @@ module Pod
       @file_accessor = @installer.pod_targets.flat_map(&:file_accessors).find { |fa| fa.spec.name == consumer.spec.name }
     end
 
+    def create_app_project
+      app_project = Xcodeproj::Project.new(validation_dir + 'App.xcodeproj')
+      app_project.new_target(:application, 'App', consumer.platform_name, deployment_target)
+      app_project.save
+      app_project.recreate_user_schemes
+      Xcodeproj::XCScheme.share_scheme(app_project.path, 'App')
+    end
+
+    def add_app_project_import
+      app_project = Xcodeproj::Project.open(validation_dir + 'App.xcodeproj')
+      pod_target = @installer.pod_targets.find { |pt| pt.pod_name == spec.root.name }
+
+      source_file = write_app_import_source_file(pod_target)
+      source_file_ref = app_project.new_group('App', 'App').new_file(source_file)
+      app_project.targets.first.add_file_references([source_file_ref])
+      app_project.save
+    end
+
+    def write_app_import_source_file(pod_target)
+      language = pod_target.uses_swift? ? :swift : :objc
+
+      if language == :swift
+        source_file = validation_dir.+('App/main.swift')
+        source_file.parent.mkpath
+        import_statement = use_frameworks ? "import #{pod_target.product_module_name}\n" : ''
+        source_file.open('w') { |f| f << import_statement }
+      else
+        source_file = validation_dir.+('App/main.m')
+        source_file.parent.mkpath
+        import_statement = if use_frameworks
+                             "@import #{pod_target.product_module_name};\n"
+                           else
+                             header_name = "#{pod_target.product_module_name}/#{pod_target.product_module_name}.h"
+                             if pod_target.sandbox.public_headers.root.+(header_name).file?
+                               "#import <#{header_name}>\n"
+                             else
+                               ''
+                             end
+        end
+        source_file.open('w') do |f|
+          f << "@import Foundation;\n"
+          f << "@import UIKit;\n" if consumer.platform_name == :ios || consumer.platform_name == :tvos
+          f << "@import Cocoa;\n" if consumer.platform_name == :osx
+          f << "#{import_statement}int main() {}\n"
+        end
+      end
+      source_file
+    end
+
     # It creates a podfile in memory and builds a library containing the pod
     # for all available platforms with xcodebuild.
     #
     def install_pod
       %i(determine_dependency_product_types verify_no_duplicate_framework_names
          verify_no_static_framework_transitive_dependencies
-         verify_framework_usage generate_pods_project
+         verify_framework_usage generate_pods_project integrate_user_project
          perform_post_install_actions).each { |m| @installer.send(m) }
 
       deployment_target = spec.subspec_by_name(subspec_name).deployment_target(consumer.platform_name)
       @installer.aggregate_targets.each do |target|
+        target.pod_targets.each do |pod_target|
+          next unless native_target = pod_target.native_target
+          native_target.build_configuration_list.build_configurations.each do |build_configuration|
+            (build_configuration.build_settings['OTHER_CFLAGS'] ||= '$(inherited)') << ' -Wincomplete-umbrella'
+          end
+        end
         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
+      @installer.pods_project.save
     end
 
     def validate_vendored_dynamic_frameworks
@@ -406,7 +476,7 @@ module Pod
         UI.warn "Skipping compilation with `xcodebuild' because it can't be found.\n".yellow
       else
         UI.message "\nBuilding with xcodebuild.\n".yellow do
-          output = Dir.chdir(config.sandbox_root) { xcodebuild }
+          output = xcodebuild
           UI.puts output
           parsed_output = parse_xcodebuild_output(output)
           parsed_output.each do |message|
@@ -454,6 +524,7 @@ module Pod
         end
       end
 
+      _validate_header_mappings_dir
       if consumer.spec.root?
         _validate_license
         _validate_module_map
@@ -491,12 +562,26 @@ module Pod
     def _validate_header_files(attr_name)
       non_header_files = file_accessor.send(attr_name).
         select { |f| !Sandbox::FileAccessor::HEADER_EXTENSIONS.include?(f.extname) }.
-        map { |f| f.relative_path_from file_accessor.root }
+        map { |f| f.relative_path_from(file_accessor.root) }
       unless non_header_files.empty?
         error(attr_name, "The pattern matches non-header files (#{non_header_files.join(', ')}).")
       end
     end
 
+    def _validate_header_mappings_dir
+      return unless header_mappings_dir = file_accessor.spec_consumer.header_mappings_dir
+      absolute_mappings_dir = file_accessor.root + header_mappings_dir
+      unless absolute_mappings_dir.directory?
+        error('header_mappings_dir', "The header_mappings_dir (`#{header_mappings_dir}`) is not a directory.")
+      end
+      non_mapped_headers = file_accessor.headers.
+        reject { |h| h.to_path.start_with?(absolute_mappings_dir.to_path) }.
+        map { |f| f.relative_path_from(file_accessor.root) }
+      unless non_mapped_headers.empty?
+        error('header_mappings_dir', "There are header files outside of the header_mappings_dir (#{non_mapped_headers.join(', ')}).")
+      end
+    end
+
     #-------------------------------------------------------------------------#
 
     private
@@ -572,13 +657,16 @@ module Pod
       local    = local?
       urls     = source_urls
       Pod::Podfile.new do
+        install! 'cocoapods', :deterministic_uuids => false
         urls.each { |u| source(u) }
-        use_frameworks!(use_frameworks)
-        platform(platform_name, deployment_target)
-        if local
-          pod name, :path => podspec.dirname.to_s
-        else
-          pod name, :podspec => podspec.to_s
+        target 'App' do
+          use_frameworks!(use_frameworks)
+          platform(platform_name, deployment_target)
+          if local
+            pod name, :path => podspec.dirname.to_s
+          else
+            pod name, :podspec => podspec.to_s
+          end
         end
       end
     end
@@ -610,18 +698,20 @@ module Pod
     #         returns its output (both STDOUT and STDERR).
     #
     def xcodebuild
-      command = 'xcodebuild clean build -target Pods'
-
+      command = %w(clean build -workspace App.xcworkspace -scheme App -configuration Release)
       case consumer.platform_name
       when :ios
-        command << ' CODE_SIGN_IDENTITY=- -sdk iphonesimulator'
+        command += %w(CODE_SIGN_IDENTITY=- -sdk iphonesimulator)
+        command += Fourflusher::SimControl.new.destination('iPhone 4s', deployment_target)
       when :watchos
-        command << ' CODE_SIGN_IDENTITY=- -sdk watchsimulator'
+        command += %w(CODE_SIGN_IDENTITY=- -sdk watchsimulator)
+        command += Fourflusher::SimControl.new.destination('Apple Watch - 38mm', deployment_target)
       when :tvos
-        command << ' CODE_SIGN_IDENTITY=- -sdk appletvsimulator'
+        command += %w(CODE_SIGN_IDENTITY=- -sdk appletvsimulator)
+        command += Fourflusher::SimControl.new.destination('Apple TV 1080p', deployment_target)
       end
 
-      output, status = _xcodebuild "#{command} 2>&1"
+      output, status = Dir.chdir(validation_dir) { _xcodebuild(command) }
 
       unless status.success?
         message = 'Returned an unsuccessful exit code.'
@@ -638,9 +728,8 @@ module Pod
     #         resulting status.
     #
     def _xcodebuild(command)
-      UI.puts command if config.verbose
-      output = `#{command}`
-      [output, $?]
+      UI.puts 'xcodebuild ' << command.join(' ') if config.verbose
+      Executable.capture_command('xcodebuild', command, :capture => :merge)
     end
 
     #-------------------------------------------------------------------------#