cocoapods-downloader 1.2.2 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1fa4c5fb3da8df7c444f32589cb2df38e60c2eebe18f8e7ebcff0ee50bcbb7
-  data.tar.gz: 24d3fe5d0ddbf3e5638c5781cfd09490864f4d4e673c2140de67560e819afb10
+  metadata.gz: 62d6e0b714faaaf66ca8228f636b34e61976252749672e04a3a6aa0445b18709
+  data.tar.gz: f585de6e9a7e972a89c87c98d73619798e66340d814fff06231992dfbce62e33
 SHA512:
-  metadata.gz: bddb10ca07f8081a4f0cef416bf150b623472d81b9dbb096d854ec5a810dd30709b63a6d4c2b487b9e617a80cc34fe20191bc0193bc37aa496a36b003baa8e93
-  data.tar.gz: 6488ab1e8081b6b24f98fb519d259e6da8d709158d645abfaf7f732749ab942c994ba4f8e93d3337e024d27854bcf9149b01271da55fe77ecc3474b050780f46
+  metadata.gz: 87552efe2b4e7332c9b5cfe88ea19ad1e404d4eee94ea3187f60d26e40dcd910b049f05e7246dd8a7cb210ce96658cc7703a3f9095e6ed0c49151ae9019a80a7
+  data.tar.gz: 8b44845a7e0da71748ff781fd15de6eb17bbca24f8fa72b76029bc65341805436d2460b6df38b092322006a5e7b2075b40a04eaad06c63cd9dcef87a69fcdfa0

data/README.markdown

@@ -2,9 +2,10 @@
 
 A small library for downloading files from remotes in a folder.
 
-[![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)
+[![Build Status](https://img.shields.io/github/workflow/status/CocoaPods/CocoaPods-Downloader/Spec)](https://github.com/CocoaPods/cocoapods-downloader/actions)
+[![Gem Version](https://img.shields.io/gem/v/cocoapods-downloader)](https://rubygems.org/gems/cocoapods-downloader)
+[![Maintainability](https://api.codeclimate.com/v1/badges/a99a88d28ad37a79dbf6/maintainability)](https://codeclimate.com/github/CocoaPods/cocoapods-downloader/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/a99a88d28ad37a79dbf6/test_coverage)](https://codeclimate.com/github/CocoaPods/cocoapods-downloader/test_coverage)
 
 ## Install
 

data/lib/cocoapods-downloader/base.rb

@@ -121,6 +121,18 @@ module Pod
         raise 'Abstract method'
       end
 
+      # Returns a User-Agent string that itentifies http network requests as
+      # originating from CocoaPods.
+      # Contains version numbers from the CocoaPods Gem and the cocoapods-downloader Gem.
+      #
+      # @param  [module] base_module The Base CocoaPods Module to retrieve the version number from.
+      # @return [String] the User-Agent string.
+      #
+      def self.user_agent_string(base_module = Pod)
+        pods_version = base_module.const_defined?('VERSION') ? "CocoaPods/#{base_module::VERSION} " : ''
+        "#{pods_version}cocoapods-downloader/#{Pod::Downloader::VERSION}"
+      end
+
       #-----------------------------------------------------------------------#
 
       # Defines two methods for an executable, based on its name. The bang

data/lib/cocoapods-downloader/gem_version.rb

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

data/lib/cocoapods-downloader/git.rb

@@ -27,16 +27,38 @@ module Pod
                    options[:git],
                    options[:branch]]
         output = Git.execute_command('git', command)
-        match = /^([a-z0-9]*)\t.*/.match(output)
+        match = commit_from_ls_remote output, options[:branch]
 
         return options if match.nil?
 
-        options[:commit] = match[1]
+        options[:commit] = match
         options.delete(:branch)
 
         options
       end
 
+      # Matches a commit from the branches reported by git ls-remote.
+      #
+      # @note   When there is a branch and tag with the same name, it will match
+      #         the branch, since `refs/heads` is sorted before `refs/tags`.
+      #
+      # @param  [String] output
+      #         The output from git ls-remote.
+      #
+      # @param  [String] branch_name
+      #         The desired branch to match a commit to.
+      #
+      # @return [String] commit hash string, or nil if no match found
+      #
+      def self.commit_from_ls_remote(output, branch_name)
+        return nil if branch_name.nil?
+        encoded_branch_name = branch_name.dup.force_encoding(Encoding::ASCII_8BIT)
+        match = %r{([a-z0-9]*)\trefs\/(heads|tags)\/#{Regexp.quote(encoded_branch_name)}}.match(output)
+        match[1] unless match.nil?
+      end
+
+      private_class_method :commit_from_ls_remote
+
       private
 
       # @!group Base class hooks

data/lib/cocoapods-downloader/http.rb

@@ -3,12 +3,31 @@ require 'cocoapods-downloader/remote_file'
 module Pod
   module Downloader
     class Http < RemoteFile
+      USER_AGENT_HEADER = 'User-Agent'.freeze
+
       private
 
       executable :curl
 
       def download_file(full_filename)
-        curl! '-f', '-L', '-o', full_filename, url, '--create-dirs', '--netrc-optional', '--retry', '2'
+        parameters = ['-f', '-L', '-o', full_filename, url, '--create-dirs', '--netrc-optional', '--retry', '2']
+        parameters << user_agent_argument if headers.nil? ||
+            headers.none? { |header| header.casecmp(USER_AGENT_HEADER).zero? }
+
+        headers.each do |h|
+          parameters << '-H'
+          parameters << h
+        end unless headers.nil?
+
+        curl! parameters
+      end
+
+      # Returns a cURL command flag to add the CocoaPods User-Agent.
+      #
+      # @return [String] cURL command -A flag and User-Agent.
+      #
+      def user_agent_argument
+        "-A '#{Http.user_agent_string}'"
       end
     end
   end

data/lib/cocoapods-downloader/remote_file.rb

@@ -6,7 +6,7 @@ module Pod
   module Downloader
     class RemoteFile < Base
       def self.options
-        [:type, :flatten, :sha1, :sha256]
+        [:type, :flatten, :sha1, :sha256, :headers]
       end
 
       class UnsupportedFileTypeError < StandardError; end
@@ -35,6 +35,10 @@ module Pod
         end
       end
 
+      def headers
+        options[:headers]
+      end
+
       # @note   The archive is flattened if it contains only one folder and its
       #         extension is either `tgz`, `tar`, `tbz` or the options specify
       #         it.
@@ -89,13 +93,7 @@ module Pod
         case type
         when :zip
           unzip! unpack_from, '-d', unpack_to
-        when :tgz
-          tar! 'xfz', unpack_from, '-C', unpack_to
-        when :tar
-          tar! 'xf', unpack_from, '-C', unpack_to
-        when :tbz
-          tar! 'xfj', unpack_from, '-C', unpack_to
-        when :txz
+        when :tar, :tgz, :tbz, :txz
           tar! 'xf', unpack_from, '-C', unpack_to
         when :dmg
           extract_dmg(unpack_from, unpack_to)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.5.1
 platform: ruby
 authors:
 - Eloy Duran
 - Fabio Pelosin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2021-09-07 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - eloy.de.enige@gmail.com
 - fabiopelosin@gmail.com
@@ -37,7 +37,7 @@ homepage: https://github.com/CocoaPods/cocoapods-downloader
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -45,16 +45,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 3
 summary: A small library for downloading files from remotes in a folder.
 test_files: []