cocoapods 0.33.1 → 0.34.0.rc1

data/lib/cocoapods/target/aggregate_target.rb

@@ -1,10 +1,8 @@
 module Pod
-
   # Stores the information relative to the target used to cluster the targets
   # of the single Pods. The client targets will then depend on this one.
   #
   class AggregateTarget < Target
-
     # @param [TargetDefinition] target_definition @see target_definition
     # @param [Sandbox] sandbox @see sandbox
     #
@@ -13,6 +11,7 @@ module Pod
       @sandbox = sandbox
       @pod_targets = []
       @file_accessors = []
+      @xcconfigs = {}
     end
 
     # @return [String] the label for the target.
@@ -36,21 +35,37 @@ module Pod
     #
     attr_accessor :user_project_path
 
-    # @return [String] the list of the UUIDs of the user targets that will be
-    #         integrated by this target as identified by the analizer.
+    # @return [Array<String>] the list of the UUIDs of the user targets that
+    #         will be integrated by this target as identified by the analyzer.
     #
     # @note   The target instances are not stored to prevent editing different
     #         instances.
     #
     attr_accessor :user_target_uuids
 
-    # @return [Xcodeproj::Config] The configuration file of the target.
+    # @return [Array<PBXNativeTarget>] The list of all the user targets that
+    #         will be integrated by this target.
+    #
+    def user_targets(project = nil)
+      project ||= Xcodeproj::Project.open(user_project_path)
+      user_target_uuids.map do |uuid|
+        native_target = 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"
+        end
+        native_target
+      end
+    end
+
+    # @return [Hash<String, Xcodeproj::Config>] Map from configuration name to
+    #         configuration file for the target
     #
-    # @note   The configuration is generated by the {TargetInstaller} and
+    # @note   The configurations are generated by the {TargetInstaller} and
     #         used by {UserProjectIntegrator} to check for any overridden
     #         values.
     #
-    attr_accessor :xcconfig
+    attr_reader :xcconfigs
 
     # @return [Array<PodTarget>] The dependencies for this target.
     #
@@ -62,6 +77,19 @@ module Pod
       pod_targets.map(&:specs).flatten
     end
 
+    # @return [Hash{Symbol => Array<PodTarget>}] The pod targets for each
+    #         build configuration.
+    #
+    def specs_by_build_configuration
+      result = {}
+      user_build_configurations.keys.each do |build_configuration|
+        result[build_configuration] = pod_targets.select do |pod_target|
+          pod_target.include_in_build_config?(build_configuration)
+        end.map(&:specs).flatten
+      end
+      result
+    end
+
     # @return [Array<Specification::Consumer>] The consumers of the Pod.
     #
     def spec_consumers
@@ -74,27 +102,28 @@ module Pod
     #         the file type.
     #
     def acknowledgements_basepath
-      support_files_root + "#{label}-acknowledgements"
+      support_files_dir + "#{label}-acknowledgements"
     end
 
     # @return [Pathname] The absolute path of the copy resources script.
     #
     def copy_resources_script_path
-      support_files_root + "#{label}-resources.sh"
+      support_files_dir + "#{label}-resources.sh"
     end
 
     # @return [String] The xcconfig path of the root from the `$(SRCROOT)`
     #         variable of the user's project.
     #
     def relative_pods_root
-      "${SRCROOT}/#{support_files_root.relative_path_from(client_root)}"
+      "${SRCROOT}/#{sandbox.root.relative_path_from(client_root)}"
     end
 
+    # @param  [String] config_name The build configuration name to get the xcconfig for
     # @return [String] The path of the xcconfig file relative to the root of
     #         the user project.
     #
-    def xcconfig_relative_path
-      relative_to_srcroot(xcconfig_path).to_s
+    def xcconfig_relative_path(config_name)
+      relative_to_srcroot(xcconfig_path(config_name)).to_s
     end
 
     # @return [String] The path of the copy resources script relative to the
@@ -104,11 +133,10 @@ module Pod
       "${SRCROOT}/#{relative_to_srcroot(copy_resources_script_path)}"
     end
 
-    #-------------------------------------------------------------------------#
+    private
 
     # @!group Private Helpers
-
-    private
+    #-------------------------------------------------------------------------#
 
     # Computes the relative path of a sandboxed file from the `$(SRCROOT)`
     # variable of the user's project.
@@ -121,8 +149,5 @@ module Pod
     def relative_to_srcroot(path)
       path.relative_path_from(client_root).to_s
     end
-
-    #-------------------------------------------------------------------------#
-
   end
 end

data/lib/cocoapods/target/pod_target.rb

@@ -1,10 +1,8 @@
 module Pod
-
   # Stores the information relative to the target used to compile a single Pod.
   # A pod can have one or more activated spec/subspecs.
   #
   class PodTarget < Target
-
     # @return [Specification] the spec for the target.
     #
     attr_reader :specs
@@ -21,14 +19,14 @@ module Pod
       @specs = specs
       @target_definition = target_definition
       @sandbox = sandbox
-      @build_headers  = Sandbox::HeadersStore.new(sandbox, "BuildHeaders")
+      @build_headers  = Sandbox::HeadersStore.new(sandbox, 'Build')
       @file_accessors = []
     end
 
     # @return [String] the label for the target.
     #
     def label
-      "#{target_definition.label.to_s}-#{root_spec.name}"
+      "#{target_definition.label}-#{root_spec.name}"
     end
 
     # @return [Array<Sandbox::FileAccessor>] the file accessors for the
@@ -64,5 +62,40 @@ module Pod
       end.flatten
     end
 
+    # Checks if the target should be included in the build configuration with
+    # the given name.
+    #
+    # @param  [String] configuration_name
+    #         The name of the build configuration.
+    #
+    def include_in_build_config?(configuration_name)
+      whitelists = target_definition_dependencies.map do |dependency|
+        target_definition.pod_whitelisted_for_configuration?(dependency.name, configuration_name)
+      end.uniq
+
+      if whitelists.empty?
+        return true
+      elsif whitelists.count == 1
+        whitelists.first
+      else
+        raise Informative, "The subspecs of `#{pod_name}` are linked to " \
+          "different build configurations for the `#{target_definition}` " \
+          'target. CocoaPods does not currently support subspecs across ' \
+          'different build configurations.'
+      end
+    end
+
+    private
+
+    # @return [Array<Dependency>] The dependency of the target definition for
+    #         this Pod. Return an empty array if the Pod is not a direct
+    #         dependency of the target definition but the dependency of one or
+    #         more Pods.
+    #
+    def target_definition_dependencies
+      target_definition.dependencies.select do |dependency|
+        Specification.root_name(dependency.name) == pod_name
+      end
+    end
   end
 end

data/lib/cocoapods/user_interface.rb

@@ -1,22 +1,19 @@
 require 'cocoapods/user_interface/error_report'
 
 module Pod
-
   # Provides support for UI output. It provides support for nested sections of
   # information and for a verbose mode.
   #
   module UserInterface
-
     require 'colored'
 
-    @title_colors      =  %w|yellow green|
+    @title_colors      =  %w(    yellow green    )
     @title_level       =  0
     @indentation_level =  2
     @treat_titles_as_messages = false
     @warnings = []
 
     class << self
-
       include Config::Mixin
 
       attr_accessor :indentation_level
@@ -27,7 +24,7 @@ module Pod
       #         terminal should be disabled.
       #
       attr_accessor :disable_wrap
-      alias_method  :disable_wrap?, :disable_wrap
+      alias_method :disable_wrap?, :disable_wrap
 
       # Prints a title taking an optional verbose prefix and
       # a relative indentation valid for the UI action in the passed
@@ -78,7 +75,7 @@ module Pod
       # A title opposed to a section is always visible
       #
       def title(title, verbose_prefix = '', relative_indentation = 2)
-        if(@treat_titles_as_messages)
+        if @treat_titles_as_messages
           message(title, verbose_prefix)
         else
           title = verbose_prefix + title if config.verbose?
@@ -122,7 +119,7 @@ module Pod
       #
       def info(message)
         indentation = config.verbose? ? self.indentation_level : 0
-        indented = wrap_string(message, " " * indentation)
+        indented = wrap_string(message, ' ' * indentation)
         puts(indented)
 
         self.indentation_level += 2
@@ -148,7 +145,9 @@ module Pod
       #
       def path(pathname)
         if pathname
-          path = pathname.relative_path_from((config.podfile_path.dirname if config.podfile_path) || Pathname.pwd)
+          from_path = config.podfile_path.dirname if config.podfile_path
+          from_path ||= Pathname.pwd
+          path = Pathname(pathname).relative_path_from(from_path)
           "`#{path}`"
         else
           ''
@@ -162,7 +161,15 @@ module Pod
           puts_indented "#{set.name} #{set.versions.first.version}"
         else
           pod = Specification::Set::Presenter.new(set, statistics_provider)
-          title("\n-> #{pod.name} (#{pod.version})".green, '', 1) do
+          title = "\n-> #{pod.name} (#{pod.version})"
+          if pod.spec.deprecated?
+            title += " #{pod.deprecation_description}"
+            colored_title = title.red
+          else
+            colored_title = title.green
+          end
+
+          title(colored_title, '', 1) do
             puts_indented pod.summary
             puts_indented "pod '#{pod.name}', '~> #{pod.version}'"
             labeled('Homepage', pod.homepage)
@@ -202,7 +209,7 @@ module Pod
       # wrapping it to the terminal width if necessary.
       #
       def puts_indented(message = '')
-        indented = wrap_string(message, " " * self.indentation_level)
+        indented = wrap_string(message, ' ' * self.indentation_level)
         puts(indented)
       end
 
@@ -217,7 +224,7 @@ module Pod
           next if warning[:verbose_only] && !config.verbose?
           STDERR.puts("\n[!] #{warning[:message]}".yellow)
           warning[:actions].each do |action|
-            indented = wrap_string(action, "    - ")
+            indented = wrap_string(action, '    - ')
             puts(indented)
           end
         end
@@ -294,9 +301,7 @@ module Pod
   # Redirects cocoapods-core UI.
   #
   module CoreUI
-
     class << self
-
       def puts(message)
         UI.puts message
       end
@@ -308,14 +313,12 @@ module Pod
   end
 end
 
-  #---------------------------------------------------------------------------#
+#---------------------------------------------------------------------------#
 
 module Xcodeproj
-
   # Redirects xcodeproj UI.
   #
   module UserInterface
-
     def self.puts(message)
       ::Pod::UI.puts message
     end
@@ -323,7 +326,5 @@ module Xcodeproj
     def self.warn(message)
       ::Pod::UI.warn message
     end
-
   end
 end
-

data/lib/cocoapods/user_interface/error_report.rb

@@ -8,7 +8,7 @@ module Pod
     module ErrorReport
       class << self
         def report(exception)
-          return <<-EOS
+          <<-EOS
 
 #{'――― MARKDOWN TEMPLATE ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――'.reversed}
 
@@ -32,6 +32,12 @@ module Pod
 Ruby lib dir : #{RbConfig::CONFIG['libdir']}
 Repositories : #{repo_information.join("\n               ")}
 ```
+
+### Plugins
+
+```
+#{plugins_string}
+```
 #{markdown_podfile}
 ### Error
 
@@ -75,7 +81,7 @@ EOS
 
         def error_from_podfile(error)
           if error.message =~ /Podfile:(\d*)/
-            "\nIt appears to have originated from your Podfile at line #{$1}.\n"
+            "\nIt appears to have originated from your Podfile at line #{Regexp.last_match[1]}.\n"
           end
         end
 
@@ -90,15 +96,28 @@ EOS
         end
 
         def host_information
-          product, version, build =`sw_vers`.strip.split("\n").map { |line| line.split(":").last.strip }
+          product, version, build = `sw_vers`.strip.split("\n").map { |line| line.split(':').last.strip }
           "#{product} #{version} (#{build})"
         end
 
         def xcode_information
-          version, build = `xcodebuild -version`.strip.split("\n").map { |line| line.split(" ").last }
+          version, build = `xcodebuild -version`.strip.split("\n").map { |line| line.split(' ').last }
           "#{version} (#{build})"
         end
 
+        def installed_plugins
+          CLAide::Command::PluginsHelper.specifications.
+            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,5 +1,4 @@
 module Pod
-
   # Validates a Specification.
   #
   # Extends the Linter from the Core to add additional which require the
@@ -10,7 +9,6 @@ module Pod
   # it without integration and building the project with xcodebuild.
   #
   class Validator
-
     include Config::Mixin
 
     # @return [Specification::Linter] the linter instance from CocoaPods
@@ -70,7 +68,7 @@ module Pod
       perform_linting
       perform_extensive_analysis(a_spec) if a_spec && !quick
 
-      UI.puts " -> ".send(result_color) << (a_spec ? a_spec.to_s : file.basename.to_s)
+      UI.puts ' -> '.send(result_color) << (a_spec ? a_spec.to_s : file.basename.to_s)
       print_results
       validated?
     end
@@ -82,25 +80,25 @@ module Pod
     def print_results
       results.each do |result|
         if result.platforms == [:ios]
-          platform_message = "[iOS] "
+          platform_message = '[iOS] '
         elsif result.platforms == [:osx]
-          platform_message = "[OSX] "
+          platform_message = '[OSX] '
         end
 
-        subspecs_message = ""
+        subspecs_message = ''
         if result.is_a?(Result)
-            subspecs = result.subspecs.uniq
-            if subspecs.count > 2
-                subspecs_message = "[" + subspecs[0..2].join(', ') + ", and more...] "
-            elsif subspecs.count > 0
-                subspecs_message = "[" + subspecs.join(',') + "] "
-            end
+          subspecs = result.subspecs.uniq
+          if subspecs.count > 2
+            subspecs_message = '[' + subspecs[0..2].join(', ') + ', and more...] '
+          elsif subspecs.count > 0
+            subspecs_message = '[' + subspecs.join(',') + '] '
+          end
         end
 
         case result.type
-        when :error   then type = "ERROR"
-        when :warning then type = "WARN"
-        when :note    then type = "NOTE"
+        when :error   then type = 'ERROR'
+        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.message}"
       end
@@ -109,7 +107,7 @@ module Pod
 
     #-------------------------------------------------------------------------#
 
-    # @!group Configuration
+    #  @!group Configuration
 
     # @return [Bool] whether the validation should skip the checks that
     #         requires the download of the library.
@@ -126,8 +124,8 @@ module Pod
     #
     # @note   Uses the `:path` option of the Podfile.
     #
-    attr_writer :local
-    def local?; @local; end
+    attr_accessor :local
+    alias_method :local?, :local
 
     # @return [Bool] Whether the validator should fail only on errors or also
     #         on warnings.
@@ -177,7 +175,7 @@ module Pod
     # @return [Pathname] the temporary directory used by the linter.
     #
     def validation_dir
-      Pathname.new(File.join(Pathname.new('/tmp').realpath,'CocoaPods/Lint'))
+      Pathname.new(File.join(Pathname.new('/tmp').realpath, 'CocoaPods/Lint'))
     end
 
     #-------------------------------------------------------------------------#
@@ -229,7 +227,7 @@ module Pod
     # Performs validation of a URL
     #
     def validate_url(url)
-      resp = Pod::HTTP::validate_url(url)
+      resp = Pod::HTTP.validate_url(url)
 
       if !resp
         warning "There was a problem validating the URL #{url}."
@@ -351,8 +349,10 @@ module Pod
         end
       end
 
-      unless file_accessor.license || spec.license && ( spec.license[:type] == 'Public Domain' || spec.license[:text] )
-        warning "Unable to find a license file"
+      if consumer.spec.root?
+        unless file_accessor.license || spec.license && ( spec.license[:type] == 'Public Domain' || spec.license[:text])
+          warning 'Unable to find a license file'
+        end
       end
     end
 
@@ -387,14 +387,12 @@ module Pod
     # Specialized Result to support subspecs aggregation
     #
     class Result < Specification::Linter::Result
+      def initialize(type, message)
+        super(type, message)
+        @subspecs = []
+      end
 
-        def initialize(type, message)
-            super(type, message)
-            @subspecs = []
-        end
-
-        attr_reader :subspecs
-
+      attr_reader :subspecs
     end
 
     #-------------------------------------------------------------------------#
@@ -415,7 +413,7 @@ module Pod
       local    = local?
       podfile  = Pod::Podfile.new do
         platform(platform_name, deployment_target)
-        if (local)
+        if local
           pod name, :path => podspec.dirname.to_s
         else
           pod name, :podspec => podspec.to_s
@@ -443,8 +441,8 @@ module Pod
           l.include?('note: ') && (l !~ /expanded from macro/)
       end
       selected_lines.map do |l|
-        new = l.gsub(/\/tmp\/CocoaPods\/Lint\/Pods\//,'')
-        new.gsub!(/^ */,' ')
+        new = l.gsub(/\/tmp\/CocoaPods\/Lint\/Pods\//, '')
+        new.gsub!(/^ */, ' ')
       end
     end
 
@@ -457,6 +455,5 @@ module Pod
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end