cocoapods-core 1.0.0.beta.6 → 1.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b116f2a8b2c3c090b6aada3e046db9d3515e538a
-  data.tar.gz: e4f97aed43c5b3ddc85381673e863a414796def1
+  metadata.gz: 4c385f0112647c0300a73d55e8c6d160f98fec9d
+  data.tar.gz: 1d87fa015bcf769c785e181c394aa1fdc7584ead
 SHA512:
-  metadata.gz: b06b2f5053a53c500861559f776f65864128c2144b1e5a7bff34d40c78811fa952b70ee112e3a2f18475962049a1e3258da1b0d32c78aa0f62ab961d4a24fe3c
-  data.tar.gz: 123a0a4674f478085c4abc1ba8d63b155c20b3fbc16d93b399bac5ebd0ff2d6914bb49baf8c730093a086881c61868f0829010737a5226c7a5a61ee5afbf5344
+  metadata.gz: 51e7cb1f3134fdd9d08f15427489033a43b76616429d7158d2534ca6fe461fde55da4c459ef98030d9f1e4bd53259b6d64c171edebc4ba4428725f1073259e6d
+  data.tar.gz: 7c0aaacccb38fbd1f89fdb950731eb72c58ecf3462258468a9b6703746fe2d0fb9d1ad5e98b652a317ab1bae6643c114f19748c097da1342052c8b56fa81512f

data/lib/cocoapods-core/core_ui.rb

@@ -6,6 +6,10 @@ module Pod
       STDOUT.puts message
     end
 
+    def self.print(message)
+      STDOUT.print(message)
+    end
+
     def self.warn(message)
       STDERR.puts message
     end

data/lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '1.0.0.beta.6'.freeze unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '1.0.0.beta.7'.freeze unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/podfile/dsl.rb

@@ -123,21 +123,22 @@ module Pod
       # your Podfile to use future versions of CocoaPods. Anyway a clear and
       # simple upgrade path will be provided.
       #
-      # By default dependencies are installed on all the build configurations
+      # By default dependencies are installed in all the build configurations
       # of the target. For debug purposes or for other reasons, they can be
-      # enabled only on a given list of build configuration names.
+      # only enabled on a list of build configurations.
       #
-      #     pod 'PonyDebugger', :configurations => ['Release', 'App Store']
+      #     pod 'PonyDebugger', :configurations => ['Debug', 'Beta']
       #
-      # Alternatively you can white-list only a single build configuration.
+      # Alternatively, you specify to have it included on a single build
+      # configuration.
       #
-      #     pod 'PonyDebugger', :configuration => ['Release']
+      #     pod 'PonyDebugger', :configuration => 'Debug'
       #
       # ------
       #
       # ### Subspecs
       #
-      # When installing a Pod via it's name, it will install all of the
+      # When installing a Pod via its name, it will install all of the
       # default subspecs defined in the podspec.
       #
       # You may install a specific subspec using the following:
@@ -295,12 +296,12 @@ module Pod
       #           target 'ShowsApp' do
       #             pod 'ShowsKit'
       #
-      #             # Has it's own copy of ShowsKit + ShowTVAuth
+      #             # Has its own copy of ShowsKit + ShowTVAuth
       #             target 'ShowsTV' do
       #               pod 'ShowTVAuth'
       #             end
       #
-      #             # Has it's own copy of Specta + Expecta
+      #             # Has its own copy of Specta + Expecta
       #             # and has access to ShowsKit via the app
       #             # that the test target is bundled into
       #
@@ -344,23 +345,24 @@ module Pod
       #
       # @example  Defining an abstract_target wrapping Pods to multiple targets
       #
-      #           # There are no targets called "Shows" in any Xcode projects
+      #           # Note: There are no targets called "Shows" in any of this workspace's Xcode projects
       #           abstract_target 'Shows' do
       #             pod 'ShowsKit'
       #
-      #             # Has it's own copy of ShowsKit + ShowWebAuth
+      #             # The target ShowsiOS has its own copy of ShowsKit (inherited) + ShowWebAuth (added here)
       #             target 'ShowsiOS' do
       #               pod 'ShowWebAuth'
       #             end
       #
-      #             # Has it's own copy of ShowsKit + ShowTVAuth
+      #             # The target ShowsTV has its own copy of ShowsKit (inherited) + ShowTVAuth (added here)
       #             target 'ShowsTV' do
       #               pod 'ShowTVAuth'
       #             end
       #
-      #             # Has it's own copy of Specta + Expecta
-      #             # and has access to ShowsKit via the app
-      #             # that the test target is bundled into
+      #             # Our tests target has its own copy of
+      #             # our testing frameworks, and has access
+      #             # to ShowsKit as well because it is
+      #             # a child of the abstract target 'Shows'
       #
       #             target 'ShowsTests' do
       #               inherit! :search_paths

data/lib/cocoapods-core/source/aggregate.rb

@@ -10,6 +10,7 @@ module Pod
       # @param  [Array<Source>] repos_dirs @see Sources
       #
       def initialize(sources)
+        raise "Cannot initialize an aggregate with a nil source: (#{sources})" if sources.include?(nil)
         @sources = sources
       end
 
@@ -164,7 +165,7 @@ module Pod
         result = {}
         sets.each do |set|
           word_list_from_set(set).each do |w|
-            (result[w] ||= []).push(set.name.to_sym)
+            (result[w] ||= []).push(set.name)
           end
         end
         result

data/lib/cocoapods-core/source/manager.rb

@@ -0,0 +1,412 @@
+module Pod
+  class Source
+    class Manager
+      # @return [Pathname] The directory that contains the source repo
+      #         directories.
+      #
+      attr_reader :repos_dir
+
+      def initialize(repos_dir)
+        @repos_dir = Pathname(repos_dir).expand_path
+      end
+
+      # @return [Array<Pathname>] The source repo directories.
+      #
+      def source_repos
+        return [] unless repos_dir.exist?
+        repos_dir.children.select(&:directory?).sort_by { |d| d.basename.to_s.downcase }
+      end
+
+      # @return [Source::Aggregate] The aggregate of all the sources with the
+      #         known Pods.
+      #
+      def aggregate
+        aggregate_with_repos(source_repos)
+      end
+
+      # @return [Source::Aggregate] The aggregate of the sources from repos.
+      #
+      # @param  [Dependency] dependency
+      #         The dependency for which to find or build the appropriate.
+      #         aggregate. If the dependency specifies a source podspec repo
+      #         then only that source will be used, otherwise all sources
+      #         will be used.
+      #
+      def aggregate_for_dependency(dependency)
+        if dependency.podspec_repo
+          source = source_with_url(dependency.podspec_repo)
+          raise StandardError, '[Bug] Failed to find known source with the URL ' \
+            "#{dependency.podspec_repo.inspect}" if source.nil?
+
+          aggregate_with_repos([source.repo])
+        else
+          aggregate
+        end
+      end
+
+      # @return [Array<Source>] The list of the sources with the given names.
+      #
+      # @param  [Array<#to_s>] names
+      #         The names of the sources.
+      #
+      def sources(names)
+        dirs = names.map { |name| source_dir(name) }
+        dirs.map { |repo| source_from_path(repo) }
+      end
+
+      # @return [Array<Source>] The list of all the sources known to this
+      #         installation of CocoaPods.
+      #
+      def all
+        aggregate.sources
+      end
+
+      # @return [Array<Source>] The CocoaPods Master Repo source.
+      #
+      def master
+        sources(['master']).select { |s| s.repo.directory? }
+      end
+
+      # @!group Master repo
+
+      # @return [Pathname] The path of the master repo.
+      #
+      def master_repo_dir
+        source_dir('master')
+      end
+
+      # @return [Bool] Checks if the master repo is usable.
+      #
+      # @note   Note this is used to automatically setup the master repo if
+      #         needed.
+      #
+      def master_repo_functional?
+        return false unless master_repo = master.first
+        master_repo.metadata.compatible?(CORE_VERSION)
+      end
+
+      # Search the appropriate sources to match the set for the given dependency.
+      #
+      # @return [Set, nil] a set for a given dependency including all the
+      #         {Source} that contain the Pod. If no sources containing the
+      #         Pod where found it returns nil.
+      #
+      # @raise  If no source can be found that includes the dependency.
+      #
+      def search(dependency)
+        aggregate_for_dependency(dependency).search(dependency)
+      end
+
+      # Search all the sources with the given 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.
+      #
+      # @raise  If no source including the set can be found.
+      #
+      # @return [Array<Set>]  The sets that contain the search term.
+      #
+      def search_by_name(query, full_text_search = false)
+        query_word_regexps = query.split.map { |word| /#{word}/i }
+        if full_text_search
+          query_word_results_hash = {}
+          updated_search_index.each_value do |word_spec_hash|
+            word_spec_hash.each_pair do |word, spec_names|
+              query_word_regexps.each do |query_word_regexp|
+                set = (query_word_results_hash[query_word_regexp] ||= Set.new)
+                set.merge(spec_names) if word =~ query_word_regexp
+              end
+            end
+          end
+          found_set_names = query_word_results_hash.values.reduce(:&)
+          found_set_names ||= []
+          sets = found_set_names.map do |name|
+            aggregate.representative_set(name)
+          end
+          # Remove nil values because representative_set return nil if no pod is found in any of the sources.
+          sets.compact!
+        else
+          sets = aggregate.search_by_name(query, false)
+        end
+        if sets.empty?
+          extra = ', author, summary, or description' if full_text_search
+          raise Informative, "Unable to find a pod with name#{extra}" \
+            "matching `#{query}`"
+        end
+        sorted_sets(sets, query_word_regexps)
+      end
+
+      # Returns given set array by sorting it in-place.
+      #
+      # @param  [Array<Set>] sets
+      #         Array of sets to be sorted.
+      #
+      # @param  [Array<Regexp>] query_word_regexps
+      #         Array of regexp objects for user query.
+      #
+      # @return [Array<Set>]  Given sets parameter itself after sorting it in-place.
+      #
+      def sorted_sets(sets, query_word_regexps)
+        sets.sort_by! do |set|
+          pre_match_length = nil
+          found_query_index = nil
+          found_query_count = 0
+          query_word_regexps.each_with_index do |q, idx|
+            if (m = set.name.match(/#{q}/i))
+              pre_match_length ||= m.pre_match.length
+              found_query_index ||= idx
+              found_query_count += 1
+            end
+          end
+          pre_match_length ||= 1000
+          found_query_index ||= 1000
+          [-found_query_count, pre_match_length, found_query_index, set.name.downcase]
+        end
+        sets
+      end
+
+      # Returns the search data. If a saved search data exists, retrieves it from file and returns it.
+      # Else, creates the search data from scratch, saves it to file system, and returns it.
+      # Search data is grouped by source repos. For each source, it contains a hash where keys are words
+      # and values are the pod names containing corresponding word.
+      #
+      # For each source, list of unique words are generated from the following spec information.
+      #   - version
+      #   - summary
+      #   - description
+      #   - authors
+      #
+      # @return [Hash{String => Hash{String => Array<String>}}] The up to date search data.
+      #
+      def updated_search_index
+        index = stored_search_index || {}
+        all.each do |source|
+          source_name = source.name
+          unless index[source_name]
+            CoreUI.print "Creating search index for spec repo '#{source_name}'.."
+            index[source_name] = aggregate.generate_search_index_for_source(source)
+            CoreUI.puts ' Done!'
+          end
+        end
+        save_search_index(index)
+        index
+      end
+
+      # Updates the stored search index if there are changes in spec repos while updating them.
+      # Update is performed incrementally. Only the changed pods' search data is re-generated and updated.
+      # @param  [Hash{Source => Array<String>}] changed_spec_paths
+      #                  A hash containing changed specification paths for each source.
+      #
+      def update_search_index_if_needed(changed_spec_paths)
+        search_index = stored_search_index
+        return unless search_index
+        changed_spec_paths.each_pair do |source, spec_paths|
+          index_for_source = search_index[source.name]
+          next unless index_for_source && !spec_paths.empty?
+          updated_pods = source.pods_for_specification_paths(spec_paths)
+
+          new_index = aggregate.generate_search_index_for_changes_in_source(source, spec_paths)
+          # First traverse search_index and update existing words
+          # Remove traversed words from new_index after adding to search_index,
+          # so that only non existing words will remain in new_index after enumeration completes.
+          index_for_source.each_pair do |word, _|
+            if new_index[word]
+              index_for_source[word] |= new_index[word]
+              new_index.delete(word)
+            else
+              index_for_source[word] -= updated_pods
+            end
+          end
+
+          # Now add non existing words remained in new_index to search_index
+          index_for_source.merge!(new_index)
+        end
+        save_search_index(search_index)
+      end
+
+      # Updates search index for changed pods in background
+      # @param  [Hash{Source => Array<String>}] changed_spec_paths
+      #                  A hash containing changed specification paths for each source.
+      #
+      def update_search_index_if_needed_in_background(changed_spec_paths)
+        Process.fork do
+          Process.daemon
+          update_search_index_if_needed(changed_spec_paths)
+          exit
+        end
+      end
+
+      # Returns the search data stored in the file system.
+      # If existing data in the file system is not valid, returns nil.
+      #
+      def stored_search_index
+        @updated_search_index ||= begin
+          if search_index_path.exist?
+            require 'json'
+            index = JSON.parse(search_index_path.read)
+            index if index.is_a?(Hash) # TODO: should we also check if hash has correct hierarchy?
+          end
+        end
+      end
+
+      # Stores given search data in the file system.
+      # @param [Hash] index
+      #        Index to be saved in file system
+      #
+      def save_search_index(index)
+        require 'json'
+        @updated_search_index = index
+        search_index_path.open('w') do |io|
+          io.write(@updated_search_index.to_json)
+        end
+      end
+
+      # Allows to clear the search index.
+      #
+      attr_writer :updated_search_index
+
+      # @return [Pathname] The path where the search index should be stored.
+      #
+      attr_accessor :search_index_path
+
+      private
+
+      # @return [Source] The Source at a given path.
+      #
+      # @param [Pathname] path
+      #        The local file path to one podspec repo.
+      #
+      def source_from_path(path)
+        @sources_by_path ||= Hash.new do |hash, key|
+          hash[key] = if key.basename.to_s == 'master'
+                        MasterSource.new(key)
+                      else
+                        Source.new(key)
+                      end
+        end
+        @sources_by_path[path]
+      end
+
+      # @return [Source::Aggregate] The aggregate of the sources from repos.
+      #
+      # @param  [Array<Pathname>] repos
+      #         The local file paths to one or more podspec repo caches.
+      #
+      def aggregate_with_repos(repos)
+        sources = repos.map { |path| source_from_path(path) }
+        @aggregates_by_repos ||= {}
+        @aggregates_by_repos[repos] ||= Source::Aggregate.new(sources)
+      end
+
+      # @return [Source] The git source with the given name. If no git source
+      #         with given name is found it raises.
+      #
+      # @param  [String] name
+      #         The name of the source.
+      #
+      def git_source_named(name)
+        specified_source = sources([name]).first
+        unless specified_source
+          raise Informative, "Unable to find the `#{name}` repo."
+        end
+        unless specified_source.git?
+          raise Informative, "The `#{name}` repo is not a git repo."
+        end
+        specified_source
+      end
+
+      # @return [Source] The list of the git sources.
+      #
+      def git_sources
+        all.select(&:git?)
+      end
+
+      # @return [Pathname] The path of the source with the given name.
+      #
+      # @param  [String] name
+      #         The name of the source.
+      #
+      def source_dir(name)
+        repos_dir + name
+      end
+
+      # @return [Source] The source whose {Source#url} is equal to `url`.
+      #
+      # @param  [String] url
+      #         The URL of the source.
+      #
+      def source_with_url(url)
+        url = url.downcase.gsub(/.git$/, '')
+        url = 'https://github.com/cocoapods/specs' if url =~ %r{github.com[:/]+cocoapods/specs}
+        all.find do |source|
+          source.url && source.url.downcase.gsub(/.git$/, '') == url
+        end
+      end
+
+      # Returns a suitable repository name for `url`.
+      #
+      # @example A GitHub.com URL
+      #
+      #          name_for_url('https://github.com/Artsy/Specs.git')
+      #            # "artsy"
+      #          name_for_url('https://github.com/Artsy/Specs.git')
+      #            # "artsy-1"
+      #
+      # @example A non-Github.com URL
+      #
+      #          name_for_url('https://sourceforge.org/Artsy/Specs.git')
+      #            # sourceforge-artsy-specs
+      #
+      # @example A file URL
+      #
+      #           name_for_url('file:///Artsy/Specs.git')
+      #             # artsy-specs
+      #
+      # @param  [#to_s] url
+      #         The URL of the source.
+      #
+      # @return [String] A suitable repository name for `url`.
+      #
+      def name_for_url(url)
+        base_from_host_and_path = lambda do |host, path|
+          if host
+            base = host.split('.')[-2] || host
+            base += '-'
+          else
+            base = ''
+          end
+
+          base + path.gsub(/.git$/, '').gsub(%r{^/}, '').split('/').join('-')
+        end
+
+        case url.to_s.downcase
+        when %r{github.com[:/]+cocoapods/specs}
+          base = 'master'
+        when %r{github.com[:/]+(.+)/(.+)}
+          base = Regexp.last_match[1]
+        when %r{^\S+@(\S+)[:/]+(.+)$}
+          host, path = Regexp.last_match.captures
+          base = base_from_host_and_path[host, path]
+        when URI.regexp
+          url = URI(url.downcase)
+          base = base_from_host_and_path[url.host, url.path]
+        else
+          base = url.to_s.downcase
+        end
+
+        name = base
+        infinity = 1.0 / 0
+        (1..infinity).each do |i|
+          break unless source_dir(name).exist?
+          name = "#{base}-#{i}"
+        end
+        name
+      end
+    end
+  end
+end

data/lib/cocoapods-core/source/metadata.rb

@@ -0,0 +1,79 @@
+autoload :Digest, 'digest/md5'
+require 'active_support/hash_with_indifferent_access'
+require 'active_support/core_ext/hash/indifferent_access'
+
+module Pod
+  class Source
+    class Metadata
+      attr_reader :minimum_cocoapods_version
+      attr_reader :maximum_cocoapods_version
+      attr_reader :latest_cocoapods_version
+      attr_reader :prefix_lengths
+      attr_reader :last_compatible_versions
+
+      def initialize(hash = {})
+        hash = hash.with_indifferent_access
+        @minimum_cocoapods_version = hash['min']
+        @minimum_cocoapods_version &&= Pod::Version.new(@minimum_cocoapods_version)
+        @maximum_cocoapods_version = hash['max']
+        @maximum_cocoapods_version &&= Pod::Version.new(@maximum_cocoapods_version)
+        @latest_cocoapods_version = hash['last']
+        @latest_cocoapods_version &&= Pod::Version.new(@latest_cocoapods_version)
+        @prefix_lengths = Array(hash['prefix_lengths']).map!(&:to_i)
+        @last_compatible_versions = Array(hash['last_compatible_versions']).map(&Pod::Version.method(:new)).sort
+      end
+
+      def self.from_file(file)
+        hash = file.file? ? YAMLHelper.load_file(file) : {}
+        new(hash)
+      end
+
+      def to_hash
+        hash = ActiveSupport::HashWithIndifferentAccess.new
+        hash['min'] = @minimum_cocoapods_version.to_s if @minimum_cocoapods_version
+        hash['max'] = @maximum_cocoapods_version.to_s if @maximum_cocoapods_version
+        hash['last'] = @latest_cocoapods_version.to_s if @latest_cocoapods_version
+        hash['prefix_lengths'] = @prefix_lengths unless @prefix_lengths.empty?
+        hash['last_compatible_versions'] = @last_compatible_versions.map(&:to_s) unless @last_compatible_versions.empty?
+        hash
+      end
+
+      def path_fragment(pod_name, version = nil)
+        prefixes = if prefix_lengths.empty?
+                     []
+                   else
+                     hashed = Digest::MD5.hexdigest(pod_name)
+                     prefix_lengths.map do |length|
+                       hashed.slice!(0, length)
+                     end
+                   end
+        prefixes.concat([pod_name, version]).compact.join(File::SEPARATOR)
+      end
+
+      def last_compatible_version(target_version)
+        return unless minimum_cocoapods_version
+        return if minimum_cocoapods_version <= target_version
+        @last_compatible_versions.reverse_each.bsearch { |v| v <= target_version }.tap do |version|
+          raise Informative, 'Unable to find compatible version' unless version
+        end
+      end
+
+      # Returns whether a source is compatible with the current version of
+      # CocoaPods.
+      #
+      # @param  [Pathname] dir
+      #         The directory where the source is stored.
+      #
+      # @return [Bool] whether the source is compatible.
+      #
+      def compatible?(version)
+        bin_version  = Gem::Version.new(version)
+        supports_min = !minimum_cocoapods_version ||
+          (bin_version >= Gem::Version.new(minimum_cocoapods_version))
+        supports_max = !maximum_cocoapods_version ||
+          (bin_version <= Gem::Version.new(maximum_cocoapods_version))
+        supports_min && supports_max
+      end
+    end
+  end
+end

data/lib/cocoapods-core/source.rb

@@ -1,6 +1,8 @@
 require 'cocoapods-core/source/acceptor'
 require 'cocoapods-core/source/aggregate'
 require 'cocoapods-core/source/health_reporter'
+require 'cocoapods-core/source/manager'
+require 'cocoapods-core/source/metadata'
 
 module Pod
   # The Source class is responsible to manage a collection of podspecs.
@@ -14,14 +16,15 @@ module Pod
   #     "#{SPEC_NAME}/#{VERSION}/#{SPEC_NAME}.podspec"
   #
   class Source
-    # @return [Pathname] The path where the source is stored.
+    # @return [Pod::Source::Metadata] The metadata for this source.
     #
-    attr_reader :repo
+    attr_reader :metadata
 
     # @param  [Pathname, String] repo @see #repo.
     #
     def initialize(repo)
       @repo = Pathname(repo).expand_path
+      refresh_metadata
     end
 
     # @return [String] The name of the source.
@@ -74,9 +77,49 @@ module Pod
       "#<#{self.class} name:#{name} type:#{type}>"
     end
 
+    # @!group Paths
+    #-------------------------------------------------------------------------#
+
+    # @return [Pathname] The path where the source is stored.
+    #
+    attr_reader :repo
+
+    # @return [Pathname] The directory where the specs are stored.
+    #
+    # @note   In previous versions of CocoaPods they used to be stored in
+    #         the root of the repo. This lead to issues, especially with
+    #         the GitHub interface and now they are stored in a dedicated
+    #         folder.
+    #
+    def specs_dir
+      @specs_dir ||= begin
+        specs_sub_dir = repo + 'Specs'
+        if specs_sub_dir.exist?
+          specs_sub_dir
+        elsif repo.exist?
+          repo
+        end
+      end
+    end
+
+    # @param  [String] name The name of the pod.
+    #
+    # @return [Pathname] The path at which the specs for the given pod are
+    #         stored.
+    #
+    def pod_path(name)
+      specs_dir.join(*metadata.path_fragment(name))
+    end
+
+    # @return [Pathname] The path at which source metadata is stored.
+    #
+    def metadata_path
+      repo + 'CocoaPods-version.yml'
+    end
+
     public
 
-    # @!group Queering the source
+    # @!group Querying the source
     #-------------------------------------------------------------------------#
 
     # @return [Array<String>] the list of the name of all the Pods.
@@ -86,10 +129,10 @@ module Pod
       unless specs_dir
         raise Informative, "Unable to find a source named: `#{name}`"
       end
-      specs_dir_as_string = specs_dir.to_s
-      Dir.entries(specs_dir).select do |entry|
-        valid_name = entry[0, 1] != '.'
-        valid_name && File.directory?(File.join(specs_dir_as_string, entry))
+      glob = specs_dir.join('*/' * metadata.prefix_lengths.size, '*')
+      Pathname.glob(glob).reduce([]) do |pods, entry|
+        pods << entry.basename.to_s if entry.directory?
+        pods
       end.sort
     end
 
@@ -118,7 +161,7 @@ module Pod
     def versions(name)
       return nil unless specs_dir
       raise ArgumentError, 'No name' unless name
-      pod_dir = specs_dir + name
+      pod_dir = pod_path(name)
       return unless pod_dir.exist?
       pod_dir.children.map do |v|
         basename = v.basename.to_s
@@ -153,7 +196,7 @@ module Pod
     def specification_path(name, version)
       raise ArgumentError, 'No name' unless name
       raise ArgumentError, 'No version' unless version
-      path = specs_dir + name + version.to_s
+      path = pod_path(name) + version.to_s
       specification_path = path + "#{name}.podspec.json"
       unless specification_path.exist?
         specification_path = path + "#{name}.podspec"
@@ -169,15 +212,17 @@ module Pod
     #         source.
     #
     def all_specs
-      specs = pods.map do |name|
+      glob = specs_dir.join('*/' * metadata.prefix_lengths.size, '*', '*', '*.podspec{.json,}')
+      specs = Pathname.glob(glob).map do |path|
         begin
-          versions(name).map { |version| specification(name, version) }
+          Specification.from_file(path)
         rescue
-          CoreUI.warn "Skipping `#{name}` because the podspec contains errors."
+          CoreUI.warn "Skipping `#{path.relative_path_from(repo)}` because the " \
+                      'podspec contains errors.'
           next
         end
       end
-      specs.flatten.compact
+      specs.compact
     end
 
     # Returns the set for the Pod with the given name.
@@ -217,8 +262,10 @@ module Pod
       if query.is_a?(Dependency)
         query = query.root_name
       end
-      if specs_dir.children.select(&:directory?).map(&:basename).map(&:to_s).include?(query.to_s)
-        set(query)
+      found = Pathname.glob(pod_path(query)).map { |path| path.basename.to_s }
+      if [query] == found
+        set = set(query)
+        set if set.specification.name == query
       end
     end
 
@@ -290,11 +337,37 @@ module Pod
       Dir.chdir(repo) do
         prev_commit_hash = git_commit_hash
         update_git_repo(show_output)
+        refresh_metadata
+        if version = metadata.last_compatible_version(Version.new(CORE_VERSION))
+          tag = "v#{version}"
+          CoreUI.warn "Using the `#{tag}` tag of the `#{name}` source because " \
+            "it is the last version compatible with CocoaPods #{CORE_VERSION}."
+          git(['checkout', tag])
+        end
         changed_spec_paths = diff_until_commit_hash(prev_commit_hash)
       end
       changed_spec_paths
     end
 
+    def git?
+      Dir.chdir(repo) do
+        !git(%w(rev-parse HEAD)).empty?
+      end
+    end
+
+    def verify_compatibility!
+      return if metadata.compatible?(CORE_VERSION)
+
+      version_msg = if metadata.minimum_cocoapods_version == metadata.maximum_cocoapods_version
+                      metadata.minimum_cocoapods_version
+                    else
+                      "#{metadata.minimum_cocoapods_version} - #{metadata.maximum_cocoapods_version}"
+                    end
+      raise Informative, "The `#{name}` repo requires " \
+        "CocoaPods #{version_msg} (currently using #{CORE_VERSION})\n" \
+        'Update CocoaPods, or checkout the appropriate tag in the repo.'
+    end
+
     public
 
     # @!group Representations
@@ -326,8 +399,9 @@ module Pod
     #-------------------------------------------------------------------------#
 
     def ensure_in_repo!
-      return if Pathname.pwd == repo
-      raise 'Must be in the root of the repo'
+      return if Pathname.pwd.realpath == repo.realpath
+      raise StandardError, "Must be in the root of the repo (#{repo}), " \
+        "instead in #{Pathname.pwd}."
     end
 
     # Loads the specification for the given Pod gracefully.
@@ -349,22 +423,8 @@ module Pod
       nil
     end
 
-    # @return [Pathname] The directory where the specs are stored.
-    #
-    # @note   In previous versions of CocoaPods they used to be stored in
-    #         the root of the repo. This lead to issues, especially with
-    #         the GitHub interface and now they are stored in a dedicated
-    #         folder.
-    #
-    def specs_dir
-      @specs_dir ||= begin
-        specs_sub_dir = repo + 'Specs'
-        if specs_sub_dir.exist?
-          specs_sub_dir
-        elsif repo.exist?
-          repo
-        end
-      end
+    def refresh_metadata
+      @metadata = Metadata.from_file(metadata_path)
     end
 
     def git_commit_hash
@@ -374,10 +434,16 @@ module Pod
 
     def update_git_repo(show_output = false)
       ensure_in_repo!
+      git(['checkout', git_tracking_branch])
       output = git(%w(pull --ff-only), :include_error => true)
       CoreUI.puts output if show_output
     end
 
+    def git_tracking_branch
+      path = repo.join('.git', 'cocoapods_branch')
+      path.file? ? path.read.strip : 'master'
+    end
+
     def diff_until_commit_hash(commit_hash)
       ensure_in_repo!
       git(%W(diff --name-only #{commit_hash}..HEAD)).split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.6
+  version: 1.0.0.beta.7
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -98,6 +98,8 @@ files:
 - lib/cocoapods-core/source/acceptor.rb
 - lib/cocoapods-core/source/aggregate.rb
 - lib/cocoapods-core/source/health_reporter.rb
+- lib/cocoapods-core/source/manager.rb
+- lib/cocoapods-core/source/metadata.rb
 - lib/cocoapods-core/specification.rb
 - lib/cocoapods-core/specification/consumer.rb
 - lib/cocoapods-core/specification/dsl.rb
@@ -138,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods