predictability-engine 0.11.5 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f44e183717ab04fd8fe35647721a39741d26fc337d360d1792407814bf6298ef
-  data.tar.gz: 0df772dc4b55abc978aa1f9d7ba8994d375683f0fc899bbcb8c18c1af1fd9ecc
+  metadata.gz: 16cf4b6b4c370fb56e77ced5289cebf2b67e235d9b7bf35c0b85ce00daa70c35
+  data.tar.gz: '080674ff5893d9c3dd52ac8db12354bef60a6d4b4dbd819d717e4c2d0afc56b6'
 SHA512:
-  metadata.gz: c8adb03e9f72ad485039b7957616ceb8dc2fb533d7b5ff0b72d611028c2cf224485299ec56f14d9a390ef8c35ff91d2be02b1b0aaad0b931643c7e3a79f354bd
-  data.tar.gz: 55ad22940cef1ffcad66759ee9f345fcc397db8dc2f24a71e1217c2a7ce12c7a5642ebd1ad514dd1bec9c8ffc5b54f3ae4d4b465f95aec2e0d1fc523fc5a7f3f
+  metadata.gz: 23a796c824436791e64e306f4c60e5b240b4004fb4000ac39271a5f50f09aa5f6242fceba09899beee7c9d462b74eadc64d02ca308a118de6d06acc19a707960
+  data.tar.gz: cc39a09c796c223c8ce7d7cd84c446f145a81d661d0b0f322d94d8d99beaf96db9b3869a2cf72bf86616313ae7c51cda7ed082bec156c531e86809c08c3ed9a4

data/bin/setup.ps1

@@ -3,8 +3,9 @@
 .SYNOPSIS
   Bootstrap Ruby and the Predictability Engine on Windows.
 .DESCRIPTION
-  Installs Ruby 4.x + MSYS2 DevKit via winget (if Ruby >= 4 is not already present),
-  then runs gem install bundler, bundle install, and predictability-engine setup
+  Ensures Ruby 4.x + MSYS2 DevKit is installed (tries winget, Chocolatey, Scoop,
+  then a direct SHA256-verified download from GitHub Releases), then runs
+  gem install bundler, bundle install, and predictability-engine setup
   (which handles Node.js, Playwright, and Chromium).
 
   Invoke via the thin CMD wrapper:  bin\setup.bat
@@ -29,36 +30,73 @@ function Get-RubyMajorVersion {
     return $null
 }
 
+function Test-RubyAdequate {
+    $m = Get-RubyMajorVersion
+    return ($null -ne $m) -and ($m -ge $RequiredRubyMajor)
+}
+
 function Refresh-Path {
     $machine = [System.Environment]::GetEnvironmentVariable('PATH', 'Machine')
     $user    = [System.Environment]::GetEnvironmentVariable('PATH', 'User')
     $env:PATH = "$machine;$user"
 }
 
+function Install-RubyDirect {
+    param([string]$RubyVersion)
+    $tag     = "RubyInstaller-$RubyVersion-1"
+    $exe     = "rubyinstaller-devkit-$RubyVersion-1-x64.exe"
+    $baseUrl = "https://github.com/oneclick/rubyinstaller2/releases/download/$tag"
+    $tmp     = Join-Path $env:TEMP $exe
+
+    Write-Host "==> Downloading Ruby $RubyVersion installer from GitHub Releases..."
+    Invoke-WebRequest -Uri "$baseUrl/$exe" -OutFile $tmp -UseBasicParsing
+
+    Write-Host "==> Verifying SHA256 checksum..."
+    $shaLines = (Invoke-WebRequest -Uri "$baseUrl/SHA256.txt" -UseBasicParsing).Content -split "`n"
+    $expected = ($shaLines | Where-Object { $_ -match [regex]::Escape($exe) } |
+                 ForEach-Object { ($_ -split '\s+')[0] } | Select-Object -First 1).ToUpper()
+    $actual   = (Get-FileHash $tmp -Algorithm SHA256).Hash.ToUpper()
+    if ($actual -ne $expected) {
+        Remove-Item $tmp -Force
+        throw "SHA256 mismatch for $exe`n  Expected: $expected`n  Got:      $actual"
+    }
+
+    Write-Host "==> Installing Ruby $RubyVersion (silent)..."
+    Start-Process -FilePath $tmp -ArgumentList '/verysilent /tasks="assocfiles,modpath"' -Wait
+    Remove-Item $tmp -Force
+}
+
 function Install-Ruby {
     $rubyVersion = (Get-Content .ruby-version).Trim() -replace '^ruby-', ''
 
+    # Priority 1: winget (built into Windows 10 1809+ / Windows 11)
     if (Get-Command winget -ErrorAction SilentlyContinue) {
-        Write-Host "==> Installing Ruby+Devkit 4.x via winget..."
+        Write-Host "==> Installing Ruby 4.x via winget..."
         winget install --id RubyInstallerTeam.RubyWithDevKit.4 --source winget --silent --accept-package-agreements --accept-source-agreements
         Refresh-Path
-    } else {
-        Write-Host @"
-
-ERROR: winget not found. Install Ruby $rubyVersion manually:
-
-  Option 1 (Recommended):
-    Download Ruby+Devkit $rubyVersion-x64 from https://rubyinstaller.org/downloads/
-    Run the installer and check "Add Ruby to PATH".
+        if (Test-RubyAdequate) { return }
+    }
 
-  Option 2:
-    Install winget (App Installer) from the Microsoft Store, then re-run:
-      bin\setup.bat
+    # Priority 2: Chocolatey
+    if (Get-Command choco -ErrorAction SilentlyContinue) {
+        Write-Host "==> Installing Ruby via Chocolatey..."
+        & choco install ruby --yes
+        Refresh-Path
+        if (Test-RubyAdequate) { return }
+    }
 
-After installing Ruby, re-run: bin\setup.bat
-"@
-        exit 1
+    # Priority 3: Scoop
+    if (Get-Command scoop -ErrorAction SilentlyContinue) {
+        Write-Host "==> Installing Ruby via Scoop..."
+        & scoop install ruby
+        Refresh-Path
+        if (Test-RubyAdequate) { return }
     }
+
+    # Priority 4: direct download from GitHub Releases with SHA256 verification
+    Write-Host "==> No package manager found — downloading Ruby directly..."
+    Install-RubyDirect -RubyVersion $rubyVersion
+    Refresh-Path
 }
 
 # ── Main ───────────────────────────────────────────────────────────────────────
@@ -73,12 +111,11 @@ if ($null -eq $major) {
     Write-Host "==> Ruby $major.x found."
 }
 
-# Verify Ruby is reachable after install (winget may require a new terminal on first install)
-$major = Get-RubyMajorVersion
-if ($null -eq $major -or $major -lt $RequiredRubyMajor) {
+# Verify Ruby is reachable after install (PATH refresh may not propagate to parent shell)
+if (-not (Test-RubyAdequate)) {
     Write-Host @"
 
-ERROR: Ruby is not in PATH after installation.
+ERROR: Ruby $RequiredRubyMajor+ is not in PATH after installation.
 Close this terminal, open a new one, and re-run: bin\setup.bat
 "@
     exit 1

data/lib/predictability_engine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PredictabilityEngine
-  VERSION = '0.11.5'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: predictability-engine
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - cbp-org