cocoapods-core 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f5057b97903d18d2dc9fbf5d408642218db0419
-  data.tar.gz: 255f683fd32314431419e620a2227cf36e4ccbd0
+  metadata.gz: c399c99ab349e04494bdd2c9567bac5986a94dcd
+  data.tar.gz: 208b7c85249adcdf5e4dfec5c6bca57fea487b3f
 SHA512:
-  metadata.gz: cfd052918bba6c65eb1c75b9d091ecbf43b26a0d984cb88ebd4d83dcb0254f8e61a2d832ec42ac620c0956612c150e2c8ad7afcaf8bf96ddc972dcdb00657c79
-  data.tar.gz: fea6ce47e015e85ca5eeb3974a096e0b0db0d38289b12afde5cce7ba147c0c3904efd730a98d4f73b486c7ba3aa22bdd11cf0d2ab7542fa0464a811226077f3b
+  metadata.gz: 388ce299694e4dabfc94df92de6beb2f1234dd9b8883caa80a6af6350116d5a6259074ef8c398c136d0309c56c36a4c7e0410806db261e47dbe2ea288c84ef0f
+  data.tar.gz: 5f9d1bac5d614a36565044d41e78b3809d342e00adc7b280fb5a80f3724a30b6d1b53a55dc0b921a1a1b9cd995fc0108f51e9625326cbf5be5ba84b2af652bf0

data/README.md

@@ -36,7 +36,7 @@ All CocoaPods development happens on GitHub, there is a repository for
 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
+Follow [@CocoaPods](http://twitter.com/CocoaPods) to get up to date
 information about what's going on in the CocoaPods world.
 
 ## License

data/lib/cocoapods-core/dependency.rb

@@ -54,7 +54,7 @@ module Pod
     #   @example  Initialization with an external source.
     #
     #             Dependency.new('libPusher', {:git     => 'example.com/repo.git'})
-    #             Dependency.new('libPusher', {:local   => 'path/to/folder'})
+    #             Dependency.new('libPusher', {:path   => 'path/to/folder'})
     #             Dependency.new('libPusher', {:podspec => 'example.com/libPusher.podspec'})
     #
     # @overload   initialize(name, is_head)
@@ -116,7 +116,13 @@ module Pod
     # @return [Bool] whether the dependency points to an external source.
     #
     def external?
-      !@external_source.nil?
+      !!@external_source
+    end
+
+    # @return [Bool] whether the dependency points to a local path.
+    #
+    def local?
+      external_source && !!(external_source[:path] || external_source[:local])
     end
 
     # Creates a new dependency with the name of the top level spec and the same
@@ -353,6 +359,8 @@ module Pod
         desc =  "`#{source[:svn]}`"
       elsif source.key?(:podspec)
         desc = "`#{source[:podspec]}`"
+      elsif source.key?(:path)
+        desc = "`#{source[:path]}`"
       elsif source.key?(:local)
         desc = "`#{source[:local]}`"
       else
@@ -361,4 +369,5 @@ module Pod
       "from #{desc}"
     end
   end
+
 end

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/lockfile.rb

@@ -148,6 +148,12 @@ module Pod
       locked_dependency
     end
 
+    # @return [Version] The version of CocoaPods which generated this lockfile.
+    #
+    def cocoapods_version
+      Version.new(internal_data['COCOAPODS'])
+    end
+
     #--------------------------------------#
 
     # !@group Accessing the internal data.
@@ -194,7 +200,6 @@ module Pod
       internal_data['SPEC CHECKSUMS'] || {}
     end
 
-
     #-------------------------------------------------------------------------#
 
     # !@group Comparison with a Podfile

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

@@ -94,7 +94,7 @@ module Pod
       #  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'
+      #     pod 'AFNetworking', :path => '~/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

data/lib/cocoapods-core/podfile.rb

@@ -212,17 +212,12 @@ module Pod
       unless path.exist?
         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
-      if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
-        string.encode!('UTF-8')
-      end
 
       case path.extname
-      when ''
-        Podfile.from_ruby(string, path)
-      when '.yaml', '.cocoapods'
-        Podfile.from_yaml(string, path)
+      when '', '.podfile'
+        Podfile.from_ruby(path)
+      when '.yaml'
+        Podfile.from_yaml(path)
       else
         raise Informative, "Unsupported Podfile format `#{path}`."
       end
@@ -238,7 +233,12 @@ module Pod
     #
     # @return [Podfile] the new Podfile
     #
-    def self.from_ruby(string, path = nil)
+    def self.from_ruby(path)
+      string = File.open(path, 'r:utf-8')  { |f| f.read }
+      # Work around for Rubinius incomplete encoding in 1.9 mode
+      if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
+        string.encode!('UTF-8')
+      end
       podfile = Podfile.new(path) do
         begin
           eval(string, nil, path.to_s)
@@ -249,6 +249,27 @@ module Pod
       podfile
     end
 
+    # Configures a new Podfile from the given YAML representation.
+    #
+    # @param  [String] yaml
+    #         The YAML encoded hash which contains the information of the
+    #         Podfile.
+    #
+    # @param  [Pathname] path
+    #         The path from which the Podfile is loaded.
+    #
+    # @return [Podfile] the new Podfile
+    #
+    def self.from_yaml(path)
+      string = File.open(path, 'r:utf-8')  { |f| f.read }
+      # Work around for Rubinius incomplete encoding in 1.9 mode
+      if string.respond_to?(:encoding) && string.encoding.name != "UTF-8"
+        string.encode!('UTF-8')
+      end
+      hash = YAML.load(string)
+      from_hash(hash, path)
+    end
+
     # Configures a new Podfile from the given hash.
     #
     # @param  [Hash] hash
@@ -270,22 +291,6 @@ module Pod
       podfile
     end
 
-    # Configures a new Podfile from the given YAML representation.
-    #
-    # @param  [String] yaml
-    #         The YAML encoded hash which contains the information of the
-    #         Podfile.
-    #
-    # @param  [Pathname] path
-    #         The path from which the Podfile is loaded.
-    #
-    # @return [Podfile] the new Podfile
-    #
-    def self.from_yaml(yaml, path = nil)
-      hash = YAML.load(yaml)
-      from_hash(hash)
-    end
-
     #-------------------------------------------------------------------------#
 
     private

data/lib/cocoapods-core/source.rb

@@ -52,16 +52,31 @@ module Pod
 
     # @return [Array<String>] the list of the name of all the Pods.
     #
+    # @note   Using Pathname#children is sensibly slower.
+    #
     def pods
-      specs_dir.children.map do |child|
-        child.basename.to_s if child.directory? && child.basename.to_s != '.git'
-      end.compact
+      specs_dir_as_string = specs_dir.to_s
+      Dir.entries(specs_dir).select do |entry|
+        valid_name = !(entry =='.' || entry == '..' || entry == '.git')
+        valid_name && File.directory?(File.join(specs_dir_as_string, entry))
+      end
+    end
+
+    # Returns the set for the Pod with the given name.
+    #
+    # @param  [String] pod_name
+    #         The name of the Pod.
+    #
+    # @return [Sets] the set.
+    #
+    def set(pod_name)
+      Specification::Set.new(pod_name, self)
     end
 
     # @return [Array<Sets>] the sets of all the Pods.
     #
     def pod_sets
-      pods.map { |pod| Specification::Set.new(pod, self) }
+      pods.map { |pod_name| set(pod_name) }
     end
 
     # @return [Array<Version>] all the available versions for the Pod, sorted
@@ -155,19 +170,20 @@ module Pod
     #         hence is considerably slower.
     #
     def search_by_name(query, full_text_search = false)
-      pod_sets.map do |set|
-        if full_text_search
+      if full_text_search
+        pod_sets.map do |set|
           begin
             s = set.specification
             text = "#{s.name} #{s.authors} #{s.summary} #{s.description}"
           rescue
             CoreUI.warn "Skipping `#{set.name}` because the podspec contains errors."
           end
-        else
-          text = set.name
-        end
-        set if text && text.downcase.include?(query.downcase)
-      end.compact
+          set if text && text.downcase.include?(query.downcase)
+        end.compact
+      else
+        names = pods.select { |pod_name| pod_name.downcase.include?(query.downcase) }
+        names.map { |pod_name| set(pod_name) }
+      end
     end
 
     #-------------------------------------------------------------------------#
@@ -210,8 +226,8 @@ module Pod
     def specs_dir
       unless @specs_dir
         specs_sub_dir = repo + 'Specs'
-        if repo.children.include?(specs_sub_dir)
-          @specs_dir = repo + 'Specs'
+        if specs_sub_dir.exist?
+          @specs_dir = specs_sub_dir
         else
           @specs_dir = repo
         end

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

@@ -119,6 +119,10 @@ module Pod
       #
       spec_attr_accessor :public_header_files
 
+      # @return [Array<String>] the private headers of the Pod.
+      #
+      spec_attr_accessor :private_header_files
+
       # @return [Array<String>] A hash where the key represents the
       #         paths of the resources to copy and the values the paths of
       #         the resources that should be copied.

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

@@ -203,7 +203,7 @@ module Pod
         :svn   => [:folder, :tag, :revision],
         :hg    => [:revision],
         :http  => nil,
-        :local => nil
+        :path => nil
       }.freeze
 
       # @!method source=(source)
@@ -417,11 +417,13 @@ module Pod
       #
       # ---
       #
-      # Dependencies can specify versions requirements. The use of the spermy
-      # indicator `~>` is recommended because it provides a good compromise
-      # between control on the version without being too restrictive.
+      # Dependencies can specify versions requirements. The use of the approximate
+      # version indicator `~>` is recommended because it provides good
+      # control over the version without being too restrictive. For example,
+      # `~> 1.0.1` is equivalent to `>= 1.0.1` combined with `< 1.1`. Similarly,
+      # `~> 1.0` will match `1.0`, `1.0.1`, `1.1`, but will not upgrade to `2.0`.
       #
-      # Pods with too restrictive dependencies, limit their compatibility with
+      # Pods with overly restrictive dependencies limit their compatibility with
       # other Pods.
       #
       # @example
@@ -782,6 +784,31 @@ module Pod
 
       #------------------#
 
+      # @!method private_header_files=(private_header_files)
+      #
+      #   A list of file patterns that should be used to mark private headers.
+      #
+      #   ---
+      #
+      #   These patterns are matched against the public headers (or all the
+      #   headers if no public headers have been specified) to exclude those
+      #   headers which should not be exposed to the user project and which
+      #   should not be used to generate the documentation.
+      #
+      #   @example
+      #
+      #     spec.private_header_files = "Headers/Private/*.h"
+      #
+      #   @param  [String, Array<String>] private_header_files
+      #           the private headers of the Pod.
+      #
+      attribute :private_header_files, {
+        :container => Array,
+        :file_patterns => true,
+      }
+
+      #------------------#
+
       # @!method resources=(resources)
       #
       #   A list of resources that should be copied into the target bundle.

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

@@ -198,10 +198,14 @@ module Pod
         end
       end
 
+      def _validate_version(v)
+        error "The version of the spec should be higher than 0." unless v > Version::ZERO
+      end
+
       # Performs validations related to the `summary` attribute.
       #
       def _validate_summary(s)
-        warning "The summary should be short use `description` (max 140 characters)." if s.length > 140
+        warning "The summary should be a short version of `description` (max 140 characters)." if s.length > 140
         warning "The summary is not meaningful." if s =~ /A short description of/
         warning "The summary should end with proper punctuation." if s !~ /(\.|\?|!)$/
       end

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

@@ -128,7 +128,7 @@ module Pod
         # @return [String] the URL of the source of the Pod.
         #
         def source_url
-          url_keys = [:git, :svn, :http, :hg, :local ]
+          url_keys = [:git, :svn, :http, :hg, :path ]
           key = spec.source.keys.find { |k| url_keys.include?(k) }
           key ? spec.source[key] : 'No source url'
         end

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

@@ -54,15 +54,19 @@ module Pod
         #
         def initialize(cache_file = nil, cache_expiration = (60 * 60 * 24 * 3))
           require 'yaml'
-          # This is to make sure Faraday doesn't warn the user about the
-          # `system_timer` gem missing.
-          old_warn, $-w = $-w, nil
           begin
-            require 'faraday'
-          ensure
-            $-w = old_warn
+            # This is to make sure Faraday doesn't warn the user about the
+            # `system_timer` gem missing.
+            old_warn, $-w = $-w, nil
+            begin
+              require 'faraday'
+            ensure
+              $-w = old_warn
+            end
+            require 'octokit'
+          rescue LoadError
+            raise PlainInformative, 'The `octokit` gem is required in order to use the Statistics class.'
           end
-          require 'octokit'
 
           @cache_file       = cache_file
           @cache_expiration = cache_expiration

data/lib/cocoapods-core/specification.rb

@@ -95,7 +95,7 @@ module Pod
     #         clients.
     #
     def to_s
-      if name && version.version != ""
+      if name && !version.version.empty?
         "#{name} (#{version})"
       elsif name
         name
@@ -125,6 +125,9 @@ module Pod
     #
     def self.name_and_version_from_string(string_reppresenation)
       match_data = string_reppresenation.match(/(\S*) \((.*)\)/)
+      unless match_data
+        raise Informative, "Invalid string representation for a Specification: `#{string_reppresenation}`."
+      end
       name = match_data[1]
       vers = Version.new(match_data[2])
       [name, vers]
@@ -284,7 +287,7 @@ module Pod
     #         source.
     #
     def local?
-      !source.nil? && !source[:local].nil?
+      !!(source[:path] || source[:local]) rescue false
     end
 
     # @return     [Bool] whether the specification is supported in the given

data/lib/cocoapods-core/version.rb

@@ -62,6 +62,10 @@ module Pod
       super(version)
     end
 
+    # An instance that represents version 0.
+    #
+    ZERO = new('0')
+
     # @return [String] a string representation that indicates if the version is
     #         head.
     #
@@ -97,6 +101,45 @@ module Pod
     def self.correct? version
       version.to_s =~ ANCHORED_VERSION_PATTERN
     end
+
+    #-------------------------------------------------------------------------#
+
+    # @!group Semantic Versioning
+
+    SEMANTIC_VERSION_PATTERN = '[0-9]+(\.[0-9]+(\.[0-9]+(-[0-9A-Za-z\-\.]+)?)?)?'
+    ANCHORED_SEMANTIC_VERSION_PATTERN = /\A\s*(#{SEMANTIC_VERSION_PATTERN})*\s*\z/
+
+    # @return [Bool] Whether the version conforms to the Semantic Versioning
+    #         specification (2.0.0-rc.1).
+    #
+    # @note   This comparison is lenient.
+    #
+    # @note   It doesn't support build identifiers.
+    #
+    def semantic?
+      version.to_s =~ ANCHORED_SEMANTIC_VERSION_PATTERN
+    end
+
+    # @return [Fixnum] The semver major identifier.
+    #
+    def major
+      segments[0]
+    end
+
+    # @return [Fixnum] The semver minor identifier.
+    #
+    def minor
+      segments[1] || 0
+    end
+
+    # @return [Fixnum] The semver patch identifier.
+    #
+    def patch
+      segments[2] || 0
+    end
+
+    #-------------------------------------------------------------------------#
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,33 +26,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: octokit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +53,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 10.0.0
 description: |-
   The CocoaPods-Core gem provides support to work with the models of CocoaPods.
 
@@ -147,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods