cocoapods-core 0.34.4 → 0.35.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc4bac123c0f0a768327fe21f563e19f88b5424c
-  data.tar.gz: 43eda593b694d6556704533eafb506bbbce2df4e
+  metadata.gz: acbdd73d6fbc58893650122dcf22d2f2c23218bc
+  data.tar.gz: da6b9b4be28ca16ea5a3fb2be80642e9493de0ab
 SHA512:
-  metadata.gz: c8820b07f7bf55acae493f522419a4e3292166bc8c8eb08adab3c86342f45b848c13c9f3f899e0fdea7ec1f6d7dcfb2ae58e360cf70f8154f2b631860e17e658
-  data.tar.gz: eebbfd13e1643fbb920a0ac85938054bdacdfa6962adc07e009f02eabbce2449dd1a4e236f887f51344d0ba1a4426d5ed5ca74df6f14664361f86e8b6a5ba1f4
+  metadata.gz: dca18284145229944534fd07db387e8afdc190eeff2fb61048bee9b4de1233f0d218270b28ea8fa418396f94f7247da5f12cb8fc6a64fe312005be4791473055
+  data.tar.gz: d1db51ab71bf788eb2dc08b1128cd98e6351d8a14aa796162ea046a3f53b4fc207673b4c4d9df8adf997f2db22e88b55b4ca5ca10e518f0639d292fdc49f1502

data/lib/cocoapods-core/dependency.rb

@@ -26,6 +26,12 @@ module Pod
     attr_accessor :head
     alias_method :head?, :head
 
+    # @return [Bool] whether the dependency came from an invocation of
+    #                {Specification#subspec_dependencies} or not.
+    #
+    attr_accessor :from_subspec_dependency
+    alias_method :from_subspec_dependency?, :from_subspec_dependency
+
     # @overload   initialize(name, requirements)
     #
     #   @param    [String] name
@@ -247,6 +253,15 @@ module Pod
       dep
     end
 
+    # Whether the dependency has any pre-release requirements
+    #
+    # @return [Bool] Whether the dependency has any pre-release requirements
+    #
+    def prerelease?
+      @prerelease ||= requirement.requirements.
+        any? { |r| Version.new(r[1].version).prerelease? }
+    end
+
     # Checks whether the dependency would be satisfied by the specification
     # with the given name and version.
     #

data/lib/cocoapods-core/gem_version.rb

@@ -1,5 +1,5 @@
 module Pod
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '0.34.4' unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '0.35.0.rc1' unless defined? Pod::CORE_VERSION
 end

data/lib/cocoapods-core/source.rb

@@ -32,9 +32,14 @@ module Pod
 
     # @return [String] The URL of the source.
     #
+    # @note In the past we had used `git ls-remote --get-url`, but this could
+    #       lead to an issue when finding a source based on its URL when `git`
+    #       is configured to rewrite URLs with the `url.<base>.insteadOf`
+    #       option. See https://github.com/CocoaPods/CocoaPods/issues/2724.
+    #
     def url
       Dir.chdir(repo) do
-        remote = `git ls-remote --get-url`.chomp
+        remote = `git config --get remote.origin.url`.chomp
 
         if $?.success?
           remote

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

@@ -165,7 +165,7 @@ module Pod
           has_data = set_data && set_data['version']
           if has_data
             stored_version = Version.new(set_data['version'])
-            if stored_version < set.required_version
+            if stored_version < set.highest_version
               search_data[set.name] = search_data_from_set(set)
             end
           else

data/lib/cocoapods-core/specification.rb

@@ -191,13 +191,17 @@ module Pod
     #           the relative name of the subspecs starting from the receiver
     #           including the name of the receiver.
     #
+    # @param    [Boolean] raise_if_missing
+    #           whether an exception should be raised if no specification named
+    #           `relative_name` is found.
+    #
     # @example  Retrieving a subspec
     #
     #           s.subspec_by_name('Pod/subspec').name #=> 'subspec'
     #
     # @return   [Specification] the subspec with the given name or self.
     #
-    def subspec_by_name(relative_name)
+    def subspec_by_name(relative_name, raise_if_missing = true)
       if relative_name.nil? || relative_name == base_name
         self
       else
@@ -205,8 +209,12 @@ module Pod
         subspec_name = remainder.split('/').shift
         subspec = subspecs.find { |s| s.base_name == subspec_name }
         unless subspec
-          raise Informative, 'Unable to find a specification named ' \
-            "`#{relative_name}` in `#{name} (#{version})`."
+          if raise_if_missing
+            raise Informative, 'Unable to find a specification named ' \
+              "`#{relative_name}` in `#{name} (#{version})`."
+          else
+            return nil
+          end
         end
         subspec.subspec_by_name(remainder)
       end
@@ -238,7 +246,9 @@ module Pod
       if platform
         specs = specs.select { |s| s.supported_on_platform?(platform) }
       end
-      specs.map { |s| Dependency.new(s.name) }
+      specs.map do |s|
+        Dependency.new(s.name, version).tap { |d| d.from_subspec_dependency = self }
+      end
     end
 
     # Returns the dependencies on other Pods or subspecs of other Pods.

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

@@ -232,10 +232,10 @@ module Pod
       # The keys accepted by the hash of the source attribute.
       #
       SOURCE_KEYS = {
-        :git => [:tag, :branch, :commit, :submodules],
-        :svn => [:folder, :tag, :revision],
-        :hg => [:revision],
-        :http => [:type, :sha256, :sha1],
+        :git  => [:tag, :branch, :commit, :submodules].freeze,
+        :svn  => [:folder, :tag, :revision].freeze,
+        :hg   => [:revision].freeze,
+        :http => [:flatten, :type, :sha256, :sha1].freeze,
         :path => nil,
       }.freeze
 
@@ -1134,7 +1134,7 @@ module Pod
       #     pod 'ShareKit', '2.0'
       #
       # Installs ShareKit with all the sharers like `ShareKit/Evernote`,
-      # `ShareKit/Facebook`, etc, as they are defined a subspecs.
+      # `ShareKit/Facebook`, etc, as they are defined as subspecs.
       #
       #     pod 'ShareKit/Twitter',  '2.0'
       #     pod 'ShareKit/Pinboard', '2.0'

data/lib/cocoapods-core/specification/linter.rb

@@ -9,8 +9,6 @@ module Pod
     # specification, but also to support the maintenance of sources.
     #
     class Linter
-      include ResultHelpers
-
       # @return [Specification] the specification to lint.
       #
       attr_reader :spec
@@ -20,6 +18,8 @@ module Pod
       #
       attr_reader :file
 
+      attr_reader :results
+
       # @param  [Specification, Pathname, String] spec_or_path
       #         the Specification or the path of the `podspec` file to lint.
       #
@@ -39,20 +39,19 @@ module Pod
       end
 
       # Lints the specification adding a {Result} for any failed check to the
-      # {#results} list.
+      # {#results} object.
       #
       # @return [Bool] whether the specification passed validation.
       #
       def lint
-        @results = []
+        @results = Results.new
         if spec
           check_required_root_attributes
           run_root_validation_hooks
           perform_all_specs_analysis
         else
-          error "[spec] The specification defined in `#{file}` could not be" \
-          ' loaded.' \
-            "\n\n#{@raise_message}"
+          results.add_error "[spec] The specification defined in `#{file}` "\
+            "could not be loaded.\n\n#{@raise_message}"
         end
         results.empty?
       end
@@ -92,9 +91,11 @@ module Pod
           next unless attr.required?
           unless value && (!value.respond_to?(:empty?) || !value.empty?)
             if attr.name == :license
-              warning("[attributes] Missing required attribute `#{attr.name}`.")
+              results.add_warning('[attributes] Missing required attribute' \
+              "`#{attr.name}`.")
             else
-              error("[attributes] Missing required attribute `#{attr.name}`.")
+              results.add_error('[attributes] Missing required attribute' \
+               "`#{attr.name}`.")
             end
           end
         end
@@ -118,11 +119,12 @@ module Pod
         all_specs.each do |current_spec|
           current_spec.available_platforms.each do |platform|
             @consumer = Specification::Consumer.new(current_spec, platform)
+            results.consumer = @consumer
             run_all_specs_validation_hooks
-            analyzer = Analyzer.new(@consumer)
-            analyzer.analyze
-            add_results(analyzer.results)
+            analyzer = Analyzer.new(@consumer, results)
+            results = analyzer.analyze
             @consumer = nil
+            results.consumer = nil
           end
         end
       end
@@ -174,25 +176,28 @@ module Pod
           ]
           names_match = acceptable_names.include?(file.basename.to_s)
           unless names_match
-            error '[name] The name of the spec should match the name of the \
-                    file.'
+            results.add_error '[name] The name of the spec should match the ' \
+                           'name of the file.'
           end
 
           if spec.root.name =~ /\s/
-            error '[name] The name of a spec should not contain whitespace.'
+            results.add_error '[name] The name of a spec should not contain ' \
+                           'whitespace.'
           end
 
           if spec.root.name[0, 1] == '.'
-            error '[name] The name of a spec should not begin with a period.'
+            results.add_error '[name] The name of a spec should not begin' \
+            ' with a period.'
           end
         end
       end
 
       def _validate_version(v)
         if v.to_s.empty?
-          error '[version] A version is required.'
+          results.add_error '[version] A version is required.'
         elsif v <= Version::ZERO
-          error '[version] The version of the spec should be higher than 0.'
+          results.add_error '[version] The version of the spec should be' \
+          ' higher than 0.'
         end
       end
 
@@ -200,11 +205,11 @@ module Pod
       #
       def _validate_summary(s)
         if s.length > 140
-          warning '[summary] The summary should be a short version of' \
-          '`description` (max 140 characters).'
+          results.add_warning '[summary] The summary should be a short ' \
+            'version of `description` (max 140 characters).'
         end
         if s =~ /A short description of/
-          warning '[summary] The summary is not meaningful.'
+          results.add_warning '[summary] The summary is not meaningful.'
         end
       end
 
@@ -212,13 +217,15 @@ module Pod
       #
       def _validate_description(d)
         if d =~ /An optional longer description of/
-          warning '[description] The description is not meaningful.'
+          results.add_warning '[description] The description is not meaningful.'
         end
         if d == spec.summary
-          warning '[description] The description is equal to the summary.'
+          results.add_warning '[description] The description is equal to' \
+           ' the summary.'
         end
         if d.length < spec.summary.length
-          warning '[description] The description is shorter than the summary.'
+          results.add_warning '[description] The description is shorter ' \
+          'than the summary.'
         end
       end
 
@@ -226,7 +233,8 @@ module Pod
       #
       def _validate_homepage(h)
         if h =~ %r{http://EXAMPLE}
-          warning '[homepage] The homepage has not been updated from default'
+          results.add_warning '[homepage] The homepage has not been updated' \
+           ' from default'
         end
       end
 
@@ -234,7 +242,8 @@ module Pod
       #
       def _validate_frameworks(frameworks)
         if frameworks_invalid?(frameworks)
-          error '[frameworks] A framework should only be specified by its name'
+          results.add_error '[frameworks] A framework should only be' \
+          ' specified by its name'
         end
       end
 
@@ -242,8 +251,8 @@ module Pod
       #
       def _validate_weak_frameworks(frameworks)
         if frameworks_invalid?(frameworks)
-          error '[weak_frameworks] A weak framework should only be specified' \
-          'by its name'
+          results.add_error '[weak_frameworks] A weak framework should only be' \
+          ' specified by its name'
         end
       end
 
@@ -253,17 +262,19 @@ module Pod
         libs.each do |lib|
           lib = lib.downcase
           if lib.end_with?('.a') || lib.end_with?('.dylib')
-            error '[libraries] Libraries should not include the extension ' \
+            results.add_error '[libraries] Libraries should not include the' \
+            ' extension ' \
             "(`#{lib}`)"
           end
 
           if lib.start_with?('lib')
-            error '[libraries] Libraries should omit the `lib` prefix' \
+            results.add_error '[libraries] Libraries should omit the `lib`' \
+            ' prefix ' \
             " (`#{lib}`)"
           end
 
           if lib.include?(',')
-            error '[libraries] Libraries should not include comas' \
+            results.add_error '[libraries] Libraries should not include comas ' \
             "(`#{lib}`)"
           end
         end
@@ -275,16 +286,16 @@ module Pod
         type = l[:type]
         file = l[:file]
         if type.nil?
-          warning '[license] Missing license type.'
+          results.add_warning '[license] Missing license type.'
         end
         if type && type.gsub(' ', '').gsub("\n", '').empty?
-          warning '[license] Invalid license type.'
+          results.add_warning '[license] Invalid license type.'
         end
         if type && type =~ /\(example\)/
-          error '[license] Sample license type.'
+          results.add_error '[license] Sample license type.'
         end
         if file && Pathname.new(file).extname !~ /^(\.(txt|md|markdown|))?$/i
-          error '[license] Invalid file type'
+          results.add_error '[license] Invalid file type'
         end
       end
 
@@ -296,16 +307,19 @@ module Pod
           version = spec.version.to_s
 
           if git =~ %r{http://EXAMPLE}
-            error '[source] The Git source still contains the example URL.'
+            results.add_error '[source] The Git source still contains the ' \
+            'example URL.'
           end
           if commit && commit.downcase =~ /head/
-            error '[source] The commit of a Git source cannot be `HEAD`.'
+            results.add_error '[source] The commit of a Git source cannot be' \
+            ' `HEAD`.'
           end
           if tag && !tag.to_s.include?(version)
-            warning '[source] The version should be included in the Git tag.'
+            results.add_warning '[source] The version should be included in' \
+             ' the Git tag.'
           end
           if tag.nil?
-            warning '[source] Git sources should specify a tag.'
+            results.add_warning '[source] Git sources should specify a tag.'
           end
         end
 
@@ -322,17 +336,17 @@ module Pod
           return unless git =~ /^#{URI.regexp}$/
           git_uri = URI.parse(git)
           if git_uri.host == 'www.github.com'
-            warning '[github_sources] Github repositories should not use' \
-            '`www` in URL.'
+            results.add_warning '[github_sources] Github repositories should ' \
+             'not use `www` in their URL.'
           end
           if git_uri.host == 'github.com' || git_uri.host == 'gist.github.com'
             unless git.end_with?('.git')
-              warning '[github_sources] Github repositories should end in' \
-              '`.git`.'
+              results.add_warning '[github_sources] Github repositories ' \
+              'should end in `.git`.'
             end
             unless git_uri.scheme == 'https'
-              warning '[github_sources] Github repositories should use' \
-              '`https` link.'
+              results.add_warning '[github_sources] Github repositories ' \
+                'should use an `https` link.'
             end
           end
         end
@@ -343,9 +357,9 @@ module Pod
       def check_git_ssh_source(s)
         if git = s[:git]
           if git =~ /\w+\@(\w|\.)+\:(\/\w+)*/
-            warning '[source] Git SSH URLs will NOT work for people behind' \
-              'firewalls configured to only allow HTTP, therefore HTTPS is' \
-              'preferred.'
+            results.add_warning '[source] Git SSH URLs will NOT work for ' \
+              'people behind firewalls configured to only allow HTTP, ' \
+              'therefore HTTPS is preferred.'
           end
         end
       end
@@ -354,8 +368,8 @@ module Pod
       #
       def _validate_social_media_url(s)
         if s =~ %r{https://twitter.com/EXAMPLE}
-          warning '[social_media_url] The social media URL has not been' \
-          'updated from default'
+          results.add_warning '[social_media_url] The social media URL has ' \
+            'not been updated from the default.'
         end
       end
 
@@ -369,7 +383,7 @@ module Pod
       #
       def _validate_compiler_flags(flags)
         if flags.join(' ').split(' ').any? { |flag| flag.start_with?('-Wno') }
-          warning '[compiler_flags] Warnings must not be disabled' \
+          results.add_warning '[compiler_flags] Warnings must not be disabled' \
           '(`-Wno compiler` flags).'
         end
       end

data/lib/cocoapods-core/specification/linter/analyzer.rb

@@ -4,23 +4,30 @@ module Pod
   class Specification
     class Linter
       class Analyzer
-        include Linter::ResultHelpers
-
-        def initialize(consumer)
+        def initialize(consumer, results)
           @consumer = consumer
-          @results = []
+          @results = results
+          @results.consumer = @consumer
         end
 
+        # Analyzes the consumer adding a {Result} for any failed check to
+        # the {#results} object.
+        #
+        # @return [Results] the results of the analysis.
+        #
         def analyze
           check_attributes
           validate_file_patterns
           check_if_spec_is_empty
+          results
         end
 
         private
 
         attr_reader :consumer
 
+        attr_reader :results
+
         # Checks the attributes hash for any unknown key which might be the
         # result of a misspelling in a JSON file.
         #
@@ -46,7 +53,7 @@ module Pod
           unknown_keys = keys - valid_keys
 
           unknown_keys.each do |key|
-            warning "Unrecognized `#{key}` key"
+            results.add_warning "Unrecognized `#{key}` key"
           end
 
           Pod::Specification::DSL.attributes.each do |_key, attribute|
@@ -74,8 +81,8 @@ module Pod
             end
             patterns.each do |pattern|
               if pattern.start_with?('/')
-                error '[File Patterns] File patterns must be relative ' \
-                "and cannot start with a slash (#{attrb.name})."
+                results.add_error '[File Patterns] File patterns must be ' \
+                  "relative and cannot start with a slash (#{attrb.name})."
               end
             end
           end
@@ -84,16 +91,15 @@ module Pod
         # Check empty subspec attributes
         #
         def check_if_spec_is_empty
-          methods = %w( source_files resources resource_bundles preserve_paths dependencies
-                        vendored_libraries vendored_frameworks )
+          methods = %w( source_files resources resource_bundles preserve_paths
+                        dependencies vendored_libraries vendored_frameworks )
           empty_patterns = methods.all? { |m| consumer.send(m).empty? }
           empty = empty_patterns && consumer.spec.subspecs.empty?
           if empty
-            error "[File Patterns] The #{consumer.spec} spec is empty"
-            '(no source files, ' \
-            'resources, resource_bundles, preserve paths,' \
-            'vendored_libraries, vendored_frameworks dependencies' \
-            'or subspecs).'
+            results.add_error "[File Patterns] The #{consumer.spec} spec is " \
+              'empty (no source files, resources, resource_bundles, ' \
+              'preserve paths, vendored_libraries, vendored_frameworks, ' \
+              'dependencies, nor subspecs).'
           end
         end
 
@@ -119,29 +125,29 @@ module Pod
         def validate_attribute_array_keys(attribute, value)
           unknown_keys = value.keys.map(&:to_s) - attribute.keys.map(&:to_s)
           unknown_keys.each do |unknown_key|
-            warning "Unrecognized `#{unknown_key}` key for " \
-              "`#{attribute.name}` attribute"
+            results.add_warning "Unrecognized `#{unknown_key}` key for " \
+              "`#{attribute.name}` attribute."
           end
         end
 
         def validate_attribute_hash_keys(attribute, value)
           major_keys = value.keys & attribute.keys.keys
           if major_keys.count.zero?
-            warning "Missing primary key for `#{attribute.name}` " \
+            results.add_warning "Missing primary key for `#{attribute.name}` " \
               'attribute. The acceptable ones are: ' \
-              "`#{attribute.keys.keys.map(&:to_s).sort.join(', ')}`"
+              "`#{attribute.keys.keys.map(&:to_s).sort.join(', ')}`."
           elsif major_keys.count == 1
             acceptable = attribute.keys[major_keys.first] || []
             unknown = value.keys - major_keys - acceptable
             unless unknown.empty?
-              warning "Incompatible `#{unknown.sort.join(', ')}` key(s) " \
-                "with `#{major_keys.first}` primary key for " \
-                "`#{attribute.name}` attribute"
+              results.add_warning "Incompatible `#{unknown.sort.join(', ')}` " \
+                "key(s) with `#{major_keys.first}` primary key for " \
+                "`#{attribute.name}` attribute."
             end
           else
             sorted_keys = major_keys.map(&:to_s).sort
-            warning "Incompatible `#{sorted_keys.join(', ')}` keys for " \
-              "`#{attribute.name}` attribute"
+            results.add_warning "Incompatible `#{sorted_keys.join(', ')}` " \
+              "keys for `#{attribute.name}` attribute."
           end
         end
       end

data/lib/cocoapods-core/specification/linter/result.rb

@@ -1,51 +1,64 @@
 module Pod
   class Specification
     class Linter
-      class Result
-        # @return [Symbol] the type of result.
-        #
-        attr_reader :type
+      class Results
+        public
 
-        # @return [String] the message associated with result.
-        #
-        attr_reader :message
+        class Result
+          # @return [Symbol] the type of result.
+          #
+          attr_reader :type
 
-        # @param [Symbol] type    @see type
-        # @param [String] message @see message
-        #
-        def initialize(type, message)
-          @type    = type
-          @message = message
-          @platforms = []
-        end
+          # @return [String] the message associated with result.
+          #
+          attr_reader :message
 
-        # @return [Array<Platform>] the platforms where this result was
-        #         generated.
-        #
-        attr_reader :platforms
+          # @param [Symbol] type    @see type
+          # @param [String] message @see message
+          #
+          def initialize(type, message)
+            @type    = type
+            @message = message
+            @platforms = []
+          end
 
-        # @return [String] a string representation suitable for UI output.
-        #
-        def to_s
-          r = "[#{type.to_s.upcase}] #{message}"
-          if platforms != Specification::PLATFORMS
-            platforms_names = platforms.uniq.map do |p|
-              Platform.string_name(p)
+          # @return [Array<Platform>] the platforms where this result was
+          #         generated.
+          #
+          attr_reader :platforms
+
+          # @return [String] a string representation suitable for UI output.
+          #
+          def to_s
+            r = "[#{type.to_s.upcase}] #{message}"
+            if platforms != Specification::PLATFORMS
+              platforms_names = platforms.uniq.map do |p|
+                Platform.string_name(p)
+              end
+              r << " [#{platforms_names * ' - '}]" unless platforms.empty?
             end
-            r << " [#{platforms_names * ' - '}]" unless platforms.empty?
+            r
           end
-          r
         end
-      end
 
-      module ResultHelpers
-        public
+        def initialize
+          @results = []
+          @consumer = nil
+        end
 
-        # @return [Array<Result>] all of the generated results.
-        #
-        attr_reader :results
+        include Enumerable
 
-        private
+        def each
+          results.each { |r| yield r }
+        end
+
+        def empty?
+          results.empty?
+        end
+
+        # @return [Specification::Consumer] the current consumer.
+        #
+        attr_accessor :consumer
 
         # Adds an error result with the given message.
         #
@@ -54,7 +67,7 @@ module Pod
         #
         # @return [void]
         #
-        def error(message)
+        def add_error(message)
           add_result(:error, message)
         end
 
@@ -65,26 +78,15 @@ module Pod
         #
         # @return [void]
         #
-        def warning(message)
+        def add_warning(message)
           add_result(:warning, message)
         end
 
-        # Merges results passed in with the current results
-        #
-        # @param  [Array<Result>] results
-        #         The results to be merged.
-        #
-        # @return [void]
+        private
+
+        # @return [Array<Result>] all of the generated results.
         #
-        def add_results(results)
-          results.each do |result|
-            if result.type == :warning
-              warning(result.message)
-            else
-              error(result.message)
-            end
-          end
-        end
+        attr_reader :results
 
         # Adds a result of the given type with the given message. If there is a
         # current platform it is added to the result. If a result with the same
@@ -105,7 +107,7 @@ module Pod
             result = Result.new(type, message)
             results << result
           end
-          result.platforms << consumer.platform_name if consumer
+          result.platforms << @consumer.platform_name if @consumer
         end
       end
     end

data/lib/cocoapods-core/specification/set.rb

@@ -33,50 +33,6 @@ module Pod
       def initialize(name, sources = [])
         @name    = name
         @sources = Array(sources)
-        @dependencies_by_requirer_name = {}
-        @dependencies = []
-      end
-
-      # Stores a dependency on the Pod.
-      #
-      # @param  [Dependency] dependency
-      #         a dependency that requires the Pod.
-      #
-      # @param  [String] dependent_name
-      #         the name of the owner of the dependency.  It is used only to
-      #         display the Pod::Informative.
-      #
-      # @raise  If the versions requirement of the dependency are not
-      #         compatible with the previously stored dependencies.
-      #
-      # @todo   This should simply return a boolean. Is CocoaPods that should
-      #         raise.
-      #
-      # @return [void]
-      #
-      def required_by(dependency, dependent_name)
-        dependencies_by_requirer_name[dependent_name] ||= []
-        dependencies_by_requirer_name[dependent_name] << dependency
-        dependencies << dependency
-
-        if acceptable_versions.empty?
-          message = "Unable to satisfy the following requirements:\n\n"
-          dependencies_by_requirer_name.each do |name, dependencies|
-            dependencies.each do |dep|
-              message << "- `#{dep}` required by `#{name}`\n"
-            end
-          end
-          raise Informative, message
-        end
-      end
-
-      # @return [Dependency] A dependency that includes all the versions
-      #         requirements of the stored dependencies.
-      #
-      def dependency
-        dependencies.reduce(Dependency.new(name)) do |previous, dependency|
-          previous.merge(dependency.to_root_dependency)
-        end
       end
 
       # @return [Specification] the top level specification of the Pod for the
@@ -87,37 +43,15 @@ module Pod
       #         is used to disambiguate.
       #
       def specification
-        path = specification_paths_for_version(required_version).first
-        Specification.from_file(path)
+        Specification.from_file(highest_version_spec_path)
       end
 
       # @return [Array<String>] the paths to specifications for the given
       #         version
       #
-      def specification_paths_for_version(_version)
-        sources = @sources.select { |source| versions_by_source[source].include?(required_version) }
-        sources.map { |source| source.specification_path(name, required_version) }
-      end
-
-      # @return [Version] the highest version that satisfies the stored
-      #         dependencies.
-      #
-      # @todo   This should simply return nil. CocoaPods should raise instead.
-      #
-      def required_version
-        version = versions.find { |v| dependency.match?(name, v) }
-        unless version
-          raise Informative, "Required version (#{dependency}) not found " \
-            "for `#{name}`.\nAvailable versions: #{versions.join(', ')}"
-        end
-        version
-      end
-
-      # @return [Array<Version>] All the versions which are acceptable given
-      #         the requirements.
-      #
-      def acceptable_versions
-        versions.select { |v| dependency.match?(name, v) }
+      def specification_paths_for_version(version)
+        sources = @sources.select { |source| versions_by_source[source].include?(version) }
+        sources.map { |source| source.specification_path(name, version) }
       end
 
       # @return [Array<Version>] all the available versions for the Pod, sorted
@@ -161,8 +95,7 @@ module Pod
       end
 
       def to_s
-        "#<#{self.class.name} for `#{name}' with required version " \
-          "`#{required_version}' available at `#{sources.map(&:name) * ', '}'>"
+        "#<#{self.class.name} for `#{name}' available at `#{sources.map(&:name).join(', ')}'>"
       end
       alias_method :inspect, :to_s
 
@@ -192,11 +125,6 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
-      attr_accessor :dependencies_by_requirer_name
-      attr_accessor :dependencies
-
-      #-----------------------------------------------------------------------#
-
       # The Set::External class handles Pods from external sources. Pods from
       # external sources don't use the {Source} and are initialized by a given
       # specification.
@@ -215,10 +143,6 @@ module Pod
           self.class == other.class && specification == other.specification
         end
 
-        def specification_path
-          raise StandardError, 'specification_path'
-        end
-
         def versions
           [specification.version]
         end

data/lib/cocoapods-core/specification/set/presenter.rb

@@ -90,17 +90,9 @@ module Pod
         #
         #           "Author 1, Author 2 and Author 3"
         #
-        # @note     In ruby 1.8.7 the authors are sorted by name because the
-        #           hash doesn't preserve the order in which they are defined
-        #           in the podspec.
-        #
         def authors
           return '' unless spec.authors
-          if RUBY_VERSION == '1.8.7'
-            spec.authors.keys.sort.to_sentence
-          else
-            spec.authors.keys.to_sentence
-          end
+          spec.authors.keys.to_sentence
         end
 
         # @return [String] the homepage of the pod.

data/lib/cocoapods-core/yaml_helper.rb

@@ -14,6 +14,8 @@ module Pod
   #       The missing features include:
   #       - Strings are never quoted even when ambiguous.
   #
+  # @todo Remove any code required solely for Ruby 1.8.x.
+  #
   class YAMLHelper
     class << self
       # Returns the YAML representation of the given object. If the given object

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.34.4
+  version: 0.35.0.rc1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-18 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,20 +39,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.0
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -156,4 +142,3 @@ signing_key:
 specification_version: 3
 summary: The models of CocoaPods
 test_files: []
-has_rdoc: