cocoapods-core 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 947ec8b96eb3185b766c593bb593b2581c52b638
-  data.tar.gz: 4a98493b105f0b2992122ece671512f3d479097a
+  metadata.gz: b8cd1d3394fab84bd79670bad3389820b40a6110
+  data.tar.gz: 064af0e2916d74b5ea2db298397198e9a06c204a
 SHA512:
-  metadata.gz: 0eea0f9b451e7ece86fdcfb637a91b82517bb623d14a505c73f470b1826d9929672c15cd83c1fa7b027e85b797611beac28686f958b9ae2ffe0ab80f31895138
-  data.tar.gz: da57b1c31ee3fa64a5ea3948497307bb65812b9b50117a61cd0ebe4be3986d7ba19af02ca04d2296d34be31c2e5cd19849e4555548e79ce869755276d8bf2e17
+  metadata.gz: 8445099953c499685134515408e0c1640e46509181b9b3a743b47716bcbfa9004b9b7b6063e2dde0261d4c842a945a6649f953d678f5e9bda0b7cf86ceb974f3
+  data.tar.gz: b6e932b7c370d35f851683cd79ebafb3152eea3349dcc1f27bc46697da0cd88633854e15c3b06f151bd7d027bcfe63967b6bc14e3779b4db6fc00149346e4883

data/lib/cocoapods-core/dependency.rb

@@ -4,10 +4,16 @@ module Pod
   # {Specification} on a Pod. It stores the name of the dependency, version
   # requirements and external sources information.
   #
-  # This class leverages the RubyGems dependency class with minor extension to
-  # support CocoaPods specific features like subspecs.
+  # This class is based on the dependency class of RubyGems and mimics its
+  # implementation with adjustments specific to CocoaPods. RubyGems is
+  # available under the
+  # [MIT license](https://github.com/rubygems/rubygems/blob/master/MIT.txt).
   #
-  class Dependency < Pod::Vendor::Gem::Dependency
+  class Dependency
+
+    # @return [String] The name of the Pod described by this dependency.
+    #
+    attr_accessor :name
 
     # @return [Hash{Symbol=>String}] a hash describing the external source
     #         where the pod should be fetched. The external source has to
@@ -27,7 +33,7 @@ module Pod
     #   @param    [String] name
     #             the name of the Pod.
     #
-    #   @param    [Array] requirements
+    #   @param    [Array, Version, String, Requirement] requirements
     #             an array specifying the version requirements of the
     #             dependency.
     #
@@ -78,7 +84,11 @@ module Pod
         end
       end
 
-      super(name, *requirements)
+      if requirements.length == 1 && requirements.first.is_a?(Requirement)
+        requirements = requirements.first
+      end
+      @name = name
+      @requirement = Requirement.create(requirements)
     end
 
     # @return [Version] whether the dependency points to a specific version.
@@ -94,7 +104,7 @@ module Pod
     #
     def requirement
       return Requirement.new(Version.new(specific_version.version)) if specific_version
-      super
+      @requirement
     end
 
     # @return [Bool] whether the dependency points to a subspec.
@@ -117,6 +127,9 @@ module Pod
     #         what particular specification (subspecs or top level) is
     #         required.
     #
+    # @todo   This should not use `dup`. The `name` property should be an
+    #         attr_reader.
+    #
     # @return [Dependency] a dependency with the same versions requirements
     #         that is guaranteed to point to a top level specification.
     #
@@ -165,10 +178,28 @@ module Pod
     #         external source.
     #
     def ==(other)
-      super && head? == other.head? && @external_source == other.external_source
+      Dependency === other &&
+        name == other.name &&
+        requirement == other.requirement &&
+        head? == other.head? &&
+        external_source == other.external_source
     end
     alias :eql? :==
 
+    #  @return [Fixnum] The hash value based on the name and on the
+    #  requirements.
+    #
+    def hash
+      name.hash ^ requirement.hash
+    end
+
+    # @return [Fixnum] How the dependency should be sorted respect to another
+    #         one according to its name.
+    #
+    def <=> other
+      self.name <=> other.name
+    end
+
     # Merges the version requirements of the dependency with another one.
     #
     # @param  [Dependency] other
@@ -181,7 +212,21 @@ module Pod
     #         includes also the version requirements of the given one.
     #
     def merge(other)
-      dep = super
+      unless name == other.name then
+        raise ArgumentError, "#{self} and #{other} have different names"
+      end
+      default   = Requirement.default
+      self_req  = self.requirement
+      other_req = other.requirement
+
+      if other_req == default
+        dep = self.class.new(name, self_req)
+      elsif self_req == default
+        dep = self.class.new(name, other_req)
+      else
+        dep = self.class.new(name, self_req.as_list.concat(other_req.as_list))
+      end
+
       dep.head = head? || other.head?
       if external_source || other.external_source
         self_external_source  = external_source || {}
@@ -191,6 +236,23 @@ module Pod
       dep
     end
 
+    # Checks whether the dependency would be satisfied by the specification
+    # with the given name and version.
+    #
+    # @param  [String]
+    #         The proposed name.
+    #
+    # @param  [String, Version] version
+    #         The proposed version.
+    #
+    # @return [Bool] Whether the dependency is satisfied.
+    #
+    def match?(name, version)
+      return false unless self.name === name
+      return true if requirement.none?
+      requirement.satisfied_by?(Version.new(version))
+    end
+
     #-------------------------------------------------------------------------#
 
     # !@group String representation
@@ -220,8 +282,8 @@ module Pod
         version << external_source_description(external_source)
       elsif head?
         version << 'HEAD'
-      elsif @version_requirements != Requirement.default
-        version << @version_requirements.to_s
+      elsif requirement != Requirement.default
+        version << requirement.to_s
       end
       result = @name.dup
       result << " (#{version})" unless version.empty?

data/lib/cocoapods-core/gem_version.rb

@@ -2,5 +2,5 @@ module Pod
 
   # The version of the cocoapods-core.
   #
-  CORE_VERSION = '0.17.2' unless defined? Pod::CORE_VERSION
+  CORE_VERSION = '0.18.0' unless defined? Pod::CORE_VERSION
 end

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

@@ -88,6 +88,26 @@ module Pod
       #
       # Dependencies can be obtained also from external sources.
       #
+      #
+      # ### Using the files from a folder local to the machine.
+      #
+      #  If you wold like to use develop a Pod in tandem with its client
+      #  project you can use the `local` option.
+      #
+      #     pod 'AFNetworking', :local => '~/Documents/AFNetworking'
+      #
+      #  Using this option CocoaPods will assume the given folder to be the
+      #  root of the Pod and will link the files directly from there in the
+      #  Pods project. This means that your edits will persist to CocoaPods
+      #  installations.
+      #
+      #  The referenced folder can be a checkout of your your favorite SCM or
+      #  even a git submodule of the current repo.
+      #
+      #  Note that the `podspec` of the Pod file is expected to be in the
+      #  folder.
+      #
+      #
       # ### From a podspec in the root of a library repo.
       #
       # Sometimes you may want to use the bleeding edge version of a Pod. Or a
@@ -103,16 +123,9 @@ module Pod
       #
       #     pod 'AFNetworking', :git => 'https://github.com/gowalla/AFNetworking.git', :commit => '082f8319af'
       #
-      #
-      # Or specify a local folder in the machine:
-      #
-      #     pod 'AFNetworking', :local => '~/Documents/AFNetworking'
-      #
-      #
       # It is important to note, though, that this means that the version will
       # have to satisfy any other dependencies on the Pod by other Pods.
       #
-      #
       # The `podspec` file is expected to be in the root of the repo, if this
       # library does not have a `podspec` file in its repo yet, you will have
       # to use one of the approaches outlined in the sections below.
@@ -125,6 +138,7 @@ module Pod
       #
       #     pod 'JSONKit', :podspec => 'https://raw.github.com/gist/1346394/1d26570f68ca27377a27430c65841a0880395d72/JSONKit.podspec'
       #
+      #
       # @note       This method allow a nil name and the raises to be more
       #             informative.
       #
@@ -351,6 +365,11 @@ module Pod
       #
       # This attribute is inherited by child target definitions.
       #
+      # If you would like to inhibit warnings per Pod you can use the 
+      # following syntax:
+      #
+      #     pod 'SSZipArchive', :inhibit_warnings => true
+      #
       def inhibit_all_warnings!
         current_target_definition.inhibit_all_warnings = true
       end

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

@@ -267,15 +267,19 @@ module Pod
 
       #--------------------------------------#
 
-      # @return [Bool] whether the target definition should silence all the
-      #         warnings with a compiler flag.
+      # @return [Bool] whether the target definition should inhibit warnings
+      #         for a single pod. If inhibit_all_warnings is true, it will
+      #         return true for any asked pod.
       #
-      def inhibit_all_warnings?
-        get_hash_value('inhibit_all_warnings') || (parent.inhibit_all_warnings? unless root?)
+      def inhibits_warnings_for_pod?(pod_name)
+        return true if inhibit_warnings_hash['all'] || (parent.inhibits_warnings_for_pod?(name) unless root?)
+
+        inhibit_warnings_hash['for_pods'] ||= []
+        inhibit_warnings_hash['for_pods'].include? pod_name
       end
 
       # Sets whether the target definition should inhibit the warnings during
-      # compilation.
+      # compilation for all pods.
       #
       # @param  [Bool] flag
       #         Whether the warnings should be suppressed.
@@ -283,7 +287,19 @@ module Pod
       # @return [void]
       #
       def inhibit_all_warnings=(flag)
-        set_hash_value('inhibit_all_warnings', flag)
+        inhibit_warnings_hash['all'] = flag
+      end
+
+      # Inhibits warnings for a specific pod during compilation.
+      #
+      # @param  [String] pod name
+      #         Whether the warnings should be suppressed.
+      #
+      # @return [void]
+      #
+      def inhibit_warnings_for_pod(pod_name)
+        inhibit_warnings_hash['for_pods'] ||= []
+        inhibit_warnings_hash['for_pods'] << pod_name
       end
 
       #--------------------------------------#
@@ -354,11 +370,14 @@ module Pod
       # @return [void]
       #
       def store_pod(name, *requirements)
+        parse_inhibit_warnings(name, requirements)
+
         if requirements && !requirements.empty?
           pod = { name => requirements }
         else
           pod = name
         end
+
         get_hash_value('dependencies', []) << pod
       end
 
@@ -406,7 +425,7 @@ module Pod
         'exclusive',
         'link_with',
         'link_with_first_target',
-        'inhibit_all_warnings',
+        'inhibit_warnings',
         'user_project_path',
         'build_configurations',
         'dependencies',
@@ -491,6 +510,16 @@ module Pod
         internal_hash[key] ||= base_value
       end
 
+      # Returns the inhibit_warnings hash prepopulated with default values
+      #
+      # @return [Hash<String, Array>] Hash with :all key for inhibiting all warnings,
+      #         and :for_pods key for inhibiting warnings per pod
+      #
+      def inhibit_warnings_hash
+        get_hash_value('inhibit_warnings', {})
+      end
+
+
       # @return [Array<Dependency>] The dependencies specified by the user for
       #         this target definition.
       #
@@ -547,6 +576,27 @@ module Pod
         end
       end
 
+      # Removes :inhibit_warnings from the requirements list, and adds
+      # the pod's name into internal hash for disabling warnings.
+      #
+      # @param [String] pod name
+      #
+      # @param [Array] requirements
+      #        If :inhibit_warnings is the only key in the hash, the hash 
+      #        should be destroyed because it confuses Gem::Dependency.
+      #
+      # @return [void]
+      #
+      def parse_inhibit_warnings(name, requirements)
+        options = requirements.last
+        return requirements unless options.is_a?(Hash)
+
+        should_inhibit = options.delete(:inhibit_warnings)
+        inhibit_warnings_for_pod(name) if should_inhibit
+
+        requirements.pop if options.empty?
+      end
+
       #-----------------------------------------------------------------------#
 
     end

data/lib/cocoapods-core/requirement.rb

@@ -10,6 +10,66 @@ module Pod
   #       the Dependency class.
   #
   class Requirement < Pod::Vendor::Gem::Requirement
+
+    quoted_operators = OPS.keys.map { |k| Regexp.quote k }.join "|"
+
+    # @return [Regexp] The regular expression used to validate input strings.
+    #
+    PATTERN = /\A\s*(#{quoted_operators})?\s*(#{Version::VERSION_PATTERN})\s*\z/
+
+    #-------------------------------------------------------------------------#
+
+    # Factory method to create a new requirement.
+    #
+    # @param  [Requirement, Version, Array<Version>, String, Nil] input
+    #         The input used to create the requirement.
+    #
+    # @return [Requirement] A new requirement.
+    #
+    def self.create(input)
+      case input
+      when Requirement
+        input
+      when Version, Array
+        new(input)
+      else
+        if input.respond_to? :to_str
+          new([input.to_str])
+        else
+          default
+        end
+      end
+    end
+
+    # @return [Requirement] The default requirement.
+    #
+    def self.default
+      new('>= 0')
+    end
+
+    # Parses the given object returning an tuple where the first entry is an
+    # operator and the second a version. If not operator is provided it
+    # defaults to `=`.
+    #
+    # @param  [String, Version] input
+    #         The input passed to create the requirement.
+    #
+    # @return [Array] A tuple representing the requirement.
+    #
+    def self.parse(input)
+      return ["=", input] if input.is_a?(Version)
+
+      unless PATTERN =~ input.to_s
+        raise ArgumentError, "Illformed requirement `#{input.inspect}`"
+      end
+
+      operator = $1 || "="
+      version = Version.new($2)
+      [operator, version]
+    end
+
+    #-------------------------------------------------------------------------#
+
   end
 
 end

data/lib/cocoapods-core/source.rb

@@ -29,7 +29,7 @@ module Pod
     # @return [String] the name of the source.
     #
     def name
-      @repo.basename.to_s
+      repo.basename.to_s
     end
 
     alias_method :to_s, :name
@@ -53,7 +53,7 @@ module Pod
     # @return [Array<String>] the list of the name of all the Pods.
     #
     def pods
-      @repo.children.map do |child|
+      specs_dir.children.map do |child|
         child.basename.to_s if child.directory? && child.basename.to_s != '.git'
       end.compact
     end
@@ -71,7 +71,7 @@ module Pod
     #         the name of the Pod.
     #
     def versions(name)
-      pod_dir = repo + name
+      pod_dir = specs_dir + name
       return unless pod_dir.exist?
       pod_dir.children.map do |v|
         basename = v.basename.to_s
@@ -98,7 +98,7 @@ module Pod
     # @return [Pathname] The path of the specification.
     #
     def specification_path(name, version)
-      path = repo + name + version.to_s
+      path = specs_dir + name + version.to_s
       specification_path = path + "#{name}.podspec.yaml"
       unless specification_path.exist?
         specification_path = path + "#{name}.podspec"
@@ -194,6 +194,31 @@ module Pod
       to_hash.to_yaml
     end
 
+    private
+
+    #-------------------------------------------------------------------------#
+
+    # @group Private Helpers
+
+    # @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 the are stored in a dedicated
+    #         folder.
+    #
+    def specs_dir
+      unless @specs_dir
+        specs_sub_dir = repo + 'Specs'
+        if repo.children.include?(specs_sub_dir)
+          @specs_dir = repo + 'Specs'
+        else
+          @specs_dir = repo
+        end
+      end
+      @specs_dir
+    end
+
     #-------------------------------------------------------------------------#
 
   end

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

@@ -111,7 +111,7 @@ module Pod
       #
       def check_spec_path(name, version, spec)
         unless spec.name == name && spec.version.to_s == version.to_s
-          report.add_message(:error, "Incorrect path", name, spec.version)
+          report.add_message(:error, "Incorrect path #{ spec.defined_in_file }", name, spec.version)
         end
       end
 

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

@@ -21,9 +21,33 @@ module Pod
       #         without loss of information.
       #
       def safe_to_hash?
-        pre_install_callback.nil? && post_install_callback.nil?
+        !has_file_list(self) && pre_install_callback.nil? && post_install_callback.nil?
       end
 
+      # @return [Bool] If any of the specs uses the FileList class.
+      #
+      def has_file_list(spec)
+        result = false
+        all_specs = [ spec, *spec.recursive_subspecs ]
+        all_specs.each do |current_spec|
+          current_spec.available_platforms.each do |platform|
+            consumer = Specification::Consumer.new(current_spec, platform)
+            attributes = DSL.attributes.values.select(&:file_patterns?)
+            attributes.each do |attrb|
+              patterns = consumer.send(attrb.name)
+              if patterns.is_a?(Hash)
+                patterns = patterns.values.flatten(1)
+              end
+              patterns.each do |pattern|
+                if pattern.is_a?(Rake::FileList)
+                  result = true
+                end
+              end
+            end
+          end
+        end
+        result
+      end
     end
 
     # Configures a new specification from the given hash.
@@ -39,7 +63,7 @@ module Pod
       subspecs = attributes_hash.delete('subspecs')
       spec.attributes_hash = attributes_hash
       if subspecs
-        spec.subspecs = subspecs.map { |hash| Specification.from_hash(hash) }
+        spec.subspecs = subspecs.map { |s_hash| Specification.from_hash(s_hash) }
       end
       spec
     end

data/lib/cocoapods-core/vendor.rb

@@ -22,11 +22,10 @@ module Pod
 
       require 'cocoapods-core/vendor/version'
       require 'cocoapods-core/vendor/requirement'
-      require 'cocoapods-core/vendor/dependency'
 
       #-----------------------------------------------------------------------#
       # RubyGems License                                                      #
-      # https://github.com/rubygems/rubygems/blob/master/MIT.txt
+      # https://github.com/rubygems/rubygems/blob/master/MIT.txt              #
       #-----------------------------------------------------------------------#
 
       # Copyright (c) Chad Fowler, Rich Kilmer, Jim Weirich and others.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.18.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,7 +119,6 @@ files:
 - lib/cocoapods-core/specification/yaml.rb
 - lib/cocoapods-core/specification.rb
 - lib/cocoapods-core/standard_error.rb
-- lib/cocoapods-core/vendor/dependency.rb
 - lib/cocoapods-core/vendor/requirement.rb
 - lib/cocoapods-core/vendor/version.rb
 - lib/cocoapods-core/vendor.rb

data/lib/cocoapods-core/vendor/dependency.rb

@@ -1,264 +0,0 @@
-module Pod::Vendor
-
-  # require "rubygems/requirement"
-
-  ##
-  # The Dependency class holds a Gem name and a Gem::Requirement.
-
-  class Gem::Dependency
-
-    ##
-    # Valid dependency types.
-    #--
-    # When this list is updated, be sure to change
-    # Gem::Specification::CURRENT_SPECIFICATION_VERSION as well.
-
-    TYPES = [
-      :development,
-      :runtime,
-    ]
-
-    ##
-    # Dependency name or regular expression.
-
-    attr_accessor :name
-
-    ##
-    # Allows you to force this dependency to be a prerelease.
-
-    attr_writer :prerelease
-
-    ##
-    # Constructs a dependency with +name+ and +requirements+. The last
-    # argument can optionally be the dependency type, which defaults to
-    # <tt>:runtime</tt>.
-
-    def initialize name, *requirements
-      if Regexp === name then
-        msg = ["NOTE: Dependency.new w/ a regexp is deprecated.",
-               "Dependency.new called from #{Gem.location_of_caller.join(":")}"]
-        warn msg.join("\n") unless Gem::Deprecate.skip
-      end
-
-      type         = Symbol === requirements.last ? requirements.pop : :runtime
-      requirements = requirements.first if 1 == requirements.length # unpack
-
-      unless TYPES.include? type
-        raise ArgumentError, "Valid types are #{TYPES.inspect}, "
-        + "not #{type.inspect}"
-      end
-
-      @name        = name
-      @requirement = Gem::Requirement.create requirements
-      @type        = type
-      @prerelease  = false
-
-      # This is for Marshal backwards compatibility. See the comments in
-      # +requirement+ for the dirty details.
-
-      @version_requirements = @requirement
-    end
-
-    ##
-    # A dependency's hash is the XOR of the hashes of +name+, +type+,
-    # and +requirement+.
-
-    def hash # :nodoc:
-      name.hash ^ type.hash ^ requirement.hash
-    end
-
-    def inspect # :nodoc:
-      "<%s type=%p name=%p requirements=%p>" %
-      [self.class, self.type, self.name, requirement.to_s]
-    end
-
-    ##
-    # Does this dependency require a prerelease?
-
-    def prerelease?
-      @prerelease || requirement.prerelease?
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, 'Gem::Dependency.new(', ')' do
-      q.pp name
-      q.text ','
-      q.breakable
-
-      q.pp requirement
-
-      q.text ','
-      q.breakable
-
-      q.pp type
-    end
-    end
-
-    ##
-    # What does this dependency require?
-
-    def requirement
-      return @requirement if defined?(@requirement) and @requirement
-
-      # @version_requirements and @version_requirement are legacy ivar
-      # names, and supported here because older gems need to keep
-      # working and Dependency doesn't implement marshal_dump and
-      # marshal_load. In a happier world, this would be an
-      # attr_accessor. The horrifying instance_variable_get you see
-      # below is also the legacy of some old restructurings.
-      #
-      # Note also that because of backwards compatibility (loading new
-      # gems in an old RubyGems installation), we can't add explicit
-      # marshaling to this class until we want to make a big
-      # break. Maybe 2.0.
-      #
-      # Children, define explicit marshal and unmarshal behavior for
-      # public classes. Marshal formats are part of your public API.
-
-      if defined?(@version_requirement) && @version_requirement
-        version = @version_requirement.instance_variable_get :@version
-        @version_requirement  = nil
-        @version_requirements = Gem::Requirement.new version
-      end
-
-      @requirement = @version_requirements if defined?(@version_requirements)
-    end
-
-    def requirements_list
-      requirement.as_list
-    end
-
-    def to_s # :nodoc:
-      if type != :runtime then
-        "#{name} (#{requirement}, #{type})"
-      else
-        "#{name} (#{requirement})"
-      end
-    end
-
-    ##
-    # Dependency type.
-
-    def type
-      @type ||= :runtime
-    end
-
-    def == other # :nodoc:
-      Gem::Dependency === other &&
-      self.name        == other.name &&
-      self.type        == other.type &&
-      self.requirement == other.requirement
-    end
-
-    ##
-    # Dependencies are ordered by name.
-
-    def <=> other
-      self.name <=> other.name
-    end
-
-    ##
-    # Uses this dependency as a pattern to compare to +other+. This
-    # dependency will match if the name matches the other's name, and
-    # other has only an equal version requirement that satisfies this
-    # dependency.
-
-    def =~ other
-      unless Gem::Dependency === other
-        return unless other.respond_to?(:name) && other.respond_to?(:version)
-        other = Gem::Dependency.new other.name, other.version
-      end
-
-      return false unless name === other.name
-
-      reqs = other.requirement.requirements
-
-      return false unless reqs.length == 1
-      return false unless reqs.first.first == '='
-
-      version = reqs.first.last
-
-      requirement.satisfied_by? version
-    end
-
-    def match? name, version
-      return false unless self.name === name
-      return true if requirement.none?
-
-      requirement.satisfied_by? Gem::Version.new(version)
-    end
-
-    def matches_spec? spec
-      return false unless name === spec.name
-      return true  if requirement.none?
-
-      requirement.satisfied_by?(spec.version)
-    end
-
-    ##
-    # Merges the requirements of +other+ into this dependency
-
-    def merge other
-      unless name == other.name then
-        raise ArgumentError,
-          "#{self} and #{other} have different names"
-      end
-
-      default = Gem::Requirement.default
-      self_req  = self.requirement
-      other_req = other.requirement
-
-      return self.class.new name, self_req  if other_req == default
-      return self.class.new name, other_req if self_req  == default
-
-      self.class.new name, self_req.as_list.concat(other_req.as_list)
-    end
-
-    def matching_specs platform_only = false
-      matches = Gem::Specification.find_all { |spec|
-        self.name === spec.name and # TODO: == instead of ===
-          requirement.satisfied_by? spec.version
-      }
-
-      if platform_only
-        matches.reject! { |spec|
-          not Gem::Platform.match spec.platform
-        }
-      end
-
-      matches = matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed
-    end
-
-    ##
-    # True if the dependency will not always match the latest version.
-
-    def specific?
-      @requirement.specific?
-    end
-
-    def to_specs
-      matches = matching_specs true
-
-      # TODO: check Gem.activated_spec[self.name] in case matches falls outside
-
-      if matches.empty? then
-        specs = Gem::Specification.all_names.join ", "
-        error = Gem::LoadError.new "Could not find #{name} (#{requirement}) amongst [#{specs}]"
-        error.name        = self.name
-        error.requirement = self.requirement
-        raise error
-      end
-
-      # TODO: any other resolver validations should go here
-
-      matches
-    end
-
-    def to_spec
-      matches = self.to_specs
-
-      matches.find { |spec| spec.activated? } or matches.last
-    end
-  end
-
-end