cocoapods-core 1.0.0.beta.5 → 1.0.0.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76708b23bcc64b18355ee04008aebc0aaa54fad2
-  data.tar.gz: c11c210e6b36496813245f9b9635821925697d35
+  metadata.gz: b116f2a8b2c3c090b6aada3e046db9d3515e538a
+  data.tar.gz: e4f97aed43c5b3ddc85381673e863a414796def1
 SHA512:
-  metadata.gz: 516cd6d40cd2dcbac3b2609b121b48bcac240ceaf53fbfa34e3fd82eab31a829b35754de36acf237a97d1738b5bbbd51f3590c7cc15f71308692d4431bb51eca
-  data.tar.gz: 435f074158033ca5a786f5c8b150e94c74df2eb02b967b435ca14ac302cc268250a3a08bda9bbde5076116546d3028a4d1f3fb8b89c84732346dbef15c2bd206
+  metadata.gz: b06b2f5053a53c500861559f776f65864128c2144b1e5a7bff34d40c78811fa952b70ee112e3a2f18475962049a1e3258da1b0d32c78aa0f62ab961d4a24fe3c
+  data.tar.gz: 123a0a4674f478085c4abc1ba8d63b155c20b3fbc16d93b399bac5ebd0ff2d6914bb49baf8c730093a086881c61868f0829010737a5226c7a5a61ee5afbf5344

data/lib/cocoapods-core.rb

@@ -27,6 +27,7 @@ module Pod
   autoload :Platform,       'cocoapods-core/platform'
   autoload :Podfile,        'cocoapods-core/podfile'
   autoload :Source,         'cocoapods-core/source'
+  autoload :MasterSource,   'cocoapods-core/master_source'
   autoload :Specification,  'cocoapods-core/specification'
   autoload :StandardError,  'cocoapods-core/standard_error'
   autoload :YAMLHelper,     'cocoapods-core/yaml_helper'

data/lib/cocoapods-core/dependency.rb

@@ -253,13 +253,13 @@ module Pod
       self_req  = requirement
       other_req = other.requirement
 
-      if other_req == default
-        dep = self.class.new(name, self_req)
-      elsif self_req == default
-        dep = self.class.new(name, other_req)
-      else
-        dep = self.class.new(name, self_req.as_list.concat(other_req.as_list))
-      end
+      dep = if other_req == default
+              self.class.new(name, self_req)
+            elsif self_req == default
+              self.class.new(name, other_req)
+            else
+              self.class.new(name, self_req.as_list.concat(other_req.as_list))
+            end
 
       if external_source || other.external_source
         self_external_source  = external_source || {}

data/lib/cocoapods-core/gem_version.rb

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

data/lib/cocoapods-core/github.rb

@@ -76,6 +76,32 @@ module Pod
       end
     end
 
+    # Returns whether the repository has been updated since a given commit.
+    # If the request fails, the response will be true as the API is still in
+    # beta and likely to change.
+    #
+    # @param [String] url @see #repo
+    #
+    # @param [String] commit
+    #        The current HEAD commit.
+    #
+    # @return [Bool] Whether the repository has been updated since the commit.
+    #
+    def self.modified_since_commit(url, commit)
+      return true unless repo_id = normalized_repo_id(url)
+      require 'rest'
+      request_url = "https://api.github.com/repos/#{repo_id}/commits/master"
+      headers = {
+        'User-Agent' => 'CocoaPods',
+        'Accept' => 'application/vnd.github.chitauri-preview+sha',
+        'If-None-Match' => %("#{commit}"),
+      }
+      response = REST.get(request_url, headers)
+      code = response.status_code
+
+      code != 304
+    end
+
     private
 
     # @!group Private helpers

data/lib/cocoapods-core/master_source.rb

@@ -0,0 +1,35 @@
+module Pod
+  class MasterSource < Source
+    # @!group Updating the source
+    #-------------------------------------------------------------------------#
+
+    # Updates the local clone of the source repo.
+    #
+    # @param  [Bool] show_output
+    #
+    # @return  [Array<String>] changed_spec_paths
+    #          Returns the list of changed spec paths.
+    #
+    def update(show_output)
+      if requires_update?
+        super
+      else
+        []
+      end
+    end
+
+    private
+
+    # Returns whether a source requires updating.
+    #
+    # @param [Source] source
+    #        The source to check.
+    #
+    # @return [Bool] Whether the given source should be updated.
+    #
+    def requires_update?
+      commit_hash = Dir.chdir(repo) { git_commit_hash }
+      GitHub.modified_since_commit('CocoaPods/Specs', commit_hash)
+    end
+  end
+end

data/lib/cocoapods-core/requirement.rb

@@ -82,11 +82,11 @@ module Pod
       requirements.compact!
       requirements.uniq!
 
-      if requirements.empty?
-        @requirements = [DefaultRequirement]
-      else
-        @requirements = requirements.map! { |r| self.class.parse r }
-      end
+      @requirements = if requirements.empty?
+                        [DefaultRequirement]
+                      else
+                        requirements.map! { |r| self.class.parse r }
+                      end
     end
 
     #

data/lib/cocoapods-core/source.rb

@@ -21,7 +21,7 @@ module Pod
     # @param  [Pathname, String] repo @see #repo.
     #
     def initialize(repo)
-      @repo = Pathname.new(repo)
+      @repo = Pathname(repo).expand_path
     end
 
     # @return [String] The name of the source.
@@ -39,9 +39,9 @@ module Pod
     #
     def url
       Dir.chdir(repo) do
-        remote = `git config --get remote.origin.url`.chomp
+        remote = git(%w(config --get remote.origin.url))
 
-        if $?.success?
+        if !remote.empty?
           remote
         elsif (repo + '.git').exist?
           "file://#{repo}/.git"
@@ -325,6 +325,11 @@ module Pod
     # @group Private Helpers
     #-------------------------------------------------------------------------#
 
+    def ensure_in_repo!
+      return if Pathname.pwd == repo
+      raise 'Must be in the root of the repo'
+    end
+
     # Loads the specification for the given Pod gracefully.
     #
     # @param  [String] name
@@ -363,16 +368,25 @@ module Pod
     end
 
     def git_commit_hash
-      (`git rev-parse HEAD` || '').strip
+      ensure_in_repo!
+      git(%w(rev-parse HEAD))
     end
 
     def update_git_repo(show_output = false)
-      output = `git pull --ff-only 2>&1`
+      ensure_in_repo!
+      output = git(%w(pull --ff-only), :include_error => true)
       CoreUI.puts output if show_output
     end
 
     def diff_until_commit_hash(commit_hash)
-      (`git diff --name-only #{commit_hash}..HEAD` || '').strip.split("\n")
+      ensure_in_repo!
+      git(%W(diff --name-only #{commit_hash}..HEAD)).split("\n")
+    end
+
+    def git(args, include_error: false)
+      command = 'git ' << args.join(' ')
+      command << ' 2>&1' if include_error
+      (`#{command}` || '').strip
     end
 
     #-------------------------------------------------------------------------#

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

@@ -3,20 +3,14 @@ module Pod
     # The Aggregate manages a directory of sources repositories.
     #
     class Aggregate
-      # @return [Array<Pathname>] The ordered list of source directories.
+      # @return [Array<Source>] The ordered list of sources.
       #
-      attr_reader :directories
+      attr_reader :sources
 
-      # @param  [Array<Pathname>] repos_dirs @see directories
+      # @param  [Array<Source>] repos_dirs @see Sources
       #
-      def initialize(repos_dirs)
-        @directories = Array(repos_dirs)
-      end
-
-      # @return [Array<Source>] The ordered list of the sources.
-      #
-      def sources
-        @sources ||= directories.map { |repo| Source.new(repo) }
+      def initialize(sources)
+        @sources = sources
       end
 
       # @return [Array<String>] the names of all the pods available.

data/lib/cocoapods-core/specification.rb

@@ -265,13 +265,13 @@ module Pod
     # @return [Array<Dependency>] the dependencies on subspecs.
     #
     def subspec_dependencies(platform = nil)
-      if default_subspecs.empty?
-        specs = subspecs.compact
-      else
-        specs = default_subspecs.map do |subspec_name|
-          root.subspec_by_name("#{name}/#{subspec_name}")
-        end
-      end
+      specs = if default_subspecs.empty?
+                subspecs.compact
+              else
+                default_subspecs.map do |subspec_name|
+                  root.subspec_by_name("#{name}/#{subspec_name}")
+                end
+              end
       if platform
         specs = specs.select { |s| s.supported_on_platform?(platform) }
       end

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

@@ -513,11 +513,11 @@ module Pod
       #
       def platform=(args)
         name, deployment_target = args
-        if name
-          attributes_hash['platforms'] = { name.to_s => deployment_target }
-        else
-          attributes_hash['platforms'] = {}
-        end
+        attributes_hash['platforms'] = if name
+                                         { name.to_s => deployment_target }
+                                       else
+                                         {}
+                                       end
       end
 
       #------------------#

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

@@ -122,11 +122,11 @@ module Pod
         def deprecation_description
           if spec.deprecated?
             description = '[DEPRECATED'
-            if spec.deprecated_in_favor_of.nil?
-              description += ']'
-            else
-              description += " in favor of #{spec.deprecated_in_favor_of}]"
-            end
+            description += if spec.deprecated_in_favor_of.nil?
+                             ']'
+                           else
+                             " in favor of #{spec.deprecated_in_favor_of}]"
+                           end
 
             description
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.5
+  version: 1.0.0.beta.6
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: nap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 description: |-
@@ -87,6 +87,7 @@ files:
 - lib/cocoapods-core/github.rb
 - lib/cocoapods-core/http.rb
 - lib/cocoapods-core/lockfile.rb
+- lib/cocoapods-core/master_source.rb
 - lib/cocoapods-core/metrics.rb
 - lib/cocoapods-core/platform.rb
 - lib/cocoapods-core/podfile.rb
@@ -127,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 3
 summary: The models of CocoaPods