mini_portile 0.5.1 → 0.5.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 68971ad5491d04db792cc4c302012dba5c426a8f
+  data.tar.gz: 4e4dbabe7a1ea8310f95aa6e7617f7ab54980e5d
+SHA512:
+  metadata.gz: bd5797cd26aa5b37cef63b0c16315d31445d95362d9102c4800af077dc40d495f0810a2abc28090526cc276f7b3712839915adb0c7fa68cf604645d245081ace
+  data.tar.gz: d27ce0daed9bf07388092c125e90a75e32763e4f7fcfdf71ac802dd1f2ce7574aad988800636b2439ce89762c0f1675a80769a5def71bb4002b6c6f6363fa547

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.5.2 / 2013-10-23
+
+* Bugfixes:
+  * Change tar detection order to support NetBSD 'gtar'. Closes #24
+  * Trick 'git-apply' when applying patches on nested Git checkouts. [larskanis]
+  * Respect ENV's MAKE before fallback to 'make'. [larskanis]
+  * Respect ENV's CC variable before fallback to 'gcc'.
+  * Avoid non-ASCII output of GCC cause host detection issues. Closes #22
+
 === 0.5.1 / 2013-07-07
 
 * 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.1"
+  s.version     = "0.5.2"
   s.platform    = Gem::Platform::RUBY
 
   # description and details

data/lib/mini_portile.rb

@@ -36,10 +36,18 @@ class MiniPortile
   end
 
   def patch
-    @patch_files.each do |full_path|
-      next unless File.exists?(full_path)
-      output "Running git apply with #{full_path}..."
-      execute('patch', %Q(git apply #{full_path}))
+    # Set GIT_DIR while appying patches to work around
+    # git-apply doing nothing when started within another
+    # git directory.
+    ENV['GIT_DIR'], old_git = '.', ENV['GIT_DIR']
+    begin
+      @patch_files.each do |full_path|
+        next unless File.exists?(full_path)
+        output "Running git apply with #{full_path}..."
+        execute('patch', %Q(git apply #{full_path}))
+      end
+    ensure
+      ENV['GIT_DIR'] = old_git
     end
   end
 
@@ -58,12 +66,12 @@ class MiniPortile
   end
 
   def compile
-    execute('compile', 'make')
+    execute('compile', make_cmd)
   end
 
   def install
     return if installed?
-    execute('install', %Q(make install))
+    execute('install', %Q(#{make_cmd} install))
   end
 
   def downloaded?
@@ -186,7 +194,7 @@ private
 
   def tar_exe
     @@tar_exe ||= begin
-      %w[tar bsdtar basic-bsdtar].find { |c|
+      %w[gtar bsdtar tar basic-bsdtar].find { |c|
         which(c)
       }
     end
@@ -212,12 +220,18 @@ private
   def detect_host
     return @detect_host if defined?(@detect_host)
 
-    output = `gcc -v 2>&1`
-    if m = output.match(/^Target\: (.*)$/)
-      @detect_host = m[1]
-    end
+    begin
+      ENV["LC_ALL"], old_lc_all = "C", ENV["LC_ALL"]
+
+      output = `#{gcc_cmd} -v 2>&1`
+      if m = output.match(/^Target\: (.*)$/)
+        @detect_host = m[1]
+      end
 
-    @detect_host
+      @detect_host
+    ensure
+      ENV["LC_ALL"] = old_lc_all
+    end
   end
 
   def extract_file(file, target)
@@ -378,4 +392,13 @@ private
     FileUtils.mv temp_file.path, full_path, :force => true
   end
 
+  def gcc_cmd
+    cc = ENV["CC"] || "gcc"
+    return cc.dup
+  end
+
+  def make_cmd
+    m = ENV['MAKE'] || ENV['make'] || 'make'
+    return m.dup
+  end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.5.2
 platform: ruby
 authors:
 - Luis Lavena
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-10-24 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
@@ -25,12 +24,13 @@ files:
 - examples/Rakefile
 - lib/mini_portile.rb
 - Rakefile
-- README.rdoc
 - History.txt
 - LICENSE.txt
+- README.rdoc
 homepage: http://github.com/luislavena/mini_portile
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -40,21 +40,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.12
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simplistic port-like solution for developers
 test_files: []