wreq 1.2.6-aarch64-linux → 1.2.7-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908bcf2c57df2f5b5307ac3e1705702cc37dea141a8e405d8677d41a66a1b27c
-  data.tar.gz: 4988ae3fd70f97aabc4cd628a007295eac6fc070f28eda0962be10507dbc5a14
+  metadata.gz: 9316db9e35fe5cfb70ebdf780a508df148eaee98239484d093b6b548fb7e3396
+  data.tar.gz: 2fc029910c849a41c069b0b6fd637ec3d13ae2a81eac22a081a361d0f1f6cbc0
 SHA512:
-  metadata.gz: 61593576f9ad8326ee3e24308fda204b003c1144eec94d88ce6989389e605b90ad6f30b396f95ffef60bb4359241032c423c0b73cc0ba0787db31b1bbca7836e
-  data.tar.gz: 94a42f93749674470c97d9e7777827b20a908b316782858c51bf48093cec70187e251f590585d34c66583d8c8aa52b86f36b7c3193a09dff89ccd40a78699b65
+  metadata.gz: 83e817b5150d93ae1723aa17b506e04379f5989b8c4d1052c81ac2fe0aaf9acba3bd8e5fdffd70f7f9ffde31e71c92315d7951db6907ffe12e4f7972af8eb82d
+  data.tar.gz: c0d45f2c282bdf328b0dc66f238f3962d69541f070adbb32577d39f6d6bff8a57fbe2e2fa4ed91b861406102db200beaac9bd71d7aa63371e7ed1351d1531473

data/.cargo/config.toml

@@ -0,0 +1,4 @@
+# Rake creates or removes this host-specific file when switching platforms.
+include = [
+  { path = "windows.toml", optional = true },
+]

data/Rakefile

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
+require_relative "script/rust_env"
+
+# Cargo needs RubyInstaller's UCRT tools when Rake builds the native extension
+# on Windows. Other platforms keep their existing native Cargo environment.
+Wreq::RustEnv.activate
+
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rb_sys/extensiontask"

data/crates/wreq-util/README.md

@@ -43,7 +43,7 @@ async fn main() -> wreq::Result<()> {
         .build()?;
 
     // Use the API you're already familiar with
-    let resp = client.get("https://www.google.com").send().await?;
+    let resp = client.get("https://pingly.us.kg/api/all").send().await?;
     println!("{}", resp.text().await?);
     Ok(())
 }

data/docs/windows-gnu-tokio-crash.md

@@ -57,14 +57,60 @@ DLL Name: KERNEL32.dll
 problematic `Sleep` reference can come from Rust std, MinGW, or pthread-related
 linking paths, not only from `windows-sys`.
 
-Verified with:
+Windows builds use the `x86_64-pc-windows-gnu` target and the RubyInstaller
+UCRT toolchain. The Rakefile configures that environment automatically, so the
+extension and tests can be built with:
 
 ```powershell
-.\script\build_windows_gnu.ps1 -SkipBundleInstall -SkipToolInstall -RunTests
+rustup target add x86_64-pc-windows-gnu
+ridk exec pacman -S --needed --noconfirm `
+    mingw-w64-ucrt-x86_64-gcc `
+    mingw-w64-ucrt-x86_64-clang `
+    mingw-w64-ucrt-x86_64-cmake `
+    mingw-w64-ucrt-x86_64-pkgconf
+bundle exec rake test
 ```
 
+The first Rake invocation also writes a machine-local `.cargo/windows.toml`.
+The checked-in `.cargo/config.toml` loads it automatically, so Cargo and Rust
+language servers use the same GNU target and RubyInstaller tools without
+editor-specific settings.
+
+## RubyInstaller development tools
+
+RubyInstaller adds Ruby itself to `PATH`, but it does not enable the bundled
+MSYS2 development environment globally. Running `ridk enable` adds tools such
+as GCC, CMake, and Make to the current terminal only. This is normally useful
+because it avoids conflicts with other Windows toolchains.
+
+Rust language servers start Cargo directly and do not run `ridk enable` or the
+Rakefile first. Add RubyInstaller's `ucrt64\bin` and `usr\bin` directories to
+the user `PATH` so Cargo can load GCC, libclang, and their dependent DLLs from
+any editor:
+
+```powershell
+$rubyRoot = ruby -rrbconfig -e "print RbConfig::CONFIG.fetch('prefix')"
+$required = @(
+    (Join-Path $rubyRoot "msys64\ucrt64\bin"),
+    (Join-Path $rubyRoot "msys64\usr\bin")
+)
+$userPath = [Environment]::GetEnvironmentVariable("Path", "User")
+$entries = @($userPath -split ";" | Where-Object {
+    $_ -and $_ -notin $required
+})
+$entries = $required + $entries
+[Environment]::SetEnvironmentVariable("Path", ($entries -join ";"), "User")
+```
+
+Restart the editor after changing `PATH` so its language server inherits the
+updated environment. Run `bundle exec rake compile` once after installing or
+switching Ruby so `.cargo/windows.toml` points to the active RubyInstaller.
+Run a Rake command after switching the same checkout between Windows and WSL;
+Windows generates this local configuration, while other platforms remove it.
+
 Result:
 
 ```text
-160 runs, 775 assertions, 0 failures, 0 errors
+254 runs, 1198 assertions, 0 failures, 0 errors
+2 Rust tests passed
 ```

data/extconf.rb

@@ -1,4 +1,8 @@
 require "mkmf"
+require_relative "script/rust_env"
+
+Wreq::RustEnv.activate
+
 # We use rb_sys for makefile generation only.
 # We can use `RB_SYS_CARGO_PROFILE` to choose Cargo profile
 # Read more https://github.com/oxidize-rb/rb-sys/blob/main/gem/README.md

data/script/rust_env.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+require "fileutils"
+
+module Wreq
+  module RustEnv
+    WINDOWS_GNU_TARGET = "x86_64-pc-windows-gnu"
+    WINDOWS_RUBY_PLATFORM = "x64-mingw-ucrt"
+
+    # Uses the UCRT toolchain shipped with the active RubyInstaller installation.
+    def self.activate
+      unless RbConfig::CONFIG["host_os"].match?(/mingw|mswin/)
+        FileUtils.rm_f(cargo_config_path)
+        return
+      end
+
+      ruby_platform = RbConfig::CONFIG.fetch("arch")
+      unless ruby_platform == WINDOWS_RUBY_PLATFORM
+        raise "Unsupported Windows Ruby platform: #{ruby_platform}. " \
+          "Use RubyInstaller UCRT (#{WINDOWS_RUBY_PLATFORM})."
+      end
+
+      ruby_root = RbConfig::CONFIG.fetch("prefix")
+      msys_root = File.join(ruby_root, "msys64")
+      ucrt_bin = File.join(msys_root, "ucrt64", "bin")
+      msys_bin = File.join(msys_root, "usr", "bin")
+
+      validate_tools(ucrt_bin, msys_bin)
+      write_cargo_config(ucrt_bin, msys_bin)
+      ENV["CARGO_BUILD_TARGET"] = WINDOWS_GNU_TARGET
+      ENV["LIBCLANG_PATH"] = ucrt_bin
+      ENV.delete("CMAKE_GENERATOR")
+      ENV["PATH"] = [ucrt_bin, msys_bin, ENV.fetch("PATH", nil)].compact.join(File::PATH_SEPARATOR)
+    end
+
+    # Reports missing RubyInstaller packages before Cargo starts compiling.
+    def self.validate_tools(ucrt_bin, msys_bin)
+      required = %w[gcc.exe g++.exe gcc-ar.exe clang.exe libclang.dll cmake.exe]
+        .map { |tool| File.join(ucrt_bin, tool) }
+        .append(File.join(msys_bin, "make.exe"))
+      missing = required.reject { |tool| File.file?(tool) }
+      unless %w[pkgconf.exe pkg-config.exe].any? { |tool| File.file?(File.join(ucrt_bin, tool)) }
+        missing << File.join(ucrt_bin, "pkgconf.exe")
+      end
+      return if missing.empty?
+
+      raise "Missing RubyInstaller UCRT tools: #{missing.join(", ")}. " \
+        "Install the Windows build dependencies documented in " \
+        "docs/windows-gnu-tokio-crash.md."
+    end
+
+    # Generates machine-local Cargo defaults that work in command lines and IDEs.
+    def self.write_cargo_config(ucrt_bin, msys_bin)
+      config = <<~TOML
+        # Generated by script/rust_env.rb for the active RubyInstaller.
+
+        [build]
+        target = "#{WINDOWS_GNU_TARGET}"
+
+        [target.#{WINDOWS_GNU_TARGET}]
+        linker = "#{File.join(ucrt_bin, "gcc.exe")}"
+
+        [env]
+        CC_x86_64_pc_windows_gnu = { value = "#{File.join(ucrt_bin, "gcc.exe")}", force = true }
+        CXX_x86_64_pc_windows_gnu = { value = "#{File.join(ucrt_bin, "g++.exe")}", force = true }
+        AR_x86_64_pc_windows_gnu = { value = "#{File.join(ucrt_bin, "gcc-ar.exe")}", force = true }
+        CMAKE = { value = "#{File.join(ucrt_bin, "cmake.exe")}", force = true }
+        CMAKE_GENERATOR = { value = "MSYS Makefiles", force = true }
+        CMAKE_MAKE_PROGRAM = { value = "#{File.join(msys_bin, "make.exe")}", force = true }
+        LIBCLANG_PATH = { value = "#{ucrt_bin}", force = true }
+      TOML
+
+      return if File.exist?(cargo_config_path) && File.binread(cargo_config_path) == config
+
+      FileUtils.mkdir_p(File.dirname(cargo_config_path))
+      File.binwrite(cargo_config_path, config)
+    end
+
+    # Returns the ignored Cargo configuration shared by Rake and language servers.
+    def self.cargo_config_path
+      File.expand_path("../.cargo/windows.toml", __dir__)
+    end
+  end
+end

data/wreq.gemspec

@@ -56,7 +56,7 @@ Gem::Specification.new do |spec|
   # Exclude non-Ruby files from RDoc to prevent parsing errors
   spec.rdoc_options = ["--exclude", "Cargo\\..*", "--exclude", "\\.rs$"]
 
-  spec.requirements = ["Rust >= 1.85"]
+  spec.requirements = ["Rust >= 1.97"]
   # use a Ruby version which:
   # - supports Rubygems with the ability of compilation of Rust gem
   # - not end of life

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wreq
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: aarch64-linux
 authors:
 - SearchApi
@@ -20,6 +20,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - "./extconf.rb"
+- ".cargo/config.toml"
 - Gemfile
 - LICENSE
 - README.md
@@ -60,7 +61,7 @@ files:
 - lib/wreq_ruby/http.rb
 - lib/wreq_ruby/response.rb
 - script/build_platform_gem.rb
-- script/build_windows_gnu.ps1
+- script/rust_env.rb
 - test/body_sender_test.rb
 - test/client_cookie_test.rb
 - test/client_test.rb
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- Rust >= 1.85
+- Rust >= 1.97
 rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4

data/script/build_windows_gnu.ps1

@@ -1,270 +0,0 @@
-param(
-    [switch]$SkipBundleInstall,
-    [switch]$SkipToolInstall,
-    [switch]$BuildGem,
-    [switch]$TestGem,
-    [switch]$RunTests,
-    [string]$SmokeUrl = $env:WREQ_SMOKE_URL
-)
-
-$ErrorActionPreference = "Stop"
-
-$target = "x86_64-pc-windows-gnu"
-$platform = "x64-mingw-ucrt"
-$gemPattern = "pkg\wreq-*-$platform.gem"
-if ([string]::IsNullOrWhiteSpace($SmokeUrl)) {
-    $SmokeUrl = "https://httpbin.io/get"
-}
-$rubyRoot = Split-Path (Split-Path (Get-Command ruby).Source -Parent) -Parent
-$ucrt = Join-Path $rubyRoot "msys64\ucrt64"
-$ucrtBin = Join-Path $ucrt "bin"
-$msysPackages = @(
-    "mingw-w64-ucrt-x86_64-gcc",
-    "mingw-w64-ucrt-x86_64-clang",
-    "mingw-w64-ucrt-x86_64-cmake",
-    "mingw-w64-ucrt-x86_64-pkgconf"
-)
-
-function Invoke-Step {
-    param(
-        [string]$Name,
-        [scriptblock]$Command
-    )
-
-    Write-Host "==> $Name"
-    # Native command failures do not honor ErrorActionPreference in Windows PowerShell.
-    $global:LASTEXITCODE = 0
-    & $Command
-    if ($LASTEXITCODE -ne 0) {
-        throw "$Name failed with exit code $LASTEXITCODE."
-    }
-}
-
-function Get-MissingUcrtTools {
-    $missing = @()
-
-    if (-not (Test-Path (Join-Path $ucrtBin "gcc.exe")) -or -not (Test-Path (Join-Path $ucrtBin "g++.exe"))) {
-        $missing += "gcc/g++"
-    }
-
-    if (-not (Test-Path (Join-Path $ucrtBin "clang.exe")) -or -not (Test-Path (Join-Path $ucrtBin "libclang.dll"))) {
-        $missing += "clang/libclang"
-    }
-
-    if (-not (Test-Path (Join-Path $ucrtBin "cmake.exe"))) {
-        $missing += "cmake"
-    }
-
-    if (-not (Test-Path (Join-Path $ucrtBin "pkgconf.exe")) -and -not (Test-Path (Join-Path $ucrtBin "pkg-config.exe"))) {
-        $missing += "pkgconf"
-    }
-
-    $missing
-}
-
-function Get-LatestPlatformGem {
-    $gem = Get-ChildItem -Path $gemPattern -ErrorAction SilentlyContinue |
-        Sort-Object LastWriteTime -Descending |
-        Select-Object -First 1
-
-    if (-not $gem) {
-        throw "No Windows GNU platform gem found at '$gemPattern'. Re-run with -BuildGem first."
-    }
-
-    $gem
-}
-
-function Invoke-RubySmoke {
-    param(
-        [string]$Name,
-        [string]$Code
-    )
-
-    Write-Host "Smoke: $Name"
-    ruby -e $Code
-    if ($LASTEXITCODE -ne 0) {
-        throw "$Name failed with exit code $LASTEXITCODE."
-    }
-}
-
-Invoke-Step "Check Ruby platform" {
-    $rubyArch = & ruby -rrbconfig -e "print RbConfig::CONFIG['arch']"
-    if ($rubyArch -ne $platform) {
-        throw "Expected Ruby platform '$platform', got '$rubyArch'. Use RubyInstaller UCRT for this build."
-    }
-
-    ruby -v
-    ruby -rrbconfig -rrubygems -e "puts RbConfig::CONFIG.values_at('arch', 'host', 'CC').join(%q{ }); puts Gem::Platform.local"
-}
-
-Invoke-Step "Install Rust target" {
-    $installedTargets = @(rustup target list --installed)
-    if ($installedTargets -contains $target) {
-        Write-Host "Rust target $target already installed; skipping rustup."
-        return
-    }
-
-    rustup target add $target
-    if ($LASTEXITCODE -ne 0) {
-        throw "Failed to install Rust target $target."
-    }
-}
-
-Invoke-Step "Check MSYS2 UCRT build tools" {
-    $missing = @(Get-MissingUcrtTools)
-    if ($missing.Count -eq 0) {
-        Write-Host "MSYS2 UCRT build tools already present; skipping pacman."
-        return
-    }
-
-    if ($SkipToolInstall) {
-        throw "Missing MSYS2 UCRT build tools: $($missing -join ', '). Re-run without -SkipToolInstall or install them with ridk."
-    }
-
-    Write-Host "Missing MSYS2 UCRT build tools: $($missing -join ', ')"
-    ridk exec pacman -S --needed --noconfirm @msysPackages
-    if ($LASTEXITCODE -ne 0) {
-        $stillMissing = @(Get-MissingUcrtTools)
-        if ($stillMissing.Count -eq 0) {
-            Write-Warning "pacman returned exit code $LASTEXITCODE, but all required tools are present; continuing."
-            $global:LASTEXITCODE = 0
-            return
-        }
-
-        throw "Failed to install MSYS2 UCRT build tools. Missing: $($stillMissing -join ', '). If pacman cannot lock its database, close other pacman/ridk shells, run PowerShell as Administrator, or install RubyInstaller in a user-writable directory."
-    }
-}
-
-Invoke-Step "Configure Windows GNU toolchain" {
-    $env:CARGO_BUILD_TARGET = $target
-    $env:LIBCLANG_PATH = $ucrtBin
-    $env:CC_x86_64_pc_windows_gnu = Join-Path $ucrtBin "gcc.exe"
-    $env:CXX_x86_64_pc_windows_gnu = Join-Path $ucrtBin "g++.exe"
-    $env:CMAKE = Join-Path $ucrtBin "cmake.exe"
-    Remove-Item Env:\CMAKE_GENERATOR -ErrorAction SilentlyContinue
-
-    rustc -Vv
-    Write-Host "LIBCLANG_PATH=$env:LIBCLANG_PATH"
-    Write-Host "CC_x86_64_pc_windows_gnu=$env:CC_x86_64_pc_windows_gnu"
-    Write-Host "CXX_x86_64_pc_windows_gnu=$env:CXX_x86_64_pc_windows_gnu"
-    Write-Host "CMAKE=$env:CMAKE"
-}
-
-if (-not $SkipBundleInstall) {
-    Invoke-Step "Install Ruby dependencies" {
-        bundle install
-    }
-}
-
-Invoke-Step "Compile native extension" {
-    ridk exec ruby -S bundle exec rake compile
-}
-
-Invoke-Step "Sync versioned extension" {
-    $rubyMinor = & ruby -e "print RUBY_VERSION[/\A\d+\.\d+/]"
-    $dest = "lib\wreq_ruby\$rubyMinor"
-    New-Item -ItemType Directory -Force $dest | Out-Null
-    Copy-Item "lib\wreq_ruby\wreq_ruby.so" (Join-Path $dest "wreq_ruby.so") -Force
-}
-
-Invoke-Step "Verify extension loads" {
-    ruby -Ilib -rwreq -e "puts Wreq::VERSION; puts Wreq::Client.new.class"
-}
-
-if ($RunTests) {
-    Invoke-Step "Run tests" {
-        ridk exec ruby -S bundle exec rake test
-    }
-}
-
-if ($BuildGem) {
-    Invoke-Step "Build local platform gem" {
-        $rubyMinor = & ruby -e "print RUBY_VERSION[/\A\d+\.\d+/]"
-        $dest = "lib\wreq_ruby\$rubyMinor"
-        New-Item -ItemType Directory -Force $dest | Out-Null
-        Copy-Item "lib\wreq_ruby\wreq_ruby.so" (Join-Path $dest "wreq_ruby.so") -Force
-
-        ruby script/build_platform_gem.rb $platform
-    }
-}
-
-if ($TestGem) {
-    Invoke-Step "Install and smoke test platform gem" {
-        $gem = Get-LatestPlatformGem
-        $gemHome = Join-Path ([System.IO.Path]::GetTempPath()) "wreq-gem-test-$PID"
-        $gemBin = Join-Path $gemHome "bin"
-        $testDir = Join-Path ([System.IO.Path]::GetTempPath()) "wreq-gem-test-cwd-$PID"
-
-        Remove-Item -Recurse -Force $gemHome, $testDir -ErrorAction SilentlyContinue
-        New-Item -ItemType Directory -Force $gemHome, $gemBin, $testDir | Out-Null
-
-        $oldGemHome = $env:GEM_HOME
-        $oldGemPath = $env:GEM_PATH
-        $oldGemrc = $env:GEMRC
-        $oldRubyopt = $env:RUBYOPT
-        $oldRubylib = $env:RUBYLIB
-        $oldBundleGemfile = $env:BUNDLE_GEMFILE
-        $oldBundleBinPath = $env:BUNDLE_BIN_PATH
-        $oldBundlerVersion = $env:BUNDLER_VERSION
-        $oldSmokeUrl = $env:WREQ_SMOKE_URL
-        $oldWreqGemHome = $env:WREQ_GEM_HOME
-
-        try {
-            $env:GEM_HOME = $gemHome
-            $env:GEM_PATH = $gemHome
-            $env:GEMRC = ""
-            $env:RUBYOPT = ""
-            $env:RUBYLIB = ""
-            $env:BUNDLE_GEMFILE = ""
-            $env:BUNDLE_BIN_PATH = ""
-            $env:BUNDLER_VERSION = ""
-            $env:WREQ_SMOKE_URL = $SmokeUrl
-            $env:WREQ_GEM_HOME = $gemHome
-
-            gem install --norc --local --install-dir $gemHome --bindir $gemBin --no-document --force --no-user-install $gem.FullName
-            if ($LASTEXITCODE -ne 0) {
-                throw "Failed to install $($gem.FullName)."
-            }
-
-            Push-Location $testDir
-            try {
-                Invoke-RubySmoke "Load installed platform gem" @'
-STDOUT.sync = true
-STDERR.sync = true
-require "wreq"
-spec = Gem.loaded_specs.fetch("wreq")
-expected = File.expand_path(ENV.fetch("WREQ_GEM_HOME"))
-actual = File.expand_path(spec.full_gem_path)
-raise "loaded #{actual}, expected under #{expected}" unless actual.start_with?(expected)
-puts "loaded #{spec.full_name}"
-puts actual
-puts "wreq #{Wreq::VERSION}"
-'@
-
-                Invoke-RubySmoke "Request through installed platform gem" @'
-STDOUT.sync = true
-STDERR.sync = true
-require "wreq"
-client = Wreq::Client.new
-resp = client.get(ENV.fetch("WREQ_SMOKE_URL"), timeout: 20)
-puts "HTTP #{resp.code}"
-raise "unexpected status #{resp.code}" unless resp.code == 200
-'@
-            } finally {
-                Pop-Location
-            }
-        } finally {
-            $env:GEM_HOME = $oldGemHome
-            $env:GEM_PATH = $oldGemPath
-            $env:GEMRC = $oldGemrc
-            $env:RUBYOPT = $oldRubyopt
-            $env:RUBYLIB = $oldRubylib
-            $env:BUNDLE_GEMFILE = $oldBundleGemfile
-            $env:BUNDLE_BIN_PATH = $oldBundleBinPath
-            $env:BUNDLER_VERSION = $oldBundlerVersion
-            $env:WREQ_SMOKE_URL = $oldSmokeUrl
-            $env:WREQ_GEM_HOME = $oldWreqGemHome
-            Remove-Item -Recurse -Force $gemHome, $testDir -ErrorAction SilentlyContinue
-        }
-    }
-}