cocoapods-core 0.20.2 → 0.21.0.rc1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 62b312896ca3d9a7d6e2ae1631acc1b6e1c9bbbb
+  data.tar.gz: 6e5c6481e6aebb081b04d84b9ec193c0587614fc
+SHA512:
+  metadata.gz: 8996846f9dd57340fa2901478ab8671e06800cc04bc50813350ca3c9b3f2cd0563417a1b6b1ce047b89c0da81d0c90ffbfeaaa78b2f8564728356f6285c57efe
+  data.tar.gz: d2b27e00017dd8a9742c6f5b1565cf178716bbd8682b6f2232cdf0050a2e28f79603a1e5ea926403ed203b498ed5827a4e28e898639d56d1615bf32a47441783

data/lib/cocoapods-core/dependency.rb

@@ -320,7 +320,8 @@ module Pod
       when /HEAD/
         Dependency.new(name, :head)
       else
-        Dependency.new(name, version)
+        version_requirements =  version.split(',') if version
+        Dependency.new(name, version_requirements)
       end
     end
 

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/github.rb

@@ -0,0 +1,103 @@
+module Pod
+
+  # Allows to access information about the GitHub repos.
+  #
+  # This class is stored in Core because it might be used by web services.
+  #
+  module GitHub
+
+    # Returns the information of a user.
+    #
+    # @param  [String] login
+    #         The name of the user.
+    #
+    # @return [Hash] The data of user.
+    #
+    def self.user(login)
+      peform_request("https://api.github.com/users/#{login}")
+    end
+
+    # Returns the information of a repo.
+    #
+    # @param  [String] url
+    #         The URL of the repo.
+    #
+    # @return [Hash] The hash containing the data as reported by GitHub.
+    #
+    def self.repo(url)
+      if repo_id = normalized_repo_id(url)
+        peform_request("https://api.github.com/repos/#{repo_id}")
+      end
+    end
+
+    # Returns the tags of a repo.
+    #
+    # @param  [String] url @see #repo
+    #
+    # @return [Array] The list of the tags.
+    #
+    def self.tags(url)
+      if repo_id = normalized_repo_id(url)
+        peform_request("https://api.github.com/repos/#{repo_id}/tags")
+      end
+    end
+
+    # Returns the branches of a repo.
+    #
+    # @param  [String] url @see #repo
+    #
+    # @return [Array] The list of the branches.
+    #
+    def self.branches(url)
+      if repo_id = normalized_repo_id(url)
+        peform_request("https://api.github.com/repos/#{repo_id}/branches")
+      end
+    end
+
+    private
+
+    #-------------------------------------------------------------------------#
+
+    # @!group Private helpers
+
+    # Returns the repo ID as it is or converting a GitHub URL.
+    #
+    # @param [String] url_or_id
+    #        A repo ID or the URL of the repo.
+    #
+    # @return [String] the repo ID.
+    #
+    def self.normalized_repo_id(url_or_id)
+      repo_id_from_url(url_or_id) || url_or_id
+    end
+
+    # Returns the repo ID given it's URL.
+    #
+    # @param [String] url
+    #        The URL of the repo.
+    #
+    # @return [String] the repo ID.
+    # @return [Nil] if the given url is not a valid github repo url.
+    #
+    def self.repo_id_from_url(url)
+      url[/github.com\/([^\/\.]*\/[^\/\.]*)\.*/, 1]
+    end
+
+    # 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'
+      response = REST.get(url)
+      JSON.parse(response.body)
+    end
+
+    #-------------------------------------------------------------------------#
+
+  end
+end

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

@@ -268,11 +268,7 @@ module Pod
       #
       def prepare_value(attr, value)
         if attr.container ==  Array
-          if value.class == Rake::FileList
-            value = [value]
-          else
-            value = [*value].compact
-          end
+          value = [*value].compact
         end
 
         hook_name = prepare_hook_name(attr)

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

@@ -219,10 +219,6 @@ module Pod
                   "#{to_s}. Allowed keys: `#{allowed_keys.inspect}`"
               end
             end
-
-            if defined?(Rake) && value.is_a?(Rake::FileList)
-              # UI.warn "Rake::FileList is deprecated, use `exclude_files` (#{attrb.name})."
-            end
           end
 
           # @return [Array] the flattened list of the allowed keys for the

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

@@ -276,12 +276,8 @@ module Pod
             patterns = patterns.values.flatten(1)
           end
           patterns.each do |pattern|
-            if pattern.is_a?(Rake::FileList)
-              warning "Rake::FileList is deprecated, use `exclude_files` (#{attrb.name})."
-            else
-              if pattern.start_with?('/')
-                error "File patterns must be relative and cannot start with a slash (#{attrb.name})."
-              end
+            if pattern.start_with?('/')
+              error "File patterns must be relative and cannot start with a slash (#{attrb.name})."
             end
           end
         end

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

@@ -54,19 +54,6 @@ module Pod
         #
         def initialize(cache_file = nil, cache_expiration = (60 * 60 * 24 * 3))
           require 'yaml'
-          begin
-            # 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
 
           @cache_file       = cache_file
           @cache_expiration = cache_expiration
@@ -258,23 +245,21 @@ module Pod
           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_id = url[/github.com\/([^\/\.]*\/[^\/\.]*)\.*/, 1]
-          return unless repo_id
+          spec = set.specification
+          url = spec.source[:git] || ''
+          repo = GitHub.repo(url)
 
-          begin
-            repo = Octokit.repo(repo_id)
-          rescue
-            return
+          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
-
-          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

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

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

data/lib/cocoapods-core.rb

@@ -20,27 +20,20 @@ module Pod
   autoload :Dependency,     'cocoapods-core/dependency'
 
   autoload :CoreUI,         'cocoapods-core/core_ui'
+  autoload :DSLError,       'cocoapods-core/standard_error'
+  autoload :GitHub,         'cocoapods-core/github'
   autoload :Lockfile,       'cocoapods-core/lockfile'
   autoload :Platform,       'cocoapods-core/platform'
   autoload :Podfile,        'cocoapods-core/podfile'
   autoload :Source,         'cocoapods-core/source'
   autoload :Specification,  'cocoapods-core/specification'
   autoload :StandardError,  'cocoapods-core/standard_error'
-  autoload :DSLError,       'cocoapods-core/standard_error'
   autoload :YAMLConverter,  'cocoapods-core/yaml_converter'
 
   # TODO: Fix
   #
   Spec = Specification
 
-  # TODO: Temporary support for FileList
-  #
-  if RUBY_VERSION >= '1.9'
-    require 'rake/file_list'
-  else
-    require 'rake'
-  end
-  FileList = Rake::FileList
 end
 
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 0.20.2
-  prerelease: 
+  version: 0.21.0.rc1
 platform: ruby
 authors:
 - Eloy Duran
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,31 +21,41 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: nap
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,14 +63,14 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-description: ! "The CocoaPods-Core gem provides support to work with the models of
-  CocoaPods.\n\n It is intended to be used in place of the CocoaPods when the the
-  installation of the dependencies is not needed."
+description: |-
+  The CocoaPods-Core gem provides support to work with the models of CocoaPods.
+
+   It is intended to be used in place of the CocoaPods when the the installation of the dependencies is not needed.
 email:
 - eloy.de.enige@gmail.com
 - fabiopelosin@gmail.com
@@ -73,6 +81,7 @@ files:
 - lib/cocoapods-core/core_ui.rb
 - lib/cocoapods-core/dependency.rb
 - lib/cocoapods-core/gem_version.rb
+- lib/cocoapods-core/github.rb
 - lib/cocoapods-core/lockfile.rb
 - lib/cocoapods-core/platform.rb
 - lib/cocoapods-core/podfile/dsl.rb
@@ -108,25 +117,24 @@ files:
 homepage: https://github.com/CocoaPods/CocoaPods
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods