cocoapods-core 0.39.0 → 1.0.0.beta.1

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

@@ -19,17 +19,11 @@ module Pod
       # @param  [TargetDefinition] parent
       #         @see parent
       #
-      # @option options [Bool] :exclusive
-      #         @see exclusive?
-      #
       def initialize(name, parent, internal_hash = nil)
         @internal_hash = internal_hash || {}
         @parent = parent
         @children = []
-
-        unless internal_hash
-          self.name = name
-        end
+        self.name ||= name
         if parent.is_a?(TargetDefinition)
           parent.children << self
         end
@@ -73,13 +67,25 @@ module Pod
       #         definition including the inherited ones.
       #
       def dependencies
-        if exclusive? || parent.nil?
+        if exclusive?
           non_inherited_dependencies
         else
           non_inherited_dependencies + parent.dependencies
         end
       end
 
+      # @return [Array<TargetDefinition>] the targets from which this target
+      #         definition should inherit only search paths.
+      #
+      def targets_to_inherit_search_paths
+        return [] unless inheritance == 'search_paths'
+        if root? || !matches_platform?(parent)
+          raise StandardError, "Non-sensical to have search_paths inheritance for #{name} when there is no parent."
+        else
+          parent.targets_to_inherit_search_paths << parent
+        end
+      end
+
       # @return [Array] The list of the dependencies of the target definition,
       #         excluding inherited ones.
       #
@@ -142,83 +148,81 @@ module Pod
 
       #--------------------------------------#
 
-      # Returns whether the target definition should inherit the dependencies
-      # of the parent.
+      # @return [Boolean] whether this target definition is abstract.
       #
-      # @note   A target is always `exclusive` if it is root.
-      #
-      # @note   A target is always `exclusive` if the `platform` does
-      #         not match the parent's `platform`.
-      #
-      # @return [Bool] whether is exclusive.
-      #
-      def exclusive?
-        if root?
-          true
-        elsif get_hash_value('exclusive')
-          true
-        else
-          platform && parent && parent.platform != platform
-        end
+      def abstract?
+        get_hash_value('abstract', false)
       end
 
-      # Sets whether the target definition is exclusive.
+      # Sets whether this target definition is abstract.
       #
-      # @param  [Bool] flag
-      #         Whether the definition is exclusive.
+      # @param  [Boolean] abstract
+      #         whether this target definition is abstract.
       #
       # @return [void]
       #
-      def exclusive=(flag)
-        set_hash_value('exclusive', flag)
+      def abstract=(abstract)
+        set_hash_value('abstract', abstract)
       end
 
       #--------------------------------------#
 
-      # @return [Array<String>] The list of the names of the Xcode targets with
-      #         which this target definition should be linked with.
+      # @return [String] the inheritance mode for this target definition.
       #
-      def link_with
-        value = get_hash_value('link_with')
-        value unless value.nil? || value.empty?
+      def inheritance
+        get_hash_value('inheritance', 'complete')
       end
 
-      # Sets the client targets that should be integrated by this definition.
+      # Sets the inheritance mode for this target definition.
+      #
+      # @param  [#to_s] inheritance
+      #         the inheritance mode for this target definition.
       #
-      # @param  [Array<String>] targets
-      #         The list of the targets names.
+      # @raise  [Informative] if this target definition is a root target
+      #         definition or if the `inheritance` value is unknown.
       #
       # @return [void]
       #
-      def link_with=(targets)
-        set_hash_value('link_with', Array(targets).map(&:to_s))
+      def inheritance=(inheritance)
+        inheritance = inheritance.to_s
+        unless %w(none search_paths complete).include?(inheritance)
+          raise Informative, "Unrecognized inheritance option `#{inheritance}` specified for target `#{name}`."
+        end
+        if root?
+          raise Informative, 'Cannot set inheritance for the root target definition.'
+        end
+        set_hash_value('inheritance', inheritance)
       end
 
       #--------------------------------------#
 
-      # Returns whether the target definition should link with the first target
-      # of the project.
+      # Returns whether the target definition should inherit the dependencies
+      # of the parent.
+      #
+      # @note   A target is always `exclusive` if it is root.
       #
-      # @note   This option is ignored if {link_with} is set.
+      # @note   A target is always `exclusive` if the `platform` does
+      #         not match the parent's `platform`.
       #
       # @return [Bool] whether is exclusive.
       #
-      def link_with_first_target?
-        get_hash_value('link_with_first_target') unless link_with
+      def exclusive?
+        if root?
+          true
+        else
+          !matches_platform?(parent) || (inheritance != 'complete')
+        end
       end
 
-      # Sets whether the target definition should link with the first target of
-      # the project.
-      #
-      # @note   This option is ignored if {link_with} is set.
+      # @param  [TargetDefinition, Nil] target_definition
+      #         the target definition to check for platform compatibility.
       #
-      # @param  [Bool] flag
-      #         Whether the definition should link with the first target.
-      #
-      # @return [void]
+      # @return [Boolean]
+      #         whether this target definition matches the platform of
+      #         `target_definition`.
       #
-      def link_with_first_target=(flag)
-        set_hash_value('link_with_first_target', flag)
+      def matches_platform?(target_definition)
+        target_definition && target_definition.platform == platform
       end
 
       #--------------------------------------#
@@ -229,7 +233,7 @@ module Pod
       def user_project_path
         path = get_hash_value('user_project_path')
         if path
-          File.extname(path) == '.xcodeproj' ? path : "#{path}.xcodeproj"
+          Pathname(path).sub_ext('.xcodeproj').to_path
         else
           parent.user_project_path unless root?
         end
@@ -368,7 +372,7 @@ module Pod
             end
           end
         end
-        !found
+        !found && (root? || (inheritance != 'none' && parent.pod_whitelisted_for_configuration?(pod_name, configuration_name)))
       end
 
       # Whitelists a pod for a specific configuration. If a pod is whitelisted
@@ -396,7 +400,8 @@ module Pod
       #         pods have been whitelisted.
       #
       def all_whitelisted_configurations
-        configuration_pod_whitelist.keys.uniq
+        parent_configurations = (root? || inheritance == 'none') ? [] : parent.all_whitelisted_configurations
+        (configuration_pod_whitelist.keys + parent_configurations).uniq
       end
 
       #--------------------------------------#
@@ -496,7 +501,7 @@ module Pod
       # @note   The storage of this information is optimized for YAML
       #         readability.
       #
-      # @todo   This needs urgently a rename.
+      # @todo   This urgently needs a rename.
       #
       # @return [void]
       #
@@ -535,6 +540,8 @@ module Pod
         children
         configuration_pod_whitelist
         uses_frameworks
+        inheritance
+        abstract
       ).freeze
 
       # @return [Hash] The hash representation of the target definition.
@@ -588,7 +595,7 @@ module Pod
       # @param  [Object] value
       #         The value to store.
       #
-      # @raise  If the key is not recognized.
+      # @raise  [StandardError] If the key is not recognized.
       #
       # @return [void]
       #
@@ -608,7 +615,7 @@ module Pod
       # @param  [Object] base_value
       #         The value to set if they key is nil. Useful for collections.
       #
-      # @raise  If the key is not recognized.
+      # @raise  [StandardError] If the key is not recognized.
       #
       # @return [Object] The value for the key.
       #
@@ -625,7 +632,12 @@ module Pod
       #         warnings, and :for_pods key for inhibiting warnings per Pod.
       #
       def inhibit_warnings_hash
-        get_hash_value('inhibit_warnings', {})
+        inhibit_hash = get_hash_value('inhibit_warnings', {})
+        if exclusive?
+          inhibit_hash
+        else
+          parent.send(:inhibit_warnings_hash).merge(inhibit_hash) { |l, r| (l + r).uniq }
+        end
       end
 
       # Returns the configuration_pod_whitelist hash
@@ -635,7 +647,12 @@ module Pod
       #         as value.
       #
       def configuration_pod_whitelist
-        get_hash_value('configuration_pod_whitelist', {})
+        whitelist_hash = get_hash_value('configuration_pod_whitelist', {})
+        if exclusive?
+          whitelist_hash
+        else
+          parent.send(:configuration_pod_whitelist).merge(whitelist_hash) { |l, r| (l + r).uniq }
+        end
       end
 
       # @return [Array<Dependency>] The dependencies specified by the user for
@@ -656,8 +673,8 @@ module Pod
 
       # @return [Array<Dependency>] The dependencies inherited by the podspecs.
       #
-      # @note   The podspec directive is intended include the dependencies of a
-      #         spec in the project where it is developed. For this reason the
+      # @note   The podspec directive is intended to include the dependencies of
+      #         a spec in the project where it is developed. For this reason the
       #         spec, or any of it subspecs, cannot be included in the
       #         dependencies. Otherwise it would generate a chicken-and-egg
       #         problem.
@@ -744,15 +761,13 @@ module Pod
 
         configurations = options.delete(:configurations)
         configurations ||= options.delete(:configuration)
-        if configurations
-          Array(configurations).each do |configuration|
-            whitelist_pod_for_configuration(name, configuration)
-          end
+        Array(configurations).each do |configuration|
+          whitelist_pod_for_configuration(name, configuration)
         end
         requirements.pop if options.empty?
       end
 
-      # Removes :subspecs form the requirements list, and stores the pods
+      # Removes :subspecs from the requirements list, and stores the pods
       # with the given subspecs as dependencies.
       #
       # @param  [String] name

data/lib/cocoapods-core/source.rb

@@ -93,6 +93,22 @@ module Pod
       end.sort
     end
 
+    # Returns pod names for given array of specification paths.
+    #
+    # @param  [Array<String>] spec_paths
+    #         Array of file path names for specifications. Path strings should be relative to the source path.
+    #
+    # @return [Array<String>] the list of the name of Pods corresponding to specification paths.
+    #
+    def pods_for_specification_paths(spec_paths)
+      spec_paths.map do |path|
+        absolute_path = repo + path
+        relative_path = absolute_path.relative_path_from(specs_dir)
+        # The first file name returned by 'each_filename' is the pod name
+        relative_path.each_filename.first
+      end
+    end
+
     # @return [Array<Version>] all the available versions for the Pod, sorted
     #         from highest to lowest.
     #
@@ -259,6 +275,26 @@ module Pod
       end
     end
 
+    # @!group Updating the source
+    #-------------------------------------------------------------------------#
+
+    # Updates the local clone of the source repo.
+    #
+    # @param  [Bool] show_output
+    #
+    # @return  [Array<String>] changed_spec_paths
+    #          Returns the list of changed spec paths.
+    #
+    def update(show_output)
+      changed_spec_paths = []
+      Dir.chdir(repo) do
+        prev_commit_hash = git_commit_hash
+        update_git_repo(show_output)
+        changed_spec_paths = diff_until_commit_hash(prev_commit_hash)
+      end
+      changed_spec_paths
+    end
+
     public
 
     # @!group Representations
@@ -312,7 +348,7 @@ module Pod
     #
     # @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 the are stored in a dedicated
+    #         the GitHub interface and now they are stored in a dedicated
     #         folder.
     #
     def specs_dir
@@ -326,6 +362,19 @@ module Pod
       end
     end
 
+    def git_commit_hash
+      (`git rev-parse HEAD` || '').strip
+    end
+
+    def update_git_repo(show_output = false)
+      output = `git pull --ff-only 2>&1`
+      CoreUI.puts output if show_output
+    end
+
+    def diff_until_commit_hash(commit_hash)
+      (`git diff --name-only #{commit_hash}..HEAD` || '').strip.split("\n")
+    end
+
     #-------------------------------------------------------------------------#
   end
 end

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

@@ -53,7 +53,7 @@ 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
@@ -68,7 +68,7 @@ module Pod
             end
           end
         end
-        Specification::Set.new(name, representative_source)
+        representative_source ? Specification::Set.new(name, representative_source) : nil
       end
 
       public
@@ -129,57 +129,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.highest_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
@@ -187,8 +165,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.to_sym)
+          end
+        end
+        result
+      end
+
+      # Returns the vocabulary extracted from the most representative
+      # specification of the set. Vocabulary contains words from following information:
       #
       #   - version
       #   - summary
@@ -198,26 +187,34 @@ 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
+        []
       end
 
       #-----------------------------------------------------------------------#