mini_portile2 2.8.7 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70898a2aae18144f603247968314787f2bb4291ce43bab39e7d9f0236d1dcd16
-  data.tar.gz: be938e39466de9c5d731d261c7e2afa63a88e5ca20bdfd594b6f39761b250798
+  metadata.gz: da44cd16eb77e7123cd04099a6899343cec373a2343041b99da0156a6db5f254
+  data.tar.gz: 345bf22bfd3d5679dd7b49a67ab1219e3aa470ba60ed66b934709824f173289a
 SHA512:
-  metadata.gz: 55d44167607aca34fee6fa086246d7f71146e500d77a79f128af9399cd057404ee44d9fb8a349f89928c6f21139826e785d2da23bc4ea656c93047fa1990a20a
-  data.tar.gz: bd0c5d6b654deb5325d1f5329ef0e93b1a47cfde7225ab4f8730dfb419ab27604eb4713d1ae3659dcd4fdf1697e00acbad020c06347b7456041f0121ae40bb05
+  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,7 @@ 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", "3.3", "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"
@@ -53,6 +53,7 @@ jobs:
   test-examples:
     env:
       MAKEFLAGS: -j2
+      LDFLAGS: "-L/usr/local/opt/libiconv/lib" # for macos-13, sigh
     strategy:
       fail-fast: false
       matrix:
@@ -71,6 +72,7 @@ jobs:
         with:
           apt-get: _update_ build-essential cmake
           mingw: _upgrade_ cmake
+          brew: libiconv
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - uses: actions/cache@v4
@@ -141,21 +143,21 @@ jobs:
         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
+          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

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/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## 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

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/lib/mini_portile2/mini_portile.rb

@@ -5,7 +5,8 @@ require 'fileutils'
 require 'tempfile'
 require 'digest'
 require 'open-uri'
-require 'cgi'
+require "cgi/escape"
+require "cgi/util" if RUBY_VERSION < "3.5"
 require 'rbconfig'
 require 'shellwords'
 require 'open3'
@@ -553,6 +554,10 @@ class MiniPortile
     end
   end
 
+  def xzcat_exe
+    @@xzcat_exe ||= which("xzcat") ? "xzcat" : raise("xzcat not found")
+  end
+
   def tar_command(file, target)
     case File.extname(file)
       when '.gz', '.tgz'
@@ -561,7 +566,7 @@ class MiniPortile
         [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}"
+        "#{xzcat_exe.shellescape} #{file.shellescape} | #{tar_exe.shellescape} xf - -C #{target.shellescape}"
       else
         [tar_exe, 'xf', file, '-C', target]
     end

data/lib/mini_portile2/version.rb

@@ -1,3 +1,3 @@
 class MiniPortile
-  VERSION = "2.8.7"
+  VERSION = "2.8.9"
 end

data/mini_portile2.gemspec

@@ -34,10 +34,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_development_dependency "bundler", "~> 2.2"
-  spec.add_development_dependency "minitar", "~> 0.9"
-  spec.add_development_dependency "minitest", "~> 5.15"
-  spec.add_development_dependency "minitest-hooks", "~> 1.5"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "webrick", "~> 1.7"
+  spec.metadata["changelog_uri"] = spec.homepage + "/blob/main/CHANGELOG.md"
 end

data/test/assets/test-cmake-1.0/CMakeLists.txt

@@ -1,7 +1,7 @@
 # CMakeLists files in this project can
 # refer to the root source directory of the project as ${HELLO_SOURCE_DIR} and
 # to the root binary directory of the project as ${HELLO_BINARY_DIR}.
-cmake_minimum_required (VERSION 2.8.7)
+cmake_minimum_required (VERSION 3.5)
 project (HELLO)
 add_executable (hello hello.c)
 install (TARGETS hello DESTINATION bin)

metadata

@@ -1,101 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: mini_portile2
 version: !ruby/object:Gem::Version
-  version: 2.8.7
+  version: 2.8.9
 platform: ruby
 authors:
 - Luis Lavena
 - Mike Dalessio
 - Lars Kanis
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-31 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: minitar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.15'
-- !ruby/object:Gem::Dependency
-  name: minitest-hooks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
+date: 1980-01-02 00:00:00.000000000 Z
+dependencies: []
 description: |
   Simple autoconf and cmake builder for developers. It provides a standard way to compile against
   dependency libraries without requiring system-wide installation. It also simplifies
@@ -108,6 +23,7 @@ files:
 - ".github/FUNDING.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/downstream.yml"
+- ".github/workflows/upstream.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
@@ -145,8 +61,8 @@ files:
 homepage: https://github.com/flavorjones/mini_portile
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/flavorjones/mini_portile/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -161,8 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.6.8
 specification_version: 4
 summary: Simple autoconf and cmake builder for developers
 test_files: