cocoapods-downloader 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b8678c1ca6b7e11a35732115f8a24930b39833be521123b79fcfdcdacbe793f
-  data.tar.gz: 336dda5a7586b04f9ec28dd75826c55d3432455e26508b420b740fbe880aaafe
+  metadata.gz: 128f7eaefbd34c1b7f9c66c06a45dd5e3d186322938a8346fc5283df450617d0
+  data.tar.gz: 60a084074452df93b41cfda6248c2fc455b8111c109fc471075e96ca7085e5b9
 SHA512:
-  metadata.gz: 4b676a01ee65b3ac1fe20190078c1b5768e71b1aa61093b6621dfb969797b2a1bdb3930894908ed33877dff757a18f5d22e09c9d539b4bc9dd504bf951d2f9fb
-  data.tar.gz: '09a70d3cd823fd999ea82718440490c69443b55b5035688dcbd5d31ab2454b42ff135a91650f02001df1f1237b6c4dc7410ffa5a21a89596359878b5869fecd5'
+  metadata.gz: 2fd8b780dc60807be9317865fea329ecf608f18ce1e81bca8653c23b548589d9b7c3099d4e82ff7c7097e75f256e856ff788d2691f34312798e61f13f13154f3
+  data.tar.gz: 8435a98df7285ea8753b443656e306d1467dc8bfa28551c70d018630c03ad8820dc564576bd70a90d51d848cdad184a8e8b00ab59d05950740af4548d0971ae0

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.3.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

data/lib/cocoapods-downloader/git.rb

@@ -27,16 +27,37 @@ 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?
+        match = %r{([a-z0-9]*)\trefs\/(heads|tags)\/#{Regexp.quote(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,16 @@ 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)
         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'
@@ -17,6 +21,14 @@ module Pod
 
         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
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -45,7 +45,7 @@ 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:
   - - ">="