cocoapods-downloader 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d939a67d6d36d973515d8ec5bf4cdd203f288487
-  data.tar.gz: 1f341084741d856cca13e86ab23cc858ea7dd692
+  metadata.gz: 60818e780d8483366ea6ecc6db5653ca73f7d6a2
+  data.tar.gz: c7802185fb74b2d56ac7ff76f3ab4a18cc1258fe
 SHA512:
-  metadata.gz: 12033cc74a68218cf549a9d31668d726cdb570292b627b04a2a9d7cb239ea9cf2e859b951c7577bac9772225be141d6de4ae74cd0571877dafd67aefafb34139
-  data.tar.gz: 1521f867b04670fe0c931e9dea7ab908f481846c80ec68c040733b0716718ed80c6bc046637393e01739cc095c670da71e37a4fd04d40d4e69137e0e11b90eab
+  metadata.gz: ad752c3add9ca8972fcb1754a1fa6f4be42cb1a44a50176b1c43ae91f3113f886ae3c33337a3c6c64c510061191b530258d9111d94244cf551192806474f8db1
+  data.tar.gz: b6e61992a0c9059b25668637e67454a1224e51f1599f9458f599be800daf1dfe7edb84f7a233f0a8470f40ff98feae23cc8a0fe2ee7a007b2e30dce701d025db

data/README.markdown

@@ -2,9 +2,9 @@
 
 A small library for downloading files from remotes in a folder.
 
-[![Build Status](https://travis-ci.org/CocoaPods/cocoapods-downloader.svg?branch=master)](https://travis-ci.org/CocoaPods/cocoapods-downloader)
-[![Coverage Status](https://img.shields.io/coveralls/CocoaPods/cocoapods-downloader.svg)](https://coveralls.io/r/CocoaPods/cocoapods-downloader)
-[![Code Climate](https://img.shields.io/codeclimate/github/CocoaPods/cocoapods-downloader.svg)](https://codeclimate.com/github/CocoaPods/cocoapods-downloader)
+[![Build Status](https://img.shields.io/travis/CocoaPods/cocoapods-downloader/master.svg?style=flat)](https://travis-ci.org/CocoaPods/cocoapods-downloader)
+[![Coverage](https://img.shields.io/codeclimate/coverage/github/CocoaPods/cocoapods-downloader.svg?style=flat)](https://codeclimate.com/github/CocoaPods/cocoapods-downloader)
+[![Code Climate](https://img.shields.io/codeclimate/github/CocoaPods/cocoapods-downloader.svg?style=flat)](https://codeclimate.com/github/CocoaPods/cocoapods-downloader)
 
 ## Install
 

data/lib/cocoapods-downloader.rb

@@ -1,5 +1,11 @@
 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'
@@ -24,7 +30,7 @@ module Pod
         :git  => Git,
         :hg   => Mercurial,
         :http => Http,
-        :svn  => Subversion,
+        :svn  => Subversion
       }
     end
 
@@ -52,16 +58,16 @@ module Pod
     #
     def self.for_target(target_path, options)
       if target_path.nil?
-        raise DownloaderError, "No target path provided."
+        raise DownloaderError, 'No target path provided.'
       end
 
       if options.nil? || options.empty?
-        raise DownloaderError, "No source URL provided."
+        raise DownloaderError, 'No source URL provided.'
       end
 
       strategy = strategy_from_options(options)
       unless strategy
-        raise DownloaderError, "Unsupported download strategy " \
+        raise DownloaderError, 'Unsupported download strategy ' \
           "`#{options.inspect}`."
       end
 

data/lib/cocoapods-downloader/api.rb

@@ -1,11 +1,9 @@
 module Pod
   module Downloader
-
     # The Downloader::Hooks module allows to adapt the Downloader to
     # the UI of other gems.
     #
     module API
-
       # Executes
       # @return [String] the output of the command.
       #
@@ -23,7 +21,7 @@ module Pod
       # @return [void]
       #
       def check_exit_code!(executable, command, output)
-        if $?.to_i != 0
+        if $CHILD_STATUS.to_i != 0
           raise DownloaderError, "Error on `#{executable} #{command}`.\n#{output}"
         end
       end

data/lib/cocoapods-downloader/api_exposable.rb

@@ -1,7 +1,6 @@
 module Pod
   module Downloader
     module APIExposable
-
       def expose_api(mod = nil, &block)
         if mod.nil?
           if block.nil?
@@ -10,7 +9,7 @@ module Pod
             mod = Module.new(&block)
           end
         elsif mod && block
-          raise "Only a module *or* is required, not both."
+          raise 'Only a module *or* is required, not both.'
         end
         include mod
       end

data/lib/cocoapods-downloader/base.rb

@@ -1,4 +1,4 @@
-require "shellwords"
+require 'shellwords'
 
 class Pathname
   # @return [String] a version of the path that is escaped to be safe to use in
@@ -10,7 +10,6 @@ end
 
 module Pod
   module Downloader
-
     # The base class defines the common behaviour of the downloaders.
     #
     # @abstract Subclass and implement {#download}.
@@ -18,7 +17,6 @@ module Pod
     # @private
     #
     class Base
-
       extend APIExposable
       expose_api API
 
@@ -94,7 +92,7 @@ module Pod
       #         remote. Defaults to `false`.
       #
       attr_accessor :aggressive_cache
-      alias_method  :aggressive_cache?, :aggressive_cache
+      alias_method :aggressive_cache?, :aggressive_cache
 
       #-----------------------------------------------------------------------#
 
@@ -125,7 +123,7 @@ module Pod
             download_head!
           else
             raise DownloaderError, "The `#{name}` downloader does not support " \
-            "the HEAD option."
+            'the HEAD option.'
           end
         end
       end
@@ -141,7 +139,7 @@ module Pod
       #         re-download the exact files.
       #
       def checkout_options
-        raise "Abstract method"
+        raise 'Abstract method'
       end
 
       #-----------------------------------------------------------------------#
@@ -173,7 +171,7 @@ module Pod
       # @return [Bool] Whether the downloader should use the cache.
       #
       def use_cache?
-         !cache_root.nil? && !@options[:download_only]
+        !(cache_root && !@options[:download_only]).nil?
       end
 
       # The default maximum allowed size for the cache expressed in Mb.
@@ -201,8 +199,6 @@ module Pod
         end
       end
 
-      private
-
       # Defines two methods for an executable, based on its name. The bag
       # version raises if the executable terminates with a non-zero exit code.
       #
@@ -230,7 +226,7 @@ module Pod
           execute_command(name.to_s, command, false)
         end
 
-        define_method(name.to_s + "!") do |command|
+        define_method(name.to_s + '!') do |command|
           execute_command(name.to_s, command, true)
         end
       end

data/lib/cocoapods-downloader/bazaar.rb

@@ -1,7 +1,6 @@
 module Pod
   module Downloader
     class Bazaar < Base
-
       def self.options
         [:revision, :tag]
       end
@@ -37,11 +36,11 @@ module Pod
       end
 
       def download_head!
-        bzr! %|branch "#{url}" #{dir_opts} #{@target_path.shellescape}|
+        bzr! %(branch "#{url}" #{dir_opts} #{@target_path.shellescape})
       end
 
       def download_revision!(rev)
-        bzr! %|branch "#{url}" #{dir_opts} -r '#{rev}' #{@target_path.shellescape}|
+        bzr! %(branch "#{url}" #{dir_opts} -r '#{rev}' #{@target_path.shellescape})
       end
 
       # @return [String] The command line flags to use according to whether the
@@ -56,8 +55,6 @@ module Pod
       end
 
       #-----------------------------------------------------------------------#
-
     end
   end
 end
-

data/lib/cocoapods-downloader/gem_version.rb

@@ -1,10 +1,8 @@
 module Pod
   module Downloader
-
     # @return [String] Downloader’s version, following
     #         [semver](http://semver.org).
     #
-    VERSION = '0.5.0'
-
+    VERSION = '0.6.0'
   end
 end

data/lib/cocoapods-downloader/git.rb

@@ -1,17 +1,15 @@
 module Pod
   module Downloader
-
     # Concreted Downloader class that provides support for specifications with
     # git sources.
     #
     class Git < Base
-
       def self.options
         [:commit, :tag, :branch, :submodules]
       end
 
       def options_specific?
-        !options[:commit].nil? || !options[:tag].nil?
+        !(options[:commit] || options[:tag]).nil?
       end
 
       def checkout_options
@@ -38,7 +36,7 @@ module Pod
         else
           download_head!
         end
-        Dir.chdir(target_path) { git! "submodule update --init"  } if options[:submodules]
+        Dir.chdir(target_path) { git! 'submodule update --init'  } if options[:submodules]
       end
 
       # @return [void] Checkouts the HEAD of the git source in the destination
@@ -47,7 +45,7 @@ module Pod
       def download_head!
         update_cache if use_cache?
         clone(clone_url, target_path)
-        Dir.chdir(target_path) { git! "submodule update --init"  } if options[:submodules]
+        Dir.chdir(target_path) { git! 'submodule update --init'  } if options[:submodules]
       end
 
       #--------------------------------------#
@@ -63,8 +61,8 @@ module Pod
       # @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}|
+        ui_sub_action('Cloning to Pods folder') do
+          command = %Q(clone #{from.shellescape} #{to.shellescape})
           command << ' ' + flags if flags
           git!(command)
         end
@@ -95,13 +93,13 @@ module Pod
           if use_cache?
             clone(clone_url, target_path)
           else
-            git! "init"
+            git! 'init'
             git! "remote add origin '#{clone_url}'"
           end
 
           git! "fetch origin tags/#{options[:tag]} 2>&1"
-          git! "reset --hard FETCH_HEAD"
-          git! "checkout -b activated-pod-commit 2>&1"
+          git! 'reset --hard FETCH_HEAD'
+          git! 'checkout -b activated-pod-commit 2>&1'
         end
       end
 
@@ -130,9 +128,9 @@ module Pod
         clone(clone_url, target_path)
         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! '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("Just downloaded and checked out branch: #{options[:branch]} from upstream #{clone_url}")
+          ui_message("Downloaded and checked out branch: #{options[:branch]} from upstream #{clone_url}")
         end
       end
 
@@ -145,7 +143,7 @@ module Pod
       def ref_exists?(ref)
         if cache_exist?
           Dir.chdir(cache_path) { git "rev-list --max-count=1 #{ref}" }
-          $? == 0
+          $CHILD_STATUS == 0
         else
           false
         end
@@ -166,7 +164,7 @@ module Pod
       #
       def branch_exists?(branch)
         Dir.chdir(cache_path) { git "branch --all | grep #{branch}$" } # check for remote branch and do suffix matching ($ anchor)
-        $? == 0
+        $CHILD_STATUS == 0
       end
 
       # @return [void] Checks if a branch exists in the cache and updates
@@ -177,7 +175,7 @@ module Pod
       def ensure_remote_branch_exists(branch)
         return if branch_exists?(branch)
         update_cache
-        raise DownloaderError, "Cache unable to find git reference `#{branch}' for `#{url}' (#{$?})." unless branch_exists?(branch)
+        raise DownloaderError, "Cache unable to find git reference `#{branch}' for `#{url}' (#{$CHILD_STATUS})." unless branch_exists?(branch)
       end
 
       #--------------------------------------#
@@ -194,7 +192,7 @@ module Pod
       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" }
+          Dir.chdir(cache_path) { git('config core.bare').chomp == 'true' }
       end
 
       # @return [String] The origin URL of the cache with the given directory.
@@ -222,7 +220,7 @@ module Pod
       def update_cache
         if cache_exist?
           ui_sub_action("Updating cache git repo (#{cache_path})") do
-            Dir.chdir(cache_path) { git! "remote update" }
+            Dir.chdir(cache_path) { git! 'remote update' }
           end
         else
           create_cache
@@ -235,7 +233,6 @@ module Pod
     # Allows to download tarballs from GitHub.
     #
     class GitHub < Git
-
       require 'open-uri'
 
       def download_head!
@@ -255,12 +252,12 @@ module Pod
       end
 
       def tarball_url_for(id)
-        original_url, username, reponame = *(url.match(/[:\/]([\w\-]+)\/([\w\-]+)\.git/))
-        "https://github.com/#{username}/#{reponame}/tarball/#{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"
+        target_path + 'tarball.tar.gz'
       end
 
       private
@@ -270,7 +267,7 @@ module Pod
       end
 
       def download_and_extract_tarball(id)
-        File.open(tmp_path, "w+") do |tmpfile|
+        File.open(tmp_path, 'w+') do |tmpfile|
           open tarball_url_for(id) do |archive|
             tmpfile.write Zlib::GzipReader.new(archive).read
           end

data/lib/cocoapods-downloader/http.rb

@@ -3,9 +3,8 @@ require 'zlib'
 module Pod
   module Downloader
     class Http < Base
-
       def self.options
-        [:type, :flatten]
+        [:type, :flatten, :sha1, :sha256]
       end
 
       class UnsupportedFileTypeError < StandardError; end
@@ -22,6 +21,7 @@ module Pod
         @filename = filename_with_type(type)
         @download_path = (target_path + @filename)
         download_file(@download_path)
+        verify_checksum(@download_path)
         extract_with_type(@download_path, type)
       end
 
@@ -41,7 +41,7 @@ module Pod
       #         only one folder.
       #
       def should_flatten?
-        if options.has_key?(:flatten)
+        if options.key?(:flatten)
           true
         elsif [:tgz, :tar, :tbz, :txz].include?(type)
           true # those archives flatten by default
@@ -66,46 +66,48 @@ module Pod
         end
       end
 
-      def filename_with_type(type=:zip)
+      def filename_with_type(type = :zip)
         case type
         when :zip
-          "file.zip"
+          'file.zip'
         when :tgz
-          "file.tgz"
+          'file.tgz'
         when :tar
-          "file.tar"
+          'file.tar'
         when :tbz
-          "file.tbz"
+          'file.tbz'
         when :txz
-          "file.txz"
+          'file.txz'
         else
-          raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
+          raise UnsupportedFileTypeError, "Unsupported file type: #{type}"
         end
       end
 
       def download_file(full_filename)
-        curl! %|-L -o #{full_filename.shellescape} "#{url}" --create-dirs|
+        curl! %(-L -o #{full_filename.shellescape} "#{url}" --create-dirs)
       end
 
-      def extract_with_type(full_filename, type=:zip)
+      def extract_with_type(full_filename, type = :zip)
         unpack_from = full_filename.shellescape
         unpack_to = @target_path.shellescape
         case type
         when :zip
-          unzip! %|#{unpack_from} -d #{unpack_to}|
+          unzip! %(#{unpack_from} -d #{unpack_to})
         when :tgz
-          tar! %|xfz #{unpack_from} -C #{unpack_to}|
+          tar! %(xfz #{unpack_from} -C #{unpack_to})
         when :tar
-          tar! %|xf #{unpack_from} -C #{unpack_to}|
+          tar! %(xf #{unpack_from} -C #{unpack_to})
         when :tbz
-          tar! %|xfj #{unpack_from} -C #{unpack_to}|
+          tar! %(xfj #{unpack_from} -C #{unpack_to})
         when :txz
-          tar! %|xf #{unpack_from} -C #{unpack_to}|
+          tar! %(xf #{unpack_from} -C #{unpack_to})
         else
-          raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
+          raise UnsupportedFileTypeError, "Unsupported file type: #{type}"
         end
 
-        # If the archive is a tarball and it only contained a folder, move its contents to the target (#727)
+        # If the archive is a tarball and it only contained a folder, move its
+        # contents to the target (#727)
+        #
         if should_flatten?
           contents = @target_path.children
           contents.delete(target_path + @filename)
@@ -116,6 +118,45 @@ module Pod
         end
       end
 
+      def compare_hash(filename, hasher, hash)
+        incremental_hash = hasher.new
+
+        File.open(filename, 'rb') do |file|
+          buf = ''
+          incremental_hash << buf while file.read(1024, buf)
+        end
+
+        computed_hash = incremental_hash.hexdigest
+
+        if computed_hash != hash
+          raise DownloaderError, 'Verification checksum was incorrect, ' \
+            "expected #{hash}, got #{computed_hash}"
+        end
+      end
+
+      # Verify that the downloaded file matches a sha1 hash
+      #
+      def verify_sha1_hash(filename, hash)
+        require 'digest/sha1'
+        compare_hash(filename, Digest::SHA1, hash)
+      end
+
+      # Verify that the downloaded file matches a sha256 hash
+      #
+      def verify_sha256_hash(filename, hash)
+        require 'digest/sha2'
+        compare_hash(filename, Digest::SHA2, hash)
+      end
+
+      # Verify that the downloaded file matches the hash if set
+      #
+      def verify_checksum(filename)
+        if options[:sha256]
+          verify_sha256_hash(filename, options[:sha256])
+        elsif options[:sha1]
+          verify_sha1_hash(filename, options[:sha1])
+        end
+      end
     end
   end
 end

data/lib/cocoapods-downloader/mercurial.rb

@@ -1,13 +1,12 @@
 module Pod
   module Downloader
     class Mercurial < Base
-
       def self.options
         [:revision, :tag, :branch]
       end
 
       def options_specific?
-        !options[:revision].nil? || !options[:tag].nil?
+        !(options[:revision] || options[:tag]).nil?
       end
 
       def checkout_options
@@ -36,21 +35,20 @@ module Pod
       end
 
       def download_head!
-        hg! %|clone #{url} #{@target_path.shellescape}|
+        hg! %(clone #{url} #{@target_path.shellescape})
       end
 
       def download_revision!
-        hg! %|clone "#{url}" --rev '#{options[:revision]}' #{@target_path.shellescape}|
+        hg! %(clone "#{url}" --rev '#{options[:revision]}' #{@target_path.shellescape})
       end
-      
+
       def download_tag!
-        hg! %|clone "#{url}" --updaterev '#{options[:tag]}' #{@target_path.shellescape}|
+        hg! %(clone "#{url}" --updaterev '#{options[:tag]}' #{@target_path.shellescape})
       end
 
       def download_branch!
-          hg! %|clone "#{url}" --updaterev '#{options[:branch]}' #{@target_path.shellescape}|
+        hg! %(clone "#{url}" --updaterev '#{options[:branch]}' #{@target_path.shellescape})
       end
     end
   end
 end
-

data/lib/cocoapods-downloader/subversion.rb

@@ -1,13 +1,12 @@
 module Pod
   module Downloader
     class Subversion < Base
-
       def self.options
-        [:revision, :tag, :folder, :externals]
+        [:revision, :tag, :folder, :externals, :checkout]
       end
 
       def options_specific?
-        !options[:revision].nil? || !options[:tag].nil?
+        !(options[:revision] || options[:tag]).nil?
       end
 
       def checkout_options
@@ -18,27 +17,34 @@ module Pod
           options
         end
       end
+
       private
 
       executable :svn
 
       def download!
-        output = svn!(%|#{export_subcommand} "#{reference_url}" #{@target_path.shellescape}|)
-          store_exported_revision(output)
+        output = svn!(%(#{subcommand} "#{reference_url}" #{@target_path.shellescape}))
+        store_exported_revision(output)
       end
 
       def download_head!
-        output = svn!(%|#{export_subcommand} "#{trunk_url}" #{@target_path.shellescape}|)
-          store_exported_revision(output)
+        output = svn!(%(#{subcommand} "#{trunk_url}" #{@target_path.shellescape}))
+        store_exported_revision(output)
       end
 
       def store_exported_revision(output)
         output.match(/Exported revision ([0-9]+)\./)
-        @exported_revision = $1
+        @exported_revision = Regexp.last_match[1] if Regexp.last_match
       end
 
-      def export_subcommand
-        result = 'export --non-interactive --trust-server-cert --force'
+      def subcommand
+        if options[:checkout]
+          result = 'checkout'
+        else
+          result = 'export'
+        end
+
+        result << ' --non-interactive --trust-server-cert --force'
         result << ' --ignore-externals' if options[:externals] == false
         result
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: