cocoapods 0.14.0 → 0.15.0

data/lib/cocoapods/podfile.rb

@@ -472,6 +472,17 @@ module Pod
       @target_definition = parent
     end
 
+    # This hook allows you to make any changes to the downloaded Pods and to
+    # their targets before they are installed.
+    #
+    #   pre_install do |installer|
+    #     # Do something fancy!
+    #   end
+    #
+    def pre_install(&block)
+      @pre_install_callback = block
+    end
+
     # This hook allows you to make any last changes to the generated Xcode project
     # before it is written to disk, or any other tasks you might want to perform.
     #
@@ -532,6 +543,10 @@ module Pod
       configs_array.inject({}) { |hash, config| hash.merge(config) }
     end
 
+    def pre_install!(installer)
+      @pre_install_callback.call(installer) if @pre_install_callback
+    end
+
     def post_install!(installer)
       @post_install_callback.call(installer) if @post_install_callback
     end

data/lib/cocoapods/resolver.rb

@@ -66,36 +66,32 @@ module Pod
       @specs_by_target = {}
       @pods_from_external_sources = []
       @pods_to_lock = []
-      @log_indent = 0
 
       if @lockfile
-        puts "\nFinding added, modified or removed dependencies:".green if config.verbose?
         @pods_by_state = @lockfile.detect_changes_with_podfile(podfile)
-        if config.verbose?
+        UI.section "Finding added, modified or removed dependencies:" do
+          marks = {:added => "A".green, :changed => "M".yellow, :removed => "R".red, :unchanged => "-" }
           @pods_by_state.each do |symbol, pod_names|
-            case symbol
-            when :added
-              mark = "A".green
-            when :changed
-              mark = "M".yellow
-            when :removed
-              mark = "R".red
-            when :unchanged
-              mark = "-"
-            end
             pod_names.each do |pod_name|
-              puts "  #{mark} " << pod_name
+              UI.message("#{marks[symbol]} #{pod_name}", '',2)
             end
           end
-        end
+        end if config.verbose?
         @pods_to_lock = (lockfile.pods_names - @pods_by_state[:added] - @pods_by_state[:changed] - @pods_by_state[:removed]).uniq
       end
 
+      unless config.skip_repo_update?
+        UI.section 'Updating spec repositories' do
+          Command::Repo.new(Command::ARGV.new(["update"])).run
+        end if !@lockfile || !(@pods_by_state[:added] + @pods_by_state[:changed]).empty? || update_mode
+      end
+
       @podfile.target_definitions.values.each do |target_definition|
-        puts "\nResolving dependencies for target `#{target_definition.name}' (#{target_definition.platform}):".green if config.verbose?
-        @loaded_specs = []
-        find_dependency_specs(@podfile, target_definition.dependencies, target_definition)
-        @specs_by_target[target_definition] = @cached_specs.values_at(*@loaded_specs).sort_by(&:name)
+        UI.section "Resolving dependencies for target `#{target_definition.name}' (#{target_definition.platform})" do
+          @loaded_specs = []
+          find_dependency_specs(@podfile, target_definition.dependencies, target_definition)
+          @specs_by_target[target_definition] = @cached_specs.values_at(*@loaded_specs).sort_by(&:name)
+        end
       end
 
       @cached_specs.values.sort_by(&:name)
@@ -187,35 +183,33 @@ module Pod
     # @return [void]
     #
     def find_dependency_specs(dependent_specification, dependencies, target_definition)
-      @log_indent += 1
       dependencies.each do |dependency|
         # Replace the dependency with a more specific one if the pod is already installed.
         if !update_mode && @pods_to_lock.include?(dependency.name)
           dependency = lockfile.dependency_for_installed_pod_named(dependency.name)
         end
-
-        puts '  ' * @log_indent + "- #{dependency}" if config.verbose?
-        set = find_cached_set(dependency, target_definition.platform)
-        set.required_by(dependency, dependent_specification.to_s)
-
-        # Ensure we don't resolve the same spec twice for one target
-        unless @loaded_specs.include?(dependency.name)
-          spec = set.specification_by_name(dependency.name)
-          @pods_from_external_sources << spec.pod_name if dependency.external?
-          @loaded_specs << spec.name
-          @cached_specs[spec.name] = spec
-          # Configure the specification
-          spec.activate_platform(target_definition.platform)
-          spec.version.head = dependency.head?
-          # And recursively load the dependencies of the spec.
-          find_dependency_specs(spec, spec.dependencies, target_definition) if spec.dependencies
+        UI.message("- #{dependency}", '', 2) do
+          set = find_cached_set(dependency, target_definition.platform)
+          set.required_by(dependency, dependent_specification.to_s)
+
+          # Ensure we don't resolve the same spec twice for one target
+          unless @loaded_specs.include?(dependency.name)
+            spec = set.specification_by_name(dependency.name)
+            @pods_from_external_sources << spec.pod_name if dependency.external?
+            @loaded_specs << spec.name
+            @cached_specs[spec.name] = spec
+            # Configure the specification
+            spec.activate_platform(target_definition.platform)
+            spec.version.head = dependency.head?
+            # And recursively load the dependencies of the spec.
+            find_dependency_specs(spec, spec.dependencies, target_definition) if spec.dependencies
+          end
+          validate_platform(spec || @cached_specs[dependency.name], target_definition)
         end
-        validate_platform(spec || @cached_specs[dependency.name], target_definition)
       end
-      @log_indent -= 1
     end
 
-    # Ensures that a spec is compatible with platform of a target.
+    # Ensures that a spec is compatible with the platform of a target.
     #
     # @raises If the spec is not supported by the target.
     #

data/lib/cocoapods/source.rb

@@ -1,67 +1,81 @@
 module Pod
-  class Source
-    class Aggregate
-      def all
-        @sources ||= begin
-          repos_dir = Config.instance.repos_dir
-          unless repos_dir.exist?
-            raise Informative, "No spec repos found in `#{repos_dir}'. " \
-                               "To fetch the `master' repo run: $ pod setup"
-          end
-          repos_dir.children.select(&:directory?).map { |repo| Source.new(repo) }
-        end
-      end
 
-      def all_sets
-        all.map(&:pod_sets).flatten
-      end
+  # The {Source} class is responsible to manage a collection of podspecs.
+  #
+  # @note The backing store of the podspecs collection is an implementation detail
+  # abstraced from the rest of CocoaPods.
+  #
+  # @note The default implementation uses a git repo as a backing store, where the
+  # podspecs are namespaces as:
+  #
+  #     #{POD_NAME}/#{VERSION}/#{POD_NAME}.podspec
+  #
+  # @todo For better abstranction the sources should be responsible to update themselves.
+  #
+  class Source
 
-      def search(dependency)
-        all.map { |s| s.search(dependency) }.compact.first ||
-          raise(Informative, "[!] Unable to find a pod named `#{dependency.name}'".red)
-      end
+    # @return [Pathname] The location of the repo.
+    #
+    attr_reader :repo
 
-      def search_by_name(query, full_text_search)
-        result = all.map { |s| s.search_by_name(query, full_text_search) }.flatten
-        if result.empty?
-          extra = ", author, summary, or description" if full_text_search
-          raise(Informative, "Unable to find a pod with name" \
-                             "#{extra} matching `#{query}'")
-        end
-        result
-      end
+    # @param [Pathname] repo @see repo.
+    #
+    def initialize(repo)
+      @repo = repo
     end
 
-    def self.all
-      Aggregate.new.all
+    # @return [String] the name of the repo.
+    #
+    def name
+      @repo.basename.to_s
     end
 
-    def self.all_sets
-      Aggregate.new.all_sets
-    end
+    # @!group Quering the source
 
-    def self.search(dependency)
-      Aggregate.new.search(dependency)
+    # @return [Array<String>] The name of all the Pods.
+    #
+    def pods
+      @repo.children.map do |child|
+        child.basename.to_s if child.directory? && child.basename.to_s != '.git'
+      end.compact
     end
 
-    def self.search_by_name(name, full_text_search)
-      Aggregate.new.search_by_name(name, full_text_search)
+    # @return [Array<Sets>] The sets of all the Pods.
+    #
+    def pod_sets
+      pods.map { |pod| Specification::Set.new(pod, self) }
     end
 
-    attr_reader :repo
-
-    def initialize(repo)
-      @repo = repo
+    # @return [Array<Version>] All the available versions for the Pod, sorted
+    #                          from highest to lowest.
+    #
+    # @param [String] name     The name of the Pod.
+    #
+    def versions(name)
+      pod_dir = repo + name
+      pod_dir.children.map do |v|
+        basename = v.basename.to_s
+        Version.new(basename) if v.directory? && basename[0,1] != '.'
+      end.compact.sort.reverse
     end
 
-    def pod_sets
-      @repo.children.map do |child|
-        if child.directory? && child.basename.to_s != '.git'
-          Specification::Set.new(child)
-        end
-      end.compact
+    # @return [Specification]  The specification for a given version of Pod.
+    #
+    # @param [String] name     The name of the Pod.
+    #
+    # @param [Version,String] version
+    #                          The version for the specification.
+    #
+    def specification(name, version)
+      specification_path = repo + name + version.to_s + "#{name}.podspec"
+      Specification.from_file(specification_path)
     end
 
+    # @!group Searching the source
+
+    # @return [Set] A set for a given dependency. The set is identified by the
+    #               name of the dependency and takes into account subspecs.
+    #
     def search(dependency)
       pod_sets.find do |set|
         # First match the (top level) name, which does not yet load the spec from disk
@@ -72,7 +86,19 @@ module Pod
       end
     end
 
-    def search_by_name(query, full_text_search)
+    # @return [Array<Set>] The sets that contain the search term.
+    #
+    # @param [String] query           The search term.
+    #
+    # @param [Bool] full_text_search  Whether the search should be limited to
+    #                                 the name of the Pod or should include
+    #                                 also the author, the summary, and the
+    #                                 description.
+    #
+    # @note Full text search requires to load the specification for each pod,
+    #       hence is considerably slower.
+    #
+    def search_by_name(query, full_text_search = false)
       pod_sets.map do |set|
         text = if full_text_search
           s = set.specification
@@ -83,5 +109,103 @@ module Pod
         set if text.downcase.include?(query.downcase)
       end.compact
     end
+
+    # The {Source::Aggregate} manages all the sources available to CocoaPods.
+    #
+    class Aggregate
+
+      # @return [Array<Source>] All the sources.
+      #
+      def all
+        @sources ||= dirs.map { |repo| Source.new(repo) }.sort_by(&:name)
+      end
+
+      # @return [Array<String>] The names of all the pods available.
+      #
+      def all_pods
+        all.map(&:pods).flatten.uniq
+      end
+
+      # @return [Array<Set>] The sets for all the pods available.
+      #
+      def all_sets
+        all_pods.map do |pod|
+          sources = all.select{ |s| s.pods.include?(pod) }.compact
+          Specification::Set.new(pod, sources)
+        end
+      end
+
+      # @return [Set] A set for a given dependency including all the Sources
+      #               that countain the Pod.
+      #
+      # @raises       If no source including the set can be foud.
+      #
+      # @see          Source#search
+      #
+      def search(dependency)
+        sources = all.select { |s| !s.search(dependency).nil? }
+        raise(Informative, "[!] Unable to find a pod named `#{dependency.name}'".red) if sources.empty?
+        Specification::Set.new(dependency.top_level_spec_name, sources)
+      end
+
+      # @return [Array<Set>]  The sets that contain the search term.
+      #
+      # @raises               If no source including the set can be foud.
+      #
+      # @see                  Source#search_by_name
+      #
+      def search_by_name(query, full_text_search = false)
+        pods_by_source = {}
+        result = []
+        all.each { |s| pods_by_source[s] = s.search_by_name(query, full_text_search).map(&:name) }
+        pod_names = pods_by_source.values.flatten.uniq
+        pod_names.each do |pod|
+          sources = []
+          pods_by_source.each{ |source, pods| sources << source if pods.include?(pod) }
+          result << Specification::Set.new(pod, sources)
+        end
+        if result.empty?
+          extra = ", author, summary, or description" if full_text_search
+          raise(Informative, "Unable to find a pod with name" \
+                "#{extra} matching `#{query}'")
+        end
+        result
+      end
+
+      # @return [Array<Pathname>] The directories where the sources are stored.
+      #
+      # @raises If the repos dir doesn't exits.
+      #
+      def dirs
+        if ENV['CP_MASTER_REPO_DIR']
+          [Pathname.new(ENV['CP_MASTER_REPO_DIR'])]
+        else
+          repos_dir = Config.instance.repos_dir
+          unless repos_dir.exist?
+            raise Informative, "No spec repos found in `#{repos_dir}'. " \
+              "To fetch the `master' repo run: $ pod setup"
+          end
+          repos_dir.children.select(&:directory?)
+        end
+      end
+    end
+
+    # @!group Shortcuts
+
+    def self.all
+      Aggregate.new.all
+    end
+
+    def self.all_sets
+      Aggregate.new.all_sets
+    end
+
+    def self.search(dependency)
+      Aggregate.new.search(dependency)
+    end
+
+    def self.search_by_name(name, full_text_search = false)
+      Aggregate.new.search_by_name(name, full_text_search)
+    end
   end
 end

data/lib/cocoapods/specification.rb

@@ -54,6 +54,7 @@ module Pod
       @xcconfig     = { :ios => Xcodeproj::Config.new, :osx => Xcodeproj::Config.new }
       @header_dir   = { :ios => nil, :osx => nil }
       @requires_arc = { :ios => nil, :osx => nil }
+      @header_mappings_dir = { :ios => nil, :osx => nil }
 
       yield self if block_given?
     end
@@ -88,6 +89,7 @@ module Pod
     # Returns the value of the attribute for the active platform
     # chained with the upstream specifications. The ivar must store
     # the platform specific values as an array.
+    #
     def self.pltf_chained_attr_reader(attr)
       define_method(attr) do
         active_plaform_check
@@ -96,6 +98,17 @@ module Pod
       end
     end
 
+    # Returns the first value defined of the attribute traversing the chain
+    # upwards.
+    #
+    def self.pltf_first_defined_attr_reader(attr)
+      define_method(attr) do
+        active_plaform_check
+        ivar_value = instance_variable_get("@#{attr}")[active_platform]
+        ivar_value.nil? ? (@parent.send(attr) if @parent) : ivar_value
+      end
+    end
+
     def active_plaform_check
       raise Informative, "#{self.inspect} not activated for a platform before consumption." unless active_platform
     end
@@ -240,13 +253,11 @@ module Pod
 
     ### Attributes **with** multiple platform support
 
-    # @todo allow for subspecs
+    # @todo allow for subspecs?
     #
-    top_attr_accessor :header_mappings_dir, lambda { |file| Pathname.new(file) } # If not provided the headers files are flattened
     top_attr_accessor :prefix_header_file,  lambda { |file| Pathname.new(file) }
     top_attr_accessor :prefix_header_contents
 
-
     pltf_chained_attr_accessor  :source_files,                lambda {|value, current| pattern_list(value) }
     pltf_chained_attr_accessor  :public_header_files,         lambda {|value, current| pattern_list(value) }
     pltf_chained_attr_accessor  :resources,                   lambda {|value, current| pattern_list(value) }
@@ -262,7 +273,6 @@ module Pod
     alias_method :weak_framework=,  :weak_frameworks=
     alias_method :library=,         :libraries=
 
-
     # @!method requires_arc=
     #
     # @abstract Wether the `-fobjc-arc' flag should be added to the compiler
@@ -271,14 +281,7 @@ module Pod
     # @param [Bool] Wether the source files require ARC.
     #
     platform_attr_writer :requires_arc
-
-    def requires_arc
-      requires_arc = @requires_arc[active_platform]
-      if requires_arc.nil?
-        requires_arc = @parent ? @parent.requires_arc : false
-      end
-      requires_arc
-    end
+    pltf_first_defined_attr_reader :requires_arc
 
     # @!method header_dir=
     #
@@ -287,17 +290,13 @@ module Pod
     #
     # @param [String] The headers directory.
     #
-    platform_attr_writer :header_dir, lambda { |dir, _| Pathname.new(dir) }
+    platform_attr_writer           :header_dir, lambda { |dir, _| Pathname.new(dir) }
+    pltf_first_defined_attr_reader :header_dir
 
-    # @abstract (see #header_dir=)
-    #
-    # @return [Pathname] The headers directory.
+    # If not provided the headers files are flattened
     #
-    # @note If no value is provided it returns an empty {Pathname}.
-    #
-    def header_dir
-      @header_dir[active_platform] || (@parent.header_dir if @parent) || Pathname.new('')
-    end
+    platform_attr_writer           :header_mappings_dir, lambda { |file, _| Pathname.new(file) }
+    pltf_first_defined_attr_reader :header_mappings_dir
 
     # @!method xcconfig=
     #
@@ -316,13 +315,14 @@ module Pod
     end
 
 
+    def recursive_compiler_flags
+      @parent ? @parent.recursive_compiler_flags | @compiler_flags[active_platform] : @compiler_flags[active_platform]
+    end
+
     def compiler_flags
-      if @parent
-        flags = [@parent.compiler_flags]
-      else
-        flags = [requires_arc ? ' -fobjc-arc' : '']
-      end
-      (flags + @compiler_flags[active_platform].clone).join(' ')
+      flags = recursive_compiler_flags.dup
+      flags << '-fobjc-arc' if requires_arc
+      flags.join(' ')
     end
 
     platform_attr_writer :compiler_flags, lambda {|value, current| current << value }
@@ -430,20 +430,36 @@ module Pod
       header_mappings_dir ? from.relative_path_from(header_mappings_dir) : from.basename
     end
 
+    # This is a convenience method which gets called after all pods have been
+    # downloaded but before they have been installed, and the Xcode project and
+    # related files have been generated. (It receives the Pod::LocalPod
+    # instance generated form the specification and the #
+    # Pod::Podfile::TargetDefinition instance for the current target.) Override
+    # this to, for instance, to run any build script:
+    #
+    #   Pod::Spec.new do |s|
+    #     def pre_install(pod, target_definition)
+    #       Dir.chdir(pod.root){ `sh make.sh` }
+    #     end
+    #   end
+    def pre_install(pod, target_definition)
+    end
+
     # This is a convenience method which gets called after all pods have been
     # downloaded, installed, and the Xcode project and related files have been
-    # generated. (It receives the Pod::Installer::Target instance for the current
-    # target.) Override this to, for instance, add to the prefix header:
+    # generated. (It receives the Pod::Installer::TargetInstaller instance for
+    # the current target.) Override this to, for instance, add to the prefix
+    # header:
     #
     #   Pod::Spec.new do |s|
-    #     def s.post_install(target)
-    #       prefix_header = config.project_pods_root + target.prefix_header_filename
+    #     def s.post_install(target_installer)
+    #       prefix_header = config.project_pods_root + target_installer.prefix_header_filename
     #       prefix_header.open('a') do |file|
     #         file.puts(%{#ifdef __OBJC__\n#import "SSToolkitDefines.h"\n#endif})
     #       end
     #     end
     #   end
-    def post_install(target)
+    def post_install(target_installer)
     end
 
     def podfile?