cocoapods-core 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ebc8caae99ff0b103a68db5da56f145260a701
-  data.tar.gz: eb4956ae204fe1e15a008927bc56ab09c5c0ca57
+  metadata.gz: da81ad7e5574affa671f8df2cb9392a2adc60caf
+  data.tar.gz: 58d6aa2090f7c57af994b2125f97c105c72f8797
 SHA512:
-  metadata.gz: 59cdc3c942852b9143f88b3218c378071e4266a6f197cfa86ad7ca84bef718cd26fe4418792b0e65a4951481e06304d2054a3d541cf9ca6847f238ec0d6ce829
-  data.tar.gz: 3a090a0ab43fc39016d6a079571b66834b8ca04dd3a4cff462aa31883afee60cba36dc3e79af1b1bd4087bc9ddf651b094fee85e531f0f7d2565f8a04d06f166
+  metadata.gz: 190da0981dae81cc2053ce8b270981fda47b0577d75756a73266fe8128c8a9039a53442a59492320744e7becc1e5b0c7acf4a9dae5c23aef74a248817c76da0a
+  data.tar.gz: cd169506f6ef8cfd5c8b3a4918ff123553a063fdbeeed1deeb54a493ad26969ab2c7bbed32cee2dd4f70018854011dffcac9d6397a00c98aa0707a889018367c

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/github.rb

@@ -54,11 +54,34 @@ module Pod
       end
     end
 
-    private
+    # Returns the contents of a file or directory in a repository.
+    #
+    # @param  [String] url @see #repo
+    #
+    # @param  [#to_s] path
+    #         The path for which the contents are needed.
+    #
+    # @param  [String] branch
+    #         The branch for which to fetch the contents of the path.
+    #
+    # @return [Array] The list of the files and of the directories if the given
+    #         path is a directory.
+    #
+    # @return [Hash] The contents of the file (usually base64 encoded).
+    #
+    def self.contents(url, path = nil, branch = nil)
+      if repo_id = normalized_repo_id(url)
+        request_url = "https://api.github.com/repos/#{repo_id}/contents"
+        request_url << "/#{path}" if path
+        request_url << "?ref=#{branch}" if branch
+        peform_request(request_url)
+      end
+    end
 
-    #-------------------------------------------------------------------------#
+    private
 
     # @!group Private helpers
+    #-------------------------------------------------------------------------#
 
     # Returns the repo ID as it is or converting a GitHub URL.
     #
@@ -93,8 +116,16 @@ module Pod
     def self.peform_request(url)
       require 'rest'
       require 'json'
-      response = REST.get(url)
-      JSON.parse(response.body)
+      headers = { "User-Agent" => "CocoaPods" }
+      response = REST.get(url, headers)
+      body = JSON.parse(response.body)
+      if response.ok?
+        body
+      else
+        CoreUI.warn "Request to #{url} failed - #{response.status_code}"
+        CoreUI.warn body['message']
+        nil
+      end
     end
 
     #-------------------------------------------------------------------------#

data/lib/cocoapods-core/source.rb

@@ -1,6 +1,9 @@
 require 'cocoapods-core/source/acceptor'
 require 'cocoapods-core/source/aggregate'
 require 'cocoapods-core/source/health_reporter'
+require 'cocoapods-core/source/abstract_data_provider'
+require 'cocoapods-core/source/file_system_data_provider'
+require 'cocoapods-core/source/github_data_provider'
 
 module Pod
 
@@ -16,20 +19,31 @@ module Pod
   #
   class Source
 
-    # @return [Pathname] the location of the repo of the source.
+    # @return [AbstractDataProvider] the data provider for this source.
     #
-    attr_reader :repo
+    attr_accessor :data_provider
 
     # @param  [Pathname, String] repo @see #repo.
     #
-    def initialize(repo)
-      @repo = Pathname.new(repo)
+    def initialize(repo = nil)
+      # TODO: Temporary solution to aide the transition
+      if repo.is_a?(String) || repo.is_a?(Pathname)
+        @data_provider = FileSystemDataProvider.new(repo)
+      else
+        @data_provider = repo
+      end
     end
 
-    # @return [String] the name of the source.
+    # @return [String] The name of the source.
     #
     def name
-      repo.basename.to_s
+      data_provider.name
+    end
+
+    # @return [String] The type of the source.
+    #
+    def type
+      data_provider.type
     end
 
     alias_method :to_s, :name
@@ -45,37 +59,27 @@ module Pod
       name <=> other.name
     end
 
-    #-------------------------------------------------------------------------#
+    # @return [String] A description suitable for debugging.
+    #
+    def inspect
+      "#<#{self.class} name:#{name} type:#{type}>"
+    end
+
+    public
 
     # @!group Queering the source
+    #-------------------------------------------------------------------------#
 
     # @return [Array<String>] the list of the name of all the Pods.
     #
-    # @note   Using Pathname#children is sensibly slower.
     #
     def pods
-      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))
+      pods = data_provider.pods
+      unless pods
+        raise Informative, "Unable to find the #{data_provider.type} source " \
+          "named: `#{data_provider.name}`"
       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_name| set(pod_name) }
+      pods
     end
 
     # @return [Array<Version>] all the available versions for the Pod, sorted
@@ -85,12 +89,8 @@ module Pod
     #         the name of the Pod.
     #
     def versions(name)
-      pod_dir = specs_dir + name
-      return unless pod_dir.exist?
-      pod_dir.children.map do |v|
-        basename = v.basename.to_s
-        Version.new(basename) if v.directory? && basename[0, 1] != '.'
-      end.compact.sort.reverse
+      versions = data_provider.versions(name)
+      versions.map { |version| Version.new(version) } if versions
     end
 
     # @return [Specification] the specification for a given version of Pod.
@@ -113,7 +113,7 @@ module Pod
     #
     def specification_path(name, version)
       path = specs_dir + name + version.to_s
-      specification_path = path + "#{name}.podspec.yaml"
+      specification_path = path + "#{name}.podspec.json"
       unless specification_path.exist?
         specification_path = path + "#{name}.podspec"
       end
@@ -121,7 +121,7 @@ module Pod
         raise StandardError, "Unable to find the specification #{name} " \
           "(#{version}) in the #{name} source."
       end
-      specification_path
+      spec
     end
 
     # @return [Array<Specification>] all the specifications contained by the
@@ -139,9 +139,43 @@ module Pod
       specs.flatten.compact
     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_name| set(pod_name) }
+    end
+
+    # Returns the path of the specification with the given name and version.
+    #
+    # @param  [String] name
+    #         the name of the Pod.
+    #
+    # @param  [Version,String] version
+    #         the version for the specification.
+    #
+    # @return [Pathname] The path of the specification.
+    #
+    # @todo   Remove.
+    #
+    def specification_path(name, version)
+      data_provider.specification_path(name, version)
+    end
+
+    public
 
     # @!group Searching the source
+    #-------------------------------------------------------------------------#
 
     # @return [Set] a set for a given dependency. The set is identified by the
     #               name of the dependency and takes into account subspecs.
@@ -162,7 +196,7 @@ module Pod
     # @return [Array<Set>] The list of the sets that contain the search term.
     #
     # @param  [String] query
-    #         the search term.
+    #         the search term. Can be a regular expression.
     #
     # @param  [Bool] full_text_search
     #         whether the search should be limited to the name of the Pod or
@@ -171,20 +205,31 @@ module Pod
     # @note   full text search requires to load the specification for each pod,
     #         hence is considerably slower.
     #
+    # @todo   Rename to #search
+    #
     def search_by_name(query, full_text_search = false)
+      regexp_query = /#{query}/i
       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."
+        if data_provider.is_a?(FileSystemDataProvider)
+          pod_sets.reject do |set|
+            texts = []
+            begin
+              s = set.specification
+              texts << s.name
+              texts += s.authors.keys
+              texts << s.summary
+              texts << s.description
+            rescue
+              CoreUI.warn "Skipping `#{set.name}` because the podspec " \
+                "contains errors."
+            end
+            texts.grep(regexp_query).empty?
           end
-          set if text && text.downcase.include?(query.downcase)
-        end.compact
+        else
+          []
+        end
       else
-        names = pods.select { |name| name.downcase.include?(query.downcase) }
+        names = pods.grep(regexp_query)
         names.map { |pod_name| set(pod_name) }
       end
     end
@@ -205,9 +250,10 @@ module Pod
       end
     end
 
-    #-------------------------------------------------------------------------#
+    public
 
     # @!group Representations
+    #-------------------------------------------------------------------------#
 
     # @return [Hash{String=>{String=>Specification}}] the static representation
     #         of all the specifications grouped first by name and then by
@@ -231,29 +277,26 @@ module Pod
 
     private
 
-    #-------------------------------------------------------------------------#
-
     # @group Private Helpers
+    #-------------------------------------------------------------------------#
 
-    # @return [Pathname] The directory where the specs are stored.
+    # Loads the specification for the given Pod gracefully.
     #
-    # @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.
+    # @param  [String] name
+    #         the name of the Pod.
     #
-    def specs_dir
-      unless @specs_dir
-        specs_sub_dir = repo + 'Specs'
-        if specs_sub_dir.exist?
-          @specs_dir = specs_sub_dir
-        elsif repo.exist?
-          @specs_dir = repo
-        else
-          raise Informative, "Unable to find a source named: `#{name}`"
-        end
-      end
-      @specs_dir
+    # @return [Specification] The specification for the last version of the
+    #         Pod.
+    # @return [Nil] If the spec could not be loaded.
+    #
+    def load_spec_gracefully(name)
+      versions = versions(name)
+      version = versions.sort.last if versions
+      specification(name, version) if version
+    rescue Informative
+      Pod::CoreUI.warn "Skipping `#{name}` because the podspec " \
+        "contains errors."
+      nil
     end
 
     #-------------------------------------------------------------------------#

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

@@ -0,0 +1,71 @@
+module Pod
+  class Source
+
+    # Defines the required and the optional methods of a data provider.
+    #
+    class AbstractDataProvider
+
+      public
+
+      # @group Required methods
+      #-----------------------------------------------------------------------#
+
+      # @return [String] The name of the source.
+      #
+      def name
+        raise StandardError, "Abstract method."
+      end
+
+      # @return [String] The user friendly type of the source.
+      #
+      def type
+        raise StandardError, "Abstract method."
+      end
+
+      # @return [Array<String>] The list of the name of all the Pods known to
+      #         the Source.
+      #
+      def pods
+        raise StandardError, "Abstract method."
+      end
+
+      # @return [Array<String>] All the available versions of a given Pod,
+      #         sorted from highest to lowest.
+      #
+      # @param  [String] name
+      #         The name of the Pod.
+      #
+      def versions(name)
+        raise StandardError, "Abstract method."
+      end
+
+      # @return [Specification] The specification for a given version of a Pod.
+      #
+      # @param  [String] name
+      #         The name of the Pod.
+      #
+      # @param  [String] version
+      #         The version of the Pod.
+      #
+      def specification(name, version)
+        raise StandardError, "Abstract method."
+      end
+
+      # @return [Specification] The contents of the specification for a given
+      #         version of a Pod.
+      #
+      # @param  [String] name
+      #         the name of the Pod.
+      #
+      # @param  [String] version
+      #         the version of the Pod.
+      #
+      def specification_contents(name, version)
+        raise StandardError, "Abstract method."
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

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

@@ -72,7 +72,7 @@ module Pod
       # @return [Set] The most representative set for the Pod with the given
       #         name.
       #
-      def represenative_set(name)
+      def representative_set(name)
         representative_source = nil
         highest_version = nil
         all.each do |source|

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

@@ -0,0 +1,150 @@
+module Pod
+  class Source
+
+    # Data provider for a `Pod::Source` backed by a repository hosted in the
+    # file system.
+    #
+    class FileSystemDataProvider < AbstractDataProvider
+
+      # @return [Pathname] The path where the source is stored.
+      #
+      attr_reader :repo
+
+      # @param  [Pathname, String] repo @see #repo.
+      #
+      def initialize(repo)
+        @repo = Pathname.new(repo)
+      end
+
+      public
+
+      # @group Required methods
+      #-----------------------------------------------------------------------#
+
+      # @return [String] The name of the source.
+      #
+      def name
+        repo.basename.to_s
+      end
+
+      # @return [String] The user friendly type of the source.
+      #
+      def type
+        "file system"
+      end
+
+      # @return [Array<String>] The list of the name of all the Pods known to
+      #         the Source.
+      #
+      # @note   Using Pathname#children is sensibly slower.
+      #
+      def pods
+        return nil unless specs_dir
+        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.sort
+      end
+
+      # @return [Array<String>] All the available versions of a given Pod,
+      #         sorted from highest to lowest.
+      #
+      # @param  [String] name
+      #         The name of the Pod.
+      #
+      def versions(name)
+        return nil unless specs_dir
+        raise ArgumentError, "No name" unless name
+        pod_dir = specs_dir + name
+        return unless pod_dir.exist?
+        pod_dir.children.map do |v|
+          basename = v.basename.to_s
+          basename if v.directory? && basename[0, 1] != '.'
+        end.compact.sort.reverse
+      end
+
+      # @return [Specification] The specification for a given version of a Pod.
+      #
+      # @param  [String] name
+      #         The name of the Pod.
+      #
+      # @param  [String] version
+      #         The version of the Pod.
+      #
+      def specification(name, version)
+        path = specification_path(name, version)
+        Pod::Specification.from_file(path) if path && path.exist?
+      end
+
+      # @return [Specification] The contents of the specification for a given
+      #         version of a Pod.
+      #
+      # @param  [String] name
+      #         the name of the Pod.
+      #
+      # @param  [String] version
+      #         the version of the Pod.
+      #
+      def specification_contents(name, version)
+        path = specification_path(name, version)
+        File.open(path, 'r:utf-8') { |f| f.read } if path && path.exist?
+      end
+
+      public
+
+      # @group Other methods
+      #-----------------------------------------------------------------------#
+
+      # Returns the path of the specification with the given name and version.
+      #
+      # @param  [String] name
+      #         the name of the Pod.
+      #
+      # @param  [Version,String] version
+      #         the version for the specification.
+      #
+      # @return [Pathname] The path of the specification.
+      #
+      def specification_path(name, version)
+        raise ArgumentError, "No name" unless name
+        raise ArgumentError, "No version" unless version
+        return nil unless specs_dir
+        path = specs_dir + name + version.to_s
+        specification_path = path + "#{name}.podspec.json"
+        specification_path.exist?
+        unless specification_path.exist?
+          specification_path = path + "#{name}.podspec"
+        end
+        specification_path
+      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 specs_sub_dir.exist?
+            @specs_dir = specs_sub_dir
+          elsif repo.exist?
+            @specs_dir = repo
+          end
+        end
+        @specs_dir
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

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

@@ -0,0 +1,143 @@
+module Pod
+  class Source
+
+    # Data provider for a `Pod::Source` backed by a repository hosted on GitHub
+    # and accessed via the HTTP API. Only pure JSON repos using the `Specs`
+    # subdir to store the specifications are supported.
+    #
+    class GitHubDataProvider < AbstractDataProvider
+
+      # @return [String] The identifier of the repository (user name and repo
+      #         name) or the full URL of the repo.
+      #
+      attr_reader :repo_id
+
+      # @return [String] The branch of the repo if the default one shouldn't be
+      #         used.
+      #
+      attr_reader :branch
+
+      # @param [String] repo_id @see repo_id
+      # @param [String] branch @see branch
+      #
+      def initialize(repo_id, branch = nil)
+        @repo_id = repo_id
+        @branch = branch
+      end
+
+      public
+
+      # @group Data Source
+      #-----------------------------------------------------------------------#
+
+      # @return [String] The name of the Source. User name and repo.
+      #
+      def name
+        GitHub.normalized_repo_id(repo_id)
+      end
+
+      # @return [String] The user friendly type of the source.
+      #
+      def type
+        "GitHub API"
+      end
+
+      # @return [Array<String>] The list of the name of all the Pods known to
+      #         the Source.
+      #
+      def pods
+        root_contents = get_github_contents("Specs")
+        pods = dir_names(root_contents)
+        pods.sort if pods
+      end
+
+      # @return [Array<String>] All the available versions of a given Pod,
+      #         sorted from highest to lowest.
+      #
+      # @param  [String] name
+      #         The name of the Pod.
+      #
+      def versions(name)
+        raise ArgumentError, "No name" unless name
+        contents = get_github_contents("Specs/#{name}")
+        dir_names(contents)
+      end
+
+      # @return [Specification] The specification for a given version of a Pod.
+      #
+      # @param  [String] name
+      #         The name of the Pod.
+      #
+      # @param  [String] version
+      #         The version of the Pod.
+      #
+      def specification(name, version)
+        raise ArgumentError, "No name" unless name
+        raise ArgumentError, "No version" unless version
+        spec_content = specification_contents(name, version)
+        if spec_content
+          Pod::Specification.from_json(spec_content)
+        end
+      end
+
+      # @return [Specification] The contents of the specification for a given
+      #         version of a Pod.
+      #
+      # @param  [String] name
+      #         the name of the Pod.
+      #
+      # @param  [String] version
+      #         the version of the Pod.
+      #
+      def specification_contents(name, version)
+        raise ArgumentError, "No name" unless name
+        raise ArgumentError, "No version" unless version
+        path = "Specs/#{name}/#{version}/#{name}.podspec.json"
+        file_contents = get_github_contents(path)
+        if file_contents
+          if file_contents['encoding'] == 'base64'
+            require "base64"
+            Base64.decode64(file_contents['content'])
+          end
+        end
+      end
+
+      private
+
+      # @group Private Helpers
+      #-----------------------------------------------------------------------#
+
+      # Performs a get request with the given URL.
+      #
+      # @param [String] url
+      #        The URL of the resource.
+      #
+      # @return [Array, Hash] The information of the resource as Ruby objects.
+      #
+      def get_github_contents(path = nil)
+        Pod::GitHub.contents(repo_id, path, branch)
+      end
+
+      # @param  [Array] [Array<Hash>] The contents of a directory.
+      #
+      # @return [Array<String>] Returns the list of the directories given the
+      #         contents returned for the API of a directory.
+      #
+      # @return [Nil] If the directory was not found or the contents is not an
+      #         array.
+      #
+      def dir_names(contents)
+        if contents.is_a?(Array)
+          contents.map do |entry|
+            if entry['type'] == 'dir'
+              entry['name']
+            end
+          end.compact
+        end
+      end
+
+      #-----------------------------------------------------------------------#
+
+    end
+  end
+end

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

@@ -124,7 +124,7 @@ module Pod
       # @return [void]
       #
       def check_stray_specs
-        all_paths = Pathname.glob(source.repo + '**/*.podspec{,.yaml}')
+        all_paths = Pathname.glob(source.data_provider.repo + '**/*.podspec{,.json}')
         stray_specs = all_paths - report.analyzed_paths
         stray_specs.each do |path|
           report.add_message(:error, "Stray spec", path)

data/lib/cocoapods-core/specification.rb

@@ -3,7 +3,7 @@ require 'cocoapods-core/specification/dsl'
 require 'cocoapods-core/specification/linter'
 require 'cocoapods-core/specification/root_attribute_accessors'
 require 'cocoapods-core/specification/set'
-require 'cocoapods-core/specification/yaml'
+require 'cocoapods-core/specification/json'
 
 module Pod
 
@@ -18,7 +18,7 @@ module Pod
     include Pod::Specification::DSL
     include Pod::Specification::DSL::Deprecations
     include Pod::Specification::RootAttributesAccessors
-    include Pod::Specification::YAMLSupport
+    include Pod::Specification::JSONSupport
 
     # @return [Specification] the parent of the specification unless the
     #         specification is a root.
@@ -127,7 +127,9 @@ module Pod
       match_data = string_representation.match(/(\S*) \((.*)\)/)
       unless match_data
         raise Informative, "Invalid string representation for a " \
-          "Specification: `#{string_representation}`."
+          "Specification: `#{string_representation}`." \
+          "String representation should include the name and " \
+          "the version of a pod."
       end
       name = match_data[1]
       vers = Version.new(match_data[2])
@@ -559,8 +561,8 @@ module Pod
         unless spec.is_a?(Specification)
           raise Informative, "Invalid podspec file at path `#{path}`."
         end
-      when '.yaml'
-        spec = Specification.from_yaml(spec_contents)
+      when '.json'
+        spec = Specification.from_json(spec_contents)
       else
         raise Informative, "Unsupported specification format `#{path.extname}`."
       end

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

@@ -29,17 +29,17 @@ module Pod
     # [convention over configuration](http://en.wikipedia.org/wiki/Convention_over_configuration)
     # and thus it can be very simple:
     #
-    #     Pod::Spec.new do |s|
-    #       s.name         = 'Reachability'
-    #       s.version      = '3.1.0'
-    #       s.license      = { :type => 'BSD' }
-    #       s.homepage     = 'https://github.com/tonymillion/Reachability'
-    #       s.authors      = { 'Tony Million' => 'tonymillion@gmail.com' }
-    #       s.summary      = 'ARC and GCD Compatible Reachability Class for iOS and OS X. Drop in replacement for Apple Reachability.'
-    #       s.source       = { :git => 'https://github.com/tonymillion/Reachability.git', :tag => 'v3.1.0' }
-    #       s.source_files = 'Reachability.{h,m}'
-    #       s.framework    = 'SystemConfiguration'
-    #       s.requires_arc = true
+    #     Pod::Spec.new do |spec|
+    #       spec.name         = 'Reachability'
+    #       spec.version      = '3.1.0'
+    #       spec.license      = { :type => 'BSD' }
+    #       spec.homepage     = 'https://github.com/tonymillion/Reachability'
+    #       spec.authors      = { 'Tony Million' => 'tonymillion@gmail.com' }
+    #       spec.summary      = 'ARC and GCD Compatible Reachability Class for iOS and OS X. Drop in replacement for Apple Reachability.'
+    #       spec.source       = { :git => 'https://github.com/tonymillion/Reachability.git', :tag => 'v3.1.0' }
+    #       spec.source_files = 'Reachability.{h,m}'
+    #       spec.framework    = 'SystemConfiguration'
+    #       spec.requires_arc = true
     #     end
     #
     module DSL
@@ -259,7 +259,7 @@ module Pod
       #
       #     spec.source = { :hg => "https://bitbucket.org/dcutting/hyperbek", :revision => "#{s.version}" }
       #
-      #   @example Using HTTP to download a compressed file of the code. It supports zip, tgz, bz2 and tar.
+      #   @example Using HTTP to download a compressed file of the code. It supports zip, tgz, bz2, txz and tar.
       #
       #     spec.source = { :http => "http://dev.wechatapp.com/download/sdk/WeChat_SDK_iOS_en.zip" }
       #
@@ -988,7 +988,7 @@ module Pod
       #   attribute.
       #
       #   The names of the bundles should at least include the name of the Pod
-      #   to minimize the change of name collisions.
+      #   to minimize the chance of name collisions.
       #
       #   To provide different resources per platform namespaced bundles *must*
       #   be used.

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

@@ -96,7 +96,7 @@ module Pod
           CoreUI.warn "[#{to_s}] The pre install hook of the specification " \
             "DSL has been deprecated, use the `resource_bundles` or the " \
               "`prepare_command` attributes."
-            @pre_install_callback = block
+          @pre_install_callback = block
         end
 
         # This is a convenience method which gets called after all pods have been
@@ -126,7 +126,7 @@ module Pod
           CoreUI.warn "[#{to_s}] The post install hook of the specification " \
             "DSL has been deprecated, use the `resource_bundles` or the " \
               "`prepare_command` attributes."
-            @post_install_callback = block
+          @post_install_callback = block
         end
 
         #-----------------------------------------------------------------------#

data/lib/cocoapods-core/specification/{yaml.rb → json.rb}

@@ -1,13 +1,16 @@
 module Pod
   class Specification
-    module YAMLSupport
+    module JSONSupport
 
-      # @return [String] the yaml representation of the specification.
+      # @return [String] the json representation of the specification.
       #
-      def to_yaml
-        to_hash.to_yaml
+      def to_json(*a)
+        require 'json'
+        to_hash.to_json(*a)
       end
 
+      #-----------------------------------------------------------------------#
+
       # @return [Hash] the hash representation of the specification including
       #         subspecs.
       #
@@ -25,7 +28,20 @@ module Pod
       def safe_to_hash?
         pre_install_callback.nil? && post_install_callback.nil?
       end
+    end
 
+    # Configures a new specification from the given JSON representation.
+    #
+    # @param  [String] the JSON encoded hash which contains the information of
+    #         the specification.
+    #
+    #
+    # @return [Specification] the specification
+    #
+    def self.from_json(json)
+      require 'json'
+      hash = JSON.parse(json)
+      from_hash(hash)
     end
 
     # Configures a new specification from the given hash.
@@ -48,17 +64,7 @@ module Pod
       spec
     end
 
-    # Configures a new specification from the given YAML representation.
-    #
-    # @param  [String] the YAML encoded hash which contains the information of
-    #         the specification.
-    #
-    #
-    # @return [Specification] the specification
-    #
-    def self.from_yaml(yaml)
-      hash = YAML.load(yaml)
-      from_hash(hash)
-    end
+    #-----------------------------------------------------------------------#
+
   end
 end

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

@@ -189,9 +189,9 @@ module Pod
       #
       # @return [void]
       #
-      def run_validation_hooks(attributes)
-
-      end
+      # def run_validation_hooks(attributes)
+      #
+      # end
 
       #-----------------------------------------------------------------------#
 
@@ -205,12 +205,16 @@ module Pod
         if spec.name && file
           acceptable_names = [
             spec.root.name + '.podspec',
-            spec.root.name + '.podspec.yaml'
+            spec.root.name + '.podspec.json'
           ]
           names_match = acceptable_names.include?(file.basename.to_s)
           unless names_match
             error "The name of the spec should match the name of the file."
           end
+
+          if spec.root.name =~ /\s/
+            error "The name of a spec should not contain whitespace."
+          end
         end
       end
 
@@ -248,12 +252,38 @@ module Pod
         end
       end
 
+      # Performs validations related to the `homepage` attribute.
+      #
       def _validate_homepage(h)
         if h =~ %r[http://EXAMPLE]
           warning "The homepage has not been updated from default"
         end
       end
 
+      # Performs validations related to the `frameworks` attribute.
+      #
+      def _validate_frameworks(frameworks)
+        if frameworks_invalid?(frameworks)
+          error "A framework should only be specified by its name"
+        end
+      end
+
+      # Performs validations related to the `weak frameworks` attribute.
+      #
+      def _validate_weak_frameworks(frameworks)
+        if frameworks_invalid?(frameworks)
+          error "A weak framework should only be specified by its name"
+        end
+      end
+
+      # Performs validations related to the `libraries` attribute.
+      #
+      def _validate_libraries(libs)
+        if libraries_invalid?(libs)
+          error "A library should only be specified by its name"
+        end
+      end
+
       # Performs validations related to the `license` attribute.
       #
       def _validate_license(l)
@@ -391,6 +421,28 @@ module Pod
         end
       end
 
+      # Returns whether the frameworks are valid
+      #
+      # @params frameworks [Array<String>]
+      # The frameworks to be validated
+      #
+      # @return [Boolean] true if a framework ends in `.framework`
+      #
+      def frameworks_invalid?(frameworks)
+        frameworks.any? { |framework| framework.end_with?('.framework') }
+      end
+
+      # Returns whether the libraries are valid
+      #
+      # @params libs [Array<String>]
+      # The libraries to be validated
+      #
+      # @return [Boolean] true if a library ends with `.a`, `.dylib`, or
+      # starts with `lib`.
+      def libraries_invalid?(libs)
+        libs.any? { |lib| lib.end_with?('.a', '.dylib') || lib.start_with?('lib') }
+      end
+
       #-----------------------------------------------------------------------#
 
       # !@group Result Helpers

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

@@ -220,8 +220,8 @@ module Pod
         def compute_creation_date(set)
           date = get_value(set, :creation_date)
           unless date
-            Dir.chdir(set.sources.first.repo) do
-              git_log   = `git log --first-parent --format=%ct #{set.name}`
+            Dir.chdir(set.sources.first.data_provider.repo) do
+              git_log = `git log --first-parent --format=%ct "#{set.name}"`
               creation_date = git_log.split("\n").last.to_i
               date = Time.at(creation_date)
             end
@@ -246,8 +246,8 @@ module Pod
           return if update_date && update_date > (Time.now - cache_expiration)
 
           spec = set.specification
-          url = spec.source[:git] || ''
-          repo = GitHub.repo(url)
+          url = spec.source[:git]
+          repo = GitHub.repo(url) if url
 
           if repo
             set_value(set, :gh_watchers, repo['watchers'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,7 +46,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -108,8 +108,11 @@ files:
 - lib/cocoapods-core/podfile/target_definition.rb
 - lib/cocoapods-core/podfile.rb
 - lib/cocoapods-core/requirement.rb
+- lib/cocoapods-core/source/abstract_data_provider.rb
 - lib/cocoapods-core/source/acceptor.rb
 - lib/cocoapods-core/source/aggregate.rb
+- lib/cocoapods-core/source/file_system_data_provider.rb
+- lib/cocoapods-core/source/github_data_provider.rb
 - lib/cocoapods-core/source/health_reporter.rb
 - lib/cocoapods-core/source.rb
 - lib/cocoapods-core/specification/consumer.rb
@@ -118,12 +121,12 @@ files:
 - lib/cocoapods-core/specification/dsl/deprecations.rb
 - lib/cocoapods-core/specification/dsl/platform_proxy.rb
 - lib/cocoapods-core/specification/dsl.rb
+- lib/cocoapods-core/specification/json.rb
 - lib/cocoapods-core/specification/linter.rb
 - lib/cocoapods-core/specification/root_attribute_accessors.rb
 - lib/cocoapods-core/specification/set/presenter.rb
 - lib/cocoapods-core/specification/set/statistics.rb
 - lib/cocoapods-core/specification/set.rb
-- lib/cocoapods-core/specification/yaml.rb
 - lib/cocoapods-core/specification.rb
 - lib/cocoapods-core/standard_error.rb
 - lib/cocoapods-core/vendor/requirement.rb