mini_portile2 2.5.2 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a50c7c03eb4dcb7395372836a55084a65dbb7b29fde587cb9a0e795464008e50
-  data.tar.gz: d6ec7eda8e8e8fec8c50824ec50d25062cfc21ad8f745002d35ddbb31c8f4e7d
+  metadata.gz: cead22320fb80bbc4e46f568f422211dd8a6af92006edc220e1320019cc52676
+  data.tar.gz: d4b5deaa502e5ae66526eb2b23978a4ef52996a100a64f224664927dca0658b2
 SHA512:
-  metadata.gz: a5b8423782025822fed3b7ad9b24c3db71791042a510adb90260d40138286090e3bc981671d57da3639dd80a559bdb77bac222551b6a3eef9259cee63aa9d98e
-  data.tar.gz: 52ec801b7006e8bc74a4ccb87a636e5a9d222d58d18a2c2d609778a45f83a1381e74a16e9065ecff51558781561547ad96ba495c09679c759b893b6a9328bb79
+  metadata.gz: 7dbd446271e3b0c26cf39504b6b1af53faee8a212ba7451af76f17e1f8858b3f329c5e281f753d1731fe27a3d9121c9f7328188ead52aaf63c1d4728c44fcd99
+  data.tar.gz: a6b17cd4c01588c86d70a4e18c713cc5c13c16922ac64cc38e7c77fac416b1a9e1fa4eeee502dd23f13ece5a16d8b364033169de0e8e4612012544599a692c03

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## mini_portile changelog
 
+### 2.6.0 / 2021-05-31
+
+### Added
+
+Recipes may build against a local directory by specifying `source_directory` instead of `files`. In
+particular, this may be useful for debugging problems with the upstream dependency (e.g., use `git
+bisect` in a local clone) or for continuous integration with upstream HEAD.
+
+
 ### 2.5.2 / 2021-05-28
 
 #### Dependencies

data/README.md

@@ -89,6 +89,18 @@ system-wide installation.
 Same as above, but instead of `MiniPortile.new`, call `MiniPortileCMake.new`.
 
 
+### Local source directories
+
+Instead of downloading a remote file, you can also point mini_portile2 at a local source
+directory. In particular, this may be useful for testing or debugging:
+
+``` ruby
+gem "mini_portile2", "~> 2.0.0" # NECESSARY if used in extconf.rb. see below.
+require "mini_portile2"
+recipe = MiniPortile.new("libiconv", "1.13.1")
+recipe.source_directory = "/path/to/local/source/for/library-1.2.3"
+```
+
 ### Directory Structure Conventions
 
 `mini_portile2` follows the principle of **convention over configuration** and

data/lib/mini_portile2/mini_portile.rb

@@ -31,7 +31,7 @@ end
 class MiniPortile
   attr_reader :name, :version, :original_host
   attr_writer :configure_options
-  attr_accessor :host, :files, :patch_files, :target, :logger
+  attr_accessor :host, :files, :patch_files, :target, :logger, :source_directory
 
   def self.windows?
     RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
@@ -55,10 +55,22 @@ class MiniPortile
     @patch_files = []
     @log_files = {}
     @logger = STDOUT
+    @source_directory = nil
 
     @original_host = @host = detect_host
   end
 
+  def source_directory=(path)
+    @source_directory = File.expand_path(path)
+  end
+
+  def prepare_build_directory
+    raise "source_directory is not set" if source_directory.nil?
+    output "Building #{@name} #{@version} from source at '#{source_directory}'"
+    FileUtils.mkdir_p(File.join(tmp_path, [name, version].join("-")))
+    FileUtils.rm_rf(port_path) # make sure we always re-install
+  end
+
   def download
     files_hashs.each do |file|
       download_file(file[:url], file[:local_path])
@@ -110,15 +122,16 @@ class MiniPortile
   def configure
     return if configured?
 
+    FileUtils.mkdir_p(tmp_path)
     cache_file = File.join(tmp_path, 'configure.options_cache')
     File.open(cache_file, "w") { |f| f.write computed_options.to_s }
 
+    command = Array(File.join((source_directory || "."), "configure"))
     if RUBY_PLATFORM=~/mingw|mswin/
       # Windows doesn't recognize the shebang.
-      execute('configure', %w(sh ./configure) + computed_options)
-    else
-      execute('configure', %w(./configure) + computed_options)
+      command.unshift("sh")
     end
+    execute('configure', command + computed_options)
   end
 
   def compile
@@ -139,7 +152,7 @@ class MiniPortile
   end
 
   def configured?
-    configure = File.join(work_path, 'configure')
+    configure = File.join((source_directory || work_path), 'configure')
     makefile  = File.join(work_path, 'Makefile')
     cache_file  = File.join(tmp_path, 'configure.options_cache')
 
@@ -157,9 +170,13 @@ class MiniPortile
   end
 
   def cook
-    download unless downloaded?
-    extract
-    patch
+    if source_directory
+      prepare_build_directory
+    else
+      download unless downloaded?
+      extract
+      patch
+    end
     configure unless configured?
     compile
     install unless installed?

data/lib/mini_portile2/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.5.2"
+  VERSION = "2.6.0"
 end

data/test/test_cook.rb

@@ -113,3 +113,32 @@ class TestCookWithBrokenGitDir < TestCase
     end
   end
 end
+
+class TestCookAgainstSourceDirectory < TestCase
+  attr_accessor :recipe
+
+  def setup
+    super
+
+    @recipe ||= MiniPortile.new("test mini portile", "1.0.0").tap do |recipe|
+      recipe.source_directory = File.expand_path("../assets/test mini portile-1.0.0", __FILE__)
+    end
+  end
+
+  def test_source_directory
+    recipe.cook
+
+    path = File.join(work_dir, "configure.txt")
+    assert(File.exist?(path))
+    assert_equal((recipe.configure_options + ["--prefix=#{recipe.path}"]).inspect,
+                 File.read(path).chomp);
+
+    path = File.join(work_dir, "compile.txt")
+    assert(File.exist?(path))
+    assert_equal("[\"all\"]", File.read(path).chomp);
+
+    path = File.join(work_dir, "install.txt")
+    assert(File.exist?(path))
+    assert_equal("[\"install\"]", File.read(path).chomp);
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: ruby
 authors:
 - Luis Lavena
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-28 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ftp