mini_portile2 2.8.5 → 2.8.7.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f53843a25ac2651fd9970c34a44edf44de0904f99d9e63eadb3802f8dcd59bc
-  data.tar.gz: 075527f5c56f12de2ba5e3dfd72965a0093f62558eabb02571be5aee61cbe9f5
+  metadata.gz: db1b5288cce56e46ea555c45f30afa8ddb05af1af39cd42930c9eae504b05aad
+  data.tar.gz: 3ffdba1730e7b7303326192ed4f90249a4b9badc6497df6bf15714b52b6ffbc4
 SHA512:
-  metadata.gz: 0e251640701cf8ea166e1ce6725b8e7bf3d3dbf20a659a6b90ffe127667a80f908fab5b7f816f8a766edd4166464d5375c53a3c31c862a4a7a04e0e87929127d
-  data.tar.gz: 1d540e216342ef799de2188935d6de440b865606a244dd7ca6a27146a259bf5a1211c53b49668eee668187770e5e030d06508b4605779c4366999dcf831cc2b3
+  metadata.gz: 6eea1f14d4a60104b044090197f4b0ce7d7ec54e322350387100f2bffe4e0674b2343b914e09729773da4067cb616584f54ee0eb95c56b57c1bd1d013106a47d
+  data.tar.gz: 44a55718e44399e5154049ee5416d0889fe3dd1fc0d17fa0486f5bbf3c05bc0dd150cb2e1db49f9d3c0f39d8505fe91e66cf4ebc724cb51e0fef2c6b5f9c46a8

data/.github/workflows/ci.yml

@@ -25,7 +25,15 @@ jobs:
       fail-fast: false
       matrix:
         platform: [ubuntu-latest, windows-latest, macos-latest]
-        ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "head"]
+        ruby: ["2.3", "2.4", "2.5", "2.6", "2.7", "3.0", "3.1", "3.2", "3.3", "head"]
+        exclude:
+          # I can't figure out how to install these on macos through setup-ruby
+          - ruby: "2.3"
+            platform: "macos-latest"
+          - ruby: "2.4"
+            platform: "macos-latest"
+          - ruby: "2.5"
+            platform: "macos-latest"
     runs-on: ${{ matrix.platform }}
     steps:
       - name: configure git crlf on windows
@@ -33,7 +41,7 @@ jobs:
         run: |
           git config --system core.autocrlf false
           git config --system core.eol lf
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: MSP-Greg/setup-ruby-pkgs@v1
         with:
           apt-get: _update_ build-essential cmake
@@ -48,7 +56,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, windows-latest, macos-latest]
+        # use macos-13 (not 14) because libyaml 0.2.5 doesn't have up-to-date config.guess and config.sub
+        platform: [ubuntu-latest, windows-latest, macos-13]
         ruby: ["3.1"]
     runs-on: ${{ matrix.platform }}
     steps:
@@ -57,20 +66,24 @@ jobs:
         run: |
           git config --system core.autocrlf false
           git config --system core.eol lf
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: MSP-Greg/setup-ruby-pkgs@v1
         with:
           apt-get: _update_ build-essential cmake
           mingw: _upgrade_ cmake
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: examples/ports/archives
           key: examples-${{ hashFiles('examples/Rakefile') }}
       - run: bundle exec rake test:examples
 
   fedora: # see https://github.com/flavorjones/mini_portile/issues/118
+    strategy:
+      fail-fast: false
+      matrix:
+        task: ["test:unit", "test:examples"]
     runs-on: ubuntu-latest
     container:
       image: fedora:35
@@ -78,11 +91,73 @@ jobs:
       - run: |
           dnf group install -y "C Development Tools and Libraries"
           dnf install -y ruby ruby-devel libyaml-devel git-all patch cmake xz
-      - uses: actions/checkout@v3
-      - uses: actions/cache@v3
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
         with:
           path: examples/ports/archives
           key: examples-${{ hashFiles('examples/Rakefile') }}
       - run: bundle install
-      - run: bundle exec rake test:unit
-      - run: bundle exec rake test:examples
+      - run: bundle exec rake ${{ matrix.task }}
+
+  freebsd:
+    strategy:
+      fail-fast: false
+      matrix:
+        task: ["test:unit", "test:examples"]
+    runs-on: ubuntu-latest
+    env:
+      MAKE: gmake
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v4
+        with:
+          path: examples/ports/archives
+          key: examples-${{ hashFiles('examples/Rakefile') }}
+      - uses: vmactions/freebsd-vm@v1
+        with:
+          envs: MAKE
+          usesh: true
+          copyback: false
+          prepare: pkg install -y ruby devel/ruby-gems pkgconf git cmake devel/gmake textproc/libyaml security/gnupg
+          run: |
+            git config --global --add safe.directory /home/runner/work/mini_portile/mini_portile
+            gem install bundler
+            bundle install
+            bundle exec rake ${{ matrix.task }}
+
+  openbsd:
+    strategy:
+      fail-fast: false
+      matrix:
+        task: ["test:unit", "test:examples"]
+    runs-on: ubuntu-latest
+    env:
+      MAKE: gmake
+    steps:
+    - uses: actions/checkout@v4
+    - uses: vmactions/openbsd-vm@v1
+      with:
+        envs: MAKE
+        usesh: true
+        copyback: false
+        prepare: |
+          pkg_add ruby%3.1 gmake cmake git pkgconf security/gnupg
+          ln -sf /usr/local/bin/ruby31 /usr/local/bin/ruby
+          ln -sf /usr/local/bin/bundle31 /usr/local/bin/bundle
+          ln -sf /usr/local/bin/bundler31 /usr/local/bin/bundler
+          ln -sf /usr/local/bin/erb31 /usr/local/bin/erb
+          ln -sf /usr/local/bin/gem31 /usr/local/bin/gem
+          ln -sf /usr/local/bin/irb31 /usr/local/bin/irb
+          ln -sf /usr/local/bin/racc31 /usr/local/bin/racc
+          ln -sf /usr/local/bin/rake31 /usr/local/bin/rake
+          ln -sf /usr/local/bin/rbs31 /usr/local/bin/rbs
+          ln -sf /usr/local/bin/rdbg31 /usr/local/bin/rdbg
+          ln -sf /usr/local/bin/rdoc31 /usr/local/bin/rdoc
+          ln -sf /usr/local/bin/ri31 /usr/local/bin/ri
+          ln -sf /usr/local/bin/syntax_suggest31 /usr/local/bin/syntax_suggest
+          ln -sf /usr/local/bin/typeprof31 /usr/local/bin/typeprof
+        run: |
+          git config --global --add safe.directory /home/runner/work/mini_portile/mini_portile
+          gem install bundler
+          bundle install
+          bundle exec rake ${{ matrix.task }}

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 ## mini_portile changelog
 
+### 2.8.7.rc1 / unreleased
+
+#### Added
+
+- When setting the C compiler through the `MiniPortile` constructor, the preferred keyword argument is now `:cc_command`. The original `:gcc_command` is still supported. (#144 by @flavorjones)
+- Add support for extracting xz-compressed tarballs on OpenBSD. (#141 by @postmodern)
+- Add OpenBSD support to the experimental method `MakeMakefile#mkmf_config`. (#141 by @flavorjones)
+
+
+#### Changed
+
+- `MiniPortileCMake` now detects the C and C++ compiler the same way `MiniPortile` does: by examining environment variables, then using kwargs, then looking in RbConfig (in that order). (#144 by @flavorjones)
+- GPG file verification error messages are captured in the raised exception. Previously these errors went to `stderr`. (#145 by @flavorjones)
+
+
+### 2.8.6 / 2024-04-14
+
+#### Added
+
+- When using CMake on FreeBSD, default to clang's "cc" and "c++" compilers. (#139 by @mudge)
+
+
 ### 2.8.5 / 2023-10-22
 
 #### Added

data/README.md

@@ -85,21 +85,30 @@ system-wide installation.
 
 Some keyword arguments can be passed to the constructor to configure the commands used:
 
-#### `gcc_command`
+#### `cc_command` and `cxx_command`
 
-The compiler command that is used is configurable, and in order of preference will use:
+The C 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
+- the `:cc_command` keyword argument passed in to the constructor
 - `RbConfig::CONFIG["CC"]`
 - `"gcc"`
 
-You can pass it in like so:
+The C++ compiler is similarly configuratble, and in order of preference will use:
+
+- the `CXX` environment variable (if present)
+- the `:cxx_command` keyword argument passed in to the constructor
+- `RbConfig::CONFIG["CXX"]`
+- `"g++"`
+
+You can pass your compiler commands to the MiniPortile constructor:
 
 ``` ruby
-MiniPortile.new("libiconv", "1.13.1", gcc_command: "cc")
+MiniPortile.new("libiconv", "1.13.1", cc_command: "clang", cxx_command: "clang++")
 ```
 
+(For backwards compatibility, the constructor also supports a keyword argument `:gcc_command` for the C compiler.)
+
 #### `make_command`
 
 The configuration/make command that is used is configurable, and in order of preference will use:

data/Rakefile

@@ -1,12 +1,10 @@
 require "rake/clean"
 require "bundler/gem_tasks"
+require "rake/testtask"
 
-namespace :test do
-  desc "Test MiniPortile by running unit tests"
-  task :unit do
-    sh "ruby -w -W2 -I. -Ilib -e \"#{Dir["test/test_*.rb"].map { |f| "require '#{f}';" }.join}\" -- #{ENV["TESTOPTS"]} -v"
-  end
+Rake::TestTask.new("test:unit")
 
+namespace :test do
   desc "Test MiniPortile by compiling examples"
   task :examples do
     Dir.chdir("examples") do

data/lib/mini_portile2/mini_portile.rb

@@ -8,6 +8,7 @@ require 'open-uri'
 require 'cgi'
 require 'rbconfig'
 require 'shellwords'
+require 'open3'
 
 # Monkey patch for Net::HTTP by ruby open-uri fix:
 # https://github.com/ruby/ruby/commit/58835a9
@@ -103,10 +104,11 @@ class MiniPortile
     @files = []
     @patch_files = []
     @log_files = {}
-    @logger = STDOUT
+    @logger = kwargs[:logger] || STDOUT
     @source_directory = nil
 
-    @gcc_command = kwargs[:gcc_command]
+    @cc_command = kwargs[:cc_command] || kwargs[:gcc_command]
+    @cxx_command = kwargs[:cxx_command]
     @make_command = kwargs[:make_command]
     @open_timeout = kwargs[:open_timeout] || DEFAULT_TIMEOUT
     @read_timeout = kwargs[:read_timeout] || DEFAULT_TIMEOUT
@@ -318,10 +320,8 @@ class MiniPortile
     if static
       libdir = lib_path
       if pcfile
-        variables = minimal_pkg_config(pcfile, "print-variables").split("\n").map(&:strip)
-        if variables.include?("libdir")
-          libdir = minimal_pkg_config(pcfile, "variable=libdir")
-        end
+        pcfile_libdir = minimal_pkg_config(pcfile, "variable=libdir").strip
+        libdir = pcfile_libdir unless pcfile_libdir.empty?
       end
 
       #
@@ -372,8 +372,13 @@ class MiniPortile
     File.join(path, "lib")
   end
 
-  def gcc_cmd
-    (ENV["CC"] || @gcc_command || RbConfig::CONFIG["CC"] || "gcc").dup
+  def cc_cmd
+    (ENV["CC"] || @cc_command || RbConfig::CONFIG["CC"] || "gcc").dup
+  end
+  alias :gcc_cmd :cc_cmd
+
+  def cxx_cmd
+    (ENV["CXX"] || @cxx_command || RbConfig::CONFIG["CXX"] || "g++").dup
   end
 
   def make_cmd
@@ -457,24 +462,29 @@ class MiniPortile
       gpg_exe = which('gpg2') || which('gpg') || raise("Neither GPG nor GPG2 is installed")
 
       # import the key into our own keyring
-      gpg_status = IO.popen([gpg_exe, "--status-fd", "1", "--no-default-keyring", "--keyring", KEYRING_NAME, "--import"], "w+") do |io|
-        io.write gpg[:key]
-        io.close_write
-        io.read
+      gpg_error = nil
+      gpg_status = Open3.popen3(gpg_exe, "--status-fd", "1", "--no-default-keyring", "--keyring", KEYRING_NAME, "--import") do |gpg_in, gpg_out, gpg_err, _thread|
+        gpg_in.write gpg[:key]
+        gpg_in.close
+        gpg_error = gpg_err.read
+        gpg_out.read
       end
       key_ids = gpg_status.scan(/\[GNUPG:\] IMPORT_OK \d+ (?<key_id>[0-9a-f]+)/i).map(&:first)
-      raise "invalid gpg key provided" if key_ids.empty?
+      raise "invalid gpg key provided:\n#{gpg_error}" if key_ids.empty?
 
-      # verify the signature against our keyring
-      gpg_status = IO.popen([gpg_exe, "--status-fd", "1", "--no-default-keyring", "--keyring", KEYRING_NAME, "--verify", signature_file, file[:local_path]], &:read)
-
-      # remove the key from our keyring
-      key_ids.each do |key_id|
-        IO.popen([gpg_exe, "--batch", "--yes", "--no-default-keyring", "--keyring", KEYRING_NAME, "--delete-keys", key_id], &:read)
-        raise "unable to delete the imported key" unless $?.exitstatus==0
+      begin
+        # verify the signature against our keyring
+        gpg_status, gpg_error, _status = Open3.capture3(gpg_exe, "--status-fd", "1", "--no-default-keyring", "--keyring", KEYRING_NAME, "--verify", signature_file, file[:local_path])
+
+        raise "signature mismatch:\n#{gpg_error}" unless gpg_status.match(/^\[GNUPG:\] VALIDSIG/)
+      ensure
+        # remove the key from our keyring
+        key_ids.each do |key_id|
+          IO.popen([gpg_exe, "--batch", "--yes", "--no-default-keyring", "--keyring", KEYRING_NAME, "--delete-keys", key_id], &:read)
+          raise "unable to delete the imported key" unless $?.exitstatus==0
+        end
       end
 
-      raise "signature mismatch" unless gpg_status.match(/^\[GNUPG:\] VALIDSIG/)
 
     else
       digest = case
@@ -498,30 +508,6 @@ class MiniPortile
       }
   end
 
-  TAR_EXECUTABLES = %w[gtar bsdtar tar basic-bsdtar]
-  def tar_exe
-    @@tar_exe ||= begin
-      TAR_EXECUTABLES.find { |c|
-        which(c)
-      } or raise("tar not found - please make sure that one of the following commands is in the PATH: #{TAR_EXECUTABLES.join(", ")}")
-    end
-  end
-
-  def tar_compression_switch(filename)
-    case File.extname(filename)
-      when '.gz', '.tgz'
-        'z'
-      when '.bz2', '.tbz2'
-        'j'
-      when '.xz'
-        'J'
-      when '.Z'
-        'Z'
-      else
-        ''
-    end
-  end
-
   # From: http://stackoverflow.com/a/5471032/7672
   # Thanks, Mislav!
   #
@@ -548,6 +534,8 @@ class MiniPortile
       output = `#{gcc_cmd} -v 2>&1`
       if m = output.match(/^Target\: (.*)$/)
         @detect_host = m[1]
+      else
+        @detect_host = nil
       end
 
       @detect_host
@@ -556,12 +544,35 @@ class MiniPortile
     end
   end
 
+  TAR_EXECUTABLES = %w[gtar bsdtar tar basic-bsdtar]
+  def tar_exe
+    @@tar_exe ||= begin
+      TAR_EXECUTABLES.find { |c|
+        which(c)
+      } or raise("tar not found - please make sure that one of the following commands is in the PATH: #{TAR_EXECUTABLES.join(", ")}")
+    end
+  end
+
+  def tar_command(file, target)
+    case File.extname(file)
+      when '.gz', '.tgz'
+        [tar_exe, 'xzf', file, '-C', target]
+      when '.bz2', '.tbz2'
+        [tar_exe, 'xjf', file, '-C', target]
+      when '.xz'
+        # NOTE: OpenBSD's tar command does not support the -J option
+        "xzcat #{file.shellescape} | #{tar_exe.shellescape} xf - -C #{target.shellescape}"
+      else
+        [tar_exe, 'xf', file, '-C', target]
+    end
+  end
+
   def extract_file(file, target)
     filename = File.basename(file)
     FileUtils.mkdir_p target
 
     message "Extracting #{filename} into #{target}... "
-    execute('extract', [tar_exe, "#{tar_compression_switch(filename)}xf", file, "-C", target], {:cd => Dir.pwd, :initial_message => false})
+    execute('extract', tar_command(file, target) , {:cd => Dir.pwd, :initial_message => false})
   end
 
   # command could be an array of args, or one string containing a command passed to the shell. See
@@ -697,7 +708,7 @@ class MiniPortile
         return download_file(redirect.url, full_path, count-1)
       rescue => e
         count = count - 1
-        puts "#{count} retrie(s) left for #{filename} (#{e.message})"
+        @logger.puts "#{count} retrie(s) left for #{filename} (#{e.message})"
         if count > 0
           sleep 1
           return download_file_http(url, full_path, count)

data/lib/mini_portile2/mini_portile_cmake.rb

@@ -67,46 +67,21 @@ class MiniPortileCMake < MiniPortile
   end
 
   def cmake_compile_flags
-    c_compiler, cxx_compiler = find_c_and_cxx_compilers(host)
+    # RbConfig::CONFIG['CC'] and RbConfig::CONFIG['CXX'] can contain additional flags, for example
+    # "clang++ -std=gnu++11" or "clang -fdeclspec". CMake is just looking for the command name.
+    cc_compiler = cc_cmd.split.first
+    cxx_compiler = cxx_cmd.split.first
 
     # needed to ensure cross-compilation with CMake targets the right CPU and compilers
     [
       "-DCMAKE_SYSTEM_NAME=#{cmake_system_name}",
       "-DCMAKE_SYSTEM_PROCESSOR=#{cpu_type}",
-      "-DCMAKE_C_COMPILER=#{c_compiler}",
+      "-DCMAKE_C_COMPILER=#{cc_compiler}",
       "-DCMAKE_CXX_COMPILER=#{cxx_compiler}",
       "-DCMAKE_BUILD_TYPE=#{cmake_build_type}",
     ]
   end
 
-  def find_compiler(compilers)
-    compilers.find { |binary| which(binary) }
-  end
-
-  # configure automatically searches for the right compiler based on the
-  # `--host` parameter.  However, CMake doesn't have an equivalent feature.
-  # Search for the right compiler for the target architecture using
-  # some basic heruistics.
-  def find_c_and_cxx_compilers(host)
-    c_compiler = ENV["CC"]
-    cxx_compiler = ENV["CXX"]
-
-    if MiniPortile.darwin?
-      c_compiler ||= 'clang'
-      cxx_compiler ||='clang++'
-    else
-      c_compiler ||= 'gcc'
-      cxx_compiler ||= 'g++'
-    end
-
-    c_platform_compiler = "#{host}-#{c_compiler}"
-    cxx_platform_compiler = "#{host}-#{cxx_compiler}"
-    c_compiler = find_compiler([c_platform_compiler, c_compiler])
-    cxx_compiler = find_compiler([cxx_platform_compiler, cxx_compiler])
-
-    [c_compiler, cxx_compiler]
-  end
-
   # Full list: https://gitlab.kitware.com/cmake/cmake/-/blob/v3.26.4/Modules/CMakeDetermineSystem.cmake?ref_type=tags#L12-31
   def cmake_system_name
     return system_name if system_name

data/lib/mini_portile2/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.8.5"
+  VERSION = "2.8.7.rc1"
 end

data/test/helper.rb

@@ -9,6 +9,12 @@ require 'archive/tar/minitar'
 require 'fileutils'
 require 'erb'
 require 'mini_portile2'
+require 'logger'
+
+puts "#{__FILE__}:#{__LINE__}: relevant RbConfig::CONFIG values:"
+%w[target_os target_cpu CC CXX].each do |key|
+  puts "- #{key}: #{RbConfig::CONFIG[key].inspect}"
+end
 
 class TestCase < Minitest::Test
   include Minitest::Hooks
@@ -18,7 +24,12 @@ class TestCase < Minitest::Test
   attr_accessor :webrick
 
   def start_webrick(path)
-    @webrick = WEBrick::HTTPServer.new(:Port => HTTP_PORT, :DocumentRoot => path).tap do |w|
+    @webrick = WEBrick::HTTPServer.new(
+      :Port => HTTP_PORT,
+      :DocumentRoot => path,
+      :Logger => Logger.new(File::NULL),
+      :AccessLog => [],
+    ).tap do |w|
       Thread.new do
         w.start
       end

data/test/test_cmake.rb

@@ -14,12 +14,16 @@ class TestCMake < TestCase
     create_tar(@tar_path, @assets_path, "test-cmake-1.0")
     start_webrick(File.dirname(@tar_path))
 
+    @logger = StringIO.new # IO to keep recipe logs in case we need to debug
     @recipe = init_recipe
 
     git_dir = File.join(@assets_path, "git")
     with_custom_git_dir(git_dir) do
       recipe.cook
     end
+  rescue => e
+    puts @logger.string
+    raise e
   end
 
   def after_all
@@ -58,6 +62,7 @@ class TestCMake < TestCase
 
   def init_recipe
     MiniPortileCMake.new("test-cmake", "1.0").tap do |recipe|
+      recipe.logger = @logger
       recipe.files << "http://localhost:#{HTTP_PORT}/#{ERB::Util.url_encode(File.basename(@tar_path))}"
       recipe.patch_files << File.join(@assets_path, "patch 1.diff")
     end
@@ -83,23 +88,20 @@ class TestCMakeConfig < TestCMake
   end
 
   def test_configure_defaults_with_macos
-    recipe = init_recipe
-    recipe.host = 'some-host'
-
     with_env({ "CC" => nil, "CXX" => nil }) do
       MiniPortile.stub(:darwin?, true) do
         with_stubbed_target(os: 'darwin22', cpu: 'arm64') do
-          with_compilers(recipe, host_prefix: true, c_compiler: 'clang', cxx_compiler: 'clang++') do
+          with_compilers(c_compiler: 'clang', cxx_compiler: 'clang++') do
             Open3.stub(:capture2, cmake_help_mock('Unix')) do
               assert_equal(
                 [
                   "-DCMAKE_SYSTEM_NAME=Darwin",
                   "-DCMAKE_SYSTEM_PROCESSOR=arm64",
-                  "-DCMAKE_C_COMPILER=some-host-clang",
-                  "-DCMAKE_CXX_COMPILER=some-host-clang++",
+                  "-DCMAKE_C_COMPILER=clang",
+                  "-DCMAKE_CXX_COMPILER=clang++",
                   "-DCMAKE_BUILD_TYPE=Release"
                 ],
-                recipe.configure_defaults)
+                @recipe.configure_defaults)
             end
           end
         end
@@ -107,40 +109,57 @@ class TestCMakeConfig < TestCMake
     end
   end
 
-  def test_configure_defaults_with_manual_system_name
-    recipe = init_recipe
-    recipe.system_name = 'Custom'
-
-    MiniPortile.stub(:darwin?, false) do
-      with_stubbed_target do
-        with_compilers(recipe) do
+  def test_configure_defaults_with_freebsd
+    with_env({ "CC" => nil, "CXX" => nil }) do
+      with_stubbed_target(os: 'freebsd14') do
+        with_compilers(c_compiler: 'cc', cxx_compiler: 'c++') do
           Open3.stub(:capture2, cmake_help_mock('Unix')) do
             assert_equal(
               [
-                "-DCMAKE_SYSTEM_NAME=Custom",
+                "-DCMAKE_SYSTEM_NAME=FreeBSD",
                 "-DCMAKE_SYSTEM_PROCESSOR=x86_64",
-                "-DCMAKE_C_COMPILER=gcc",
-                "-DCMAKE_CXX_COMPILER=g++",
+                "-DCMAKE_C_COMPILER=cc",
+                "-DCMAKE_CXX_COMPILER=c++",
                 "-DCMAKE_BUILD_TYPE=Release"
               ],
-              recipe.configure_defaults)
+              @recipe.configure_defaults)
           end
         end
       end
     end
   end
 
-  def test_configure_defaults_with_unix_makefiles
-    recipe = init_recipe
+  def test_configure_defaults_with_manual_system_name
+    MiniPortile.stub(:darwin?, false) do
+      with_stubbed_target do
+        with_compilers do
+          Open3.stub(:capture2, cmake_help_mock('Unix')) do
+            @recipe.stub(:system_name, 'Custom') do
+              assert_equal(
+                [
+                  "-DCMAKE_SYSTEM_NAME=Custom",
+                  "-DCMAKE_SYSTEM_PROCESSOR=x86_64",
+                  "-DCMAKE_C_COMPILER=gcc",
+                  "-DCMAKE_CXX_COMPILER=g++",
+                  "-DCMAKE_BUILD_TYPE=Release"
+                ],
+                @recipe.configure_defaults)
+            end
+          end
+        end
+      end
+    end
+  end
 
+  def test_configure_defaults_with_unix_makefiles
     MiniPortile.stub(:linux?, true) do
       MiniPortile.stub(:darwin?, false) do
         with_stubbed_target do
-          with_compilers(recipe) do
+          with_compilers do
             Open3.stub(:capture2, cmake_help_mock('Unix')) do
               MiniPortile.stub(:mingw?, true) do
                 assert_equal(default_x86_compile_flags,
-                            recipe.configure_defaults)
+                             @recipe.configure_defaults)
               end
             end
           end
@@ -150,15 +169,13 @@ class TestCMakeConfig < TestCMake
   end
 
   def test_configure_defaults_with_msys_makefiles
-    recipe = init_recipe
-
     MiniPortile.stub(:linux?, true) do
       MiniPortile.stub(:darwin?, false) do
         with_stubbed_target do
-          with_compilers(recipe) do
+          with_compilers do
             Open3.stub(:capture2, cmake_help_mock('MSYS')) do
               MiniPortile.stub(:mingw?, true) do
-                assert_equal(['-G', 'MSYS Makefiles'] + default_x86_compile_flags, recipe.configure_defaults)
+                assert_equal(['-G', 'MSYS Makefiles'] + default_x86_compile_flags, @recipe.configure_defaults)
               end
             end
           end
@@ -168,15 +185,13 @@ class TestCMakeConfig < TestCMake
   end
 
   def test_configure_defaults_with_nmake_makefiles
-    recipe = init_recipe
-
     MiniPortile.stub(:linux?, true) do
       MiniPortile.stub(:darwin?, false) do
         with_stubbed_target do
-          with_compilers(recipe) do
+          with_compilers do
             Open3.stub(:capture2, cmake_help_mock('NMake')) do
               MiniPortile.stub(:mswin?, true) do
-                assert_equal(['-G', 'NMake Makefiles'] + default_x86_compile_flags, recipe.configure_defaults)
+                assert_equal(['-G', 'NMake Makefiles'] + default_x86_compile_flags, @recipe.configure_defaults)
               end
             end
           end
@@ -217,21 +232,11 @@ class TestCMakeConfig < TestCMake
     end
   end
 
-  def with_compilers(recipe, host_prefix: false, c_compiler: 'gcc', cxx_compiler: 'g++')
-    mock = MiniTest::Mock.new
-
-    if host_prefix
-      mock.expect(:call, true, ["#{recipe.host}-#{c_compiler}"])
-      mock.expect(:call, true, ["#{recipe.host}-#{cxx_compiler}"])
-    else
-      mock.expect(:call, false, ["#{recipe.host}-#{c_compiler}"])
-      mock.expect(:call, true, [c_compiler])
-      mock.expect(:call, false, ["#{recipe.host}-#{cxx_compiler}"])
-      mock.expect(:call, true, [cxx_compiler])
-    end
-
-    recipe.stub(:which, mock) do
-      yield
+  def with_compilers(c_compiler: 'gcc', cxx_compiler: 'g++')
+    @recipe.stub(:cc_cmd, c_compiler) do
+      @recipe.stub(:cxx_cmd, cxx_compiler) do
+        yield
+      end
     end
   end
 

data/test/test_cook.rb

@@ -13,7 +13,9 @@ class TestCook < TestCase
     create_tar(@tar_path, @assets_path, "test mini portile-1.0.0")
     start_webrick(File.dirname(@tar_path))
 
+    @logger = StringIO.new # IO to keep recipe logs in case we need to debug
     @recipe = MiniPortile.new("test mini portile", "1.0.0").tap do |recipe|
+      recipe.logger = @logger
       recipe.files << "http://localhost:#{HTTP_PORT}/#{ERB::Util.url_encode(File.basename(@tar_path))}"
       recipe.patch_files << File.join(@assets_path, "patch 1.diff")
       recipe.configure_options << "--option=\"path with 'space'\""
@@ -22,6 +24,9 @@ class TestCook < TestCase
         recipe.cook
       end
     end
+  rescue => e
+    puts @logger.string
+    raise e
   end
 
   def after_all
@@ -79,17 +84,37 @@ class TestCookConfiguration < TestCase
     end
   end
 
-  def test_gcc_command_configuration
+  def test_cc_command_configuration
     without_env("CC") do
       expected_compiler = RbConfig::CONFIG["CC"] || "gcc"
+      assert_equal(expected_compiler, MiniPortile.new("test", "1.0.0").cc_cmd)
       assert_equal(expected_compiler, MiniPortile.new("test", "1.0.0").gcc_cmd)
+      assert_equal("xyzzy", MiniPortile.new("test", "1.0.0", cc_command: "xyzzy").cc_cmd)
+      assert_equal("xyzzy", MiniPortile.new("test", "1.0.0", gcc_command: "xyzzy").cc_cmd)
+      assert_equal("xyzzy", MiniPortile.new("test", "1.0.0", cc_command: "xyzzy").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").cc_cmd)
       assert_equal("asdf", MiniPortile.new("test", "1.0.0").gcc_cmd)
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0", cc_command: "xyzzy").cc_cmd)
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0", gcc_command: "xyzzy").cc_cmd)
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0", cc_command: "xyzzy").gcc_cmd)
       assert_equal("asdf", MiniPortile.new("test", "1.0.0", gcc_command: "xyzzy").gcc_cmd)
     end
   end
+
+  def test_cxx_command_configuration
+    without_env("CXX") do
+      expected_compiler = RbConfig::CONFIG["CXX"] || "g++"
+      assert_equal(expected_compiler, MiniPortile.new("test", "1.0.0").cxx_cmd)
+      assert_equal("xyzzy", MiniPortile.new("test", "1.0.0", cxx_command: "xyzzy").cxx_cmd)
+    end
+    with_env("CXX"=>"asdf") do
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0").cxx_cmd)
+      assert_equal("asdf", MiniPortile.new("test", "1.0.0", cxx_command: "xyzzy").cxx_cmd)
+    end
+  end
 end
 
 
@@ -116,7 +141,9 @@ class TestCookWithBrokenGitDir < TestCase
 
     create_tar(@tar_path, @assets_path, "test mini portile-1.0.0")
 
+    @logger = StringIO.new # IO to keep recipe logs in case we need to debug
     @recipe = MiniPortile.new("test mini portile", "1.0.0").tap do |recipe|
+      recipe.logger = @logger
       recipe.files << "file://#{@tar_path}"
       recipe.patch_files << File.join(@assets_path, "patch 1.diff")
       recipe.configure_options << "--option=\"path with 'space'\""
@@ -146,7 +173,9 @@ class TestCookAgainstSourceDirectory < TestCase
   def setup
     super
 
+    @logger = StringIO.new # IO to keep recipe logs in case we need to debug
     @recipe ||= MiniPortile.new("test mini portile", "1.0.0").tap do |recipe|
+      recipe.logger = @logger
       recipe.source_directory = File.expand_path("../assets/test mini portile-1.0.0", __FILE__)
     end
   end

data/test/test_digest.rb

@@ -24,7 +24,8 @@ class TestDigest < TestCase
   def setup
     super
     FileUtils.rm_rf("ports/archives")
-    @recipe = MiniPortile.new("test-digest", "1.0.0")
+    @logger = StringIO.new # IO to keep recipe logs in case we need to debug
+    @recipe = MiniPortile.new("test-digest", "1.0.0", logger: @logger)
   end
 
   def download_with_digest(key, klass)
@@ -68,28 +69,28 @@ class TestDigest < TestCase
   end
 
   def public_key
-    <<-KEY
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mI0EVwUhJQEEAMYxFhgaAdM2Ul5r+XfpqAaI7SOxB14eRjhFjhchy4ylgVxetyLq
-di3zeANXBIHsLBl7quYTlnmhJr/+GQRkCnXWiUp0tJsBVzGM3puK7c534gakEUH6
-AlDtj5p3IeygzSyn8u7KORv+ainXfhwkvTO04mJmxAb2uT8ngKYFdPa1ABEBAAG0
-J1Rlc3QgTWluaXBvcnRpbGUgPHRlc3RAbWluaXBvcnRpbGUub3JnPoi4BBMBAgAi
-BQJXBSElAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBl6D5JZMNwswAK
-A/90Cdb+PX21weBR2Q6uR06M/alPexuXXyJL8ZcwbQMJ/pBBgcS5/h1+rQkBI/CN
-qpXdDlw2Xys2k0sNwdjIw3hmYRzBrddXlCSW3Sifq/hS+kfPZ1snQmIjCgy1Xky5
-QGCcPUxBUxzmra88LakkDO+euKK3hcrfeFIi611lTum1NLiNBFcFISUBBADoyY6z
-2PwH3RWUbqv0VX1s3/JO3v3xMjCRKPlFwsNwLTBtZoWfR6Ao1ajeCuZKfzNKIQ2I
-rn86Rcqyrq4hTj+7BTWjkIPOBthjiL1YqbEBtX7jcYRkYvdQz/IG2F4zVV6X4AAR
-Twx7qaXNt67ArzbHCe5gLNRUK6e6OArkahMv7QARAQABiJ8EGAECAAkFAlcFISUC
-GwwACgkQZeg+SWTDcLNFiwP/TR33ClqWOz0mpjt0xPEoZ0ORmV6fo4sjjzgQoHH/
-KTdsabJbGp8oLQGW/mx3OxgbsAkyZymb5H5cjaF4HtSd4cxI5t1C9ZS/ytN8pqfR
-e29SBje8DAAJn2l57s2OddXLPQ0DUwCcdNEaqgHwSk/Swxc7K+IpfvjLKHKUZZBP
-4Ko=
-=SVWi
------END PGP PUBLIC KEY BLOCK-----
-KEY
+    <<~KEY
+      -----BEGIN PGP PUBLIC KEY BLOCK-----
+      Version: GnuPG v1
+
+      mI0EVwUhJQEEAMYxFhgaAdM2Ul5r+XfpqAaI7SOxB14eRjhFjhchy4ylgVxetyLq
+      di3zeANXBIHsLBl7quYTlnmhJr/+GQRkCnXWiUp0tJsBVzGM3puK7c534gakEUH6
+      AlDtj5p3IeygzSyn8u7KORv+ainXfhwkvTO04mJmxAb2uT8ngKYFdPa1ABEBAAG0
+      J1Rlc3QgTWluaXBvcnRpbGUgPHRlc3RAbWluaXBvcnRpbGUub3JnPoi4BBMBAgAi
+      BQJXBSElAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBl6D5JZMNwswAK
+      A/90Cdb+PX21weBR2Q6uR06M/alPexuXXyJL8ZcwbQMJ/pBBgcS5/h1+rQkBI/CN
+      qpXdDlw2Xys2k0sNwdjIw3hmYRzBrddXlCSW3Sifq/hS+kfPZ1snQmIjCgy1Xky5
+      QGCcPUxBUxzmra88LakkDO+euKK3hcrfeFIi611lTum1NLiNBFcFISUBBADoyY6z
+      2PwH3RWUbqv0VX1s3/JO3v3xMjCRKPlFwsNwLTBtZoWfR6Ao1ajeCuZKfzNKIQ2I
+      rn86Rcqyrq4hTj+7BTWjkIPOBthjiL1YqbEBtX7jcYRkYvdQz/IG2F4zVV6X4AAR
+      Twx7qaXNt67ArzbHCe5gLNRUK6e6OArkahMv7QARAQABiJ8EGAECAAkFAlcFISUC
+      GwwACgkQZeg+SWTDcLNFiwP/TR33ClqWOz0mpjt0xPEoZ0ORmV6fo4sjjzgQoHH/
+      KTdsabJbGp8oLQGW/mx3OxgbsAkyZymb5H5cjaF4HtSd4cxI5t1C9ZS/ytN8pqfR
+      e29SBje8DAAJn2l57s2OddXLPQ0DUwCcdNEaqgHwSk/Swxc7K+IpfvjLKHKUZZBP
+      4Ko=
+      =SVWi
+      -----END PGP PUBLIC KEY BLOCK-----
+    KEY
   end
 
   def test_with_valid_gpg_signature
@@ -130,7 +131,7 @@ KEY
     exception = assert_raises(RuntimeError){
       @recipe.download
     }
-    assert_equal("signature mismatch", exception.message)
+    assert_includes(exception.message, "signature mismatch")
   end
 
   def test_with_invalid_key
@@ -144,60 +145,58 @@ KEY
       }
     }
     exception = assert_raises(RuntimeError){ @recipe.download }
-    assert_equal("invalid gpg key provided", exception.message)
+    assert_includes(exception.message, "invalid gpg key provided")
   end
 
   def test_with_different_key_than_one_used_to_sign
-    puts "################"
-
-    key = <<-KEY
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-=4JAR
------END PGP PUBLIC KEY BLOCK-----
-KEY
+    key = <<~KEY
+      -----BEGIN PGP PUBLIC KEY BLOCK-----
+      Version: GnuPG v1
+
+      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
+      =4JAR
+      -----END PGP PUBLIC KEY BLOCK-----
+    KEY
 
     data_file = File.expand_path(File.join(File.dirname(__FILE__), 'assets', 'gpg-fixtures', 'data'))
 
@@ -209,7 +208,6 @@ KEY
       }
     }
     exception = assert_raises(RuntimeError){ @recipe.download }
-    assert_equal("signature mismatch", exception.message)
+    assert_includes(exception.message, "signature mismatch")
   end
 end
-

data/test/test_download.rb

@@ -25,12 +25,13 @@ describe "recipe download" do
       server.close
     end
 
-    request_count.must_be :>, 0
+    assert_operator(request_count, :>, 0)
   end
 
   before do
     @request_count = 0
-    @recipe = MiniPortile.new("test-download", "1.1.1")
+    @logger = StringIO.new
+    @recipe = MiniPortile.new("test-download", "1.1.1", logger: @logger)
   end
 
   describe "urls" do
@@ -62,12 +63,12 @@ describe "recipe download" do
       @recipe.files << "file://#{path}"
       @recipe.download
       assert File.exist?(dest)
-      Digest::MD5.file(dest).hexdigest.must_equal "ee0e9f44e72213015ef976d5ac23931d"
+      assert_equal("ee0e9f44e72213015ef976d5ac23931d", Digest::MD5.file(dest).hexdigest)
     end
 
     it "other" do
       @recipe.files << "foo://foo"
-      proc { @recipe.download }.must_raise ArgumentError
+      assert_raises(ArgumentError) { @recipe.download }
     end
   end
 end

data/test/test_execute.rb

@@ -4,7 +4,8 @@ class TestExecute < TestCase
   def setup
     super
     @env = {"TEST_ENV_VAR1" => "VAR1_VALUE", "TEST_ENV_VAR2" => "VAR2_VALUE"}
-    @recipe = MiniPortile.new("test_execute", "1.0.0")
+    @logger = StringIO.new
+    @recipe = MiniPortile.new("test_execute", "1.0.0", logger: @logger)
     @log_path = @recipe.send(:tmp_path)
     FileUtils.mkdir_p File.join(@log_path, "subdir") # normally created by `download`
   end
@@ -14,7 +15,7 @@ class TestExecute < TestCase
       def execute_with_env(env)
         execute("testenv1",
                 %Q(ruby -e "puts ENV['TEST_ENV_VAR1'].inspect ; exit 0"),
-                {:env => env, :initial_message => false, :debug => true})
+                {:env => env, :initial_message => false})
       end
     end
 
@@ -28,7 +29,7 @@ class TestExecute < TestCase
       def execute_with_env(env)
         execute("testenv2",
                 ["ruby", "-e", "puts ENV['TEST_ENV_VAR2'].inspect"],
-                {:env => env, :initial_message => false, :debug => true})
+                {:env => env, :initial_message => false})
       end
     end
 

data/test/test_proxy.rb

@@ -37,6 +37,7 @@ class TestProxy < TestCase
   def setup
     # remove any download files
     FileUtils.rm_rf("port/archives")
+    @logger = StringIO.new
   end
 
   def assert_proxy_auth(expected, request)
@@ -48,7 +49,7 @@ class TestProxy < TestCase
   end
 
   def test_http_proxy
-    recipe = MiniPortile.new("test http_proxy", "1.0.0")
+    recipe = MiniPortile.new("test http_proxy", "1.0.0", logger: @logger)
     recipe.files << "http://myserver/path/to/tar.gz"
     request = with_dummy_proxy do |url, thread|
       ENV['http_proxy'] = url
@@ -59,7 +60,7 @@ class TestProxy < TestCase
   end
 
   def test_http_proxy_with_basic_auth
-    recipe = MiniPortile.new("test http_proxy", "1.0.0")
+    recipe = MiniPortile.new("test http_proxy", "1.0.0", logger: @logger)
     recipe.files << "http://myserver/path/to/tar.gz"
     request = with_dummy_proxy('user: @name', '@12: üMp') do |url, thread|
       ENV['http_proxy'] = url
@@ -72,7 +73,7 @@ class TestProxy < TestCase
   end
 
   def test_https_proxy
-    recipe = MiniPortile.new("test https_proxy", "1.0.0")
+    recipe = MiniPortile.new("test https_proxy", "1.0.0", logger: @logger)
     recipe.files << "https://myserver/path/to/tar.gz"
     request = with_dummy_proxy do |url, thread|
       ENV['https_proxy'] = url
@@ -83,7 +84,7 @@ class TestProxy < TestCase
   end
 
   def test_https_proxy_with_basic_auth
-    recipe = MiniPortile.new("test https_proxy", "1.0.0")
+    recipe = MiniPortile.new("test https_proxy", "1.0.0", logger: @logger)
     recipe.files << "https://myserver/path/to/tar.gz"
     request = with_dummy_proxy('user: @name', '@12: üMp') do |url, thread|
       ENV['https_proxy'] = url
@@ -96,7 +97,7 @@ class TestProxy < TestCase
   end
 
   def test_ftp_proxy
-    recipe = MiniPortile.new("test ftp_proxy", "1.0.0")
+    recipe = MiniPortile.new("test ftp_proxy", "1.0.0", logger: @logger)
     recipe.files << "ftp://myserver/path/to/tar.gz"
     request = with_dummy_proxy do |url, thread|
       ENV['ftp_proxy'] = url
@@ -107,7 +108,7 @@ class TestProxy < TestCase
   end
 
   def test_ftp_proxy_with_basic_auth
-    recipe = MiniPortile.new("test ftp_proxy", "1.0.0")
+    recipe = MiniPortile.new("test ftp_proxy", "1.0.0", logger: @logger)
     recipe.files << "ftp://myserver/path/to/tar.gz"
     request = with_dummy_proxy('user: @name', '@12: üMp') do |url, thread|
       ENV['ftp_proxy'] = url

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.7.rc1
 platform: ruby
 authors:
 - Luis Lavena
 - Mike Dalessio
 - Lars Kanis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-22 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -145,7 +145,7 @@ homepage: https://github.com/flavorjones/mini_portile
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key: 
+rubygems_version: 3.5.10
+signing_key:
 specification_version: 4
 summary: Simple autoconf and cmake builder for developers
 test_files: