cocoapods-core 0.30.0 → 1.15.2

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

@@ -1,45 +1,37 @@
 module Pod
   class Source
-
     # The Aggregate manages a directory of sources repositories.
     #
     class Aggregate
-
-      # @return [Pathname] the directory were the repositories are stored.
+      # @return [Array<Source>] The ordered list of sources.
       #
-      attr_reader :repos_dir
-
-      # @param [Pathname] repos_dir @see repos_dir.
-      #
-      def initialize(repos_dir)
-        @repos_dir = repos_dir
-      end
+      attr_reader :sources
 
-      # @return [Array<Source>] all the sources.
+      # @param  [Array<Source>] repos_dirs @see Sources
       #
-      def all
-        @sources ||= dirs.map { |repo| Source.new(repo) }.sort_by(&:name)
+      def initialize(sources)
+        raise "Cannot initialize an aggregate with a nil source: (#{sources})" if sources.include?(nil)
+        @sources = sources
       end
 
       # @return [Array<String>] the names of all the pods available.
       #
       def all_pods
-        all.map(&:pods).flatten.uniq
+        sources.map(&:pods).flatten.uniq
       end
 
-      # @return [Array<Set>] the sets for all the pods available.
+      # @return [Array<Set>] The sets for all the pods available.
       #
       # @note   Implementation detail: The sources don't cache their values
       #         because they might change in response to an update. Therefore
-      #         this method to prevent slowness caches the values before
+      #         this method to preserve performance caches the values before
       #         processing them.
       #
       def all_sets
         pods_by_source = {}
-        all.each do |source|
+        sources.each do |source|
           pods_by_source[source] = source.pods
         end
-        sources = pods_by_source.keys
         pods = pods_by_source.values.flatten.uniq
 
         pods.map do |pod|
@@ -49,20 +41,6 @@ module Pod
         end
       end
 
-      # @return [Array<Pathname>] the directories where the sources are stored.
-      #
-      # @note   If the repos dir doesn't exits this will return an empty array.
-      #
-      # @raise  If the repos dir doesn't exits.
-      #
-      def dirs
-        if repos_dir.exist?
-          repos_dir.children.select(&:directory?)
-        else
-          []
-        end
-      end
-
       # Returns a set configured with the source which contains the highest
       # version in the aggregate.
       #
@@ -70,12 +48,12 @@ module Pod
       #         The name of the Pod.
       #
       # @return [Set] The most representative set for the Pod with the given
-      #         name.
+      #         name. Returns nil if no representative source found containing a pod with given name.
       #
       def representative_set(name)
         representative_source = nil
         highest_version = nil
-        all.each do |source|
+        sources.each do |source|
           source_versions = source.versions(name)
           if source_versions
             source_version = source_versions.first
@@ -85,7 +63,7 @@ module Pod
             end
           end
         end
-        Specification::Set.new(name, representative_source)
+        representative_source ? Specification::Set.new(name, representative_source) : nil
       end
 
       public
@@ -102,9 +80,9 @@ module Pod
       # @see    Source#search
       #
       def search(dependency)
-        sources = all.select { |s| !s.search(dependency).nil? }
-        unless sources.empty?
-          Specification::Set.new(dependency.root_name, sources)
+        found_sources = sources.select { |s| s.search(dependency) }
+        unless found_sources.empty?
+          Specification::Set.new(dependency.root_name, found_sources)
         end
       end
 
@@ -119,21 +97,23 @@ module Pod
       def search_by_name(query, full_text_search = false)
         pods_by_source = {}
         result = []
-        all.each do |s|
+        sources.each do |s|
           source_pods = s.search_by_name(query, full_text_search)
           pods_by_source[s] = source_pods.map(&:name)
         end
+
         root_spec_names = pods_by_source.values.flatten.uniq
         root_spec_names.each do |pod|
-          sources = []
-          pods_by_source.each do |source, pods|
-            sources << source if pods.include?(pod)
+          result_sources = sources.select do |source|
+            pods_by_source[source].include?(pod)
           end
-          result << Specification::Set.new(pod, sources)
+
+          result << Specification::Set.new(pod, result_sources)
         end
+
         if result.empty?
-          extra = ", author, summary, or description" if full_text_search
-          raise Informative, "Unable to find a pod with name" \
+          extra = ', author, summary, or description' if full_text_search
+          raise Informative, 'Unable to find a pod with name' \
             "#{extra} matching `#{query}'"
         end
         result
@@ -144,57 +124,35 @@ module Pod
       # @!group Search Index
       #-----------------------------------------------------------------------#
 
-      # Generates from scratch the search data for all the sources of the
-      # aggregate. This operation can take a considerable amount of time
+      # Generates from scratch the search data for given source.
+      # This operation can take a considerable amount of time
       # (seconds) as it needs to evaluate the most representative podspec
       # for each Pod.
       #
-      # @return [Hash{String=>Hash}] The search data of every set grouped by
-      #         name.
+      # @param  [Source] source
+      #         The source from which a search index will be generated.
       #
-      def generate_search_index
-        result = {}
-        all_sets.each do |set|
-          result[set.name] = search_data_from_set(set)
-        end
-        result
+      # @return [Hash{String=>Hash}] The search data for the source.
+      #
+      def generate_search_index_for_source(source)
+        generate_search_index_for_sets(source.pod_sets)
       end
 
-      # Updates inline the given search data with the information stored in all
-      # the sources. The update skips the Pods for which the version of the
-      # search data is the same of the highest version known to the aggregate.
-      # This can lead to updates in podspecs being skipped until a new version
-      # is released.
-      #
-      # @note   This procedure is considerably faster as it only needs to
-      #         load the most representative spec of the new or updated Pods.
-      #
-      # @return [Hash{String=>Hash}] The search data of every set grouped by
-      #         name.
-      #
-      def update_search_index(search_data)
-        enumerated_names = []
-        all_sets.each do |set|
-          enumerated_names << set.name
-          set_data = search_data[set.name]
-          has_data = set_data && set_data['version']
-          if has_data
-            stored_version = Version.new(set_data['version'])
-            if stored_version < set.required_version
-              search_data[set.name] = search_data_from_set(set)
-            end
-          else
-            search_data[set.name] = search_data_from_set(set)
-          end
-        end
-
-        stored_names = search_data.keys
-        delted_names = stored_names - enumerated_names
-        delted_names.each do |name|
-          search_data.delete(name)
+      # Generates from scratch the search data for changed specifications in given source.
+      #
+      # @param  [Source] source
+      #         The source from which a search index will be generated.
+      # @param  [Array<String>] spec_paths
+      #         Array of file path names for corresponding changed specifications.
+      #
+      # @return [Hash{String=>Hash}] The search data for changed specifications.
+      #
+      def generate_search_index_for_changes_in_source(source, spec_paths)
+        pods = source.pods_for_specification_paths(spec_paths)
+        sets = pods.map do |pod|
+          Specification::Set.new(pod, source)
         end
-
-        search_data
+        generate_search_index_for_sets(sets)
       end
 
       private
@@ -202,8 +160,19 @@ module Pod
       # @!group Private helpers
       #-----------------------------------------------------------------------#
 
-      # Returns the search related information from the most representative
-      # specification of the set following keys:
+      # Generates search data for given array of sets.
+      def generate_search_index_for_sets(sets)
+        result = {}
+        sets.each do |set|
+          word_list_from_set(set).each do |w|
+            (result[w] ||= []).push(set.name)
+          end
+        end
+        result
+      end
+
+      # Returns the vocabulary extracted from the most representative
+      # specification of the set. Vocabulary contains words from following information:
       #
       #   - version
       #   - summary
@@ -213,30 +182,37 @@ module Pod
       # @param  [Set] set
       #         The set for which the information is needed.
       #
-      # @note   If the specification can't load an empty hash is returned and
+      # @note   If the specification can't load an empty array is returned and
       #         a warning is printed.
       #
       # @note   For compatibility with non Ruby clients a strings are used
       #         instead of symbols for the keys.
       #
-      # @return [Hash{String=>String}] A hash with the search information.
+      # @return [Array<String>] An array of words contained by the set's search related information.
       #
-      def search_data_from_set(set)
-        result = {}
+      def word_list_from_set(set)
         spec = set.specification
-        result['version'] = spec.version.to_s
-        result['summary'] = spec.summary
-        result['description'] = spec.description
-        result['authors'] = spec.authors.keys.sort * ', '
-        result
+        word_list = [set.name.dup]
+        if spec.summary
+          word_list += spec.summary.split
+        end
+        if spec.description
+          word_list += spec.description.split
+        end
+        if spec.authors
+          spec.authors.each_pair do |k, v|
+            word_list += k.split if k
+            word_list += v.split if v
+          end
+        end
+        word_list.uniq
       rescue
         CoreUI.warn "Skipping `#{set.name}` because the podspec contains " \
-          "errors."
-        result
+          'errors.'
+        []
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end

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

@@ -1,10 +1,8 @@
 module Pod
   class Source
-
     # Checks a source for errors and warnings.
     #
     class HealthReporter
-
       # @return [Source] the source to check.
       #
       attr_reader :source
@@ -89,8 +87,8 @@ module Pod
         linter = Specification::Linter.new(spec_path)
         linter.lint
         linter.results.each do |result|
-          type = result.type == :error ? :error : :warning
-          report.add_message(type, result.message, name, version)
+          next if result.public_only?
+          report.add_message(result.type, result.message, name, version)
         end
         linter.spec
       end
@@ -111,7 +109,7 @@ module Pod
       #
       def check_spec_path(name, version, spec)
         unless spec.name == name && spec.version.to_s == version.to_s
-          message = "Incorrect path #{ spec.defined_in_file }"
+          message = "Incorrect path #{spec.defined_in_file}"
           report.add_message(:error, message, name, spec.version)
         end
       end
@@ -124,10 +122,10 @@ module Pod
       # @return [void]
       #
       def check_stray_specs
-        all_paths = Pathname.glob(source.data_provider.repo + '**/*.podspec{,.json}')
+        all_paths = Pathname.glob(source.repo + '**/*.podspec{,.json}')
         stray_specs = all_paths - report.analyzed_paths
         stray_specs.each do |path|
-          report.add_message(:error, "Stray spec", path)
+          report.add_message(:error, 'Stray spec', path)
         end
       end
 
@@ -136,7 +134,6 @@ module Pod
       # Encapsulates the information about the state of a repo.
       #
       class HealthReport
-
         # @return [Source] the source analyzed.
         #
         attr_reader :source
@@ -182,20 +179,14 @@ module Pod
         # @return [void]
         #
         def add_message(type, message, spec_name, spec_version = nil)
-          if type == :error
-            pods_by_error[message] ||= {}
-            pods_by_error[message][spec_name] ||= []
-            pods_by_error[message][spec_name] << spec_version
-          else
-            pods_by_warning[message] ||= {}
-            pods_by_warning[message][spec_name] ||= []
-            pods_by_warning[message][spec_name] << spec_version
-          end
+          pods = send(:"pods_by_#{type}")
+          pods[message] ||= {}
+          pods[message][spec_name] ||= []
+          pods[message][spec_name] << spec_version
         end
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end