cocoapods-core 0.17.0.rc5 → 0.17.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2241963abba89032cf7485e29dfd41b905792192
-  data.tar.gz: 9ec5663e5ac556ca201c6001bd0bd03686ce532a
+  metadata.gz: 3f16df566bf9d03c8f0e5026dbc78ed3d2b2224b
+  data.tar.gz: 67af4c059d2f9ffc0cccf953e86b534027a18a43
 SHA512:
-  metadata.gz: c6f8a59406a6a8754e0fbf93b8e0312cf2e75294e77a48ee2fcabf4d08691230de7334c3f3aa115c5b229d2019976cdcfb151e1f1ae507c3c268fa9e71eda028
-  data.tar.gz: 0b65940403213d8ea521805ac73c1a74ae10f4848599c0a43ff26f73010c63f7f8aecd25154a58d890831b30d306e704454407b078a6d3284bbefef3f483a6c5
+  metadata.gz: e0ac43dc421675a3dc4f717251d150a3c981147acda279caa52f7e5f5bf3d13c0a4c19a81903f814fa221f364a3354b65583df777abc8369ffbdd19fadb70515
+  data.tar.gz: adb5be37a6b3d9fea4f8b9b5be0c42af1432c9c3cc9f89e1a8792033616088a19a3b8f0e9c12b1cfcb27131229995658c587a6f9b266ce367775ac09fe52a2ba

data/README.md

@@ -1,10 +1,11 @@
 # CocoaPods Core
 
-[![Master Build Status](https://secure.travis-ci.org/CocoaPods/Core.png?branch=master)](https://secure.travis-ci.org/CocoaPods/Core)
+[![Build Status](https://travis-ci.org/CocoaPods/Core.png?branch=master)](https://travis-ci.org/CocoaPods/Core)
+[![Coverage Status](https://coveralls.io/repos/CocoaPods/Core/badge.png?branch=master)](https://coveralls.io/r/CocoaPods/Core)
 
-__This gem has not been released yet__.
-
-The CocoaPods-Core gem provides support to work with the models of CocoaPods. It is intended to be used in place of the CocoaPods when the the installation of the dependencies is not needed. Therefore, it is suitable for web services.
+The CocoaPods-Core gem provides support to work with the models of CocoaPods.
+It is intended to be used in place of the CocoaPods when the installation
+of the dependencies is not needed. Therefore, it is suitable for web services.
 
 Provides support for working with the following models:
 
@@ -12,7 +13,10 @@ Provides support for working with the following models:
 - `Pod::Podfile` - [podfile specifications](http://cocoapods.github.com/podfile.html).
 - `Pod::Source` - collections of podspec files like the [CocoaPods Spec repo](https://github.com/CocoaPods/Specs).
 
-The gem also provides support for ancillary features like `Pod::Specification::Set::Presenter` suitable for presetting descriptions of Pods and the `Specification::Linter`, which ensures the validity of podspec files.
+The gem also provides support for ancillary features like
+`Pod::Specification::Set::Presenter` suitable for presetting descriptions of
+Pods and the `Specification::Linter`, which ensures the validity of podspec
+files.
 
 ## Installation
 
@@ -27,10 +31,14 @@ The `cocoapods-core` gem requires either:
 
 ## Collaborate
 
-All CocoaPods development happens on GitHub, there is a repository for [CocoaPods](https://github.com/CocoaPods/CocoaPods) and one for the [CocoaPods specs](https://github.com/CocoaPods/Specs). Contributing patches or Pods is really easy and gratifying. You even get push access when one of your specs or patches is accepted.
+All CocoaPods development happens on GitHub, there is a repository for
+[CocoaPods](https://github.com/CocoaPods/CocoaPods) and one for the [CocoaPods
+specs](https://github.com/CocoaPods/Specs). Contributing patches or Pods is
+really easy and gratifying.
 
-Follow [@CocoaPodsOrg](http://twitter.com/CocoaPodsOrg) to get up to date information about what's going on in the CocoaPods world.
+Follow [@CocoaPodsOrg](http://twitter.com/CocoaPodsOrg) to get up to date
+information about what's going on in the CocoaPods world.
 
 ## License
 
-This gem and CocoaPods are available under the MIT license.
+This gem and CocoaPods are available under the MIT license.

data/lib/cocoapods-core.rb

@@ -1,6 +1,7 @@
 # The Pod modules name-spaces all the classes of CocoaPods.
 #
 module Pod
+
   require 'cocoapods-core/gem_version'
 
   # Indicates a runtime error **not** caused by a bug.

data/lib/cocoapods-core/core_ui.rb

@@ -4,16 +4,16 @@ module Pod
   #
   module CoreUI
 
-    class << self
-      def puts(message)
-        STDOUT.puts message
-      end
-
-      def warn(message)
-        STDERR.puts message
-      end
+    def self.puts(message)
+      STDOUT.puts message
+    end
 
+    def self.warn(message)
+      STDERR.puts message
     end
+
+    #-------------------------------------------------------------------------#
+
   end
 end
 

data/lib/cocoapods-core/dependency.rb

@@ -84,8 +84,12 @@ module Pod
     # @return [Requirement] the requirement of this dependency (a set of
     #         one or more version restrictions).
     #
+    # @todo   The specific version is stripped from head information because
+    #         because its string representation would not parse. It would
+    #         be better to add something like Version#display_string.
+    #
     def requirement
-      return Requirement.new(specific_version) if specific_version
+      return Requirement.new(Version.new(specific_version.version)) if specific_version
       super
     end
 
@@ -209,7 +213,7 @@ module Pod
     def to_s
       version = ''
       if external?
-        version << external_source_description
+        version << external_source_description(external_source)
       elsif head?
         version << 'HEAD'
       elsif @version_requirements != Requirement.default
@@ -271,8 +275,7 @@ module Pod
     #
     # @return   [String] the description of the external source.
     #
-    def external_source_description
-      source = external_source
+    def external_source_description(source)
       if source.key?(:git)
         desc =  "`#{source[:git]}`"
         desc << ", commit `#{source[:commit]}`" if source[:commit]

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/lockfile.rb

@@ -39,10 +39,10 @@ module Pod
     #
     def self.from_file(path)
       return nil unless path.exist?
-      begin
-        hash = YAML.load(File.open(path))
-      rescue Exception => e
-        raise StandardError, "Podfile.lock syntax error:  #{e.inspect}"
+      require 'yaml'
+      hash = YAML.load(File.open(path))
+      unless hash && hash.is_a?(Hash)
+        raise Informative, "Invalid Lockfile in `#{path}`"
       end
       lockfile = Lockfile.new(hash)
       lockfile.defined_in_file = path
@@ -59,12 +59,6 @@ module Pod
       other && self.to_hash == other.to_hash
     end
 
-    # @return [String] a string representation suitable for UI output.
-    #
-    def to_s
-      "Podfile.lock"
-    end
-
     # @return [String] a string representation suitable for debugging.
     #
     def inspect
@@ -95,8 +89,8 @@ module Pod
     def version(pod_name)
       version = pod_versions[pod_name]
       return version if version
-      pod_name = pod_versions.keys.find { |name| Specification.root_name(name) == pod_name }
-      pod_versions[pod_name]
+      root_name = pod_versions.keys.find { |name| Specification.root_name(name) == pod_name }
+      pod_versions[root_name]
     end
 
     # Returns the checksum for the given Pod.
@@ -135,8 +129,8 @@ module Pod
     # @param  [String] name
     #         the name of the Pod
     #
-    # @note   The generated dependencies are by the Installer to prevent the
-    #         Resolver from upgrading a Pod during an installation.
+    # @note   The generated dependencies used are by the Resolver from
+    #         upgrading a Pod during an installation.
     #
     # @raise  If there is no version stored for the given name.
     #
@@ -146,14 +140,10 @@ module Pod
       dep = dependencies.find { |d| d.name == name || d.root_name == name }
       version = version(name)
 
-      unless dep
+      unless dep && version
         raise StandardError, "Attempt to lock the `#{name}` Pod without an known dependency."
       end
 
-      unless version
-        raise StandardError, "Attempt to lock the `#{name}` Pod without an known version."
-      end
-
       locked_dependency = dep.dup
       locked_dependency.specific_version = version
       locked_dependency
@@ -272,7 +262,7 @@ module Pod
       self.defined_in_file = path
     end
 
-    # @return [Hash{String=>Array,Hash,String}] a hash reppresentation of the
+    # @return [Hash{String=>Array,Hash,String}] a hash representation of the
     #         Lockfile.
     #
     # @example Output
@@ -339,7 +329,7 @@ module Pod
       #
       def generate(podfile, specs)
         hash = {
-          'PODS'             => generate_pods_data(podfile, specs),
+          'PODS'             => generate_pods_data(specs),
           'DEPENDENCIES'     => generate_dependencies_data(podfile),
           'EXTERNAL SOURCES' => generate_external_sources_data(podfile),
           'SPEC CHECKSUMS'   => generate_checksums(specs),
@@ -369,7 +359,7 @@ module Pod
       #   "monkey (1.0.8)" ]
       #
       #
-      def generate_pods_data(podfile, specs)
+      def generate_pods_data(specs)
         pod_and_deps = specs.map do |spec|
           [spec.to_s, spec.all_dependencies.map(&:to_s).sort]
         end.uniq

data/lib/cocoapods-core/platform.rb

@@ -165,7 +165,7 @@ module Pod
       case symbolic_name
       when :ios then 'iOS'
       when :osx then 'OS X'
-      else symbolic_name end
+      else symbolic_name.to_s end
     end
   end
 end

data/lib/cocoapods-core/podfile.rb

@@ -210,7 +210,7 @@ module Pod
     def self.from_file(path)
       path = Pathname.new(path)
       unless path.exist?
-        raise StandardError, "No Podfile exists at path `#{path}`."
+        raise Informative, "No Podfile exists at path `#{path}`."
       end
       string = File.open(path, 'r:utf-8')  { |f| f.read }
       # Work around for Rubinius incomplete encoding in 1.9 mode
@@ -224,7 +224,7 @@ module Pod
       when '.yaml', '.cocoapods'
         Podfile.from_yaml(string, path)
       else
-        raise StandardError, "Unsupported Podfile format `#{path}`."
+        raise Informative, "Unsupported Podfile format `#{path}`."
       end
     end
 
@@ -332,15 +332,20 @@ module Pod
     #
     attr_accessor :current_target_definition
 
+    public
+
+    # @!group Deprecations
     #-------------------------------------------------------------------------#
 
     # @deprecated Deprecated in favour of the more succinct {#pod}. Remove for
     #             CocoaPods 1.0.
     #
     def dependency(name = nil, *requirements, &block)
-      warn "[DEPRECATED] `dependency' is deprecated (use `pod')"
+      CoreUI.warn "[DEPRECATED] `dependency' is deprecated (use `pod')"
       pod(name, *requirements, &block)
     end
 
+    #-------------------------------------------------------------------------#
+
   end
 end

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

@@ -217,7 +217,7 @@ module Pod
       #
       def target(name, options = {})
         if options && !options.keys.all? { |key| [:exclusive].include?(key) }
-          raise StandardError, "Unsupported options `#{options}` for target `#{name}`"
+          raise Informative, "Unsupported options `#{options}` for target `#{name}`"
         end
 
         parent = current_target_definition
@@ -264,10 +264,8 @@ module Pod
       # @return   [void]
       #
       def platform(name, target = nil)
-
         # Support for deprecated options parameter
         target = target[:deployment_target] if target.is_a?(Hash)
-
         current_target_definition.set_platform(name, target)
       end
 

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

@@ -105,11 +105,7 @@ module Pod
         end
       end
 
-      # @return [String] A string representation suitable for UI.
-      #
-      def to_s
-        "`#{label}` target definition"
-      end
+      alias :to_s :label
 
       # @return [String] A string representation suitable for debug.
       #

data/lib/cocoapods-core/source.rb

@@ -1,4 +1,6 @@
-require 'cocoapods-core/source/validator'
+require 'cocoapods-core/source/acceptor'
+require 'cocoapods-core/source/aggregate'
+require 'cocoapods-core/source/health_reporter'
 
 module Pod
 
@@ -18,10 +20,10 @@ module Pod
     #
     attr_reader :repo
 
-    # @param  [Pathname] repo @see #repo.
+    # @param  [Pathname, String] repo @see #repo.
     #
     def initialize(repo)
-      @repo = repo
+      @repo = Pathname.new(repo)
     end
 
     # @return [String] the name of the source.
@@ -115,7 +117,7 @@ module Pod
       specs = pods.map do |name|
         begin
           versions(name).map { |version| specification(name, version) }
-        rescue DSLError => e
+        rescue
           CoreUI.warn "Skipping `#{name}` because the podspec contains errors."
           next
         end
@@ -123,7 +125,7 @@ module Pod
       specs.flatten.compact
     end
 
-    #---------------------------------------------------------------------------#
+    #-------------------------------------------------------------------------#
 
     # @!group Searching the source
 
@@ -168,7 +170,7 @@ module Pod
       end.compact
     end
 
-    #---------------------------------------------------------------------------#
+    #-------------------------------------------------------------------------#
 
     # @!group Representations
 
@@ -179,7 +181,6 @@ module Pod
     def to_hash
       hash = {}
       all_specs.each do |spec|
-        print '.'
         hash[spec.name] ||= {}
         hash[spec.name][spec.version.version] = spec.to_hash
       end
@@ -193,112 +194,7 @@ module Pod
       to_hash.to_yaml
     end
 
-    # @return [String] the JSON encoded {to_hash} representation.
-    #
-    def to_json
-      require 'json'
-      to_hash.to_json
-    end
-
     #-------------------------------------------------------------------------#
 
-    # The Aggregate manages a directory of sources repositories.
-    #
-    class Aggregate
-
-      # @return [Pathname] the directory were the repositories are stored.
-      #
-      attr_reader :repos_dir
-
-      # @param [Pathname] repos_dir @see repos_dir.
-      #
-      def initialize(repos_dir)
-        @repos_dir = repos_dir
-      end
-
-      # @return [Array<Source>] all the sources.
-      #
-      def all
-        @sources ||= dirs.map { |repo| Source.new(repo) }.sort_by(&:name)
-      end
-
-      # @return [Array<String>] the names of all the pods available.
-      #
-      def all_pods
-        all.map(&:pods).flatten.uniq
-      end
-
-      # @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
-      #         processing them.
-      #
-      def all_sets
-        pods_by_source = {}
-        all.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|
-          pod_sources = sources.select{ |s| pods_by_source[s].include?(pod) }.compact
-          Specification::Set.new(pod, pod_sources)
-        end
-      end
-
-      # @return [Set, nil] a set for a given dependency including all the
-      #         {Source} that contain the Pod. If no sources containing the
-      #         Pod where found it returns nil.
-      #
-      # @raise  If no source including the set can be found.
-      #
-      # @see    Source#search
-      #
-      def search(dependency)
-        sources = all.select { |s| !s.search(dependency).nil? }
-        Specification::Set.new(dependency.root_name, sources) unless sources.empty?
-      end
-
-      # @return [Array<Set>]  the sets that contain the search term.
-      #
-      # @raise  If no source including the set can be found.
-      #
-      # @see    Source#search_by_name
-      #
-      def search_by_name(query, full_text_search = false)
-        pods_by_source = {}
-        result = []
-        all.each { |s| pods_by_source[s] = s.search_by_name(query, full_text_search).map(&:name) }
-        root_spec_names = pods_by_source.values.flatten.uniq
-        root_spec_names.each do |pod|
-          sources = []
-          pods_by_source.each{ |source, pods| sources << source if pods.include?(pod) }
-          result << Specification::Set.new(pod, sources)
-        end
-        if result.empty?
-          extra = ", author, summary, or description" if full_text_search
-          raise(Informative, "Unable to find a pod with name" \
-                "#{extra} matching `#{query}'")
-        end
-        result
-      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
-    end
   end
 end