mini_portile 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.4.0 / 2012-10-24
+
+* Enhancements:
+  * Allow fetching of FTP URLs along HTTP ones. [metaskills]
+
 === 0.3.0 / 2012-03-23
 
 * Enhancements:

data/Rakefile

@@ -4,7 +4,7 @@ require "rubygems/package_task"
 GEM_SPEC = Gem::Specification.new do |s|
   # basic information
   s.name        = "mini_portile"
-  s.version     = "0.3.0"
+  s.version     = "0.4.0"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

data/examples/Rakefile

@@ -4,7 +4,7 @@ $recipes = {}
 
 ICONV_VERSION = "1.13.1"
 $recipes[:libiconv] = MiniPortile.new "libiconv", ICONV_VERSION
-$recipes[:libiconv].files << "http://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
+$recipes[:libiconv].files << "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
 
 $recipes[:sqlite3] = MiniPortile.new "sqlite3", "3.7.5"
 $recipes[:sqlite3].files << "http://sqlite.org/sqlite-autoconf-3070500.tar.gz"

data/lib/mini_portile.rb

@@ -1,5 +1,6 @@
 require 'rbconfig'
 require 'net/http'
+require 'net/ftp'
 require 'fileutils'
 require 'tempfile'
 require 'digest/md5'
@@ -250,42 +251,53 @@ private
   # and adaptations of Wayne's RailsInstaller
   def download_file(url, full_path, count = 3)
     return if File.exist?(full_path)
-    filename = File.basename(full_path)
-
+    uri = URI.parse(url)
     begin
-
-      if ENV['http_proxy']
-        protocol, userinfo, host, port  = URI::split(ENV['http_proxy'])
-        proxy_user, proxy_pass = userinfo.split(/:/) if userinfo
-        http = Net::HTTP::Proxy(host, port, proxy_user, proxy_pass)
-      else
-        http = Net::HTTP
+      case uri.scheme.downcase
+      when /ftp/
+        download_file_ftp(uri, full_path)
+      when /http|https/
+        download_file_http(url, full_path, count)
       end
+    rescue Exception => e
+      File.unlink full_path if File.exists?(full_path)
+      output "ERROR: #{e.message}"
+      raise "Failed to complete download task"
+    end
+  end
 
-      message "Downloading #{filename} "
-      http.get_response(URI.parse(url)) do |response|
-        case response
-        when Net::HTTPNotFound
-          output "404 - Not Found"
-          return false
+  def download_file_http(url, full_path, count = 3)
+    filename = File.basename(full_path)
 
-        when Net::HTTPClientError
-          output "Error: Client Error: #{response.inspect}"
-          return false
+    if ENV['http_proxy']
+      protocol, userinfo, host, port  = URI::split(ENV['http_proxy'])
+      proxy_user, proxy_pass = userinfo.split(/:/) if userinfo
+      http = Net::HTTP::Proxy(host, port, proxy_user, proxy_pass)
+    else
+      http = Net::HTTP
+    end
+
+    message "Downloading #{filename} "
+    http.get_response(URI.parse(url)) do |response|
+      case response
+      when Net::HTTPNotFound
+        output "404 - Not Found"
+        return false
 
-        when Net::HTTPRedirection
-          raise "Too many redirections for the original URL, halting." if count <= 0
-          url = response["location"]
-          return download_file(url, full_path, count - 1)
+      when Net::HTTPClientError
+        output "Error: Client Error: #{response.inspect}"
+        return false
 
-        when Net::HTTPOK
-          temp_file = Tempfile.new("download-#{filename}")
-          temp_file.binmode
+      when Net::HTTPRedirection
+        raise "Too many redirections for the original URL, halting." if count <= 0
+        url = response["location"]
+        return download_file(url, full_path, count - 1)
 
+      when Net::HTTPOK
+        with_tempfile(filename, full_path) do |temp_file|
           size = 0
           progress = 0
           total = response.header["Content-Length"].to_i
-
           response.read_body do |chunk|
             temp_file << chunk
             size += chunk.size
@@ -295,20 +307,45 @@ private
             end
             progress = new_progress
           end
-
           output
-
-          temp_file.close
-          File.unlink full_path if File.exists?(full_path)
-          FileUtils.mkdir_p File.dirname(full_path)
-          FileUtils.mv temp_file.path, full_path, :force => true
         end
       end
+    end
+  end
 
-    rescue Exception => e
-      File.unlink full_path if File.exists?(full_path)
-      output "ERROR: #{e.message}"
-      raise "Failed to complete download task"
+  def download_file_ftp(uri, full_path)
+    filename = File.basename(uri.path)
+    with_tempfile(filename, full_path) do |temp_file|
+      size = 0
+      progress = 0
+      Net::FTP.open(uri.host, uri.user, uri.password) do |ftp|
+        ftp.passive = true
+        ftp.login
+        remote_dir = File.dirname(uri.path)
+        ftp.chdir(remote_dir) unless remote_dir == '.'
+        total = ftp.size(filename)
+        ftp.getbinaryfile(filename, nil, 8192) do |chunk|
+          temp_file << chunk
+          size += chunk.size
+          new_progress = (size * 100) / total
+          unless new_progress == progress
+            message "\rDownloading %s (%3d%%) " % [filename, new_progress]
+          end
+          progress = new_progress
+        end
+      end
+      output
     end
   end
+
+  def with_tempfile(filename, full_path)
+    temp_file = Tempfile.new("download-#{filename}")
+    temp_file.binmode
+    yield temp_file
+    temp_file.close
+    File.unlink full_path if File.exists?(full_path)
+    FileUtils.mkdir_p File.dirname(full_path)
+    FileUtils.mv temp_file.path, full_path, :force => true
+  end
+
 end

metadata

@@ -1,34 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mini_portile
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Luis Lavena
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-23 00:00:00 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies: []
-
-description: Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.
+description: Simplistic port-like solution for developers. It provides a standard
+  and simplified way to compile against dependency libraries without messing up your
+  system.
 email: luislavena@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - History.txt
 - LICENSE.txt
-files: 
+files:
 - examples/Rakefile
 - lib/mini_portile.rb
 - Rakefile
@@ -36,44 +29,32 @@ files:
 - History.txt
 - LICENSE.txt
 homepage: http://github.com/luislavena/mini_portile
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --title
 - MiniPortile -- Documentation
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simplistic port-like solution for developers
 test_files: []
-