cocoapods-downloader 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e28fef84925c83ab93ce7cb957dc72bbdfa737c
-  data.tar.gz: 4818acececd068574baf57d8814b59b17a1ec582
+  metadata.gz: 6f28eb1ab8b3da09fd0ad05abdd2b524aa81e329
+  data.tar.gz: 91e761ece6ef2da8f5b4086e2f9961cd66dc4daf
 SHA512:
-  metadata.gz: 493f42df8b9495d6ebd51ef7958e7ca544f23fb7c1d4eaa573192184952728f3baa65341ae6319b1f87786199c5db1a39a3d3a6494c11ba4a82d11192e5f32f7
-  data.tar.gz: 2a306f3a6c3c8cef9fcfd3490d3e3dda876d6785c478cdf74bad15e627f5829efa61c05fb3ae9c3fb1f1fb2c724bb711ae49ace5b7d5f5eea44a75600fc0d2ac
+  metadata.gz: 504d84edc7468bc3daebac5778ebd984425c703175a21cd0df78a34d9911a8cd92128e7e3700ec8b671323862457a43c6fe4bbed26bb80fe0278cc7af126658b
+  data.tar.gz: 68479c06a8cf758c63851155bea0413d43ea15e62afbca1c35d5d8a25c93d5449ed271562087dbd1b2f3a256720ae8340c6c9bcc6464b23b528589bd2fe7400f

data/README.markdown

@@ -2,8 +2,9 @@
 
 A small library for downloading files from remotes in a folder.
 
-[![Build Status](https://travis-ci.org/CocoaPods/cocoapods-downloader.png?branch=master)](https://travis-ci.org/CocoaPods/cocoapods-downloader)
-[![Coverage Status](https://coveralls.io/repos/CocoaPods/cocoapods-downloader/badge.png?branch=master)](https://coveralls.io/r/CocoaPods/cocoapods-downloader)
+[![Build Status](https://travis-ci.org/CocoaPods/cocoapods-downloader.svg?branch=master)](https://travis-ci.org/CocoaPods/cocoapods-downloader)
+[![Coverage Status](http://img.shields.io/coveralls/CocoaPods/cocoapods-downloader.svg)](https://coveralls.io/r/CocoaPods/cocoapods-downloader)
+[![Code Climate](http://img.shields.io/codeclimate/github/CocoaPods/cocoapods-downloader.svg)](https://codeclimate.com/github/CocoaPods/cocoapods-downloader)
 
 ## Install
 
@@ -18,7 +19,7 @@ require 'cocoapods-downloader'
 
 target_path = './Downloads/MyDownload'
 options = { :git => 'example.com' }
-downloader = Pod::Downloaders.for_target(target_path, options)
+downloader = Pod::Downloader.for_target(target_path, options)
 downloader.cache_root = '~/Library/Caches/APPNAME'
 downloader.max_cache_size = 500
 downloader.download
@@ -30,7 +31,7 @@ The downloader class supports the following option keys:
 - git: commit, tag, branch, submodules
 - hg: revision
 - bzr: revision, tag
-- svn: revision, tag, folder
+- svn: revision, tag, folder, externals
 - http: type
 
 The downloader also provides hooks which allow to customize its output or the way in which the commands are executed

data/lib/cocoapods-downloader.rb

@@ -1,4 +1,3 @@
-
 module Pod
   module Downloader
     require 'cocoapods-downloader/gem_version'

data/lib/cocoapods-downloader/base.rb

@@ -1,3 +1,13 @@
+require "shellwords"
+
+class Pathname
+  # @return [String] a version of the path that is escaped to be safe to use in
+  #         a shell.
+  def shellescape
+    to_s.shellescape
+  end
+end
+
 module Pod
   module Downloader
 

data/lib/cocoapods-downloader/bazaar.rb

@@ -21,6 +21,9 @@ module Pod
 
       private
 
+      # @group Private Helpers
+      #-----------------------------------------------------------------------#
+
       executable :bzr
 
       def download!
@@ -34,18 +37,26 @@ module Pod
       end
 
       def download_head!
-        bzr! %|branch "#{url}" #{dir_opts} "#{target_path}"|
+        bzr! %|branch "#{url}" #{dir_opts} #{@target_path.shellescape}|
       end
 
       def download_revision!(rev)
-        bzr! %|branch "#{url}" #{dir_opts} -r '#{rev}' "#{target_path}"|
+        bzr! %|branch "#{url}" #{dir_opts} -r '#{rev}' #{@target_path.shellescape}|
       end
 
+      # @return [String] The command line flags to use according to whether the
+      #         target path exits.
+      #
       def dir_opts
-        return '--use-existing-dir' if @target_path.exist?
-        ''
+        if @target_path.exist?
+          '--use-existing-dir'
+        else
+          ''
+        end
       end
 
+      #-----------------------------------------------------------------------#
+
     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.3.0'
+    VERSION = '0.4.0'
 
   end
 end

data/lib/cocoapods-downloader/git.rb

@@ -64,7 +64,7 @@ module Pod
       #
       def clone(from, to, flags = '')
         ui_sub_action("Cloning to Pods folder") do
-          command = %Q|clone "#{from}" "#{to}"|
+          command = %Q|clone #{from} #{to.shellescape}|
           command << ' ' + flags if flags
           git!(command)
         end

data/lib/cocoapods-downloader/http.rb

@@ -20,7 +20,7 @@ module Pod
 
       def download!
         @filename = filename_with_type(type)
-        @download_path = target_path + @filename
+        @download_path = (target_path + @filename)
         download_file(@download_path)
         extract_with_type(@download_path, type)
       end
@@ -84,29 +84,31 @@ module Pod
       end
 
       def download_file(full_filename)
-        curl! "-L -o '#{full_filename}' '#{url}'"
+        curl! %|-L -o #{full_filename.shellescape} #{url} --create-dirs|
       end
 
       def extract_with_type(full_filename, type=:zip)
+        unpack_from = full_filename.shellescape
+        unpack_to = @target_path.shellescape
         case type
         when :zip
-          unzip! "'#{full_filename}' -d '#{target_path}'"
+          unzip! %|#{unpack_from} -d #{unpack_to}|
         when :tgz
-          tar! "xfz '#{full_filename}' -C '#{target_path}'"
+          tar! %|xfz #{unpack_from} -C #{unpack_to}|
         when :tar
-          tar! "xf '#{full_filename}' -C '#{target_path}'"
+          tar! %|xf #{unpack_from} -C #{unpack_to}|
         when :tbz
-          tar! "xfj '#{full_filename}' -C '#{target_path}'"
+          tar! %|xfj #{unpack_from} -C #{unpack_to}|
         when :txz
-          tar! "xf '#{full_filename}' -C '#{target_path}'"
+          tar! %|xf #{unpack_from} -C #{unpack_to}|
         else
           raise UnsupportedFileTypeError.new "Unsupported file type: #{type}"
         end
 
         # If the archive is a tarball and it only contained a folder, move its contents to the target (#727)
         if should_flatten?
-          contents = target_path.children
-          contents.delete(full_filename)
+          contents = @target_path.children
+          contents.delete(target_path + @filename)
           entry = contents.first
           if contents.count == 1 && entry.directory?
             FileUtils.move(entry.children, target_path)

data/lib/cocoapods-downloader/mercurial.rb

@@ -32,11 +32,11 @@ module Pod
       end
 
       def download_head!
-        hg! %|clone "#{url}" "#{target_path}"|
+        hg! %|clone #{url} #{@target_path.shellescape}|
       end
 
       def download_revision!
-        hg! %|clone "#{url}" --rev '#{options[:revision]}' "#{target_path}"|
+        hg! %|clone "#{url}" --rev '#{options[:revision]}' #{@target_path.shellescape}|
       end
 
     end

data/lib/cocoapods-downloader/subversion.rb

@@ -3,7 +3,7 @@ module Pod
     class Subversion < Base
 
       def self.options
-        [:revision, :tag, :folder]
+        [:revision, :tag, :folder, :externals]
       end
 
       def options_specific?
@@ -23,12 +23,12 @@ module Pod
       executable :svn
 
       def download!
-        output = svn!(%|#{export_subcommand} "#{reference_url}" "#{target_path}"|)
+        output = svn!(%|#{export_subcommand} "#{reference_url}" #{@target_path.shellescape}|)
           store_exported_revision(output)
       end
 
       def download_head!
-        output = svn!(%|#{export_subcommand} "#{trunk_url}" "#{target_path}"|)
+        output = svn!(%|#{export_subcommand} "#{trunk_url}" #{@target_path.shellescape}|)
           store_exported_revision(output)
       end
 
@@ -39,6 +39,8 @@ module Pod
 
       def export_subcommand
         result = 'export --non-interactive --trust-server-cert --force'
+        result << ' --ignore-externals' if options[:externals] == false
+        result
       end
 
       def reference_url

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-24 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -19,6 +19,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.markdown
+- lib/cocoapods-downloader.rb
 - lib/cocoapods-downloader/api.rb
 - lib/cocoapods-downloader/api_exposable.rb
 - lib/cocoapods-downloader/base.rb
@@ -28,9 +31,6 @@ files:
 - lib/cocoapods-downloader/http.rb
 - lib/cocoapods-downloader/mercurial.rb
 - lib/cocoapods-downloader/subversion.rb
-- lib/cocoapods-downloader.rb
-- README.markdown
-- LICENSE
 homepage: https://github.com/CocoaPods/Downloader
 licenses:
 - MIT
@@ -41,17 +41,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: A small library for downloading files from remotes in a folder.