cocoapods-downloader 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5b19edc103afbfa96e6594effa1b279a07cc5a9
-  data.tar.gz: 71f247553c5e0c1395aa62299aac6a7d59849ddc
+  metadata.gz: b242104578fbc99f8c538ae8be3b168a36675dc3
+  data.tar.gz: ec05c46011c4a75379e2d6a28ad2abf5981ea89f
 SHA512:
-  metadata.gz: c3747760712b1ec112a275b5870050b27690530163e5672ef05f612385d6fc73e681a2a4a9e85fdfe17075903c60cad47b8f209316564e0fa1b0451b590608dd
-  data.tar.gz: 0c3b7da117c02b3b430d9dfdbc4cd3244fbf573aac6b9ac4ae614b5de467def745c96810180e6e19226c082fd0f8c794c2f8506ee97344b19de5f33b25824e43
+  metadata.gz: f06e8796132833ad69e887b86c1b005daf7ee8db83bcdbb9c728080e56b772376beb5fa0036a0dac9f48438dafadbdeda646892486d1432ed05e76b10b43e5a2
+  data.tar.gz: 7d9c5932b1a983cc4014bbffe126240851545259301a951b8d23be70d5acb95c464e39b188a067c7a237527e2ac89c3d5947f3098775f352b6895826ce167e92

data/lib/cocoapods-downloader/api.rb

@@ -8,6 +8,8 @@ module Pod
       # @return [String] the output of the command.
       #
       def execute_command(executable, command, raise_on_failure = false)
+        require 'shellwords'
+        command = command.map(&:to_s).map(&:shellescape).join(' ')
         output = `\n#{executable} #{command} 2>&1`
         check_exit_code!(executable, command, output) if raise_on_failure
         puts output

data/lib/cocoapods-downloader/base.rb

@@ -144,12 +144,12 @@ module Pod
       # @return [void]
       #
       def self.executable(name)
-        define_method(name) do |command|
-          execute_command(name.to_s, command, false)
+        define_method(name) do |*command|
+          execute_command(name.to_s, command.flatten, false)
         end
 
-        define_method(name.to_s + '!') do |command|
-          execute_command(name.to_s, command, true)
+        define_method(name.to_s + '!') do |*command|
+          execute_command(name.to_s, command.flatten, true)
         end
       end
     end

data/lib/cocoapods-downloader/bazaar.rb

@@ -36,11 +36,11 @@ module Pod
       end
 
       def download_head!
-        bzr! %(branch "#{url}" #{dir_opts} #{@target_path.shellescape})
+        bzr! 'branch', url, *dir_opts, target_path
       end
 
       def download_revision!(rev)
-        bzr! %(branch "#{url}" #{dir_opts} -r '#{rev}' #{@target_path.shellescape})
+        bzr! 'branch', url, *dir_opts, '-r', rev, @target_path
       end
 
       # @return [String] The command line flags to use according to whether the
@@ -48,9 +48,9 @@ module Pod
       #
       def dir_opts
         if @target_path.exist?
-          '--use-existing-dir'
+          %w(--use-existing-dir)
         else
-          ''
+          []
         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 = '0.8.1'
+    VERSION = '0.9.0'
   end
 end

data/lib/cocoapods-downloader/git.rb

@@ -62,7 +62,7 @@ module Pod
       def clone(force_head = false, shallow_clone = true)
         ui_sub_action('Git download') do
           begin
-            git! clone_arguments(force_head, shallow_clone).join(' ')
+            git! clone_arguments(force_head, shallow_clone)
           rescue DownloaderError => e
             if e.message =~ /^fatal:.*does not support --depth$/im
               clone(force_head, false)
@@ -86,10 +86,10 @@ module Pod
       # @return [Array<String>] arguments to pass to `git` to clone the repo.
       #
       def clone_arguments(force_head, shallow_clone)
-        command = ['clone', url.shellescape, target_path.shellescape]
+        command = ['clone', url, target_path]
 
         if shallow_clone && !options[:commit]
-          command += ['--single-branch', '--depth 1']
+          command += %w(--single-branch --depth 1)
         end
 
         unless force_head
@@ -105,7 +105,7 @@ module Pod
       #
       def checkout_commit
         Dir.chdir(target_path) do
-          git! "checkout -b activated-commit #{options[:commit]}"
+          git! 'checkout', '-b', 'activated-commit', options[:commit]
         end
       end
 
@@ -113,7 +113,7 @@ module Pod
       #
       def init_submodules
         Dir.chdir(target_path) do
-          git! 'submodule update --init'
+          git! %w(submodule update --init)
         end
       end
     end

data/lib/cocoapods-downloader/http.rb

@@ -62,8 +62,6 @@ module Pod
           :tbz
         elsif path =~ /.(txz|tar\.xz)$/
           :txz
-        else
-          nil
         end
       end
 
@@ -85,23 +83,23 @@ module Pod
       end
 
       def download_file(full_filename)
-        curl! %(-f -L -o #{full_filename.shellescape} "#{url}" --create-dirs)
+        curl! '-f', '-L', '-o', full_filename, url, '--create-dirs'
       end
 
       def extract_with_type(full_filename, type = :zip)
-        unpack_from = full_filename.shellescape
-        unpack_to = @target_path.shellescape
+        unpack_from = full_filename
+        unpack_to = @target_path
         case type
         when :zip
-          unzip! %(#{unpack_from} -d #{unpack_to})
+          unzip! unpack_from, '-d', unpack_to
         when :tgz
-          tar! %(xfz #{unpack_from} -C #{unpack_to})
+          tar! 'xfz', unpack_from, '-C', unpack_to
         when :tar
-          tar! %(xf #{unpack_from} -C #{unpack_to})
+          tar! 'xf', unpack_from, '-C', unpack_to
         when :tbz
-          tar! %(xfj #{unpack_from} -C #{unpack_to})
+          tar! 'xfj', unpack_from, '-C', unpack_to
         when :txz
-          tar! %(xf #{unpack_from} -C #{unpack_to})
+          tar! 'xf', unpack_from, '-C', unpack_to
         else
           raise UnsupportedFileTypeError, "Unsupported file type: #{type}"
         end

data/lib/cocoapods-downloader/mercurial.rb

@@ -35,19 +35,19 @@ module Pod
       end
 
       def download_head!
-        hg! %(clone #{url} #{@target_path.shellescape})
+        hg! 'clone', url, @target_path
       end
 
       def download_revision!
-        hg! %(clone "#{url}" --rev '#{options[:revision]}' #{@target_path.shellescape})
+        hg! 'clone', url, '--rev', options[:revision], @target_path
       end
 
       def download_tag!
-        hg! %(clone "#{url}" --updaterev '#{options[:tag]}' #{@target_path.shellescape})
+        hg! 'clone', url, '--updaterev', options[:tag], @target_path
       end
 
       def download_branch!
-        hg! %(clone "#{url}" --updaterev '#{options[:branch]}' #{@target_path.shellescape})
+        hg! 'clone', url, '--updaterev', options[:branch], @target_path
       end
     end
   end

data/lib/cocoapods-downloader/subversion.rb

@@ -23,12 +23,12 @@ module Pod
       executable :svn
 
       def download!
-        output = svn!(%(#{subcommand} "#{reference_url}" #{@target_path.shellescape}))
+        output = svn!(*subcommand, *reference_url, @target_path)
         store_exported_revision(output)
       end
 
       def download_head!
-        output = svn!(%(#{subcommand} "#{trunk_url}" #{@target_path.shellescape}))
+        output = svn!(*subcommand, *trunk_url, @target_path)
         store_exported_revision(output)
       end
 
@@ -39,13 +39,13 @@ module Pod
 
       def subcommand
         if options[:checkout]
-          result = 'checkout'
+          result = %w(checkout)
         else
-          result = 'export'
+          result = %w(export)
         end
 
-        result << ' --non-interactive --trust-server-cert --force'
-        result << ' --ignore-externals' if options[:externals] == false
+        result += %w(--non-interactive --trust-server-cert --force)
+        result << '--ignore-externals' if options[:externals] == false
         result
       end
 
@@ -53,7 +53,8 @@ module Pod
         result = url.dup
         result << '/'       << options[:folder] if options[:folder]
         result << '/tags/'  << options[:tag] if options[:tag]
-        result << '" -r "'  << options[:revision] if options[:revision]
+        result = [result]
+        result << '-r'      << options[:revision] if options[:revision]
         result
       end
 
@@ -61,7 +62,7 @@ module Pod
         result = url.dup
         result << '/' << options[:folder] if options[:folder]
         result << '/trunk'
-        result
+        [result]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-04-01 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: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 3
 summary: A small library for downloading files from remotes in a folder.