mini_portile 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee87cb39d1d3f26fada711165e1270a45ad07b5
-  data.tar.gz: 608e501834649a00f3236fff4fb405fd6e16a2e9
+  metadata.gz: 01126f5630688f97f3ee6fe7d5350299597f7bf9
+  data.tar.gz: 0d187a46934aa17f7d1a175fb85212164e3c7e75
 SHA512:
-  metadata.gz: 85b9ea5ef46b6e824bb17df60123cf0ddaea05bae22580b90ef2fbebeb383632f4a83257dc0db32e20cb68276e63d09421b7640663c3323b1ace022761c83773
-  data.tar.gz: 5a3677ffb69d4e119fc8f45ec3a1367d23a65c1055b0c3831320a0bfb7711cc54effb386940d171907e6183db3aef129cb6fde7e880cf634a4f34bb5ee6fa7eb
+  metadata.gz: a4600f5802cc11e9b3cc22b3bcd5b775d7fadb49a30df4ccfa8c09e07699cda449f2515f3115a8d669d4e938f567dec88183cc06f510df0a708232f38d955816
+  data.tar.gz: 170c8eef4ba7a276c4e28a7bddfd148db1f4e7f25cecc06592e6e1a92abd020385a5dbd9dbf8aecfd358d3d09055362bcb58bdcb2be1b791d9cfe5a929b92f4d

data/History.txt

@@ -1,3 +1,16 @@
+=== 0.6.0 / 2014-04-18
+
+* Enhancements:
+  * Add default cert store and custom certs from `SSL_CERT_FILE` if present.
+    This increases compatibility with Ruby 1.8.7.
+
+* Bugfixes:
+  * Specify Accept-Encoding to make sure a raw file content is downloaded.
+    Pull #30. [knu]
+
+* Internal:
+  * Improve examples and use them as test harness.
+
 === 0.5.3 / 2014-03-24
 
 * Bugfixes:

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.5.3"
+  s.version     = "0.6.0"
   s.platform    = Gem::Platform::RUBY
 
   # description and details
@@ -42,3 +42,12 @@ Gem::PackageTask.new(GEM_SPEC) do |pkg|
   pkg.need_tar = false
   pkg.need_zip = false
 end
+
+desc "Test MiniPortile by compiling examples"
+task :test do
+  Dir.chdir("examples") do
+    sh "rake ports:all"
+  end
+end
+
+task :default => [:test]

data/examples/Rakefile

@@ -1,46 +1,104 @@
 require File.expand_path("mini_portile", File.join(File.dirname(__FILE__), "../lib"))
 
-$recipes = {}
+recipes = []
 
-ICONV_VERSION = "1.13.1"
-$recipes[:libiconv] = MiniPortile.new "libiconv", ICONV_VERSION
-$recipes[:libiconv].files << "ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-#{ICONV_VERSION}.tar.gz"
+# libiconv
+libiconv = MiniPortile.new "libiconv", "1.14"
+libiconv.files << "ftp://ftp.gnu.org/pub/gnu/#{libiconv.name}/#{libiconv.name}-#{libiconv.version}.tar.gz"
 
-$recipes[:sqlite3] = MiniPortile.new "sqlite3", "3.7.5"
-$recipes[:sqlite3].files << "http://sqlite.org/sqlite-autoconf-3070500.tar.gz"
+recipes.push libiconv
 
-namespace :ports do
-  directory "ports"
+# sqlite3
+sqlite3 = MiniPortile.new "sqlite3", "3.8.4.1"
+sqlite3.files << "http://sqlite.org/2014/sqlite-autoconf-3080401.tar.gz"
+
+recipes.push sqlite3
+
+# c-ares
+c_ares = MiniPortile.new "c-ares", "1.7.5"
+c_ares.files << "https://s3.amazonaws.com/distfiles.openknapsack.org/#{c_ares.name}/#{c_ares.name}-#{c_ares.version}.tar.gz"
+
+recipes.push c_ares
+
+# zlib
+class ZlibRecipe < MiniPortile
+  def windows?
+    !(host =~ /mswin|mingw/).nil?
+  end
 
-  desc "Install port libiconv #{ICONV_VERSION}"
-  task :libiconv => ["ports"] do |t|
-    recipe = $recipes[:libiconv]
-    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+  def configure
+    return super unless windows?
 
-    unless File.exist?(checkpoint)
-      recipe.cook
-      touch checkpoint
+    Dir.chdir work_path do
+      mk = File.read 'win32/Makefile.gcc'
+      File.open 'win32/Makefile.gcc', 'wb' do |f|
+        f.puts "BINARY_PATH = #{path}/bin"
+        f.puts "LIBRARY_PATH = #{path}/lib"
+        f.puts "INCLUDE_PATH = #{path}/include"
+
+        cross_build? and
+          mk.sub!(/^PREFIX\s*=\s*$/, "PREFIX = #{host}-")
+
+        f.puts mk
+      end
     end
+  end
+
+  def configure_defaults
+    ["--static"]
+  end
+
+  def configured?
+    return super unless windows?
+
+    !!(File.read(File.join(work_path, 'win32/Makefile.gcc')) =~ /^BINARY_PATH/)
+  end
+
+  def compile
+    return super unless windows?
+
+    execute "compile", "make -f win32/Makefile.gcc"
+  end
+
+  def install
+    return if installed?
+    return super unless windows?
+
+    execute "install", %Q(#{make_cmd} -f win32/Makefile.gcc install)
+  end
 
-    recipe.activate
+  def cross_build?
+    host != original_host
   end
+end
+
+zlib = ZlibRecipe.new "zlib", "1.2.8"
+zlib.files << "http://zlib.net/#{zlib.name}-#{zlib.version}.tar.gz"
+
+recipes.push zlib
+
+namespace :ports do
+  directory "ports"
+
+  recipes.each do |recipe|
+    desc "Install port #{recipe.name} #{recipe.version}"
+    task recipe.name => ["ports"] do |t|
+      checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
 
-  desc "Install port sqlite3 #{$recipes[:sqlite3].version}"
-  task :sqlite3 => ["ports"] do |t|
-    recipe = $recipes[:sqlite3]
-    checkpoint = "ports/.#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
+      unless File.exist?(checkpoint)
+        recipe.cook
+        touch checkpoint
+      end
 
-    unless File.exist?(checkpoint)
-      recipe.cook
-      touch checkpoint
+      recipe.activate
     end
 
-    recipe.activate
+    task :all => recipe.name
   end
 
   desc "Install all ports and display installation location"
-  task :all => [:libiconv, :sqlite3] do
-    $recipes.each do |_, recipe|
+  task :all do
+    recipes.each do |recipe|
       puts "Artifacts of '#{recipe.name}' in '#{recipe.path}'"
     end
     puts "LDFLAGS: " << ENV['LDFLAGS'].inspect
@@ -49,7 +107,7 @@ end
 
 desc "Adjust all recipes host for cross-compilation"
 task :cross do
-  $recipes.each do |_, recipe|
+  recipes.each do |recipe|
     recipe.host = "i686-w64-mingw32"
   end
 end

data/lib/mini_portile.rb

@@ -1,5 +1,6 @@
 require 'rbconfig'
 require 'net/http'
+require 'net/https'
 require 'net/ftp'
 require 'fileutils'
 require 'tempfile'
@@ -321,46 +322,65 @@ private
 
   def download_file_http(url, full_path, count = 3)
     filename = File.basename(full_path)
+    uri = URI.parse(url)
 
     if ENV['http_proxy']
-      protocol, userinfo, host, port  = URI::split(ENV['http_proxy'])
+      _, userinfo, p_host, p_port = URI.split(ENV['http_proxy'])
       proxy_user, proxy_pass = userinfo.split(/:/) if userinfo
-      http = Net::HTTP::Proxy(host, port, proxy_user, proxy_pass)
+      http = Net::HTTP.new(uri.host, uri.port, p_host, p_port, proxy_user, proxy_pass)
     else
-      http = Net::HTTP
+      http = Net::HTTP.new(uri.host, uri.port)
+
+      if URI::HTTPS === uri
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+        store = OpenSSL::X509::Store.new
+
+        # Auto-include system-provided certificates
+        store.set_default_paths
+
+        if ENV.has_key?("SSL_CERT_FILE") && File.exist?(ENV["SSL_CERT_FILE"])
+          store.add_file ENV["SSL_CERT_FILE"]
+        end
+
+        http.cert_store = store
+      end
     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::HTTPClientError
-        output "Error: Client Error: #{response.inspect}"
-        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::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
-            new_progress = (size * 100) / total
-            unless new_progress == progress
-              message "\rDownloading %s (%3d%%) " % [filename, new_progress]
+    http.start do |h|
+      h.request_get(uri.path, 'Accept-Encoding' => 'identity') do |response|
+        case response
+        when Net::HTTPNotFound
+          output "404 - Not Found"
+          return false
+
+        when Net::HTTPClientError
+          output "Error: Client Error: #{response.inspect}"
+          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::HTTPOK
+          return 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
+              new_progress = (size * 100) / total
+              unless new_progress == progress
+                message "\rDownloading %s (%3d%%) " % [filename, new_progress]
+              end
+              progress = new_progress
             end
-            progress = new_progress
+            output
           end
-          output
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Luis Lavena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-18 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
@@ -21,37 +21,37 @@ extra_rdoc_files:
 - History.txt
 - LICENSE.txt
 files:
-- examples/Rakefile
-- lib/mini_portile.rb
-- Rakefile
 - History.txt
 - LICENSE.txt
 - README.rdoc
+- Rakefile
+- examples/Rakefile
+- lib/mini_portile.rb
 homepage: http://github.com/luislavena/mini_portile
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
-- --title
+- "--title"
 - MiniPortile -- Documentation
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simplistic port-like solution for developers