cocoapods-downloader 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8df150bd67da7e8424cae5644448b45f49d43a8
-  data.tar.gz: 6e7017b3e107271f64eadbda72f8cab72f056906
+  metadata.gz: ec3aeaa63a0bde59b725c1bedb3197803ef16bec
+  data.tar.gz: 73b1647fe1560d7c110479a9c65e43e1554754c9
 SHA512:
-  metadata.gz: 2c359fccdfc8a646e95950af5c933a47605934b37b5899f23a17e6e4993b79ecf5c0f4cf30e3e0ccc1415cb5a4a0a3e482b32498b5c4e8d1959428bbc6c78538
-  data.tar.gz: f0e31cfad49785e06b6bbdeb00e30bd9609587b368242187533282eda683f7783b9c6d31b0bac9e59af4e2169ef89dfef356d6bb0cda116dfca8164d2204f073
+  metadata.gz: f9dd8ff98b0af317733a9b56ff1d62eb657c9e0520d61112c31e182fe10ec71b03ac17be17653f4e29d66dfb13abcce13ec6ca9a3f83055ce4edbb98264c3ca3
+  data.tar.gz: ae72d264ad1ea26b4c914b1865b861eecd3456a4c73cc4fee41022ed0b772d59586d429f516fffdea246e623f046f950b3666ea96a4f28be85911de484d0f691

data/README.markdown

@@ -19,6 +19,7 @@ require 'cocoapods-downloader'
 
 target_path = './Downloads/MyDownload'
 options = { :git => 'example.com' }
+options = Pod::Downloader.preprocess_options(options)
 downloader = Pod::Downloader.for_target(target_path, options)
 downloader.cache_root = '~/Library/Caches/APPNAME'
 downloader.max_cache_size = 500

data/lib/cocoapods-downloader.rb

@@ -47,12 +47,42 @@ module Pod
     #         options.
     #
     def self.for_target(target_path, options)
-      options = Hash[options.map { |k, v| [k.to_sym, v] }]
+      options = options_to_sym(options)
 
       if target_path.nil?
         raise DownloaderError, 'No target path provided.'
       end
 
+      strategy, klass = class_for_options(options)
+
+      url = options[strategy]
+      sub_options = options.dup
+      sub_options.delete(strategy)
+
+      klass.new(target_path, url, sub_options)
+    end
+
+    # Have the concrete strategy preprocess options
+    #
+    # @param [Hash<Symbol,String>] options
+    #        The request options to preprocess
+    #
+    # @return [Hash<Symbol,String>] the new options
+    #
+    def self.preprocess_options(options)
+      options = options_to_sym(options)
+
+      _, klass = class_for_options(options)
+      klass.preprocess_options(options)
+    end
+
+    private_class_method
+
+    def self.options_to_sym(options)
+      Hash[options.map { |k, v| [k.to_sym, v] }]
+    end
+
+    def self.class_for_options(options)
       if options.nil? || options.empty?
         raise DownloaderError, 'No source URL provided.'
       end
@@ -63,11 +93,8 @@ module Pod
           "`#{options.inspect}`."
       end
 
-      url = options[strategy]
-      sub_options = options.dup
-      sub_options.delete(strategy)
-      klass = downloader_class_by_key[strategy]
-      klass.new(target_path, url, sub_options)
+      # Explicit return for multiple params, rubocop thinks it's useless but it's not
+      return strategy, downloader_class_by_key[strategy] # rubocop:disable Style/RedundantReturn
     end
   end
 end

data/lib/cocoapods-downloader/api_exposable.rb

@@ -12,6 +12,9 @@ module Pod
           raise 'Only a module *or* is required, not both.'
         end
         include mod
+        # TODO: Try to find a nicer way to do this
+        # See https://github.com/CocoaPods/cocoapods-downloader/pull/57
+        extend mod
       end
 
       alias override_api expose_api

data/lib/cocoapods-downloader/base.rb

@@ -154,6 +154,20 @@ module Pod
           execute_command(name.to_s, command.flatten, true)
         end
       end
+
+      # preprocess download options
+      #
+      # Usage of this method is optional. concrete strategies should not
+      # assume options are preprocessed for correct execution.
+      #
+      # @param  [Hash<Symbol,String>] options
+      #         The request options to preprocess
+      #
+      # @return [Hash<Symbol,String>] the new options
+      #
+      def self.preprocess_options(options)
+        options
+      end
     end
   end
 end

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.0.1'.freeze
+    VERSION = '1.1.0'.freeze
   end
 end

data/lib/cocoapods-downloader/git.rb

@@ -22,6 +22,23 @@ module Pod
         end
       end
 
+      def self.preprocess_options(options)
+        return options unless options[:branch]
+
+        command = ['ls-remote',
+                   options[:git],
+                   options[:branch]]
+        output = Git.execute_command('git', command)
+        match = /^([a-z0-9]*)\t.*/.match(output)
+
+        return options if match.nil?
+
+        options[:commit] = match[1]
+        options.delete(:branch)
+
+        options
+      end
+
       private
 
       # @!group Base class hooks

data/lib/cocoapods-downloader/http.rb

@@ -90,7 +90,7 @@ module Pod
       end
 
       def download_file(full_filename)
-        curl! '-f', '-L', '-o', full_filename, url, '--create-dirs', '--netrc'
+        curl! '-f', '-L', '-o', full_filename, url, '--create-dirs', '--netrc-optional'
       end
 
       def extract_with_type(full_filename, type = :zip)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -41,17 +41,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.5
 signing_key: 
 specification_version: 3
 summary: A small library for downloading files from remotes in a folder.