cocoapods-downloader 1.2.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3cdae542174cc361bd6bb136814dc4bd9c4f1d264eba8ae5d1c8abbb30b3a7e
-  data.tar.gz: 5aa84b9a46c0180766190a51e329c12f090180a4cfe49302ca2a184534a03f13
+  metadata.gz: dc4fe940ffcfe1f304e30cf50212217dc821e13e3a3431e73c01af91f54139b7
+  data.tar.gz: e71b8009f6c2f939cac92ef1ecbff51f824e2d1ea394d5b1d9936c14d41d2c61
 SHA512:
-  metadata.gz: 7d06b9e95f57c2a91c8e8a1610cd2df2ffbd8613fd8ec0b119b36c88095e00bc1e9d7e4b23c1cde351f2f40827afe00543300961d0234d77c3e7624f48c54b1a
-  data.tar.gz: e94add19965a574eabb1ccfd2c1dd03fa97b8b2d131ec4d44be0fa9859b33a39db13f4a33373eef55ff0c0bd0b6f1d042cae6c1caca363c02c4e940b2ee617f2
+  metadata.gz: 9a3666c592eaedbd7e87a550520d6184548e9cb9d71c0b16eef51ea961a5a5b12a5803d563cb16fc1c12e07bba5892cca44520d0b9ffc38909ededee9696c86a
+  data.tar.gz: c7059215e47fc5bc22026ea3b5b4a502b39b24f377280e9242a61a11e317bfa73cbee6f1d6737885c5e4da6d6ca95bf62971e283241b7878b2cb943d09a7d380

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.1'.freeze
+    VERSION = '1.5.0'.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.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

@@ -1,12 +1,12 @@
-require 'zlib'
 require 'fileutils'
 require 'uri'
+require 'zlib'
 
 module Pod
   module Downloader
     class RemoteFile < Base
       def self.options
-        [:type, :flatten, :sha1, :sha256]
+        [:type, :flatten, :sha1, :sha256, :headers]
       end
 
       class UnsupportedFileTypeError < StandardError; end
@@ -21,7 +21,7 @@ module Pod
 
       def download!
         @filename = filename_with_type(type)
-        @download_path = (target_path + @filename)
+        @download_path = target_path + @filename
         download_file(@download_path)
         verify_checksum(@download_path)
         extract_with_type(@download_path, type)
@@ -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.
@@ -44,7 +48,7 @@ module Pod
       #
       def should_flatten?
         if options.key?(:flatten)
-          true
+          options[:flatten]
         elsif [:tgz, :tar, :tbz, :txz].include?(type)
           true # those archives flatten by default
         else
@@ -71,18 +75,8 @@ module Pod
 
       def filename_with_type(type = :zip)
         case type
-        when :zip
-          'file.zip'
-        when :tgz
-          'file.tgz'
-        when :tar
-          'file.tar'
-        when :tbz
-          'file.tbz'
-        when :txz
-          'file.txz'
-        when :dmg
-          'file.dmg'
+        when :zip, :tgz, :tar, :tbz, :txz, :dmg
+          "file.#{type}"
         else
           raise UnsupportedFileTypeError, "Unsupported file type: #{type}"
         end
@@ -95,16 +89,11 @@ module Pod
       def extract_with_type(full_filename, type = :zip)
         unpack_from = full_filename
         unpack_to = @target_path
+
         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)
@@ -116,11 +105,17 @@ module Pod
         # contents to the target (#727)
         #
         if should_flatten?
-          contents = @target_path.children
+          contents = target_path.children
           contents.delete(target_path + @filename)
           entry = contents.first
           if contents.count == 1 && entry.directory?
-            FileUtils.move(entry.children, target_path)
+            tmp_entry = entry.sub_ext("#{entry.extname}.tmp")
+            begin
+              FileUtils.move(entry, tmp_entry)
+              FileUtils.move(tmp_entry.children, target_path)
+            ensure
+              FileUtils.remove_entry(tmp_entry)
+            end
           end
         end
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Eloy Duran
 - Fabio Pelosin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-25 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - eloy.de.enige@gmail.com
 - fabiopelosin@gmail.com
@@ -33,11 +33,11 @@ files:
 - lib/cocoapods-downloader/remote_file.rb
 - lib/cocoapods-downloader/scp.rb
 - lib/cocoapods-downloader/subversion.rb
-homepage: https://github.com/CocoaPods/Downloader
+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.6
-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: []