cocoapods-downloader 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39f931857e0e88b2b1bfbd27f1444194e1f0964f
-  data.tar.gz: 04825acb584a9417a5dae4fa01a328e4233b5e82
+SHA256:
+  metadata.gz: f02617513ce98885a2e44e42744ea310ca79783239ecfde7d8bd8c692ff2db96
+  data.tar.gz: 787a49a14bd36a61a0d360289bc4a5631d6b36dbd47418c41450502d002fdd65
 SHA512:
-  metadata.gz: 8fbd2e3973f247c1a86243b1c5ab2bf00717cc928f55c8c71f5465001f1120c88c3e81bd7316847c3e7acb8fd15df300890408b9b60eaabdb615ae3cccd3584c
-  data.tar.gz: b5aadb492243642b60dece83d37a16968aaf997af47f94b1d56af92bc0bb091d1b2243aabf6ac1746b3b0866f56af232572c05b9f2ce08f661a520642e2175f2
+  metadata.gz: d2ce0b3149460f0398a8dc7c799eac8d7a0ac72bdb6f6728f990baeec133204a7ee63c282c232ee4c526f4f16704f7a7532a2d568035bb019abee097c3805e63
+  data.tar.gz: 4cdfd86c52e403cc13816e627a695086e49d179f8710173a76e55be623300e03c704c6090e083b2385d197b408cfec3a827b45b810b72a886f7cf226a9708b49

data/README.markdown

@@ -33,6 +33,7 @@ The downloader class supports the following option keys:
 - svn: revision, tag, folder, externals
 - hg: revision, tag, branch
 - http: type, flatten
+- scp: type, flatten
 - bzr: revision, tag
 
 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

@@ -9,6 +9,7 @@ module Pod
     autoload :Git,         'cocoapods-downloader/git'
     autoload :Http,        'cocoapods-downloader/http'
     autoload :Mercurial,   'cocoapods-downloader/mercurial'
+    autoload :Scp,         'cocoapods-downloader/scp'
     autoload :Subversion,  'cocoapods-downloader/subversion'
 
     # Denotes the error generated by a Downloader
@@ -24,6 +25,7 @@ module Pod
         :git  => Git,
         :hg   => Mercurial,
         :http => Http,
+        :scp  => Scp,
         :svn  => Subversion,
       }
     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.1.3'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

data/lib/cocoapods-downloader/http.rb

@@ -1,180 +1,15 @@
-require 'zlib'
-require 'fileutils'
-require 'uri'
+require 'cocoapods-downloader/remote_file'
 
 module Pod
   module Downloader
-    class Http < Base
-      def self.options
-        [:type, :flatten, :sha1, :sha256]
-      end
-
-      class UnsupportedFileTypeError < StandardError; end
-
+    class Http < RemoteFile
       private
 
       executable :curl
-      executable :unzip
-      executable :tar
-      executable :hdiutil
-
-      attr_accessor :filename, :download_path
-
-      def download!
-        @filename = filename_with_type(type)
-        @download_path = (target_path + @filename)
-        download_file(@download_path)
-        verify_checksum(@download_path)
-        extract_with_type(@download_path, type)
-      end
-
-      def type
-        if options[:type]
-          options[:type].to_sym
-        else
-          type_with_url(url)
-        end
-      end
-
-      # @note   The archive is flattened if it contains only one folder and its
-      #         extension is either `tgz`, `tar`, `tbz` or the options specify
-      #         it.
-      #
-      # @return [Bool] Whether the archive should be flattened if it contains
-      #         only one folder.
-      #
-      def should_flatten?
-        if options.key?(:flatten)
-          true
-        elsif [:tgz, :tar, :tbz, :txz].include?(type)
-          true # those archives flatten by default
-        else
-          false # all others (actually only .zip) default not to flatten
-        end
-      end
-
-      def type_with_url(url)
-        case URI.parse(url).path
-        when /\.zip$/
-          :zip
-        when /\.(tgz|tar\.gz)$/
-          :tgz
-        when /\.tar$/
-          :tar
-        when /\.(tbz|tar\.bz2)$/
-          :tbz
-        when /\.(txz|tar\.xz)$/
-          :txz
-        when /\.dmg$/
-          :dmg
-        end
-      end
-
-      def filename_with_type(type = :zip)
-        case type
-        when :zip
-          'file.zip'
-        when :tgz
-          'file.tgz'
-        when :tar
-          'file.tar'
-        when :tbz
-          'file.tbz'
-        when :txz
-          'file.txz'
-        when :dmg
-          'file.dmg'
-        else
-          raise UnsupportedFileTypeError, "Unsupported file type: #{type}"
-        end
-      end
 
       def download_file(full_filename)
         curl! '-f', '-L', '-o', full_filename, url, '--create-dirs', '--netrc-optional'
       end
-
-      def extract_with_type(full_filename, type = :zip)
-        unpack_from = full_filename
-        unpack_to = @target_path
-        case type
-        when :zip
-          unzip! unpack_from, '-d', unpack_to
-        when :tgz
-          tar! 'xfz', unpack_from, '-C', unpack_to
-        when :tar
-          tar! 'xf', unpack_from, '-C', unpack_to
-        when :tbz
-          tar! 'xfj', unpack_from, '-C', unpack_to
-        when :txz
-          tar! 'xf', unpack_from, '-C', unpack_to
-        when :dmg
-          extract_dmg(unpack_from, unpack_to)
-        else
-          raise UnsupportedFileTypeError, "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(target_path + @filename)
-          entry = contents.first
-          if contents.count == 1 && entry.directory?
-            FileUtils.move(entry.children, target_path)
-          end
-        end
-      end
-
-      def extract_dmg(unpack_from, unpack_to)
-        require 'rexml/document'
-        plist_s = hdiutil! 'attach', '-plist', '-nobrowse', unpack_from, '-mountrandom', unpack_to
-        plist = REXML::Document.new plist_s
-        xpath = '//key[.="mount-point"]/following-sibling::string'
-        mount_point = REXML::XPath.first(plist, xpath).text
-        FileUtils.cp_r(Dir.glob(mount_point + '/*'), unpack_to)
-        hdiutil! 'detach', mount_point
-      end
-
-      def compare_hash(filename, hasher, hash)
-        incremental_hash = hasher.new
-
-        File.open(filename, 'rb') do |file|
-          buf = ''
-          incremental_hash << buf while file.read(1024, buf)
-        end
-
-        computed_hash = incremental_hash.hexdigest
-
-        if computed_hash != hash
-          raise DownloaderError, 'Verification checksum was incorrect, ' \
-            "expected #{hash}, got #{computed_hash}"
-        end
-      end
-
-      # Verify that the downloaded file matches a sha1 hash
-      #
-      def verify_sha1_hash(filename, hash)
-        require 'digest/sha1'
-        compare_hash(filename, Digest::SHA1, hash)
-      end
-
-      # Verify that the downloaded file matches a sha256 hash
-      #
-      def verify_sha256_hash(filename, hash)
-        require 'digest/sha2'
-        compare_hash(filename, Digest::SHA2, hash)
-      end
-
-      # Verify that the downloaded file matches the hash if set
-      #
-      def verify_checksum(filename)
-        if options[:sha256]
-          verify_sha256_hash(filename, options[:sha256])
-        elsif options[:sha1]
-          verify_sha1_hash(filename, options[:sha1])
-        end
-      end
     end
   end
 end

data/lib/cocoapods-downloader/remote_file.rb

@@ -0,0 +1,179 @@
+require 'zlib'
+require 'fileutils'
+require 'uri'
+
+module Pod
+  module Downloader
+    class RemoteFile < Base
+      def self.options
+        [:type, :flatten, :sha1, :sha256]
+      end
+
+      class UnsupportedFileTypeError < StandardError; end
+
+      private
+
+      executable :unzip
+      executable :tar
+      executable :hdiutil
+
+      attr_accessor :filename, :download_path
+
+      def download!
+        @filename = filename_with_type(type)
+        @download_path = (target_path + @filename)
+        download_file(@download_path)
+        verify_checksum(@download_path)
+        extract_with_type(@download_path, type)
+      end
+
+      def type
+        if options[:type]
+          options[:type].to_sym
+        else
+          type_with_url(url)
+        end
+      end
+
+      # @note   The archive is flattened if it contains only one folder and its
+      #         extension is either `tgz`, `tar`, `tbz` or the options specify
+      #         it.
+      #
+      # @return [Bool] Whether the archive should be flattened if it contains
+      #         only one folder.
+      #
+      def should_flatten?
+        if options.key?(:flatten)
+          true
+        elsif [:tgz, :tar, :tbz, :txz].include?(type)
+          true # those archives flatten by default
+        else
+          false # all others (actually only .zip) default not to flatten
+        end
+      end
+
+      def type_with_url(url)
+        case URI.parse(url).path
+        when /\.zip$/
+          :zip
+        when /\.(tgz|tar\.gz)$/
+          :tgz
+        when /\.tar$/
+          :tar
+        when /\.(tbz|tar\.bz2)$/
+          :tbz
+        when /\.(txz|tar\.xz)$/
+          :txz
+        when /\.dmg$/
+          :dmg
+        end
+      end
+
+      def filename_with_type(type = :zip)
+        case type
+        when :zip
+          'file.zip'
+        when :tgz
+          'file.tgz'
+        when :tar
+          'file.tar'
+        when :tbz
+          'file.tbz'
+        when :txz
+          'file.txz'
+        when :dmg
+          'file.dmg'
+        else
+          raise UnsupportedFileTypeError, "Unsupported file type: #{type}"
+        end
+      end
+
+      def download_file(_full_filename)
+        raise NotImplementedError
+      end
+
+      def extract_with_type(full_filename, type = :zip)
+        unpack_from = full_filename
+        unpack_to = @target_path
+        case type
+        when :zip
+          unzip! unpack_from, '-d', unpack_to
+        when :tgz
+          tar! 'xfz', unpack_from, '-C', unpack_to
+        when :tar
+          tar! 'xf', unpack_from, '-C', unpack_to
+        when :tbz
+          tar! 'xfj', unpack_from, '-C', unpack_to
+        when :txz
+          tar! 'xf', unpack_from, '-C', unpack_to
+        when :dmg
+          extract_dmg(unpack_from, unpack_to)
+        else
+          raise UnsupportedFileTypeError, "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(target_path + @filename)
+          entry = contents.first
+          if contents.count == 1 && entry.directory?
+            FileUtils.move(entry.children, target_path)
+          end
+        end
+      end
+
+      def extract_dmg(unpack_from, unpack_to)
+        require 'rexml/document'
+        plist_s = hdiutil! 'attach', '-plist', '-nobrowse', unpack_from, '-mountrandom', unpack_to
+        plist = REXML::Document.new plist_s
+        xpath = '//key[.="mount-point"]/following-sibling::string'
+        mount_point = REXML::XPath.first(plist, xpath).text
+        FileUtils.cp_r(Dir.glob(mount_point + '/*'), unpack_to)
+        hdiutil! 'detach', mount_point
+      end
+
+      def compare_hash(filename, hasher, hash)
+        incremental_hash = hasher.new
+
+        File.open(filename, 'rb') do |file|
+          buf = ''
+          incremental_hash << buf while file.read(1024, buf)
+        end
+
+        computed_hash = incremental_hash.hexdigest
+
+        if computed_hash != hash
+          raise DownloaderError, 'Verification checksum was incorrect, ' \
+            "expected #{hash}, got #{computed_hash}"
+        end
+      end
+
+      # Verify that the downloaded file matches a sha1 hash
+      #
+      def verify_sha1_hash(filename, hash)
+        require 'digest/sha1'
+        compare_hash(filename, Digest::SHA1, hash)
+      end
+
+      # Verify that the downloaded file matches a sha256 hash
+      #
+      def verify_sha256_hash(filename, hash)
+        require 'digest/sha2'
+        compare_hash(filename, Digest::SHA2, hash)
+      end
+
+      # Verify that the downloaded file matches the hash if set
+      #
+      def verify_checksum(filename)
+        if options[:sha256]
+          verify_sha256_hash(filename, options[:sha256])
+        elsif options[:sha1]
+          verify_sha1_hash(filename, options[:sha1])
+        end
+      end
+    end
+  end
+end

data/lib/cocoapods-downloader/scp.rb

@@ -0,0 +1,30 @@
+require 'uri'
+require 'cocoapods-downloader/remote_file'
+
+module Pod
+  module Downloader
+    class Scp < RemoteFile
+      DEFAULT_PORT = 22
+
+      private
+
+      executable :scp
+
+      def download_file(full_filename)
+        scp! '-P', port, '-q', source, full_filename
+      end
+
+      def source
+        "#{uri.user ? uri.user + '@' : ''}#{uri.host}:'#{uri.path}'"
+      end
+
+      def port
+        uri.port || DEFAULT_PORT
+      end
+
+      def uri
+        @uri ||= URI.parse(url)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cocoapods-downloader
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Eloy Duran
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -30,6 +30,8 @@ files:
 - lib/cocoapods-downloader/git.rb
 - lib/cocoapods-downloader/http.rb
 - lib/cocoapods-downloader/mercurial.rb
+- lib/cocoapods-downloader/remote_file.rb
+- lib/cocoapods-downloader/scp.rb
 - lib/cocoapods-downloader/subversion.rb
 homepage: https://github.com/CocoaPods/Downloader
 licenses:
@@ -51,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 3
 summary: A small library for downloading files from remotes in a folder.