cocoapods-downloader 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96bf7705d6b8a1db8b835ade67743ab65bff9ad1
-  data.tar.gz: 5017578a23c22971e72ac93c7b9caf0b79b2d2fa
+  metadata.gz: aa8a46dc2f695c41fea96ed47be215c794d7b525
+  data.tar.gz: 1484c387e242ed7e655d29b395d9a8924394e522
 SHA512:
-  metadata.gz: 44973e1199503c02113bbebf09c14eb5186c4d9fda7a46bdbe15b83a8f88343b8e2ac9434f9dfd839884c2715b0464018c3db1c7c4631c782e330d2c1cc0326c
-  data.tar.gz: 134caa87da0f72c8c018bf18e1d6371905440655ff4654e6efc102a05d7661af3b50dbfc482886e76788988054b9c0b0f7b63bee88bb4e771c6e21729a489489
+  metadata.gz: a667857e15a111546ab8f842f449567be58de096f4909ef0a0042035f997973cbc527958db579b368554d2dec266e5bd588633f0b26f5c8973af0d104e9e2410
+  data.tar.gz: 7ec7bb4994034106647d350b181769d14d79382447640cc6e57b193635447d5ce0906ed9e85869a1bfd2fc0305331635c0035b1823cd5dc973a5cc0c93423da0

data/lib/cocoapods-downloader.rb

@@ -1,11 +1,5 @@
 module Pod
   module Downloader
-    if RUBY_VERSION >= '1.9.3'
-      require 'English'
-    else
-      alias $CHILD_STATUS $CHILD_STATUS
-    end
-
     require 'cocoapods-downloader/gem_version'
     require 'cocoapods-downloader/api'
     require 'cocoapods-downloader/api_exposable'
@@ -30,7 +24,7 @@ module Pod
         :git  => Git,
         :hg   => Mercurial,
         :http => Http,
-        :svn  => Subversion
+        :svn  => Subversion,
       }
     end
 
@@ -52,12 +46,8 @@ module Pod
     # @return [Downloader::Base] A concrete downloader according to the
     #         options.
     #
-    # @todo   Improve the common support for the cache in Base and add specs.
-    # @todo   Find a way to switch to GitHub tarballs if no cache is used. Have
-    #         global options for the Downloader cache?
-    #
     def self.for_target(target_path, options)
-      options = Hash[options.map{ |k, v| [k.to_sym, v] }]
+      options = Hash[options.map { |k, v| [k.to_sym, v] }]
 
       if target_path.nil?
         raise DownloaderError, 'No target path provided.'
@@ -77,11 +67,6 @@ module Pod
       sub_options = options.dup
       sub_options.delete(strategy)
       klass = downloader_class_by_key[strategy]
-
-      if klass == Git && url.to_s =~ /github.com/
-        klass = GitHub
-      end
-
       klass.new(target_path, url, sub_options)
     end
   end

data/lib/cocoapods-downloader/api.rb

@@ -21,7 +21,7 @@ module Pod
       # @return [void]
       #
       def check_exit_code!(executable, command, output)
-        if $CHILD_STATUS.to_i != 0
+        if $?.exitstatus != 0
           raise DownloaderError, "Error on `#{executable} #{command}`.\n#{output}"
         end
       end

data/lib/cocoapods-downloader/base.rb

@@ -45,17 +45,11 @@ module Pod
       # @param  [String] url @see url
       # @param  [Hash={Symbol=>String}] options @see options
       #
-      # @todo   There is no need of the download only option, it should be
-      #         deprecated and the GitHub downloader should be initialized by
-      #         other means.
-      #
       def initialize(target_path, url, options)
         require 'pathname'
         @target_path, @url, @options = Pathname.new(target_path), url, options
-        @max_cache_size = DEFAULT_MAX_CACHE_SIZE
 
-        accepted_options = self.class.options + [:download_only]
-        unrecognized_options = options.keys - accepted_options
+        unrecognized_options = options.keys - self.class.options
         unless unrecognized_options.empty?
           raise DownloaderError, "Unrecognized options `#{unrecognized_options}`"
         end
@@ -73,29 +67,6 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
-      # @!group Configuration
-
-      # @return [Fixnum] The maximum allowed size for the cache expressed in
-      #         Mb. Defaults to `500` Mb.
-      #
-      # @note   This is specific per downloader class.
-      #
-      attr_accessor :max_cache_size
-
-      # @return [String] The directory to use as root of the cache. If no
-      #         specified the caching will not be used. Defaults to `nil`.
-      #
-      attr_accessor :cache_root
-
-      # @return [Bool] Whether the downloader should use a more aggressive
-      #         caching or ensure that the cache always return the value of the
-      #         remote. Defaults to `false`.
-      #
-      attr_accessor :aggressive_cache
-      alias_method :aggressive_cache?, :aggressive_cache
-
-      #-----------------------------------------------------------------------#
-
       # @!group Downloading
 
       # Downloads the revision specified in the option of a source. If no
@@ -107,7 +78,6 @@ module Pod
         ui_action("#{name} download") do
           target_path.mkpath
           download!
-          prune_cache
         end
       end
 
@@ -119,7 +89,7 @@ module Pod
       #
       def download_head
         ui_action("#{name} HEAD download") do
-          if self.respond_to?(:download_head!, true)
+          if head_supported?
             download_head!
           else
             raise DownloaderError, "The `#{name}` downloader does not support " \
@@ -128,6 +98,13 @@ module Pod
         end
       end
 
+      # @return [Bool] Whether the downloader supports the head download
+      #         strategy.
+      #
+      def head_supported?
+        self.respond_to?(:download_head!, true)
+      end
+
       # @return [Bool] Whether the options provided completely identify a source
       #         or could lead to the download of different files in future.
       #
@@ -144,61 +121,6 @@ module Pod
 
       #-----------------------------------------------------------------------#
 
-      # @!group Cache
-
-      public
-
-      # @return [Pathname] The directory where the cache for the current url
-      #         should be stored.
-      #
-      # @note   The name of the directory is the SHA1 hash value of the URL.
-      #
-      def cache_path
-        require 'digest/sha1'
-        if cache_root
-          @cache_path ||= class_cache_dir + "#{Digest::SHA1.hexdigest(url.to_s)}"
-        end
-      end
-
-      private
-
-      # @return [Pathname] The directory where the caches are stored.
-      #
-      def class_cache_dir
-        Pathname.new(File.expand_path(Pathname.pwd + cache_root)) + name
-      end
-
-      # @return [Bool] Whether the downloader should use the cache.
-      #
-      def use_cache?
-        !(cache_root && !@options[:download_only]).nil?
-      end
-
-      # The default maximum allowed size for the cache expressed in Mb.
-      #
-      DEFAULT_MAX_CACHE_SIZE = 500
-
-      # @return [Integer] The global size of the cache expressed in Mb.
-      #
-      def caches_size
-        `du -cm`.split("\n").last.to_i
-      end
-
-      # @return [void] Deletes the oldest caches until they the global size is
-      #         below the maximum allowed.
-      #
-      def prune_cache
-        return unless cache_root && class_cache_dir.exist?
-        Dir.chdir(class_cache_dir) do
-          repos = Pathname.new(class_cache_dir).children.select { |c| c.directory? }.sort_by(&:ctime)
-          while caches_size >= max_cache_size && !repos.empty?
-            dir = repos.shift
-            ui_message "Removing #{name} cache for `#{cache_origin_url(dir)}'"
-            dir.rmtree
-          end
-        end
-      end
-
       # Defines two methods for an executable, based on its name. The bag
       # version raises if the executable terminates with a non-zero exit code.
       #

data/lib/cocoapods-downloader/gem_version.rb

@@ -3,6 +3,6 @@ module Pod
     # @return [String] Downloader’s version, following
     #         [semver](http://semver.org).
     #
-    VERSION = '0.6.1'
+    VERSION = '0.7.0'
   end
 end

data/lib/cocoapods-downloader/git.rb

@@ -23,256 +23,69 @@ module Pod
 
       private
 
-      executable :git
+      # @!group Base class hooks
 
       def download!
-        create_cache if use_cache? && !cache_exist?
-        if options[:tag]
-          download_tag
-        elsif options[:branch]
-          download_branch
-        elsif options[:commit]
-          download_commit
-        else
-          download_head!
-        end
-        Dir.chdir(target_path) { git! 'submodule update --init'  } if options[:submodules]
+        clone
+        checkout_commit if options[:commit]
+        init_submodules if options[:submodules]
       end
 
-      # @return [void] Checkouts the HEAD of the git source in the destination
+      # @return [void] Checks out the HEAD of the git source in the destination
       #         path.
       #
       def download_head!
-        update_cache if use_cache?
-        clone(clone_url, target_path)
-        Dir.chdir(target_path) { git! 'submodule update --init'  } if options[:submodules]
+        clone(true)
+        init_submodules if options[:submodules]
       end
 
-      #--------------------------------------#
-
       # @!group Download implementations
 
-      # @return [Pathname] The clone URL, which resolves to the cache path.
-      #
-      def clone_url
-        use_cache? ? cache_path : url
-      end
-
-      # @return [void] Convenience method to perform clones operations.
-      #
-      def clone(from, to, flags = '')
-        ui_sub_action('Cloning to Pods folder') do
-          command = %Q(clone #{from.shellescape} #{to.shellescape})
-          command << ' ' + flags if flags
-          git!(command)
-        end
-      end
+      executable :git
 
-      # @return [void] Checkouts a specific tag of the git source in the
-      #         destination path.
+      # Clones the repo. If possible the repo will be shallowly cloned.
       #
-      # @note   Tags trigger a cache update unless aggressive cache is
-      #         specified.
+      # @note   The `:commit` option requires a specific strategy as it is not
+      #         possible to specify the commit to the `clone` command.
       #
-      # @note   Git fetch and checkout output to standard error and thus they
-      #         are redirected to stdout.
+      # @note   `--branch` command line option can also take tags and detaches
+      #         the HEAD.
       #
-      # @note   For performance if the cache is used the repo is inialized with
-      #         git clone (see CocoaPods/CocoaPods#1077).
+      # @param  [Bool] force_head
+      #         If any specific option should be ignored and the HEAD of the
+      #         repo should be cloned.
       #
-      def download_tag
-        if use_cache?
-          if aggressive_cache?
-            ensure_ref_exists(options[:tag])
-          else
-            update_cache
+      def clone(force_head = false)
+        ui_sub_action('Git download') do
+          command = ['clone', url.shellescape, target_path.shellescape]
+
+          unless options[:commit]
+            command += ['--single-branch', '--depth 1']
           end
-        end
 
-        Dir.chdir(target_path) do
-          if use_cache?
-            clone(clone_url, target_path)
-          else
-            git! 'init'
-            git! "remote add origin '#{clone_url}'"
+          unless force_head
+            if tag_or_branch = options[:tag] || options[:branch]
+              command += ['--branch', tag_or_branch]
+            end
           end
 
-          git! "fetch origin tags/#{options[:tag]} 2>&1"
-          git! 'reset --hard FETCH_HEAD'
-          git! 'checkout -b activated-pod-commit 2>&1'
+          git! command.join(' ')
         end
       end
 
-      # @return [void] Checkouts a specific commit of the git source in the
-      #         destination path.
+      # Checks out a specific commit of the cloned repo.
       #
-      # @note   Git checkouts output to standard error and thus it is
-      #         redirected to stdout.
-      #
-      def download_commit
-        ensure_ref_exists(options[:commit]) if use_cache?
-        clone(clone_url, target_path)
+      def checkout_commit
         Dir.chdir(target_path) do
-          git! "checkout -b activated-pod-commit #{options[:commit]} 2>&1"
+          git! "checkout -b activated-commit #{options[:commit]}"
         end
       end
 
-      # @return [void] Checkouts the HEAD of a specific branch of the git
-      #         source in the destination path.
-      #
-      # @note   Git checkouts output to standard error and thus it is
-      #         redirected to stdout.
+      # Initializes and updates the submodules of the cloned repo.
       #
-      def download_branch
-        update_cache if use_cache?
-        clone(clone_url, target_path)
+      def init_submodules
         Dir.chdir(target_path) do
-          git! "remote add upstream '#{@url}'" # we need to add the original url, not the cache url
-          git! 'fetch -q upstream' # refresh the branches
-          git! "checkout --track -b activated-pod-commit upstream/#{options[:branch]} 2>&1" # create a new tracking branch
-          ui_message("Downloaded and checked out branch: #{options[:branch]} from upstream #{clone_url}")
-        end
-      end
-
-      #--------------------------------------#
-
-      # @!group Checking references
-
-      # @return [Bool] Whether a reference (commit SHA or tag)
-      #
-      def ref_exists?(ref)
-        if cache_exist?
-          Dir.chdir(cache_path) { git "rev-list --max-count=1 #{ref}" }
-          $CHILD_STATUS == 0
-        else
-          false
-        end
-      end
-
-      # @return [void] Checks if a reference exists in the cache and updates
-      #         only if necessary.
-      #
-      # @raise If after the update the reference can't be found.
-      #
-      def ensure_ref_exists(ref)
-        return if ref_exists?(ref)
-        update_cache
-        raise DownloaderError, "Cache unable to find git reference `#{ref}' for `#{url}'." unless ref_exists?(ref)
-      end
-
-      # @return [Bool] Whether a branch exists in the cache.
-      #
-      def branch_exists?(branch)
-        Dir.chdir(cache_path) { git "branch --all | grep #{branch}$" } # check for remote branch and do suffix matching ($ anchor)
-        $CHILD_STATUS == 0
-      end
-
-      # @return [void] Checks if a branch exists in the cache and updates
-      #         only if necessary.
-      #
-      # @raise  If after the update the branch can't be found.
-      #
-      def ensure_remote_branch_exists(branch)
-        return if branch_exists?(branch)
-        update_cache
-        raise DownloaderError, "Cache unable to find git reference `#{branch}' for `#{url}' (#{$CHILD_STATUS})." unless branch_exists?(branch)
-      end
-
-      #--------------------------------------#
-
-      # @!group Cache
-
-      # @return [Bool] Whether the cache exits.
-      #
-      # @note   The previous implementation of the cache didn't use a barebone
-      #         git repo. This method takes into account this fact and checks
-      #         that the cache is actually a barebone repo. If the cache was
-      #         not barebone it will be deleted and recreated.
-      #
-      def cache_exist?
-        cache_path.exist? &&
-          cache_origin_url(cache_path).to_s == url.to_s &&
-          Dir.chdir(cache_path) { git('config core.bare').chomp == 'true' }
-      end
-
-      # @return [String] The origin URL of the cache with the given directory.
-      #
-      # @param [String] dir The directory of the cache.
-      #
-      def cache_origin_url(dir)
-        Dir.chdir(dir) { `git config remote.origin.url`.chomp }
-      end
-
-      # @return [void] Creates the barebone repo that will serve as the cache
-      #         for the current repo.
-      #
-      def create_cache
-        ui_sub_action("Creating cache git repo (#{cache_path})") do
-          cache_path.rmtree if cache_path.exist?
-          cache_path.mkpath
-          clone(url, cache_path, '--mirror')
-        end
-      end
-
-      # @return [void] Updates the barebone repo used as a cache against its
-      #         remote creating it if needed.
-      #
-      def update_cache
-        if cache_exist?
-          ui_sub_action("Updating cache git repo (#{cache_path})") do
-            Dir.chdir(cache_path) { git! 'remote update' }
-          end
-        else
-          create_cache
-        end
-      end
-    end
-
-    #---------------------------------------------------------------------------#
-
-    # Allows to download tarballs from GitHub.
-    #
-    class GitHub < Git
-      require 'open-uri'
-
-      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 download_commit
-        download_only? ? download_and_extract_tarball(options[:commit]) : super
-      end
-
-      def download_branch
-        download_only? ? download_and_extract_tarball(options[:branch]) : super
-      end
-
-      def tarball_url_for(id)
-        match = url.match(%r{[:/]([\w\-]+)/([\w\-]+)\.git})
-        "https://github.com/#{match[1]}/#{match[2]}/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.shellescape} -C #{target_path.shellescape} --strip-components 1"
+          git! 'submodule update --init --depth 1'
         end
       end
     end

data/lib/cocoapods-downloader/http.rb

@@ -25,10 +25,6 @@ module Pod
         extract_with_type(@download_path, type)
       end
 
-      def download_head!
-        download!
-      end
-
       def type
         if options[:type]
           options[:type].to_sym

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -19,9 +19,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- README.markdown
-- lib/cocoapods-downloader.rb
 - lib/cocoapods-downloader/api.rb
 - lib/cocoapods-downloader/api_exposable.rb
 - lib/cocoapods-downloader/base.rb
@@ -31,6 +28,9 @@ files:
 - lib/cocoapods-downloader/http.rb
 - lib/cocoapods-downloader/mercurial.rb
 - lib/cocoapods-downloader/subversion.rb
+- lib/cocoapods-downloader.rb
+- README.markdown
+- LICENSE
 homepage: https://github.com/CocoaPods/Downloader
 licenses:
 - MIT
@@ -41,17 +41,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 3
 summary: A small library for downloading files from remotes in a folder.