mini_portile2 2.8.2 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8c3bc43ff4324b2780fdac7f1832759fe3933330155380eeb4d3be23a55ac25
-  data.tar.gz: 4b9ed8985c6ae4b827b1cd9791a97a8a708fca9f02dd2bc0854e241d05ce71bf
+  metadata.gz: da44cd16eb77e7123cd04099a6899343cec373a2343041b99da0156a6db5f254
+  data.tar.gz: 345bf22bfd3d5679dd7b49a67ab1219e3aa470ba60ed66b934709824f173289a
 SHA512:
-  metadata.gz: f29569cacecfd0ade1fc031add7f0e1bb7bccf3a180f260b17541d4493de809f7c4b53180ed47d159a01956318c67c16df810984e974718d0b0eeee42d789a52
-  data.tar.gz: b93d7d34b54e9f6e3083642bc11d14720c566eac2dd745ad99004961f6a37d770349a5f4c99cd2e4ed084246025d26ca8e2fdf434d4b1837c59ae02c7173aa60
+  metadata.gz: e9524d1a10295307873889f41bf74ecb1ac121b926227379f6c82fecc2dba748bda6b03f2c3923777e86f7990a479c11a2dcc31c68def02ce77344ccec40244d
+  data.tar.gz: 81f1e88d8218d79a0296018ef338f9f86682f90b5b1bfb864a0a065668e00beaa19120be05f22b8ffeb86a9ca22a9c6f751747e6ab7eede83b48d4f92f2db920

data/.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Continuous Integration
+name: ci
 concurrency:
   group: "${{github.workflow}}-${{github.ref}}"
   cancel-in-progress: true
@@ -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", "3.4"]
+        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
@@ -45,10 +53,12 @@ jobs:
   test-examples:
     env:
       MAKEFLAGS: -j2
+      LDFLAGS: "-L/usr/local/opt/libiconv/lib" # for macos-13, sigh
     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,15 +67,99 @@ 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
+          brew: libiconv
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: examples/ports/archives
-          key: ${{ matrix.platform }}-examples-${{ hashFiles('examples/Rakefile') }}
+          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
+    steps:
+      - 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@v4
+      - uses: actions/cache@v4
+        with:
+          path: examples/ports/archives
+          key: examples-${{ hashFiles('examples/Rakefile') }}
+      - run: bundle install
+      - 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.4 gmake cmake git pkgconf security/gnupg
+          ln -sf /usr/local/bin/ruby34 /usr/local/bin/ruby
+          ln -sf /usr/local/bin/bundle34 /usr/local/bin/bundle
+          ln -sf /usr/local/bin/bundler34 /usr/local/bin/bundler
+          ln -sf /usr/local/bin/erb34 /usr/local/bin/erb
+          ln -sf /usr/local/bin/gem34 /usr/local/bin/gem
+          ln -sf /usr/local/bin/irb34 /usr/local/bin/irb
+          ln -sf /usr/local/bin/racc34 /usr/local/bin/racc
+          ln -sf /usr/local/bin/rake34 /usr/local/bin/rake
+          ln -sf /usr/local/bin/rbs34 /usr/local/bin/rbs
+          ln -sf /usr/local/bin/rdbg34 /usr/local/bin/rdbg
+          ln -sf /usr/local/bin/rdoc34 /usr/local/bin/rdoc
+          ln -sf /usr/local/bin/ri34 /usr/local/bin/ri
+          ln -sf /usr/local/bin/syntax_suggest34 /usr/local/bin/syntax_suggest
+          ln -sf /usr/local/bin/typeprof34 /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/.github/workflows/downstream.yml

@@ -0,0 +1,66 @@
+name: downstream
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 7 * * 1,3,5" # At 07:00 on Monday, Wednesday, and Friday # https://crontab.guru/#0_7_*_*_1,3,5
+  push:
+    branches:
+      - main
+      - "v*.*.x"
+    tags:
+      - v*.*.*
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - '*'
+
+jobs:
+  downstream:
+    name: downstream-${{matrix.name}}-${{matrix.platform}}
+    strategy:
+      fail-fast: false
+      matrix:
+        name: [re2, nokogiri, sqlite3]
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - name: re2
+            url: https://github.com/mudge/re2
+            command: "bundle exec rake compile spec"
+            ruby: "3.3"
+          - name: nokogiri
+            url: https://github.com/sparklemotion/nokogiri
+            command: "bundle exec rake compile test"
+            ruby: "3.3"
+          - name: sqlite3
+            url: https://github.com/sparklemotion/sqlite3-ruby
+            command: "bundle exec rake compile test"
+            ruby: "3.3"
+    runs-on: ${{matrix.platform}}
+    steps:
+      - name: configure git crlf
+        if: ${{ startsWith(matrix.platform, 'windows') }}
+        run: |
+          git config --system core.autocrlf false
+          git config --system core.eol lf
+      - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{matrix.ruby}}
+          bundler-cache: true
+          bundler: latest
+      - run: git clone --depth=1 ${{matrix.url}} ${{matrix.name}}
+      - uses: actions/cache@v4
+        with:
+          path: ${{matrix.name}}/ports/archives
+          key: tarballs-${{matrix.name}}
+          enableCrossOsArchive: true
+      - name: ${{matrix.name}} test suite
+        working-directory: ${{matrix.name}}
+        run: |
+          bundle remove mini_portile2 || true
+          bundle add mini_portile2 --path=".."
+          bundle install --local || bundle install
+          ${{matrix.command}}

data/.github/workflows/upstream.yml

@@ -0,0 +1,39 @@
+name: upstream
+concurrency:
+  group: "${{github.workflow}}-${{github.ref}}"
+  cancel-in-progress: true
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 8 * * 5" # At 08:00 on Friday # https://crontab.guru/#0_8_*_*_5
+  pull_request:
+    types: [opened, synchronize]
+    branches:
+      - "*"
+    paths:
+      - .github/workflows/upstream.yml # this file
+
+jobs:
+  test-unit:
+    env:
+      MAKEFLAGS: -j2
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest, windows-latest, macos-latest]
+        ruby: ["head"]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - name: configure git crlf on windows
+        if: matrix.platform == 'windows-latest'
+        run: |
+          git config --system core.autocrlf false
+          git config --system core.eol lf
+      - 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
+      - run: bundle exec rake test:unit

data/.gitignore

@@ -3,3 +3,4 @@ Gemfile.lock
 pkg
 ports
 tmp
+mkmf.log

data/CHANGELOG.md

@@ -1,5 +1,71 @@
 ## mini_portile changelog
 
+### 2.8.9 / 2025-05-12
+
+### Ruby support
+
+* Import only what's needed from `cgi`, for supporting Ruby 3.5. #160 @Earlopain
+
+
+### 2.8.8 / 2024-11-14
+
+#### Improved
+
+- Raise an exception with a clear error message when `xzcat` is needed but is not installed. (#152) @flavorjones
+
+
+### 2.8.7 / 2024-05-31
+
+#### 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
+
+- New methods `#lib_path` and `#include_path` which point at the installed directories under `ports`. (by @flavorjones)
+- Add config param for CMAKE_BUILD_TYPE, which now defaults to `Release`. (#136 by @Watson1978)
+
+#### Experimental
+
+Introduce experimental support for `MiniPortile#mkmf_config` which sets up MakeMakefile variables to properly link against the recipe. This should make it easier for C extensions to package third-party libraries. (by @flavorjones)
+
+- With no arguments, will set up just `$INCFLAGS`, `$libs`, and `$LIBPATH`.
+- Optionally, if provided a pkg-config file, will use that config to more precisely set `$INCFLAGS`, `$libs`, `$LIBPATH`, and `$CFLAGS`/`$CXXFLAGS`.
+- Optionally, if provided the name of a static archive, will rewrite linker flags to ensure correct linkage.
+
+Note that the behavior may change slightly before official support is announced. Please comment on [#118](https://github.com/flavorjones/mini_portile/issues/118) if you have feedback.
+
+
+### 2.8.4 / 2023-07-18
+
+- cmake: set CMAKE compile flags to configure cross-compilation similarly to `autotools` `--host` flag: `SYSTEM_NAME`, `SYSTEM_PROCESSOR`, `C_COMPILER`, and `CXX_COMPILER`. [#130] (Thanks, @stanhu!)
+
+
+### 2.8.3 / 2023-07-18
+
+#### Fixed
+
+- cmake: only use MSYS/NMake generators when available. [#129] (Thanks, @stanhu!)
+
+
 ### 2.8.2 / 2023-04-30
 
 #### Fixed

data/Gemfile

@@ -1,6 +1,18 @@
 source 'https://rubygems.org'
 
-gem "net-ftp" if Gem::Requirement.new("> 3.1.0.dev").satisfied_by?(Gem::Version.new(RUBY_VERSION))
-
-# Specify your gem's dependencies in mini_portile2.gemspec
 gemspec
+
+group :development do
+  gem "minitar", "0.9"
+  gem "minitest", "~> 5.15" # open range for ruby 2.3 support
+  gem "minitest-hooks", "1.5.2"
+  gem "rake", "13.2.1"
+  if RUBY_VERSION >= "3.4"
+    gem "webrick", git: "https://github.com/ruby/webrick" # shouldn't be necessary to pin once webrick 1.8.2 or 1.9.0 is released
+  else
+    gem "webrick"
+  end
+
+  gem "net-ftp" if Gem::Requirement.new("> 3.1.0.dev").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+  gem "logger", "1.6.5" if Gem::Requirement.new("> 3.5.0.dev").satisfied_by?(Gem::Version.new(RUBY_VERSION))
+end

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:
@@ -138,8 +147,8 @@ This is configurable as above, except for Windows systems where it's hardcoded t
 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"`
+- the `:cmake_command` keyword argument passed into the constructor
+- `"cmake"` (the default)
 
 You can pass it in like so:
 
@@ -147,6 +156,19 @@ You can pass it in like so:
 MiniPortileCMake.new("libfoobar", "1.3.5", cmake_command: "cmake3")
 ```
 
+#### `cmake_build_type`
+
+The cmake build type is configurable as of v2.8.5, and in order of preference will use:
+
+- the `CMAKE_BUILD_TYPE` environment variable (if present)
+- the `:cmake_build_type` keyword argument passed into the constructor
+- `"Release"` (the default)
+
+You can pass it in like so:
+
+``` ruby
+MiniPortileCMake.new("libfoobar", "1.3.5", cmake_build_type: "Debug")
+```
 
 ### Local source directories
 

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