cocoapods-core 0.35.0 → 0.36.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcbca71ceead035a92e4707de3007cc2ecad1d49
-  data.tar.gz: 0aecd4fdb9b8dea3df82280c80fddcf6a181acae
+  metadata.gz: d1aef836bf83585db97dc487c15d8a5aa7290886
+  data.tar.gz: a08f076add586a3a79f71365ae02d9b63d314ca7
 SHA512:
-  metadata.gz: a776fb7c8ccf469f3a1c94d1b9971e33b5a3b6a2789f4a7e15a318d2d532294ac80651d42fc4a1bc7bfc31aa92965c7862e179d87479d018ead16d500e69a7de
-  data.tar.gz: a1150d9acc6638be13f1c864508f5c6464a6299d85aab96d4b369ad8dbbdc7a32d5bed4fdaa3497515d72f0bbbcbee3156cfc13da6aa933570dbcad9f7f6f145
+  metadata.gz: b8b4639f30e85fd314a5fd93c2782dc2a7d125916760b4af0db485cead247b5f09426fdf8013966cd33875549503c39dbe4d20f85b077f713636aaa5f261843e
+  data.tar.gz: 4fbb5d4225d96a0be864450c6b3c2112fc544b4381e0c5d3e3fcf6c1ad08d0a2296ce93462023c2ffe4f4d8549f60ff566b64de74b28cc5049049561ea25d7c2

data/lib/cocoapods-core.rb

@@ -23,6 +23,7 @@ module Pod
   autoload :GitHub,         'cocoapods-core/github'
   autoload :HTTP,           'cocoapods-core/http'
   autoload :Lockfile,       'cocoapods-core/lockfile'
+  autoload :Metrics,        'cocoapods-core/metrics'
   autoload :Platform,       'cocoapods-core/platform'
   autoload :Podfile,        'cocoapods-core/podfile'
   autoload :Source,         'cocoapods-core/source'

data/lib/cocoapods-core/dependency.rb

@@ -52,7 +52,7 @@ module Pod
     #   @example  Initialization with an external source.
     #
     #             Dependency.new('libPusher', {:git     => 'example.com/repo.git'})
-    #             Dependency.new('libPusher', {:path   => 'path/to/folder'})
+    #             Dependency.new('libPusher', {:path    => 'path/to/folder'})
     #             Dependency.new('libPusher', {:podspec => 'example.com/libPusher.podspec'})
     #
     # @overload   initialize(name, is_head)
@@ -324,12 +324,12 @@ module Pod
     # @return   [Dependency] the dependency described by the string.
     #
     def self.from_string(string)
-      match_data = string.match(/(\S*)( (.*))?/)
+      match_data = string.match(/((?:\s?[^\s(])+)( (?:.*))?/)
       name = match_data[1]
       version = match_data[2]
       version = version.gsub(/[()]/, '') if version
       case version
-      when nil || /from `(.*)(`|')/
+      when nil, /from `(.*)(`|')/
         Dependency.new(name)
       when /HEAD/
         Dependency.new(name, :head)

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/metrics.rb

@@ -0,0 +1,47 @@
+module Pod
+  # Allows to access metrics about pods.
+  #
+  # This class is stored in Core because it might be used by web services.
+  #
+  module Metrics
+    # Returns the metrics of a pod.
+    #
+    # @param  [String] name
+    #         The name of the pod.
+    #
+    # @return [Hash] The metrics for the pod.
+    #
+    def self.pod(name)
+      peform_request("http://metrics.cocoapods.org/api/v1/pods/#{name}")
+    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 self.peform_request(url)
+      require 'rest'
+      require 'json'
+      headers = { 'User-Agent' => "CocoaPods #{Pod::CORE_VERSION}" }
+      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
+
+    #-------------------------------------------------------------------------#
+  end
+end

data/lib/cocoapods-core/platform.rb

@@ -166,6 +166,16 @@ module Pod
       end
     end
 
+    # @return [Bool] whether the platform supports dynamic frameworks.
+    #
+    def supports_dynamic_frameworks?
+      if name == :ios
+        deployment_target && (deployment_target >= Version.new(8.0))
+      else
+        true
+      end
+    end
+
     # Converts the symbolic name of a platform to a string name suitable to be
     # presented to the user.
     #

data/lib/cocoapods-core/podfile.rb

@@ -101,6 +101,12 @@ module Pod
       get_hash_value('sources') || []
     end
 
+    # @return [Hash<String, Hash>] The plugins, keyed by name.
+    #
+    def plugins
+      get_hash_value('plugins') || {}
+    end
+
     # @return [String] the path of the workspace if specified by the user.
     #
     def workspace_path
@@ -182,6 +188,7 @@ module Pod
       sources
       generate_bridge_support
       set_arc_compatibility_flag
+      plugins
     ).freeze
 
     # @return [Hash] The hash representation of the Podfile.

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

@@ -415,6 +415,16 @@ module Pod
         current_target_definition.inhibit_all_warnings = true
       end
 
+      # Use frameworks instead of static libraries for Pods.
+      #
+      # ------
+      #
+      # This attribute is inherited by child target definitions.
+      #
+      def use_frameworks!(flag = true)
+        current_target_definition.use_frameworks!(flag)
+      end
+
       #-----------------------------------------------------------------------#
 
       # @!group Workspace
@@ -525,6 +535,34 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
+      # Specifies the plugins that should be used during installation.
+      #
+      # -----
+      #
+      # Use this method to specify a plugin that should be used during
+      # installation, along with the options that should be passed to the plugin
+      # when it is invoked.
+      #
+      # @param    [String] name
+      #           The name of the plugin.
+      #
+      # @param    [Hash] options
+      #           The optional options that should be passed to the plugin when
+      #           its hooks are invoked.
+      #
+      # @example  Specifying to use the `slather` and `cocoapods-keys` plugins.
+      #
+      #           plugin 'cocoapods-keys', keyring: 'Eidolon'
+      #           plugin 'slather'
+      #
+      # @return   [void]
+      #
+      def plugin(name, options = {})
+        hash_plugins = get_hash_value('plugins') || {}
+        (hash_plugins[name] ||= {}).merge!(options.deep_stringify_keys)
+        set_hash_value('plugins', hash_plugins)
+      end
+
       # This hook allows you to make any changes to the Pods after they have
       # been downloaded but before they are installed.
       #

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

@@ -316,6 +316,30 @@ module Pod
 
       #--------------------------------------#
 
+      # Sets whether the target definition should build a framework.
+      #
+      # @param  [Bool] flag
+      #         Whether a framework should be built.
+      #
+      # @return [void]
+      #
+      def use_frameworks!(flag = true)
+        set_hash_value('uses_frameworks', flag)
+      end
+
+      # @return [Bool] whether the target definition should build
+      #         a framework.
+      #
+      def uses_frameworks?
+        if internal_hash['uses_frameworks'].nil?
+          root? ? false : parent.uses_frameworks?
+        else
+          get_hash_value('uses_frameworks')
+        end
+      end
+
+      #--------------------------------------#
+
       # Whether a specific pod should be linked to the target when building for
       # a specific configuration. If a pod has not been explicitly whitelisted
       # for any configuration, it is implicitly whitelisted.
@@ -507,6 +531,7 @@ module Pod
         dependencies
         children
         configuration_pod_whitelist
+        uses_frameworks
       ).freeze
 
       # @return [Hash] The hash representation of the target definition.

data/lib/cocoapods-core/specification.rb

@@ -142,6 +142,34 @@ module Pod
       full_name.split('/').first
     end
 
+    # Returns the module name of a specification
+    #
+    # @return [String] the module name
+    #
+    def module_name
+      attributes_hash['module_name'] ||
+        c99ext_identifier(attributes_hash['header_dir']) ||
+        c99ext_identifier(attributes_hash['name'])
+    end
+
+    private
+
+    # Transforms the given string into a valid +identifier+ after C99ext
+    # standard, so that it can be used in source code where escaping of
+    # ambiguous characters is not applicable.
+    #
+    # @param  [String] name
+    #         any name, which may contain leading numbers, spaces or invalid
+    #         characters.
+    #
+    # @return [String]
+    #
+    def c99ext_identifier(name)
+      return nil if name.nil?
+      I18n.transliterate(name).gsub(/^([0-9])/, '_\1').
+        gsub(/[^a-zA-Z0-9_]/, '_').gsub(/_+/, '_')
+    end
+
     #-------------------------------------------------------------------------#
 
     public
@@ -204,6 +232,9 @@ module Pod
     def subspec_by_name(relative_name, raise_if_missing = true)
       if relative_name.nil? || relative_name == base_name
         self
+      elsif relative_name.downcase == base_name.downcase
+        raise Informative, "Trying to access a `#{relative_name}` " \
+          "specification from `#{base_name}`, which has a different case."
       else
         remainder = relative_name[base_name.size + 1..-1]
         subspec_name = remainder.split('/').shift
@@ -216,7 +247,7 @@ module Pod
             return nil
           end
         end
-        subspec.subspec_by_name(remainder)
+        subspec.subspec_by_name(remainder, raise_if_missing)
       end
     end
 
@@ -506,6 +537,7 @@ module Pod
     end
 
     # Loads a specification with the given string.
+    # The specification is evaluated in the context of `path`.
     #
     # @param  [String] spec_contents
     #         A string describing a specification.
@@ -517,16 +549,19 @@ module Pod
     #
     def self.from_string(spec_contents, path, subspec_name = nil)
       path = Pathname.new(path)
-      case path.extname
-      when '.podspec'
-        spec = ::Pod._eval_podspec(spec_contents, path)
-        unless spec.is_a?(Specification)
-          raise Informative, "Invalid podspec file at path `#{path}`."
+      spec = nil
+      Dir.chdir(path.parent.directory? ? path.parent : Dir.pwd) do
+        case path.extname
+        when '.podspec'
+          spec = ::Pod._eval_podspec(spec_contents, path)
+          unless spec.is_a?(Specification)
+            raise Informative, "Invalid podspec file at path `#{path}`."
+          end
+        when '.json'
+          spec = Specification.from_json(spec_contents)
+        else
+          raise Informative, "Unsupported specification format `#{path.extname}`."
         end
-      when '.json'
-        spec = Specification.from_json(spec_contents)
-      else
-        raise Informative, "Unsupported specification format `#{path.extname}`."
       end
 
       spec.defined_in_file = path

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

@@ -96,6 +96,10 @@ module Pod
       #
       spec_attr_accessor :prefix_header_file
 
+      # @return [String] the module name.
+      #
+      spec_attr_accessor :module_name
+
       # @return [String] the headers directory.
       #
       spec_attr_accessor :header_dir

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

@@ -780,6 +780,25 @@ module Pod
 
       #------------------#
 
+      # @!method module_name=(name)
+      #
+      #   The name to use for the framework / clang module which
+      #   will be generated for this specification instead of the
+      #   default (header_dir if set, otherwise the specification
+      #   name).
+      #
+      #   @example
+      #
+      #     spec.module_name = 'Three20'
+      #
+      #   @param  [String] name
+      #           the module name.
+      #
+      root_attribute :module_name,
+                     :inherited => true
+
+      #------------------#
+
       # @!method header_dir=(dir)
       #
       #   The directory where to store the headers files so they don't break

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

@@ -8,6 +8,13 @@ module Pod
         to_hash.to_json(*a) << "\n"
       end
 
+      # @return [String] the pretty json representation of the specification.
+      #
+      def to_pretty_json(*a)
+        require 'json'
+        JSON.pretty_generate(to_hash, *a) << "\n"
+      end
+
       #-----------------------------------------------------------------------#
 
       # @return [Hash] the hash representation of the specification including

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

@@ -50,8 +50,8 @@ module Pod
           run_root_validation_hooks
           perform_all_specs_analysis
         else
-          results.add_error "[spec] The specification defined in `#{file}` "\
-            "could not be loaded.\n\n#{@raise_message}"
+          results.add_error('spec', "The specification defined in `#{file}` "\
+            "could not be loaded.\n\n#{@raise_message}")
         end
         results.empty?
       end
@@ -91,10 +91,10 @@ module Pod
           next unless attr.required?
           unless value && (!value.respond_to?(:empty?) || !value.empty?)
             if attr.name == :license
-              results.add_warning('[attributes] Missing required attribute' \
+              results.add_warning('attributes', 'Missing required attribute' \
               "`#{attr.name}`.")
             else
-              results.add_error('[attributes] Missing required attribute' \
+              results.add_error('attributes', 'Missing required attribute' \
                "`#{attr.name}`.")
             end
           end
@@ -176,28 +176,36 @@ module Pod
           ]
           names_match = acceptable_names.include?(file.basename.to_s)
           unless names_match
-            results.add_error '[name] The name of the spec should match the ' \
-                           'name of the file.'
+            results.add_error('name', 'The name of the spec should match the ' \
+                           'name of the file.')
           end
 
           if spec.root.name =~ /\s/
-            results.add_error '[name] The name of a spec should not contain ' \
-                           'whitespace.'
+            results.add_error('name', 'The name of a spec should not contain ' \
+                           'whitespace.')
           end
 
           if spec.root.name[0, 1] == '.'
-            results.add_error '[name] The name of a spec should not begin' \
-            ' with a period.'
+            results.add_error('name', 'The name of a spec should not begin' \
+            ' with a period.')
           end
         end
       end
 
       def _validate_version(v)
         if v.to_s.empty?
-          results.add_error '[version] A version is required.'
+          results.add_error('version', 'A version is required.')
         elsif v <= Version::ZERO
-          results.add_error '[version] The version of the spec should be' \
-          ' higher than 0.'
+          results.add_error('version', 'The version of the spec should be' \
+          ' higher than 0.')
+        end
+      end
+
+      # Performs validations related to the `module_name` attribute.
+      def _validate_module_name(m)
+        unless m.nil? || m =~ /^[a-z_][0-9a-z_]*$/i
+          results.add_error('module_name', 'The module name of a spec' \
+            ' should be a valid C99 identifier.')
         end
       end
 
@@ -205,11 +213,11 @@ module Pod
       #
       def _validate_summary(s)
         if s.length > 140
-          results.add_warning '[summary] The summary should be a short ' \
-            'version of `description` (max 140 characters).'
+          results.add_warning('summary', 'The summary should be a short ' \
+            'version of `description` (max 140 characters).')
         end
         if s =~ /A short description of/
-          results.add_warning '[summary] The summary is not meaningful.'
+          results.add_warning('summary', 'The summary is not meaningful.')
         end
       end
 
@@ -217,15 +225,15 @@ module Pod
       #
       def _validate_description(d)
         if d =~ /An optional longer description of/
-          results.add_warning '[description] The description is not meaningful.'
+          results.add_warning('description', 'The description is not meaningful.')
         end
         if d == spec.summary
-          results.add_warning '[description] The description is equal to' \
-           ' the summary.'
+          results.add_warning('description', 'The description is equal to' \
+           ' the summary.')
         end
         if d.length < spec.summary.length
-          results.add_warning '[description] The description is shorter ' \
-          'than the summary.'
+          results.add_warning('description', 'The description is shorter ' \
+          'than the summary.')
         end
       end
 
@@ -233,8 +241,8 @@ module Pod
       #
       def _validate_homepage(h)
         if h =~ %r{http://EXAMPLE}
-          results.add_warning '[homepage] The homepage has not been updated' \
-           ' from default'
+          results.add_warning('homepage', 'The homepage has not been updated' \
+           ' from default')
         end
       end
 
@@ -242,8 +250,8 @@ module Pod
       #
       def _validate_frameworks(frameworks)
         if frameworks_invalid?(frameworks)
-          results.add_error '[frameworks] A framework should only be' \
-          ' specified by its name'
+          results.add_error('frameworks', 'A framework should only be' \
+          ' specified by its name')
         end
       end
 
@@ -251,8 +259,8 @@ module Pod
       #
       def _validate_weak_frameworks(frameworks)
         if frameworks_invalid?(frameworks)
-          results.add_error '[weak_frameworks] A weak framework should only be' \
-          ' specified by its name'
+          results.add_error('weak_frameworks', 'A weak framework should only be' \
+          ' specified by its name')
         end
       end
 
@@ -262,20 +270,20 @@ module Pod
         libs.each do |lib|
           lib = lib.downcase
           if lib.end_with?('.a') || lib.end_with?('.dylib')
-            results.add_error '[libraries] Libraries should not include the' \
+            results.add_error('libraries', 'Libraries should not include the' \
             ' extension ' \
-            "(`#{lib}`)"
+            "(`#{lib}`)")
           end
 
           if lib.start_with?('lib')
-            results.add_error '[libraries] Libraries should omit the `lib`' \
+            results.add_error('libraries', 'Libraries should omit the `lib`' \
             ' prefix ' \
-            " (`#{lib}`)"
+            " (`#{lib}`)")
           end
 
           if lib.include?(',')
-            results.add_error '[libraries] Libraries should not include comas ' \
-            "(`#{lib}`)"
+            results.add_error('libraries', 'Libraries should not include comas ' \
+            "(`#{lib}`)")
           end
         end
       end
@@ -286,16 +294,16 @@ module Pod
         type = l[:type]
         file = l[:file]
         if type.nil?
-          results.add_warning '[license] Missing license type.'
+          results.add_warning('license', 'Missing license type.')
         end
         if type && type.gsub(' ', '').gsub("\n", '').empty?
-          results.add_warning '[license] Invalid license type.'
+          results.add_warning('license', 'Invalid license type.')
         end
         if type && type =~ /\(example\)/
-          results.add_error '[license] Sample license type.'
+          results.add_error('license', 'Sample license type.')
         end
         if file && Pathname.new(file).extname !~ /^(\.(txt|md|markdown|))?$/i
-          results.add_error '[license] Invalid file type'
+          results.add_error('license', 'Invalid file type')
         end
       end
 
@@ -307,19 +315,19 @@ module Pod
           version = spec.version.to_s
 
           if git =~ %r{http://EXAMPLE}
-            results.add_error '[source] The Git source still contains the ' \
-            'example URL.'
+            results.add_error('source', 'The Git source still contains the ' \
+            'example URL.')
           end
           if commit && commit.downcase =~ /head/
-            results.add_error '[source] The commit of a Git source cannot be' \
-            ' `HEAD`.'
+            results.add_error('source', 'The commit of a Git source cannot be' \
+            ' `HEAD`.')
           end
           if tag && !tag.to_s.include?(version)
-            results.add_warning '[source] The version should be included in' \
-             ' the Git tag.'
+            results.add_warning('source', 'The version should be included in' \
+             ' the Git tag.')
           end
           if tag.nil?
-            results.add_warning '[source] Git sources should specify a tag.'
+            results.add_warning('source', 'Git sources should specify a tag.')
           end
         end
 
@@ -327,6 +335,15 @@ module Pod
         check_git_ssh_source(s)
       end
 
+      # Performs validations related to the `deprecated_in_favor_of` attribute.
+      #
+      def _validate_deprecated_in_favor_of(d)
+        if d == Specification.root_name(d)
+          results.add_error('deprecated_in_favor_of', 'a spec cannot be ' \
+            'deprecated in favor of itself')
+        end
+      end
+
       # Performs validations related to github sources.
       #
       def perform_github_source_checks(s)
@@ -335,20 +352,22 @@ module Pod
         if git = s[:git]
           return unless git =~ /^#{URI.regexp}$/
           git_uri = URI.parse(git)
-          if git_uri.host == 'www.github.com'
-            results.add_warning '[github_sources] Github repositories should ' \
-             'not use `www` in their URL.'
-          end
-          if git_uri.host == 'github.com' || git_uri.host == 'gist.github.com'
-            unless git.end_with?('.git')
-              results.add_warning '[github_sources] Github repositories ' \
-              'should end in `.git`.'
-            end
-            unless git_uri.scheme == 'https'
-              results.add_warning '[github_sources] Github repositories ' \
-                'should use an `https` link.'
-            end
-          end
+          perform_github_uri_checks(git, git_uri) if git_uri.host.end_with?('github.com')
+        end
+      end
+
+      def perform_github_uri_checks(git, git_uri)
+        if git_uri.host.start_with?('www.')
+          results.add_warning('github_sources', 'Github repositories should ' \
+            'not use `www` in their URL.')
+        end
+        unless git.end_with?('.git')
+          results.add_warning('github_sources', 'Github repositories ' \
+            'should end in `.git`.')
+        end
+        unless git_uri.scheme == 'https'
+          results.add_warning('github_sources', 'Github repositories ' \
+            'should use an `https` link.')
         end
       end
 
@@ -357,9 +376,9 @@ module Pod
       def check_git_ssh_source(s)
         if git = s[:git]
           if git =~ /\w+\@(\w|\.)+\:(\/\w+)*/
-            results.add_warning '[source] Git SSH URLs will NOT work for ' \
+            results.add_warning('source', 'Git SSH URLs will NOT work for ' \
               'people behind firewalls configured to only allow HTTP, ' \
-              'therefore HTTPS is preferred.'
+              'therefore HTTPS is preferred.')
           end
         end
       end
@@ -368,8 +387,8 @@ module Pod
       #
       def _validate_social_media_url(s)
         if s =~ %r{https://twitter.com/EXAMPLE}
-          results.add_warning '[social_media_url] The social media URL has ' \
-            'not been updated from the default.'
+          results.add_warning('social_media_url', 'The social media URL has ' \
+            'not been updated from the default.')
         end
       end
 
@@ -383,8 +402,8 @@ module Pod
       #
       def _validate_compiler_flags(flags)
         if flags.join(' ').split(' ').any? { |flag| flag.start_with?('-Wno') }
-          results.add_warning '[compiler_flags] Warnings must not be disabled' \
-          '(`-Wno compiler` flags).'
+          results.add_warning('compiler_flags', 'Warnings must not be disabled' \
+          '(`-Wno compiler` flags).')
         end
       end
 

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

@@ -53,7 +53,7 @@ module Pod
           unknown_keys = keys - valid_keys
 
           unknown_keys.each do |key|
-            results.add_warning "Unrecognized `#{key}` key"
+            results.add_warning('attributes', "Unrecognized `#{key}` key")
           end
 
           Pod::Specification::DSL.attributes.each do |_key, attribute|
@@ -84,8 +84,8 @@ module Pod
             if patterns.respond_to?(:each)
               patterns.each do |pattern|
                 if pattern.start_with?('/')
-                  results.add_error '[File Patterns] File patterns must be ' \
-                    "relative and cannot start with a slash (#{attrb.name})."
+                  results.add_error('File Patterns', 'File patterns must be ' \
+                    "relative and cannot start with a slash (#{attrb.name}).")
                 end
               end
             end
@@ -100,10 +100,10 @@ module Pod
           empty_patterns = methods.all? { |m| consumer.send(m).empty? }
           empty = empty_patterns && consumer.spec.subspecs.empty?
           if empty
-            results.add_error "[File Patterns] The #{consumer.spec} spec is " \
+            results.add_error('File Patterns', "The #{consumer.spec} spec is " \
               'empty (no source files, resources, resource_bundles, ' \
               'preserve paths, vendored_libraries, vendored_frameworks, ' \
-              'dependencies, nor subspecs).'
+              'dependencies, nor subspecs).')
           end
         end
 
@@ -129,29 +129,29 @@ module Pod
         def validate_attribute_array_keys(attribute, value)
           unknown_keys = value.keys.map(&:to_s) - attribute.keys.map(&:to_s)
           unknown_keys.each do |unknown_key|
-            results.add_warning "Unrecognized `#{unknown_key}` key for " \
-              "`#{attribute.name}` attribute."
+            results.add_warning('keys', "Unrecognized `#{unknown_key}` key for " \
+              "`#{attribute.name}` attribute.")
           end
         end
 
         def validate_attribute_hash_keys(attribute, value)
           major_keys = value.keys & attribute.keys.keys
           if major_keys.count.zero?
-            results.add_warning "Missing primary key for `#{attribute.name}` " \
+            results.add_warning('keys', "Missing primary key for `#{attribute.name}` " \
               'attribute. The acceptable ones are: ' \
-              "`#{attribute.keys.keys.map(&:to_s).sort.join(', ')}`."
+              "`#{attribute.keys.keys.map(&:to_s).sort.join(', ')}`.")
           elsif major_keys.count == 1
             acceptable = attribute.keys[major_keys.first] || []
             unknown = value.keys - major_keys - acceptable
             unless unknown.empty?
-              results.add_warning "Incompatible `#{unknown.sort.join(', ')}` " \
+              results.add_warning('keys', "Incompatible `#{unknown.sort.join(', ')}` " \
                 "key(s) with `#{major_keys.first}` primary key for " \
-                "`#{attribute.name}` attribute."
+                "`#{attribute.name}` attribute.")
             end
           else
             sorted_keys = major_keys.map(&:to_s).sort
-            results.add_warning "Incompatible `#{sorted_keys.join(', ')}` " \
-              "keys for `#{attribute.name}` attribute."
+            results.add_warning('keys', "Incompatible `#{sorted_keys.join(', ')}` " \
+              "keys for `#{attribute.name}` attribute.")
           end
         end
       end

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

@@ -9,6 +9,10 @@ module Pod
           #
           attr_reader :type
 
+          # @return[String] the name of the attribute associated with result.
+          #
+          attr_reader :attribute_name
+
           # @return [String] the message associated with result.
           #
           attr_reader :message
@@ -16,8 +20,9 @@ module Pod
           # @param [Symbol] type    @see type
           # @param [String] message @see message
           #
-          def initialize(type, message)
+          def initialize(type, attribute_name, message)
             @type    = type
+            @attribute_name = attribute_name
             @message = message
             @platforms = []
           end
@@ -30,7 +35,7 @@ module Pod
           # @return [String] a string representation suitable for UI output.
           #
           def to_s
-            r = "[#{type.to_s.upcase}] #{message}"
+            r = "[#{type.to_s.upcase}] [#{attribute_name}] #{message}"
             if platforms != Specification::PLATFORMS
               platforms_names = platforms.uniq.map do |p|
                 Platform.string_name(p)
@@ -67,8 +72,8 @@ module Pod
         #
         # @return [void]
         #
-        def add_error(message)
-          add_result(:error, message)
+        def add_error(attribute_name, message)
+          add_result(:error, attribute_name, message)
         end
 
         # Adds a warning result with the given message.
@@ -78,8 +83,8 @@ module Pod
         #
         # @return [void]
         #
-        def add_warning(message)
-          add_result(:warning, message)
+        def add_warning(attribute_name, message)
+          add_result(:warning, attribute_name, message)
         end
 
         private
@@ -101,10 +106,12 @@ module Pod
         #
         # @return [void]
         #
-        def add_result(type, message)
-          result = results.find { |r| r.type == type && r.message == message }
+        def add_result(type, attribute_name, message)
+          result = results.find do |r|
+            r.type == type && r.attribute_name == attribute_name && r.message == message
+          end
           unless result
-            result = Result.new(type, message)
+            result = Result.new(type, attribute_name, message)
             results << result
           end
           result.platforms << @consumer.platform_name if @consumer

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

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/array/conversions'
 require 'cocoapods-core/specification/set/presenter'
-require 'cocoapods-core/specification/set/statistics'
 
 module Pod
   class Specification

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

@@ -11,15 +11,10 @@ module Pod
         #
         attr_reader :set
 
-        # @return [Statistics] The statistics provider.
-        #
-        attr_reader :statistics_provider
-
         # @param  [Set] set @see #set.
         #
-        def initialize(set, statistics_provider = nil)
+        def initialize(set)
           @set = set
-          @statistics_provider = statistics_provider || Statistics.instance
         end
 
         #---------------------------------------------------------------------#
@@ -54,7 +49,7 @@ module Pod
         #
         # @note     This method orders the sources by name.
         #
-        def verions_by_source
+        def versions_by_source
           result = []
           versions_by_source = @set.versions_by_source
           @set.sources.sort.each do |source|
@@ -179,71 +174,29 @@ module Pod
 
         # @!group Statistics
 
-        # @return [Time] the creation date of the first known `podspec` of the
-        #         Pod.
-        #
-        def creation_date
-          statistics_provider.creation_date(@set)
-        end
-
         # @return [Integer] the GitHub likes of the repo of the Pod.
         #
-        def github_watchers
-          statistics_provider.github_watchers(@set)
+        def github_stargazers
+          github_metrics['stargazers']
         end
 
         # @return [Integer] the GitHub forks of the repo of the Pod.
         #
         def github_forks
-          statistics_provider.github_forks(@set)
-        end
-
-        # @return [String] the relative time of the last push of the repo the Pod.
-        #
-        def github_last_activity
-          distance_from_now_in_words(statistics_provider.github_pushed_at(@set))
+          github_metrics['forks']
         end
 
         #---------------------------------------------------------------------#
 
-        private
+        # @!group Private Helpers
 
-        # Computes a human readable string that represents a past date in
-        # relative terms.
-        #
-        # @param    [Time, String] from_time
-        #           the date that should be represented.
-        #
-        # @example  Possible outputs
-        #
-        #           "less than a week ago"
-        #           "15 days ago"
-        #           "3 month ago"
-        #           "more than a year ago"
-        #
-        # @return   [String] a string that represents a past date.
-        #
-        def distance_from_now_in_words(from_time)
-          return nil unless from_time
-          from_time = Time.parse(from_time) unless from_time.is_a?(Time)
-          to_time = Time.now
-          distance_in_days = (((to_time - from_time).abs) / 60 / 60 / 24).round
-
-          case distance_in_days
-          when 0..7
-            'less than a week ago'
-          when 8..29
-            "#{distance_in_days} days ago"
-          when 30..45
-            '1 month ago'
-          when 46..365
-            "#{(distance_in_days.to_f / 30).round} months ago"
-          else
-            'more than a year ago'
-          end
+        def metrics
+          @metrics ||= Metrics.pod(name) || {}
         end
 
-        #---------------------------------------------------------------------#
+        def github_metrics
+          metrics['github'] || {}
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.0.beta.1
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -84,6 +84,7 @@ files:
 - lib/cocoapods-core/github.rb
 - lib/cocoapods-core/http.rb
 - lib/cocoapods-core/lockfile.rb
+- lib/cocoapods-core/metrics.rb
 - lib/cocoapods-core/platform.rb
 - lib/cocoapods-core/podfile/dsl.rb
 - lib/cocoapods-core/podfile/target_definition.rb
@@ -105,7 +106,6 @@ files:
 - 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.rb
 - lib/cocoapods-core/standard_error.rb

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

@@ -1,263 +0,0 @@
-module Pod
-  class Specification
-    class Set
-      # The statistics class provides information about one or more {Set} that
-      # is not readily available because expensive to compute or provided by a
-      # remote source.
-      #
-      # The class provides also facilities to work with a collection of sets.
-      # It always caches in memory the computed values and it can take an
-      # optional path to cache file that it is responsible of populating and
-      # invalidating.
-      #
-      # To reuse the in memory cache and to minimize the disk access to the
-      # cache file a shared instance is also available.
-      #
-      class Statistics
-        # @return [Statistics] the shared statistics instance.
-        #
-        def self.instance
-          @instance ||= new
-        end
-
-        # Allows to set the shared instance.
-        #
-        # @param  [Statistics] instance
-        #         the new shared instance or nil.
-        #
-        # @return [Statistics] the shared statistics instance.
-        #
-        class << self
-          attr_writer :instance
-        end
-
-        # @return [Pathname] the path to the optional cache file.
-        #
-        # @note   The cache file can be specified after initialization, but
-        #         it has to be configured before requiring any value, otherwise
-        #         it is ignored.
-        #
-        attr_accessor :cache_file
-
-        # @return [Integer] the number of seconds after which the caches of
-        #         values that might changed are discarded.
-        #
-        # @note   If not specified on initialization defaults to 3 days.
-        #
-        attr_accessor :cache_expiration
-
-        # @param  [Pathname] cache_file       @see cache_file
-        #
-        # @param  [Integer] cache_expiration  @see cache_expiration
-        #
-        def initialize(cache_file = nil, cache_expiration = (60 * 60 * 24 * 3))
-          require 'yaml'
-
-          @cache_file       = cache_file
-          @cache_expiration = cache_expiration
-        end
-
-        #---------------------------------------------------------------------#
-
-        # @!group Accessing the statistics
-
-        # Computes the date in which the first podspec of a set was committed
-        # on its git source.
-        #
-        # @param  [Set] set
-        #         the set for the Pod whose creation date is needed.
-        #
-        # @note   The set should be generated with only the source that is
-        #         analyzed. If there are more than one the first one is
-        #         processed.
-        #
-        # @note   This method needs to traverse the git history of the repo and
-        #         thus incurs in a performance hit.
-        #
-        # @return [Time] the date in which a Pod appeared for the first time on
-        #         the {Source}.
-        #
-        def creation_date(set)
-          date = compute_creation_date(set)
-          save_cache
-          date
-        end
-
-        # Computes the date in which the first podspec of each given set was
-        # committed on its git source.
-        #
-        # @param  [Array<Set>] sets
-        #         the list of the sets for the Pods whose creation date is
-        #         needed.
-        #
-        # @note   @see creation_date
-        #
-        # @note   This method is optimized for multiple sets because it saves
-        #         the cache file only once.
-        #
-        # @return [Array<Time>] the list of the dates in which the Pods
-        #         appeared for the first time on the {Source}.
-        #
-        def creation_dates(sets)
-          dates = {}
-          sets.each { |set| dates[set.name] = compute_creation_date(set) }
-          save_cache
-          dates
-        end
-
-        # Computes the number of likes that a Pod has on Github.
-        #
-        # @param  [Set] set
-        #         the set of the Pod.
-        #
-        # @return [Integer] the number of likes or nil if the Pod is not hosted
-        #         on GitHub.
-        #
-        def github_watchers(set)
-          github_stats_if_needed(set)
-          get_value(set, :gh_watchers)
-        end
-
-        # Computes the number of forks that a Pod has on Github.
-        #
-        # @param  [Set] set @see github_watchers
-        #
-        # @return [Integer] the number of forks or nil if the Pod is not hosted
-        #         on GitHub.
-        #
-        def github_forks(set)
-          github_stats_if_needed(set)
-          get_value(set, :gh_forks)
-        end
-
-        # Computes the number of likes that a Pod has on Github.
-        #
-        # @param  [Set] set @see github_watchers
-        #
-        # @return [Time] the time of the last push or nil if the Pod is not
-        #         hosted on GitHub.
-        #
-        def github_pushed_at(set)
-          github_stats_if_needed(set)
-          string_time = get_value(set, :pushed_at)
-          Time.parse(string_time) if string_time
-        end
-
-        #---------------------------------------------------------------------#
-
-        private
-
-        # @return [Hash{String => Hash}] the in-memory cache, where for each
-        #         set is stored a hash with the result of the computations.
-        #
-        def cache
-          unless @cache
-            if cache_file && cache_file.exist?
-              @cache = YAMLHelper.load_string(cache_file.read)
-            else
-              @cache = {}
-            end
-          end
-          @cache
-        end
-
-        # Returns the value for the given key of a set stored in the cache, if
-        # available.
-        #
-        # @param  [Set] set
-        #         the set for which the value is needed.
-        #
-        # @param  [Symbol] key
-        #         the key of the value.
-        #
-        # @return [Object] the value or nil.
-        #
-        def get_value(set, key)
-          if cache[set.name] && cache[set.name][key]
-            cache[set.name][key]
-          end
-        end
-
-        # Stores the given value of a set for the given key in the cache.
-        #
-        # @param  [Set] set
-        #         the set for which the value has to be stored.
-        #
-        # @param  [Symbol] key
-        #         the key of the value.
-        #
-        # @param  [Object] value
-        #         the value to store.
-        #
-        # @return [Object] the value or nil.
-        #
-        def set_value(set, key, value)
-          cache[set.name] ||= {}
-          cache[set.name][key] = value
-        end
-
-        # Saves the in-memory cache to the path of cache file if specified.
-        #
-        # @return [void]
-        #
-        def save_cache
-          if cache_file
-            yaml = YAML.dump(cache)
-            File.open(cache_file, 'w') { |f| f.write(yaml) }
-          end
-        end
-
-        # Analyzes the history of the git repository of the {Source} of the
-        # given {Set} to find when its folder was created.
-        #
-        # @param  [Set] set
-        #         the set for which the creation date is needed.
-        #
-        # @return [Time] the date in which a Pod was created.
-        #
-        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}"`
-              creation_date = git_log.split("\n").last.to_i
-              date = Time.at(creation_date)
-            end
-            set_value(set, :creation_date, date)
-          end
-          date
-        end
-
-        # Retrieved the GitHub information from the API for the given set and
-        # stores it in the in-memory cache.
-        #
-        # @note   If there is a valid cache and it was generated withing the
-        #         expiration time frame this method does nothing.
-        #
-        # @param  [Set] set
-        #         the set for which the GitHub information is needed.
-        #
-        # @return [void]
-        #
-        def github_stats_if_needed(set)
-          update_date = get_value(set, :gh_date)
-          return if update_date && update_date > (Time.now - cache_expiration)
-
-          spec = set.specification
-          url = spec.source[:git]
-          repo = GitHub.repo(url) if url
-
-          if repo
-            set_value(set, :gh_watchers, repo['watchers'])
-            set_value(set, :gh_forks,    repo['forks'])
-            set_value(set, :pushed_at,   repo['pushed_at'])
-            set_value(set, :gh_date,     Time.now)
-            save_cache
-          end
-        end
-
-        #---------------------------------------------------------------------#
-      end
-    end
-  end
-end