cocoapods-downloader 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bb5278864d56f46280ea2a14a997e5d3d020b7b
-  data.tar.gz: 2e95ec0b4373aa8a811df26f56ffb726a02b2e0b
+  metadata.gz: d939a67d6d36d973515d8ec5bf4cdd203f288487
+  data.tar.gz: 1f341084741d856cca13e86ab23cc858ea7dd692
 SHA512:
-  metadata.gz: 665137d80ff908dd728b3a3de2c1e08b298b114ff4548035d558e27aa680fe11d73f4e5b6ccda3c381023cd43d8a89dca94900abb76ba796def8a6e58659f656
-  data.tar.gz: aa61378e9fb2453920eee210517af935c372f60eb3988c70708672b647b675695f332f7ec16142cd0db27ae413ca6f5f3fc4b5d469c4b791870912011abe5cf0
+  metadata.gz: 12033cc74a68218cf549a9d31668d726cdb570292b627b04a2a9d7cb239ea9cf2e859b951c7577bac9772225be141d6de4ae74cd0571877dafd67aefafb34139
+  data.tar.gz: 1521f867b04670fe0c931e9dea7ab908f481846c80ec68c040733b0716718ed80c6bc046637393e01739cc095c670da71e37a4fd04d40d4e69137e0e11b90eab

data/README.markdown

@@ -30,7 +30,7 @@ The downloader class supports the following option keys:
 
 - git: commit, tag, branch, submodules
 - svn: revision, tag, folder, externals
-- hg: revision
+- hg: revision, tag, branch
 - http: type, flatten
 - bzr: revision, tag
 

data/lib/cocoapods-downloader.rb

@@ -1,31 +1,48 @@
 module Pod
   module Downloader
     require 'cocoapods-downloader/gem_version'
-
     require 'cocoapods-downloader/api'
     require 'cocoapods-downloader/api_exposable'
     require 'cocoapods-downloader/base'
 
+    autoload :Bazaar,      'cocoapods-downloader/bazaar'
+    autoload :Git,         'cocoapods-downloader/git'
+    autoload :Http,        'cocoapods-downloader/http'
+    autoload :Mercurial,   'cocoapods-downloader/mercurial'
+    autoload :Subversion,  'cocoapods-downloader/subversion'
 
-    # @return [Hash{Symbol=>Class}] The symbol of the options array associated
-    #         with each class.
+    # Denotes the error generated by a Downloader
     #
-    def self.downloader_class_by_key
-      require 'cocoapods-downloader/git'
-      require 'cocoapods-downloader/mercurial'
-      require 'cocoapods-downloader/subversion'
-      require 'cocoapods-downloader/http'
-      require 'cocoapods-downloader/bazaar'
+    class DownloaderError < StandardError; end
 
+    # @return [Hash{Symbol=>Class}] The concrete classes of the supported
+    #         strategies by key.
+    #
+    def self.downloader_class_by_key
       {
+        :bzr  => Bazaar,
         :git  => Git,
         :hg   => Mercurial,
-        :svn  => Subversion,
         :http => Http,
-        :bzr  => Bazaar,
+        :svn  => Subversion,
       }
     end
 
+    # Identifies the concrete strategy for the given options.
+    #
+    # @param  [Hash{Symbol}] options
+    #         The options for which a strategy is needed.
+    #
+    # @return [Symbol] The symbol associated with a concrete strategy.
+    # @return [Nil] If no suitable concrete strategy could be selected.
+    #
+    def self.strategy_from_options(options)
+      common = downloader_class_by_key.keys & options.keys
+      if common.count == 1
+        common.first
+      end
+    end
+
     # @return [Downloader::Base] A concrete downloader according to the
     #         options.
     #
@@ -34,40 +51,30 @@ module Pod
     #         global options for the Downloader cache?
     #
     def self.for_target(target_path, options)
-
       if target_path.nil?
         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
 
-      options = options.dup
-      klass = nil
-      url = nil
-      downloader_class_by_key.each do |key, key_klass|
-        url = options.delete(key)
-        if url
-          klass = key_klass
-          break
-        end
+      strategy = strategy_from_options(options)
+      unless strategy
+        raise DownloaderError, "Unsupported download strategy " \
+          "`#{options.inspect}`."
       end
 
-      unless klass
-        raise DownloaderError, "Unsupported download strategy `#{options.inspect}`."
-      end
+      url = options[strategy]
+      sub_options = options.dup
+      sub_options.delete(strategy)
+      klass = downloader_class_by_key[strategy]
 
       if klass == Git && url.to_s =~ /github.com/
         klass = GitHub
       end
 
-      klass.new(target_path, url, options)
+      klass.new(target_path, url, sub_options)
     end
-
-    # Denotes the error generated by a Downloader
-    #
-    class DownloaderError < StandardError; end
-
   end
 end

data/lib/cocoapods-downloader/gem_version.rb

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

data/lib/cocoapods-downloader/http.rb

@@ -84,7 +84,7 @@ module Pod
       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)

data/lib/cocoapods-downloader/mercurial.rb

@@ -3,11 +3,11 @@ module Pod
     class Mercurial < Base
 
       def self.options
-        [:revision]
+        [:revision, :tag, :branch]
       end
 
       def options_specific?
-        !options[:revision].nil?
+        !options[:revision].nil? || !options[:tag].nil?
       end
 
       def checkout_options
@@ -26,6 +26,10 @@ module Pod
       def download!
         if options[:revision]
           download_revision!
+        elsif options[:tag]
+          download_tag!
+        elsif options[:branch]
+          download_branch!
         else
           download_head!
         end
@@ -38,7 +42,14 @@ module Pod
       def download_revision!
         hg! %|clone "#{url}" --rev '#{options[:revision]}' #{@target_path.shellescape}|
       end
+      
+      def download_tag!
+        hg! %|clone "#{url}" --updaterev '#{options[:tag]}' #{@target_path.shellescape}|
+      end
 
+      def download_branch!
+          hg! %|clone "#{url}" --updaterev '#{options[:branch]}' #{@target_path.shellescape}|
+      end
     end
   end
 end

metadata

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