mini_portile2 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cce9a4c5c119fbab9f241aae304d9aec171a69873a168688132d55e4010ee49
-  data.tar.gz: eb61f44c46b6822aae38027d6c4aecb3c16d6b8d6e7caf008d90110da98c1d69
+  metadata.gz: 6c8eb702f252f0d5becb6655bfc84fb67220c71c9efb3b33a0e25d86b508e733
+  data.tar.gz: 3be4b50bfbc904e134928aed8d4e42a124a9931d8c16ee0f5c6ee3b81749c1d1
 SHA512:
-  metadata.gz: c943d0ce63b54f9199426af7658f200054a87d151ff30b66183a5afa10096955733bab9a7ccaa167a9052e3826243d779e0579ded63ed1ea2522d35ab5940512
-  data.tar.gz: 476d783710ca21b2893256f39a34f4f958a289ece0230eb7e364f4b1c0714e39f85c74f5f84783279685953ac179fc899959c0fb7302f41856720ceefdb33436
+  metadata.gz: bcd57ca484c13860e745aeaa732ee89c47fef3f8950826ae1de2ceaf773972f9f4208a06929b0f5bdbf9dbad775b6a63c21f9057a18da1bef733e2de59b16406
+  data.tar.gz: 3ba020aaed5610663ca00690625f0c3e62b8c62646bd98ec7b8b51fb7b77471991e651debe261d6a73861bea92589212111a38296af1482e498bae3711592698

data/.github/workflows/ci.yml

@@ -1,5 +1,7 @@
 name: Continuous Integration
-
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
 on:
   workflow_dispatch:
   push:
@@ -20,6 +22,7 @@ jobs:
     env:
       MAKEFLAGS: -j2
     strategy:
+      fail-fast: false
       matrix:
         platform: [ubuntu-latest, windows-latest]
         ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "head"]
@@ -43,6 +46,7 @@ jobs:
     env:
       MAKEFLAGS: -j2
     strategy:
+      fail-fast: false
       matrix:
         platform: [ubuntu-latest, windows-latest]
         ruby: ["3.0"]

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 ## mini_portile changelog
 
+### 2.7.0 / 2021-08-31
+
+### Added
+
+The commands used for "make", "compile", and "cmake" are configurable via keyword arguments. [#107] (Thanks, @cosmo0920!)
+
+
 ### 2.6.1 / 2021-05-31
 
 #### Dependencies

data/README.md

@@ -83,11 +83,60 @@ library into a namespaced structure.
 `#activate` ensures GCC will find this library and prefer it over a
 system-wide installation.
 
+Some keyword arguments can be passed to the constructor to configure the commands used:
+
+#### `gcc_command`
+
+The compiler command that is used is configurable, and in order of preference will use:
+
+- the `CC` environment variable (if present)
+- the `gcc_command` value passed in to the constructor
+- `RbConfig::CONFIG["CC"]`
+- `"gcc"`
+
+You can pass it in like so:
+
+``` ruby
+MiniPortile.new("libiconv", "1.13.1", gcc_command: "cc")
+```
+
+#### `make_command`
+
+The configuration/make command that is used is configurable, and in order of preference will use:
+
+- the `MAKE` environment variable (if present)
+- the `make_command` value passed in to the constructor
+- the `make` environment variable (if present)
+- `"make"`
+
+You can pass it in like so:
+
+``` ruby
+MiniPortile.new("libiconv", "1.13.1", make_command: "nmake")
+```
+
 
 ### How to use (for cmake projects)
 
 Same as above, but instead of `MiniPortile.new`, call `MiniPortileCMake.new`.
 
+#### `make_command`
+
+This is configurable as above, except for Windows systems where it's hardcoded to `"nmake"`.
+
+#### `cmake_command`
+
+The cmake command used is configurable, and in order of preference will use:
+
+- the `CMAKE` environment variable (if present)
+- the `cmake_command` value passed in to the constructor
+- `"cmake"`
+
+You can pass it in like so:
+
+``` ruby
+MiniPortileCMake.new("libfoobar", "1.3.5", cmake_command: "cmake3")
+```
 
 ### Local source directories
 

data/lib/mini_portile2/mini_portile.rb

@@ -46,7 +46,7 @@ class MiniPortile
     RbConfig::CONFIG['target_os'] =~ /mswin/
   end
 
-  def initialize(name, version)
+  def initialize(name, version, **kwargs)
     @name = name
     @version = version
     @target = 'ports'
@@ -57,6 +57,9 @@ class MiniPortile
     @source_directory = nil
 
     @original_host = @host = detect_host
+
+    @gcc_command = kwargs[:gcc_command]
+    @make_command = kwargs[:make_command]
   end
 
   def source_directory=(path)
@@ -222,6 +225,14 @@ class MiniPortile
     File.expand_path(port_path)
   end
 
+  def gcc_cmd
+    (ENV["CC"] || @gcc_command || RbConfig::CONFIG["CC"] || "gcc").dup
+  end
+
+  def make_cmd
+    (ENV["MAKE"] || @make_command || ENV["make"] || "make").dup
+  end
+
 private
 
   def tmp_path
@@ -583,14 +594,4 @@ private
     FileUtils.mkdir_p File.dirname(full_path)
     FileUtils.mv temp_file.path, full_path, :force => true
   end
-
-  def gcc_cmd
-    cc = ENV["CC"] || RbConfig::CONFIG["CC"] || "gcc"
-    return cc.dup
-  end
-
-  def make_cmd
-    m = ENV['MAKE'] || ENV['make'] || 'make'
-    return m.dup
-  end
 end

data/lib/mini_portile2/mini_portile_cmake.rb

@@ -5,6 +5,11 @@ class MiniPortileCMake < MiniPortile
     "-DCMAKE_INSTALL_PREFIX=#{File.expand_path(port_path)}"
   end
 
+  def initialize(name, version, **kwargs)
+    super(name, version, **kwargs)
+    @cmake_command = kwargs[:cmake_command]
+  end
+
   def configure_defaults
     if MiniPortile.mswin?
       ['-G', 'NMake Makefiles']
@@ -21,7 +26,7 @@ class MiniPortileCMake < MiniPortile
     cache_file = File.join(tmp_path, 'configure.options_cache')
     File.open(cache_file, "w") { |f| f.write computed_options.to_s }
 
-    execute('configure', %w(cmake) + computed_options + ["."])
+    execute('configure', [cmake_cmd] + computed_options + ["."])
   end
 
   def configured?
@@ -39,4 +44,8 @@ class MiniPortileCMake < MiniPortile
     return "nmake" if MiniPortile.mswin?
     super
   end
+
+  def cmake_cmd
+    (ENV["CMAKE"] || @cmake_command || "cmake").dup
+  end
 end

data/lib/mini_portile2/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.6.1"
+  VERSION = "2.7.0"
 end

data/test/helper.rb

@@ -57,4 +57,20 @@ class TestCase < Minitest::Test
   ensure
     ENV['GIT_DIR'] = old
   end
+
+  def with_env(env)
+    before = ENV.to_h.dup
+    env.each { |k, v| ENV[k] = v }
+    yield
+  ensure
+    ENV.replace(before)
+  end
+
+  def without_env(*keys, &blk)
+    before = ENV.to_h.dup
+    keys.flatten.each { |k| ENV.delete(k) }
+    yield
+  ensure
+    ENV.replace(before)
+  end
 end

data/test/test_cmake.rb

@@ -58,3 +58,33 @@ class TestCMake < TestCase
     assert File.exist?(binary), binary
   end
 end
+
+class TestCMakeConfig < TestCase
+  def test_make_command_configuration
+    MiniPortile.stub(:mswin?, false) do
+      without_env("MAKE") do
+        assert_equal("make", MiniPortileCMake.new("test", "1.0.0").make_cmd)
+        assert_equal("xyzzy", MiniPortileCMake.new("test", "1.0.0", make_command: "xyzzy").make_cmd)
+      end
+      with_env("MAKE"=>"asdf") do
+        assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0").make_cmd)
+        assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0", make_command: "xyzzy").make_cmd)
+      end
+    end
+
+    MiniPortile.stub(:mswin?, true) do
+      assert_equal("nmake", MiniPortileCMake.new("test", "1.0.0").make_cmd)
+    end
+  end
+
+  def test_cmake_command_configuration
+    without_env("CMAKE") do
+      assert_equal("cmake", MiniPortileCMake.new("test", "1.0.0").cmake_cmd)
+      assert_equal("xyzzy", MiniPortileCMake.new("test", "1.0.0", cmake_command: "xyzzy").cmake_cmd)
+    end
+    with_env("CMAKE"=>"asdf") do
+      assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0").cmake_cmd)
+      assert_equal("asdf", MiniPortileCMake.new("test", "1.0.0", cmake_command: "xyzzy").cmake_cmd)
+    end
+  end
+end

data/test/test_cook.rb

@@ -67,6 +67,32 @@ class TestCook < TestCase
   end
 end
 
+class TestCookConfiguration < TestCase
+  def test_make_command_configuration
+    without_env("MAKE") do
+      assert_equal("make", MiniPortile.new("test", "1.0.0").make_cmd)
+      assert_equal("xyzzy", MiniPortile.new("test", "1.0.0", make_command: "xyzzy").make_cmd)
+    end
+    with_env("MAKE"=>"asdf") do
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0").make_cmd)
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0", make_command: "xyzzy").make_cmd)
+    end
+  end
+
+  def test_gcc_command_configuration
+    without_env("CC") do
+      expected_compiler = RbConfig::CONFIG["CC"] || "gcc"
+      assert_equal(expected_compiler, MiniPortile.new("test", "1.0.0").gcc_cmd)
+      assert_equal("xyzzy", MiniPortile.new("test", "1.0.0", gcc_command: "xyzzy").gcc_cmd)
+    end
+    with_env("CC"=>"asdf") do
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0").gcc_cmd)
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0", gcc_command: "xyzzy").gcc_cmd)
+    end
+  end
+end
+
+
 class TestCookWithBrokenGitDir < TestCase
   #
   #  this is a test for #69

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Luis Lavena
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-31 00:00:00.000000000 Z
+date: 2021-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Simplistic port-like solution for developers