cocoapods 0.5.1 → 0.6.0.rc1

data/lib/cocoapods/config.rb

@@ -10,16 +10,23 @@ module Pod
       @instance = instance
     end
 
-    attr_accessor :repos_dir, :project_root, :project_pods_root, :rootspec, :clean, :verbose, :silent
-    alias_method :clean?,   :clean
-    alias_method :verbose?, :verbose
-    alias_method :silent?,  :silent
+    attr_accessor :repos_dir, :project_root, :project_pods_root
+    attr_accessor :clean, :verbose, :silent
+    attr_accessor :generate_docs, :doc_install
+    attr_accessor :integrate_targets
+    attr_accessor :git_cache_size
+
+    alias_method :clean?,             :clean
+    alias_method :verbose?,           :verbose
+    alias_method :silent?,            :silent
+    alias_method :generate_docs?,     :generate_docs
+    alias_method :doc_install?,       :doc_install
+    alias_method :integrate_targets?, :integrate_targets
 
     def initialize
       @repos_dir = Pathname.new(File.expand_path("~/.cocoapods"))
-      @clean = true
-      @verbose = false
-      @silent = false
+      @verbose = @silent = false
+      @clean = @generate_docs = @doc_install = @integrate_targets = true
     end
 
     def project_root
@@ -31,13 +38,7 @@ module Pod
     end
 
     def project_podfile
-      unless @project_podfile
-        @project_podfile = project_root + 'Podfile'
-        unless @project_podfile.exist?
-          @project_podfile = project_root.glob('*.podspec').first
-        end
-      end
-      @project_podfile
+      @project_podfile ||= project_root + 'Podfile'
     end
 
     def headers_symlink_root
@@ -45,25 +46,21 @@ module Pod
     end
 
     # Returns the spec at the pat returned from `project_podfile`.
-    def rootspec
-      unless @rootspec
-        if project_podfile
-          if project_podfile.basename.to_s == 'Podfile'
-            @rootspec = Podfile.from_file(project_podfile)
-          else
-            @rootspec = Specification.from_file(project_podfile)
-          end
-        end
+    def podfile
+      @podfile ||= begin
+        Podfile.from_file(project_podfile) if project_podfile.exist?
       end
-      @rootspec
     end
+    attr_writer :podfile
 
     def ios?
-      rootspec.platform == :ios if rootspec
+      # TODO: deprecate in 0.7
+      podfile.target_definitions[:default].platform == :ios if podfile
     end
 
     def osx?
-      rootspec.platform == :osx if rootspec
+      # TODO: deprecate in 0.7
+      podfile.target_definitions[:default].platform == :osx if podfile
     end
 
     module Mixin

data/lib/cocoapods/dependency.rb

@@ -1,14 +1,12 @@
 module Gem
 end
 require 'rubygems/dependency'
+require 'open-uri'
 
 module Pod
   class Dependency < Gem::Dependency
-    attr_accessor :only_part_of_other_pod
-    alias_method :only_part_of_other_pod?, :only_part_of_other_pod
-
-    attr_accessor :external_spec_source
 
+    attr_reader :external_source
     attr_accessor :specification
 
     def initialize(*name_and_version_requirements, &block)
@@ -19,7 +17,7 @@ module Pod
 
       elsif !name_and_version_requirements.empty? && block.nil?
         if name_and_version_requirements.last.is_a?(Hash)
-          @external_spec_source = name_and_version_requirements.pop
+          @external_source = ExternalSources.from_params(name_and_version_requirements[0].split('/').first, name_and_version_requirements.pop)
         end
         super(*name_and_version_requirements)
 
@@ -27,19 +25,24 @@ module Pod
         raise Informative, "A dependency needs either a name and version requirements, " \
                            "a source hash, or a block which defines a podspec."
       end
-      @only_part_of_other_pod = false
     end
 
     def ==(other)
-      super &&
-        @only_part_of_other_pod == other.only_part_of_other_pod &&
-         (@specification ? @specification == other.specification : @external_spec_source == other.external_spec_source)
+      super && (@specification ? @specification == other.specification : @external_source == other.external_source)
     end
 
     def subspec_dependency?
       @name.include?('/')
     end
 
+    def inline?
+      @inline_podspec
+    end
+
+    def external?
+      !@external_source.nil?
+    end
+
     # In case this is a dependency for a subspec, e.g. 'RestKit/Networking',
     # this returns 'RestKit', which is what the Pod::Source needs to know to
     # retrieve the correct Set from disk.
@@ -58,11 +61,9 @@ module Pod
 
     def to_s
       version = ''
-      if source = @external_spec_source
-        version << "from `#{source[:git] || source[:podspec]}'"
-        version << ", commit `#{source[:commit]}'" if source[:commit]
-        version << ", tag `#{source[:tag]}'"       if source[:tag]
-      elsif @inline_podspec
+      if external?
+        version << @external_source.description
+      elsif inline?
         version << "defined in Podfile"
       elsif @version_requirements != Gem::Requirement.default
         version << @version_requirements.to_s
@@ -70,32 +71,8 @@ module Pod
       version.empty? ? @name : "#{@name} (#{version})"
     end
 
-    # In case this dependency was defined with either a repo url, :podspec, or block,
-    # this method will return the Specification instance.
-    def specification
-      @specification ||= begin
-        if @external_spec_source
-          config   = Config.instance
-          pod_root = config.project_pods_root + @name
-          spec     = nil
-          if @external_spec_source[:podspec]
-            config.project_pods_root.mkpath
-            spec = config.project_pods_root + "#{@name}.podspec"
-            source = @external_spec_source[:podspec]
-            # can be http, file, etc
-            require 'open-uri'
-            puts "  * Fetching podspec for `#{@name}' from: #{source}" unless config.silent?
-            open(source) do |io|
-              spec.open('w') { |f| f << io.read }
-            end
-          else
-            puts "  * Pre-downloading: `#{@name}'" unless config.silent?
-            Downloader.for_source(pod_root, @external_spec_source).download
-            spec = pod_root + "#{@name}.podspec"
-          end
-          Specification.from_file(spec)
-        end
-      end
+    def specification_from_sandbox(sandbox, platform)
+      @external_source.specification_from_sandbox(sandbox, platform)
     end
 
     # Taken from RubyGems 1.3.7
@@ -134,5 +111,74 @@ module Pod
       end
     end
 
+    module ExternalSources
+      def self.from_params(name, params)
+        if params.key?(:git)
+          GitSource.new(name, params)
+        elsif params.key?(:podspec)
+          PodspecSource.new(name, params)
+        else
+          raise Informative, "Unknown external source parameters for #{name}: #{params}"
+        end
+      end
+
+      class AbstractExternalSource
+        include Config::Mixin
+
+        attr_reader :name, :params
+
+        def initialize(name, params)
+          @name, @params = name, params
+        end
+
+        def specification_from_sandbox(sandbox, platform)
+          if local_pod = sandbox.installed_pod_named(name, platform)
+            local_pod.top_specification
+          else
+            copy_external_source_into_sandbox(sandbox)
+            local_pod = sandbox.installed_pod_named(name, platform)
+            local_pod.clean if config.clean? && local_pod.exists?
+            local_pod.top_specification
+          end
+        end
+
+        def ==(other_source)
+          return if other_source.nil?
+          name == other_source.name && params == other_source.params
+        end
+      end
+
+      class GitSource < AbstractExternalSource
+        def copy_external_source_into_sandbox(sandbox)
+          puts "  * Pre-downloading: '#{name}'" unless config.silent?
+          Downloader.for_target(sandbox.root + name, @params).tap do |downloader|
+            downloader.download
+          end
+        end
+
+        def description
+          "from `#{@params[:git]}'".tap do |description|
+            description << ", commit `#{@params[:commit]}'" if @params[:commit]
+            description << ", tag `#{@params[:tag]}'" if @params[:tag]
+          end
+        end
+      end
+
+      # can be http, file, etc
+      class PodspecSource < AbstractExternalSource
+        def copy_external_source_into_sandbox(sandbox)
+          output_path = sandbox.root + "Local Podspecs/#{name}.podspec"
+          output_path.dirname.mkpath
+          puts "  * Fetching podspec for `#{name}' from: #{@params[:podspec]}" unless config.silent?
+          open(@params[:podspec]) do |io|
+            output_path.open('w') { |f| f << io.read }
+          end
+        end
+
+        def description
+          "from `#{@params[:podspec]}'"
+        end
+      end
+    end
   end
 end

data/lib/cocoapods/downloader.rb

@@ -1,34 +1,46 @@
+require 'uri'
+
 module Pod
   class Downloader
     autoload :Git,        'cocoapods/downloader/git'
+    autoload :GitHub,     'cocoapods/downloader/git'
     autoload :Mercurial,  'cocoapods/downloader/mercurial'
     autoload :Subversion, 'cocoapods/downloader/subversion'
+    autoload :Http,       'cocoapods/downloader/http'
 
     extend Executable
 
-    def self.for_source(pod_root, source)
-      options = source.dup
-      if url = options.delete(:git)
-        Git.new(pod_root, url, options)
-      elsif url = options.delete(:hg)
-        Mercurial.new(pod_root, url, options)
-      elsif url = options.delete(:svn)
-        Subversion.new(pod_root, url, options)
-      else
-        raise "Unsupported download strategy `#{source.inspect}'."
-      end
+    def self.for_pod(pod)
+      spec = pod.top_specification
+      for_target(pod.root, spec.source.dup)
     end
 
-    attr_reader :pod_root, :url, :options
+    attr_reader :target_path, :url, :options
 
-    def initialize(pod_root, url, options)
-      @pod_root, @url, @options = pod_root, url, options
+    def initialize(target_path, url, options)
+      @target_path, @url, @options = target_path, url, options
+      @target_path.mkpath
     end
 
-    def clean(clean_paths = [])
-      clean_paths.each do |path|
-        path.rmtree
-      end if clean_paths
+    private
+
+    def self.for_target(target_path, options)
+      options = options.dup
+      if url = options.delete(:git)
+        if url.to_s =~ /github.com/
+          GitHub.new(target_path, url, options)
+        else
+          Git.new(target_path, url, options)
+        end
+      elsif url = options.delete(:hg)
+        Mercurial.new(target_path, url, options)
+      elsif url = options.delete(:svn)
+        Subversion.new(target_path, url, options)
+      elsif url = options.delete(:http)
+        Http.new(target_path, url, options)
+      else
+        raise "Unsupported download strategy `#{options.inspect}'."
+      end
     end
   end
 end

data/lib/cocoapods/downloader/git.rb

@@ -1,46 +1,156 @@
+require 'open-uri'
+require 'tempfile'
+require 'zlib'
+require 'digest/sha1'
+
 module Pod
   class Downloader
     class Git < Downloader
+      include Config::Mixin
       executable :git
 
+      MAX_CACHE_SIZE = 500
+
       def download
-        @pod_root.dirname.mkpath
-        if @options[:tag]
+        create_cache unless cache_exist?
+        puts '-> Cloning git repo' if config.verbose?
+        if options[:tag]
           download_tag
-        elsif @options[:commit]
+        elsif options[:commit]
           download_commit
         else
           download_head
         end
+        removed_cached_repos_if_needed
+      end
+
+      def create_cache
+        puts "-> Creating cache git repo (#{cache_path})" if config.verbose?
+        cache_path.rmtree if cache_path.exist?
+        cache_path.mkpath
+        git "clone '#{url}' #{cache_path}"
+      end
+
+      def removed_cached_repos_if_needed
+        return unless caches_dir.exist?
+        Dir.chdir(caches_dir) do
+          repos = Pathname.new(caches_dir).children.select { |c| c.directory? }.sort_by(&:ctime)
+          while caches_size >= MAX_CACHE_SIZE && !repos.empty?
+            dir = repos.shift
+            puts '->'.yellow << " Removing git cache for `#{origin_url(dir)}'" if config.verbose?
+            dir.rmtree
+          end
+        end
+      end
+
+      def cache_path
+        @cache_path ||= caches_dir + "#{Digest::SHA1.hexdigest(url.to_s)}"
+      end
+
+      def cache_exist?
+        cache_path.exist? && origin_url(cache_path).to_s == url.to_s
+      end
+
+      def origin_url(dir)
+        Dir.chdir(dir) { `git config remote.origin.url`.chomp }
+      end
+
+      def caches_dir
+        Pathname.new(File.expand_path("~/Library/Caches/CocoaPods/Git"))
+      end
+
+      def clone_url
+        cache_path
+      end
+
+      def caches_size
+        # expressed in Mb
+        `du -cm`.split("\n").last.to_i
+      end
+
+      def update_cache
+        puts "-> Updating cache git repo (#{cache_path})" if config.verbose?
+        Dir.chdir(cache_path) do
+          git "reset --hard HEAD"
+          git "clean -d -x -f"
+          git "pull"
+        end
+      end
+
+      def ref_exists?(ref)
+        Dir.chdir(cache_path) { git "rev-list --max-count=1 #{ref}" }
+        $? == 0
+      end
+
+      def ensure_ref_exists(ref)
+        return if ref_exists?(ref)
+        # Skip pull if not needed
+        update_cache
+        raise Informative, "[!] Cache unable to find git reference `#{ref}' for `#{url}'.".red unless ref_exists?(ref)
       end
 
       def download_head
-        git "clone '#{@url}' '#{@pod_root}'"
+        update_cache
+        git "clone '#{clone_url}' '#{target_path}'"
       end
 
       def download_tag
-        @pod_root.mkpath
-        Dir.chdir(@pod_root) do
+        ensure_ref_exists(options[:tag])
+        Dir.chdir(target_path) do
           git "init"
-          git "remote add origin '#{@url}'"
-          git "fetch origin tags/#{@options[:tag]}"
+          git "remote add origin '#{clone_url}'"
+          git "fetch origin tags/#{options[:tag]}"
           git "reset --hard FETCH_HEAD"
           git "checkout -b activated-pod-commit"
         end
       end
 
       def download_commit
-        git "clone '#{@url}' '#{@pod_root}'"
-        Dir.chdir(@pod_root) do
-          git "checkout -b activated-pod-commit #{@options[:commit]}"
+        ensure_ref_exists(options[:commit])
+        git "clone '#{clone_url}' '#{target_path}'"
+        Dir.chdir(target_path) do
+          git "checkout -b activated-pod-commit #{options[:commit]}"
         end
       end
+    end
+
+    class GitHub < Git
+      def download_head
+        download_only? ? download_and_extract_tarball('master') : super
+      end
+
+      def download_tag
+        download_only? ? download_and_extract_tarball(options[:tag]) : super
+      end
 
-      def clean(clean_paths = [])
-        super
-        (@pod_root + '.git').rmtree
+      def download_commit
+        download_only? ? download_and_extract_tarball(options[:commit]) : super
+      end
+
+      def tarball_url_for(id)
+        original_url, username, reponame = *(url.match(/[:\/]([\w\-]+)\/([\w\-]+)\.git/).to_a)
+        "https://github.com/#{username}/#{reponame}/tarball/#{id}"
+      end
+
+      def tmp_path
+        target_path + "tarball.tar.gz"
+      end
+
+      private
+
+      def download_only?
+        @options[:download_only]
+      end
+
+      def download_and_extract_tarball(id)
+        File.open(tmp_path, "w+") do |tmpfile|
+          open tarball_url_for(id) do |archive|
+            tmpfile.write Zlib::GzipReader.new(archive).read
+          end
+
+          system "tar xf #{tmpfile.path} -C #{target_path} --strip-components 1"
+        end
       end
     end
   end
 end
-