cocoapods 0.33.1 → 0.34.0.rc1

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

@@ -0,0 +1,116 @@
+module Pod
+  class Installer
+    class UserProjectIntegrator
+      class TargetIntegrator
+        # Configures an user target to use the CocoaPods xcconfigs which allow
+        # lo link against the Pods.
+        #
+        class XCConfigIntegrator
+          # Integrates the user target.
+          #
+          # @param  [Target::AggregateTarget] pod_bundle
+          #         The Pods bundle.
+          #
+          # @param  [Array<PBXNativeTarget>] targets
+          #         The native targets associated which should be integrated
+          #         with the Pod bundle.
+          #
+          def self.integrate(pod_bundle, targets)
+            targets.each do |target|
+              target.build_configurations.each do |config|
+                update_to_cocoapods_0_34(pod_bundle, targets)
+                set_target_xcconfig(pod_bundle, config)
+              end
+            end
+          end
+
+          private
+
+          # @!group Integration steps
+          #-------------------------------------------------------------------#
+
+          # Removes the xcconfig used up to CocoaPods 0.33 from the project and
+          # deletes the file if it exists.
+          #
+          # @param  [Target::AggregateTarget] pod_bundle
+          #         The Pods bundle.
+          #
+          # @param  [XcodeProj::PBXNativeTarget] target
+          #         The native targets.
+          #
+          # @todo   This can be removed for CocoaPods 1.0
+          #
+          def self.update_to_cocoapods_0_34(pod_bundle, targets)
+            sandbox = pod_bundle.sandbox
+            targets.map(&:project).uniq.each do |project|
+              file_refs = project.files.select do |file_ref|
+                path = file_ref.path.to_s
+                if File.extname(path) == '.xcconfig'
+                  absolute_path = file_ref.real_path.to_s
+                  absolute_path.start_with?(sandbox.root.to_s) &&
+                    !absolute_path.start_with?(sandbox.target_support_files_root.to_s)
+                end
+              end
+
+              file_refs.uniq.each do |file_ref|
+                UI.message "- Removing (#{file_ref.path})" do
+                  file_ref.remove_from_project
+                end
+              end
+            end
+          end
+
+          # Creates a file reference to the xcconfig generated by
+          # CocoaPods (if needed) and sets it as the base configuration of
+          # build configuration of the user target.
+          #
+          # @param  [Target::AggregateTarget] pod_bundle
+          #         The Pods bundle.
+          #
+          # @param  [[Xcodeproj::XCBuildConfiguration] config
+          #         The build configuration.
+          #
+          def self.set_target_xcconfig(pod_bundle, config)
+            path = pod_bundle.xcconfig_relative_path(config.name)
+            group = config.project['Pods'] || config.project.new_group('Pods')
+            file_ref = group.files.find { |f| f.path == path }
+            file_ref ||= group.new_file(path)
+            config.base_configuration_reference = file_ref
+          end
+
+          private
+
+          # @!group Private helpers
+          #-------------------------------------------------------------------#
+
+          # Prints a warning informing the user that a build configuration of
+          # the integrated target is overriding the CocoaPods build settings.
+          #
+          # @param  [Target::AggregateTarget] pod_bundle
+          #         The Pods bundle.
+          #
+          # @param  [XcodeProj::PBXNativeTarget] target
+          #         The native target.
+          #
+          # @param  [Xcodeproj::XCBuildConfiguration] config
+          #         The build configuration.
+          #
+          # @param  [String] key
+          #         The key of the overridden build setting.
+          #
+          def self.print_override_warning(pod_bundle, target, config, key)
+            actions = [
+              'Use the `$(inherited)` flag, or',
+              'Remove the build settings from the target.',
+            ]
+            message = "The `#{target.name} [#{config.name}]` " \
+              "target overrides the `#{key}` build setting defined in " \
+              "`#{pod_bundle.xcconfig_relative_path(config.name)}'. " \
+              'This can lead to problems with the CocoaPods installation'
+            UI.warn(message, actions)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods/open_uri.rb

@@ -3,7 +3,6 @@ require 'open-uri'
 # Allow OpenURI to follow http to https redirects.
 #
 module OpenURI
-
   # Whether {#open} should follow a redirect.
   #
   # Inspiration from: https://gist.github.com/1271420
@@ -17,7 +16,7 @@ module OpenURI
   # (RFC 2109 4.3.1, RFC 2965 3.3, RFC 2616 15.1.3)
   # However this is ad hoc.  It should be extensible/configurable.
   #
-  def OpenURI.redirectable?(uri1, uri2)
+  def self.redirectable?(uri1, uri2)
     uri1.scheme.downcase == uri2.scheme.downcase ||
     (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme)
   end

data/lib/cocoapods/project.rb

@@ -1,14 +1,12 @@
 require 'xcodeproj'
 
 module Pod
-
   # The Pods project.
   #
   # Model class which provides helpers for working with the Pods project
   # through the installation process.
   #
   class Project < Xcodeproj::Project
-
     # @param  [Pathname, String] path @see path
     # @param  [Bool] skip_initialization
     #         Wether the project should be initialized from scratch.
@@ -34,7 +32,6 @@ module Pod
     #
     attr_reader :development_pods
 
-
     public
 
     # @!group Pod Groups
@@ -58,7 +55,7 @@ module Pod
     # @return [PBXGroup] The new group.
     #
     def add_pod_group(pod_name, path, development = false, absolute = false)
-      raise "[BUG]" if pod_group(pod_name)
+      raise '[BUG]' if pod_group(pod_name)
 
       parent_group = development ? development_pods : pods
       source_tree = absolute ? :absolute : :group
@@ -125,12 +122,11 @@ module Pod
     #
     # @return [PBXGroup] The group.
     #
-    def pod_support_files_group(pod_name)
+    def pod_support_files_group(pod_name, dir)
       group = pod_group(pod_name)
       support_files_group = group['Support Files']
       unless support_files_group
-        support_files_group = group.new_group('Support Files')
-        support_files_group.source_tree = 'SOURCE_ROOT'
+        support_files_group = group.new_group('Support Files', dir)
       end
       support_files_group
     end
@@ -193,6 +189,37 @@ module Pod
       podfile_ref
     end
 
+    # Adds a new build configuration to the project and populates it with
+    # default settings according to the provided type.
+    #
+    # @note   This method extends the original Xcodeproj implementation to
+    #         include a preprocessor definition named after the build
+    #         setting. This is done to support the TargetEnvironmentHeader
+    #         specification of Pods available only on certain build
+    #         configurations.
+    #
+    # @param  [String] name
+    #         The name of the build configuration.
+    #
+    # @param  [Symbol] type
+    #         The type of the build configuration used to populate the build
+    #         settings, must be :debug or :release.
+    #
+    # @return [XCBuildConfiguration] The new build configuration.
+    #
+    def add_build_configuration(name, type)
+      build_configuration = super
+      values = ["#{name.gsub(' ', '_').upcase}=1"]
+      settings = build_configuration.build_settings
+      definitions = Array(settings['GCC_PREPROCESSOR_DEFINITIONS'])
+      values.each do |value|
+        unless definitions.include?(value)
+          definitions << value
+        end
+      end
+      settings['GCC_PREPROCESSOR_DEFINITIONS'] = definitions
+      build_configuration
+    end
 
     private
 
@@ -205,6 +232,5 @@ module Pod
     attr_reader :refs_by_absolute_path
 
     #-------------------------------------------------------------------------#
-
   end
 end

data/lib/cocoapods/resolver.rb

@@ -1,5 +1,4 @@
 module Pod
-
   # The resolver is responsible of generating a list of specifications grouped
   # by target for a given Podfile.
   #
@@ -15,7 +14,6 @@ module Pod
   #
   #
   class Resolver
-
     # @return [Sandbox] the Sandbox used by the resolver to find external
     #         dependencies.
     #
@@ -30,14 +28,21 @@ module Pod
     #
     attr_reader :locked_dependencies
 
+    # @return [Array<Source>] The list of the sources which will be used for
+    #         the resolution.
+    #
+    attr_accessor :sources
+
     # @param  [Sandbox] sandbox @see sandbox
     # @param  [Podfile] podfile @see podfile
     # @param  [Array<Dependency>] locked_dependencies @see locked_dependencies
+    # @param  [Array<Source>, Source] sources @see sources
     #
-    def initialize(sandbox, podfile, locked_dependencies = [])
+    def initialize(sandbox, podfile, locked_dependencies, sources)
       @sandbox = sandbox
       @podfile = podfile
       @locked_dependencies = locked_dependencies
+      @sources = Array(sources)
     end
 
     #-------------------------------------------------------------------------#
@@ -53,14 +58,15 @@ module Pod
     #         definition.
     #
     def resolve
-      @cached_sources  = SourcesManager.aggregate
       @cached_sets     = {}
       @cached_specs    = {}
       @specs_by_target = {}
 
       target_definitions = podfile.target_definition_list
       target_definitions.each do |target|
-        UI.section "Resolving dependencies for target `#{target.name}' (#{target.platform})" do
+        title = "Resolving dependencies for target `#{target.name}' " \
+          "(#{target.platform})"
+        UI.section(title) do
           @loaded_specs = []
           find_dependency_specs(podfile, target.dependencies, target)
           specs = cached_specs.values_at(*@loaded_specs).sort_by(&:name)
@@ -85,14 +91,6 @@ module Pod
 
     # !@ Resolution context
 
-    # @return [Source::Aggregate] A cache of the sources needed to find the
-    #         podspecs.
-    #
-    # @note   The sources are cached because frequently accessed by the
-    #         resolver and loading them requires disk activity.
-    #
-    attr_accessor :cached_sources
-
     # @return [Hash<String => Set>] A cache that keeps tracks of the sets
     #         loaded by the resolution process.
     #
@@ -150,7 +148,7 @@ module Pod
         dependency = locked_dep if locked_dep
 
         UI.message("- #{dependency}", '', 2) do
-          set = find_cached_set(dependency)
+          set = find_cached_set(dependency, dependent_spec)
           set.required_by(dependency, dependent_spec.to_s)
 
           unless @loaded_specs.include?(dependency.name)
@@ -170,38 +168,62 @@ module Pod
       end
     end
 
-    # Loads or returns a previously initialized for the Pod of the given
-    # dependency.
+    # @return [Set] Loads or returns a previously initialized set for the Pod
+    #               of the given dependency.
     #
     # @param  [Dependency] dependency
-    #         the dependency for which the set is needed.
+    #         The dependency for which the set is needed.
+    #
+    # @param  [#to_s] dependent_spec
+    #         the specification whose dependencies are being resolved. Used
+    #         only for UI purposes.
     #
     # @return [Set] the cached set for a given dependency.
     #
-    def find_cached_set(dependency)
+    def find_cached_set(dependency, dependent_spec)
       name = dependency.root_name
       unless cached_sets[name]
         if dependency.external_source
           spec = sandbox.specification(dependency.root_name)
           unless spec
-            raise StandardError, "[Bug] Unable to find the specification for `#{dependency}`."
+            raise StandardError, '[Bug] Unable to find the specification ' \
+              "for `#{dependency}`."
           end
           set = Specification::Set::External.new(spec)
         else
-          set = cached_sources.search(dependency)
+          set = find_set_from_sources(dependency)
         end
         cached_sets[name] = set
         unless set
-          raise Informative, "Unable to find a specification for `#{dependency}`."
+          raise Informative, 'Unable to find a specification for ' \
+            "`#{dependency}` depended upon by #{dependent_spec}."
         end
       end
       cached_sets[name]
     end
 
+    # @return [Set] Loads a set for the Pod of the given dependency from the
+    #         sources. The set will be limited to the versions of the first
+    #         source which includes the Pod.
+    #
+    # @param  [Dependency] dependency
+    #         The dependency for which the set is needed.
+    #
+    def find_set_from_sources(dependency)
+      sources.each do |source|
+        set = source.search(dependency)
+        return set if set
+      end
+      nil
+    end
+
     # Ensures that a specification is compatible with the platform of a target.
     #
     # @raise  If the specification is not supported by the target.
     #
+    # @todo   This step is not specific to the resolution process and should be
+    #         performed later in the analysis.
+    #
     # @return [void]
     #
     def validate_platform(spec, target)

data/lib/cocoapods/sandbox.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 
 module Pod
-
   # The sandbox provides support for the directory that CocoaPods uses for an
   # installation. In this directory the Pods projects, the support files and
   # the sources of the Pods are stored.
@@ -12,41 +11,31 @@ module Pod
   #
   #     Pods
   #     |
-  #     +-- User
-  #     | +-- [Target Name]-configuration.h
-  #     | +-- Specs
-  #     | +-- Scripts
+  #     +-- Headers
+  #     |   +-- Private
+  #     |   |   +-- [Pod Name]
+  #     |   +-- Public
+  #     |       +-- [Pod Name]
   #     |
-  #     +-- Generated
-  #       +-- Headers
-  #       |   +-- Private
-  #       |   |   +-- [Pod Name]
-  #       |   +-- Public
-  #       |       +-- [Pod Name]
-  #       |
-  #       +-- Sources
-  #       |   +-- [Pod Name]
-  #       |
-  #       +-- Specs
-  #       |   +-- External Sources
-  #       |   +-- Normal Sources
-  #       |
-  #       +-- Target Support Files
-  #       |   +-- [Target Name]
-  #       |       +-- Pods-acknowledgements.markdown
-  #       |       +-- Pods-acknowledgements.plist
-  #       |       +-- Pods-dummy.m
-  #       |       +-- Pods-prefix.pch
-  #       |       +-- Pods.xcconfig
-  #       |
-  #       +-- Manifest.lock
-  #       |
-  #       +-- Pods.xcodeproj
-  #
-  # See #833
+  #     +-- Local Podspecs
+  #     |   +-- External Sources
+  #     |   +-- Normal Sources
+  #     |
+  #     +-- Target Support Files
+  #     |   +-- [Target Name]
+  #     |       +-- Pods-acknowledgements.markdown
+  #     |       +-- Pods-acknowledgements.plist
+  #     |       +-- Pods-dummy.m
+  #     |       +-- Pods-prefix.pch
+  #     |       +-- Pods.xcconfig
+  #     |
+  #     +-- [Pod Name]
+  #     |
+  #     +-- Manifest.lock
+  #     |
+  #     +-- Pods.xcodeproj
   #
   class Sandbox
-
     autoload :FileAccessor, 'cocoapods/sandbox/file_accessor'
     autoload :HeadersStore, 'cocoapods/sandbox/headers_store'
     autoload :PathList,     'cocoapods/sandbox/path_list'
@@ -64,7 +53,7 @@ module Pod
     def initialize(root)
       FileUtils.mkdir_p(root)
       @root = Pathname.new(root).realpath
-      @public_headers = HeadersStore.new(self, "Headers")
+      @public_headers = HeadersStore.new(self, 'Public')
       @predownloaded_pods = []
       @head_pods = []
       @checkout_sources = {}
@@ -83,14 +72,6 @@ module Pod
     #
     attr_accessor :project
 
-    # Removes the sandbox.
-    #
-    # @return [void]
-    #
-    def implode
-      root.rmtree
-    end
-
     # Removes the files of the Pod with the given name from the sandbox.
     #
     # @return [void]
@@ -105,6 +86,19 @@ module Pod
       podspe_path.rmtree if podspe_path
     end
 
+    # Prepares the sandbox for a new installation removing any file that will
+    # be regenerated and ensuring that the directories exists.
+    #
+    def prepare
+      FileUtils.rm_rf(headers_root)
+      FileUtils.rm_rf(target_support_files_root)
+
+      FileUtils.mkdir_p(headers_root)
+      FileUtils.mkdir_p(sources_root)
+      FileUtils.mkdir_p(specifications_root)
+      FileUtils.mkdir_p(target_support_files_root)
+    end
+
     # @return [String] a string representation suitable for debugging.
     #
     def inspect
@@ -120,26 +114,25 @@ module Pod
     # @return [Pathname] the path of the manifest.
     #
     def manifest_path
-      root + "Manifest.lock"
+      root + 'Manifest.lock'
     end
 
     # @return [Pathname] the path of the Pods project.
     #
     def project_path
-      root + "Pods.xcodeproj"
+      root + 'Pods.xcodeproj'
     end
 
-    # Returns the path for the directory where to store the support files of
-    # a target.
+    # Returns the path for the directory where the support files of
+    # a target are stored.
     #
     # @param  [String] name
     #         The name of the target.
     #
     # @return [Pathname] the path of the support files.
     #
-    def library_support_files_dir(name)
-      # root + "Target Support Files/#{name}"
-      root
+    def target_support_files_dir(name)
+      target_support_files_root + name
     end
 
     # Returns the path where the Pod with the given name is stored, taking into
@@ -155,8 +148,7 @@ module Pod
       if local?(root_name)
         Pathname.new(development_pods[root_name])
       else
-        # root + "Sources/#{name}"
-        root + root_name
+        sources_root + root_name
       end
     end
 
@@ -170,10 +162,31 @@ module Pod
       @pods_with_absolute_path.include? name
     end
 
-    # @return [Pathname] the directory where to store the documentation.
+    # @return [Pathname] The directory where headers are stored.
+    #
+    def headers_root
+      root + 'Headers'
+    end
+
+    # @return [Pathname] The directory where the downloaded sources of
+    #         the Pods are stored.
+    #
+    def sources_root
+      root
+    end
+
+    # @return [Pathname] the path for the directory where the
+    #         specifications are stored.
+    #
+    def specifications_root
+      root + 'Local Podspecs'
+    end
+
+    # @return [Pathname] The directory where the files generated by
+    #         CocoaPods to support the umbrella targets are stored.
     #
-    def documentation_dir
-      root + 'Documentation'
+    def target_support_files_root
+      root + 'Target Support Files'
     end
 
     #-------------------------------------------------------------------------#
@@ -191,21 +204,11 @@ module Pod
     #
     def specification(name)
       if file = specification_path(name)
-        Specification.from_file(file)
+        original_path = development_pods[name]
+        Dir.chdir(original_path || Dir.pwd) { Specification.from_file(file) }
       end
     end
 
-    # @return [Pathname] the path for the directory where to store the
-    #         specifications.
-    #
-    # @todo   Migrate old installations and store the for all the pods.
-    #         Two folders should be created `External Sources` and `Podspecs`.
-    #
-    def specifications_dir(external_source = false)
-      # root + "Specifications"
-      root + "Local Podspecs"
-    end
-
     # Returns the path of the specification for the Pod with the
     # given name, if one is stored.
     #
@@ -216,11 +219,11 @@ module Pod
     # @return [Nil] if the podspec is not stored.
     #
     def specification_path(name)
-      path = specifications_dir + "#{name}.podspec"
+      path = specifications_root + "#{name}.podspec"
       if path.exist?
         path
       else
-        path = specifications_dir + "#{name}.podspec.json"
+        path = specifications_root + "#{name}.podspec.json"
         if path.exist?
           path
         else
@@ -241,9 +244,9 @@ module Pod
     # @todo   Store all the specifications (including those not originating
     #         from external sources) so users can check them.
     #
-    def store_podspec(name, podspec, external_source = false, json = false)
+    def store_podspec(name, podspec, _external_source = false, json = false)
       file_name = json ? "#{name}.podspec.json" : "#{name}.podspec"
-      output_path = specifications_dir(external_source) + file_name
+      output_path = specifications_root + file_name
       output_path.dirname.mkpath
       if podspec.is_a?(String)
         output_path.open('w') { |f| f.puts(podspec) }
@@ -253,9 +256,13 @@ module Pod
         end
         FileUtils.copy(podspec, output_path)
       end
-      spec = Specification.from_file(output_path)
-      unless spec.name == name
-        raise Informative, "The name of the given podspec `#{spec.name}` doesn't match the expected one `#{name}`"
+
+      Dir.chdir(podspec.is_a?(Pathname) ? File.dirname(podspec) : Dir.pwd) do
+        spec = Specification.from_file(output_path)
+
+        unless spec.name == name
+          raise Informative, "The name of the given podspec `#{spec.name}` doesn't match the expected one `#{name}`"
+        end
       end
     end
 
@@ -390,7 +397,5 @@ module Pod
     end
 
     #-------------------------------------------------------------------------#
-
   end
 end
-