cocoapods 0.39.0 → 1.0.0.beta.1

data/lib/cocoapods/resolver.rb

@@ -60,11 +60,7 @@ module Pod
         end
       end
       @activated = Molinillo::Resolver.new(self, self).resolve(dependencies, locked_dependencies)
-      specs_by_target.tap do |specs_by_target|
-        specs_by_target.values.flatten.each do |spec|
-          sandbox.store_head_pod(spec.name) if spec.version.head?
-        end
-      end
+      specs_by_target
     rescue Molinillo::ResolverError => e
       handle_resolver_error(e)
     end
@@ -185,7 +181,7 @@ module Pod
         end
       requirement_satisfied && !(
         spec.version.prerelease? &&
-        existing_vertices.flat_map(&:requirements).none? { |r| r.prerelease? || r.external_source || r.head? }
+        existing_vertices.flat_map(&:requirements).none? { |r| r.prerelease? || r.external_source }
       ) && spec_is_platform_compatible?(activated, requirement, spec)
     end
 
@@ -304,9 +300,6 @@ module Pod
         else
           set = create_set_from_sources(dependency)
         end
-        if set && dependency.head?
-          set = Specification::Set::Head.new(set.specification)
-        end
         cached_sets[name] = set
         unless set
           raise Molinillo::NoSuchDependencyError.new(dependency) # rubocop:disable Style/RaiseArgs
@@ -335,13 +328,17 @@ module Pod
     #         The dependency for which the set is needed.
     #
     def create_set_from_sources(dependency)
-      aggregate.search(dependency)
+      aggregate_for_dependency(dependency).search(dependency)
     end
 
     # @return [Source::Aggregate] The aggregate of the {#sources}.
     #
-    def aggregate
-      @aggregate ||= Source::Aggregate.new(sources.map(&:repo))
+    def aggregate_for_dependency(dependency)
+      if dependency && dependency.podspec_repo
+        return SourcesManager.aggregate_for_dependency(dependency)
+      else
+        @aggregate ||= Source::Aggregate.new(sources.map(&:repo))
+      end
     end
 
     # Ensures that a specification is compatible with the platform of a target.
@@ -386,8 +383,7 @@ module Pod
           elsif (conflict.possibility && conflict.possibility.version.prerelease?) &&
               (conflict.requirement && !(
               conflict.requirement.prerelease? ||
-              conflict.requirement.external_source ||
-              conflict.requirement.head?)
+              conflict.requirement.external_source)
               )
             # Conflict was caused by not specifying an explicit version for the requirement #[name],
             # and there is no available stable version satisfying constraints for the requirement.
@@ -400,7 +396,13 @@ module Pod
             message << "\nYou should explicitly specify the version in order to install a pre-release version"
           elsif !conflict.existing
             conflict.requirements.values.flatten.each do |r|
-              unless search_for(r).empty?
+              if search_for(r).empty?
+                # There is no existing specification inside any of the spec repos with given requirements.
+                message << "\n\nNone of the spec sources contain a spec satisfying the `#{r}` dependency." \
+                  "\nYou have either; mistyped the name or version," \
+                  ' not added the source repo that hosts the Podspec to your Podfile,' \
+                  ' or not got the latest versions of your source repos.'
+              else
                 message << "\n\nSpecs satisfying the `#{r}` dependency were found, " \
                   'but they required a higher minimum deployment target.'
               end

data/lib/cocoapods/resolver/lazy_specification.rb

@@ -14,6 +14,10 @@ module Pod
           specification.send(method, *args, &block)
         end
 
+        def respond_to_missing?(method, include_all = false)
+          specification.respond_to?(method, include_all)
+        end
+
         def subspec_by_name(name = nil, raise_if_missing = true)
           if !name || name == self.name
             self

data/lib/cocoapods/sandbox.rb

@@ -59,7 +59,6 @@ module Pod
       @root = Pathname.new(root).realpath
       @public_headers = HeadersStore.new(self, 'Public')
       @predownloaded_pods = []
-      @head_pods = []
       @checkout_sources = {}
       @development_pods = {}
       @pods_with_absolute_path = []
@@ -313,37 +312,6 @@ module Pod
 
     #--------------------------------------#
 
-    # Marks a Pod as head.
-    #
-    # @param  [String] name
-    #         The name of the Pod.
-    #
-    # @return [void]
-    #
-    def store_head_pod(name)
-      root_name = Specification.root_name(name)
-      head_pods << root_name
-    end
-
-    # @return [Array<String>] The names of the pods that have been
-    #         marked as head.
-    #
-    attr_reader :head_pods
-
-    # Checks if a Pod should attempt to use the head source of the git repo.
-    #
-    # @param  [String] name
-    #         The name of the Pod.
-    #
-    # @return [Bool] Whether the Pod has been marked as head.
-    #
-    def head_pod?(name)
-      root_name = Specification.root_name(name)
-      head_pods.include?(root_name)
-    end
-
-    #--------------------------------------#
-
     # Stores the local path of a Pod.
     #
     # @param  [String] name

data/lib/cocoapods/sandbox/headers_store.rb

@@ -35,7 +35,7 @@ module Pod
       #         root with the `${PODS_ROOT}` variable.
       #
       def search_paths(platform)
-        platform_search_paths = @search_paths.select { |entry| entry[:platform] == platform }
+        platform_search_paths = @search_paths.select { |entry| entry[:platform] == platform.name }
 
         headers_dir = root.relative_path_from(sandbox.root).dirname
         ["${PODS_ROOT}/#{headers_dir}/#{@relative_path}"] + platform_search_paths.uniq.map { |entry| "${PODS_ROOT}/#{headers_dir}/#{entry[:path]}" }
@@ -117,7 +117,7 @@ module Pod
       # @return [void]
       #
       def add_search_path(path, platform)
-        @search_paths << { :platform => platform, :path => (Pathname.new(@relative_path) + path) }
+        @search_paths << { :platform => platform.name, :path => (Pathname.new(@relative_path) + path) }
       end
 
       #-----------------------------------------------------------------------#

data/lib/cocoapods/sandbox/podspec_finder.rb

@@ -10,7 +10,7 @@ module Pod
       def podspecs
         return @specs_by_name if @specs_by_name
         @specs_by_name = {}
-        spec_files = Pathname.glob(root + '{,*,*/*}.podspec{,.json}')
+        spec_files = Pathname.glob(root + '{,*}.podspec{,.json}')
         spec_files.sort_by { |p| -p.to_path.split(File::SEPARATOR).size }.each do |file|
           begin
             spec = Specification.from_file(file)

data/lib/cocoapods/sources_manager.rb

@@ -11,7 +11,27 @@ module Pod
       def aggregate
         return Source::Aggregate.new([]) unless config.repos_dir.exist?
         dirs = config.repos_dir.children.select(&:directory?)
-        Source::Aggregate.new(dirs)
+        aggregate_with_repos(dirs)
+      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_dir(source.name)])
+        else
+          aggregate
+        end
       end
 
       # @return [Array<Source>] The list of the sources with the given names.
@@ -86,16 +106,16 @@ module Pod
         sources(['master'])
       end
 
-      # Search all the sources to match the set for the given dependency.
+      # 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 including the set can be found.
+      # @raise  If no source can be found that includes the dependency.
       #
       def search(dependency)
-        aggregate.search(dependency)
+        aggregate_for_dependency(dependency).search(dependency)
       end
 
       # Search all the sources with the given search term.
@@ -110,27 +130,27 @@ module Pod
       #
       # @raise  If no source including the set can be found.
       #
-      # @note   Full text search requires to load the specification for each
-      #         pod, hence is considerably slower.
-      #
       # @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
-          set_names = []
-          query_regexp = /#{query}/i
-          updated_search_index.each do |name, set_data|
-            texts = [name]
-            if full_text_search
-              texts << set_data['authors'].to_s if set_data['authors']
-              texts << set_data['summary']      if set_data['summary']
-              texts << set_data['description']  if set_data['description']
+          query_word_results_hash = {}
+          updated_search_index.each_value do |word_spec_hash|
+            word_spec_hash.each_pair do |word, spec_symbols|
+              query_word_regexps.each do |query_word_regexp|
+                set = (query_word_results_hash[query_word_regexp] ||= Set.new)
+                set.merge(spec_symbols) if word =~ query_word_regexp
+              end
             end
-            set_names << name unless texts.grep(query_regexp).empty?
           end
-          sets = set_names.sort.map do |name|
-            aggregate.representative_set(name)
+          found_set_symbols = query_word_results_hash.values.reduce(:&)
+          found_set_symbols ||= []
+          sets = found_set_symbols.map do |symbol|
+            aggregate.representative_set(symbol.to_s)
           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
@@ -139,44 +159,94 @@ module Pod
           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
 
-      # Creates or updates the search data and returns it. The search data
-      # groups by name the following information for each set:
+      # 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
       #
-      # @note   This operation is fairly expensive, because of the YAML
-      #         conversion.
-      #
-      # @return [Hash{String => String}] The up to date search data.
+      # @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]
+            UI.print "Creating search index for spec repo '#{source_name}'.."
+            index[source_name] = aggregate.generate_search_index_for_source(source)
+            UI.puts ' Done!'
+          end
+        end
+        save_search_index(index)
+        index
+      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
         unless @updated_search_index
           if search_index_path.exist?
-            require 'yaml'
-            stored_index = YAML.load(search_index_path.read)
-            if stored_index && stored_index.is_a?(Hash)
-              search_index = aggregate.update_search_index(stored_index)
-            else
-              search_index = aggregate.generate_search_index
+            require 'json'
+            index = JSON.parse(search_index_path.read)
+            if index && index.is_a?(Hash) # TODO: should we also check if hash has correct hierarchy?
+              return @updated_search_index = index
             end
-          else
-            search_index = aggregate.generate_search_index
-          end
-
-          File.open(search_index_path, 'w') do |file|
-            file.write(search_index.to_yaml)
           end
-          @updated_search_index = search_index
+          @updated_search_index = nil
         end
         @updated_search_index
       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
@@ -192,6 +262,48 @@ module Pod
       extend Executable
       executable :git
 
+      # 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.length > 0
+          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
+          # Removed 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]
+            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
+
       # Updates the local clone of the spec-repo with the given name or of all
       # the git repos if the name is omitted.
       #
@@ -208,22 +320,16 @@ module Pod
           sources =  git_sources
         end
 
+        changed_spec_paths = {}
         sources.each do |source|
           UI.section "Updating spec repo `#{source.name}`" do
-            Dir.chdir(source.repo) do
-              begin
-                output = git! %w(pull --ff-only)
-                UI.puts output if show_output && !config.verbose?
-              rescue Informative
-                UI.warn 'CocoaPods was not able to update the ' \
-                  "`#{source.name}` repo. If this is an unexpected issue " \
-                  'and persists you can inspect it running ' \
-                  '`pod repo update --verbose`'
-              end
-            end
+            changed_source_paths = source.update(show_output && !config.verbose?)
+            changed_spec_paths[source] = changed_source_paths if changed_source_paths.count > 0
             check_version_information(source.repo)
           end
         end
+        # Perform search index update operation in background.
+        update_search_index_if_needed_in_background(changed_spec_paths)
       end
 
       # Returns whether a source is a GIT repo.
@@ -275,7 +381,7 @@ module Pod
             ("Until we reach version 1.0 the features of CocoaPods can and will change.\n" \
              'We strongly recommend that you use the latest version at all times.'.yellow unless rc),
             '',
-            'For more information see http://blog.cocoapods.org'.green,
+            'For more information see https://blog.cocoapods.org'.green,
             'and the CHANGELOG for this version http://git.io/BaH8pQ.'.green,
             '',
           ].compact.join("\n")
@@ -337,7 +443,7 @@ module Pod
           YAMLHelper.load_file(yaml_file)
         rescue Informative
           raise Informative, "There was an error reading '#{yaml_file}'.\n" \
-            'Please consult http://blog.cocoapods.org/' \
+            'Please consult https://blog.cocoapods.org/' \
             'Repairing-Our-Broken-Specs-Repository/ ' \
             'for more information.'
         end
@@ -362,6 +468,16 @@ module Pod
 
       private
 
+      # @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)
+        @aggregates_by_repos ||= {}
+        @aggregates_by_repos[repos] ||= Source::Aggregate.new(repos)
+      end
+
       # @return [Bool] Whether the given path is writable by the current user.
       #
       # @param  [#to_s] path
@@ -482,4 +598,19 @@ module Pod
       end
     end
   end
+
+  class Source
+    extend Executable
+    executable :git
+
+    def update_git_repo(show_output = false)
+      output = git! %w(pull --ff-only)
+      UI.puts output if show_output
+    rescue
+      UI.warn 'CocoaPods was not able to update the ' \
+                "`#{name}` repo. If this is an unexpected issue " \
+                'and persists you can inspect it running ' \
+                '`pod repo update --verbose`'
+    end
+  end
 end